summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README16
-rw-r--r--academic/Gridcoin-Research/Gridcoin-Research.SlackBuild6
-rw-r--r--academic/Gridcoin-Research/boost-1.73.patch54
-rw-r--r--academic/antiprism/antiprism.SlackBuild2
-rw-r--r--academic/geda-gaf/geda-gaf.info2
-rw-r--r--academic/gelemental/gcc.patch12
-rw-r--r--academic/gelemental/gelemental.SlackBuild3
-rw-r--r--academic/genius/README2
-rw-r--r--academic/genometools/genometools.SlackBuild2
-rw-r--r--academic/primer3/primer3.SlackBuild4
-rw-r--r--academic/root/root.SlackBuild9
-rw-r--r--academic/root/root.info8
-rw-r--r--academic/tophat/make_pair.patch24
-rw-r--r--academic/tophat/tophat.SlackBuild3
-rw-r--r--academic/ugene/ugene-1.22.0-dont_hardcode_includes.patch24
-rw-r--r--academic/ugene/ugene.SlackBuild3
-rw-r--r--accessibility/easystroke/easystroke.SlackBuild1
-rw-r--r--accessibility/easystroke/gcc7-build-fix.patch40
-rw-r--r--accessibility/flite/flite.info2
-rw-r--r--accessibility/jpilot/jpilot.SlackBuild23
-rw-r--r--accessibility/jpilot/jpilot.info6
-rw-r--r--accessibility/xsel/xsel.SlackBuild2
-rw-r--r--audio/aacgain/aacgain.SlackBuild2
-rw-r--r--audio/alsamodularsynth/alsamodularsynth.SlackBuild9
-rw-r--r--audio/audacious-aac/audacious-aac.SlackBuild8
-rw-r--r--audio/audacious-aac/audacious-aac.info6
-rw-r--r--audio/audacious-cue/audacious-cue.SlackBuild8
-rw-r--r--audio/audacious-cue/audacious-cue.info6
-rw-r--r--audio/audacious-ffmpeg/README4
-rw-r--r--audio/audacious-ffmpeg/audacious-ffmpeg.SlackBuild106
-rw-r--r--audio/audacious-ffmpeg/audacious-ffmpeg.info10
-rw-r--r--audio/audacious-ffmpeg/patches/enable_only_ffmpeg_plugin.diff8
-rw-r--r--audio/audacious-ffmpeg/slack-desc19
-rw-r--r--audio/audacity/audacity.SlackBuild8
-rw-r--r--audio/audacity/audacity.info10
-rw-r--r--audio/butt/butt.SlackBuild2
-rw-r--r--audio/calf-ladspa/calf-ladspa.SlackBuild2
-rw-r--r--audio/clementine/clementine.SlackBuild9
-rw-r--r--audio/clementine/clementine.info6
-rw-r--r--audio/darkice/darkice.SlackBuild2
-rw-r--r--audio/easytag/README5
-rw-r--r--audio/easytag/doinst.sh13
-rw-r--r--audio/easytag/easytag.SlackBuild106
-rw-r--r--audio/easytag/easytag.info10
-rw-r--r--audio/easytag/slack-desc19
-rw-r--r--audio/fluidsynth/README19
-rw-r--r--audio/fluidsynth/fluidsynth.SlackBuild109
-rw-r--r--audio/fluidsynth/fluidsynth.info10
-rw-r--r--audio/fluidsynth/slack-desc19
-rw-r--r--audio/lash/lash.SlackBuild2
-rw-r--r--audio/mac/gcc6.patch181
-rw-r--r--audio/mac/mac.SlackBuild2
-rw-r--r--audio/mixxx/mixxx.SlackBuild3
-rw-r--r--audio/mp3blaster/mp3blaster.SlackBuild3
-rw-r--r--audio/musepack-tools/musepack-tools.SlackBuild2
-rw-r--r--audio/opus-tools/README2
-rw-r--r--audio/opus-tools/opus-tools.SlackBuild102
-rw-r--r--audio/opus-tools/opus-tools.info10
-rw-r--r--audio/opus-tools/slack-desc19
-rw-r--r--audio/opus/README4
-rw-r--r--audio/opus/opus.SlackBuild105
-rw-r--r--audio/opus/opus.info10
-rw-r--r--audio/opus/slack-desc19
-rw-r--r--audio/opusfile/README2
-rw-r--r--audio/opusfile/opusfile.SlackBuild100
-rw-r--r--audio/opusfile/opusfile.info10
-rw-r--r--audio/opusfile/slack-desc19
-rw-r--r--audio/oss/glibc-2.23.patch19
-rw-r--r--audio/oss/oss.SlackBuild14
-rw-r--r--audio/oss/oss.info6
-rw-r--r--audio/pithos/doinst.sh6
-rw-r--r--audio/pithos/pithos.SlackBuild32
-rw-r--r--audio/pithos/pithos.info10
-rw-r--r--audio/pithos/slack-desc2
-rw-r--r--audio/qastools/qastools.SlackBuild12
-rw-r--r--audio/qastools/qastools.info6
-rw-r--r--audio/rhythmbox/rhythmbox.SlackBuild2
-rw-r--r--audio/rhythmbox/rhythmbox.info6
-rw-r--r--audio/rumor/gcc7.diff12
-rw-r--r--audio/rumor/rumor.SlackBuild3
-rw-r--r--audio/shell-fm/README12
-rw-r--r--audio/shell-fm/shell-fm.SlackBuild91
-rw-r--r--audio/shell-fm/shell-fm.info10
-rw-r--r--audio/shell-fm/slack-desc19
-rw-r--r--audio/sidplayfp/sidplayfp.SlackBuild10
-rw-r--r--audio/sidplayfp/sidplayfp.info6
-rw-r--r--audio/speex/README7
-rw-r--r--audio/speex/slack-desc19
-rw-r--r--audio/speex/speex.SlackBuild116
-rw-r--r--audio/speex/speex.info10
-rw-r--r--audio/xmms2/xmms2.SlackBuild2
-rw-r--r--audio/xmms2/xmms2.info8
-rw-r--r--business/ledger/ledger.SlackBuild4
-rw-r--r--desktop/arc-theme/README2
-rw-r--r--desktop/arc-theme/arc-theme.SlackBuild12
-rw-r--r--desktop/arc-theme/arc-theme.info10
-rw-r--r--desktop/arc-theme/slack-desc2
-rw-r--r--desktop/cairo-dock-plugins/README2
-rw-r--r--desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild30
-rw-r--r--desktop/cairo-dock-plugins/cairo-dock-plugins.info6
-rw-r--r--desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch40
-rw-r--r--desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch52
-rw-r--r--desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-mono.patch106
-rw-r--r--desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-port-WebKit2.patch77
-rw-r--r--desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch137
-rw-r--r--desktop/cairo-dock/cairo-dock.SlackBuild17
-rw-r--r--desktop/cairo-dock/cairo-dock.info6
-rw-r--r--desktop/ceti-2-theme/README10
-rw-r--r--desktop/ceti-2-theme/ceti-2-theme.SlackBuild77
-rw-r--r--desktop/ceti-2-theme/ceti-2-theme.info10
-rw-r--r--desktop/ceti-2-theme/doinst.sh13
-rw-r--r--desktop/ceti-2-theme/slack-desc19
-rw-r--r--desktop/devilspie/devilspie.SlackBuild2
-rw-r--r--desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff26
-rw-r--r--desktop/dmenu/dmenu-4.9-libdir_cflags_fixups.diff25
-rw-r--r--desktop/dmenu/dmenu.SlackBuild4
-rw-r--r--desktop/dmenu/dmenu.info6
-rw-r--r--desktop/ffmpegthumbnailer/README4
-rw-r--r--desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild104
-rw-r--r--desktop/ffmpegthumbnailer/ffmpegthumbnailer.info10
-rw-r--r--desktop/ffmpegthumbnailer/slack-desc19
-rw-r--r--desktop/i3/i3.SlackBuild2
-rw-r--r--desktop/i3/i3.info6
-rw-r--r--desktop/lumina/lumina.SlackBuild1
-rw-r--r--desktop/lxpanel/lxpanel.info2
-rw-r--r--desktop/neofetch/README8
-rw-r--r--desktop/neofetch/neofetch.SlackBuild60
-rw-r--r--desktop/neofetch/neofetch.info10
-rw-r--r--desktop/neofetch/slack-desc19
-rw-r--r--desktop/picom/README6
-rw-r--r--desktop/picom/doinst.sh (renamed from desktop/seafile-gui/doinst.sh)0
-rw-r--r--desktop/picom/picom.SlackBuild94
-rw-r--r--desktop/picom/picom.info10
-rw-r--r--desktop/picom/slack-desc19
-rw-r--r--desktop/polybar/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch44
-rw-r--r--desktop/polybar/polybar.SlackBuild5
-rw-r--r--desktop/rss-glx/patches/pixelcity-cpp.patch15
-rw-r--r--desktop/rss-glx/patches/rss-glx-0.9.1-imagemagick-7.patch178
-rw-r--r--desktop/rss-glx/rss-glx.SlackBuild2
-rw-r--r--desktop/rss-guard/01_min_qt_required_is_5.9.patch56
-rw-r--r--desktop/rss-guard/02_fix_random_class_name.patch24
-rw-r--r--desktop/rss-guard/rss-guard.SlackBuild11
-rw-r--r--desktop/rss-guard/rss-guard.info6
-rw-r--r--desktop/seafile-client/README (renamed from desktop/seafile-gui/README)0
-rw-r--r--desktop/seafile-client/doinst.sh (renamed from graphics/scantailor/doinst.sh)0
-rw-r--r--desktop/seafile-client/seafile-client.SlackBuild91
-rw-r--r--desktop/seafile-client/seafile-client.info10
-rw-r--r--desktop/seafile-client/slack-desc19
-rw-r--r--desktop/seafile-gui/seafile-gui.SlackBuild92
-rw-r--r--desktop/seafile-gui/seafile-gui.info10
-rw-r--r--desktop/seafile-gui/slack-desc19
-rw-r--r--desktop/searchmonkey/patch.txt11
-rw-r--r--desktop/searchmonkey/searchmonkey.SlackBuild1
-rw-r--r--desktop/ssr/README6
-rw-r--r--desktop/ssr/doinst.sh9
-rw-r--r--desktop/ssr/slack-desc19
-rw-r--r--desktop/ssr/ssr.SlackBuild105
-rw-r--r--desktop/ssr/ssr.info10
-rw-r--r--desktop/suru-plus-icon-theme/README3
-rw-r--r--desktop/suru-plus-icon-theme/doinst.sh5
-rw-r--r--desktop/suru-plus-icon-theme/slack-desc19
-rw-r--r--desktop/suru-plus-icon-theme/suru-plus-icon-theme.SlackBuild63
-rw-r--r--desktop/suru-plus-icon-theme/suru-plus-icon-theme.info10
-rw-r--r--desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild8
-rw-r--r--desktop/thunar-archive-plugin/thunar-archive-plugin.info6
-rw-r--r--desktop/thunar-dropbox/README1
-rw-r--r--desktop/thunar-dropbox/doinst.sh6
-rw-r--r--desktop/thunar-dropbox/slack-desc19
-rw-r--r--desktop/thunar-dropbox/thunar-dropbox.SlackBuild88
-rw-r--r--desktop/thunar-dropbox/thunar-dropbox.info10
-rw-r--r--desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.patch61
-rw-r--r--desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.patch61
-rw-r--r--desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.SlackBuild10
-rw-r--r--desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.info6
-rw-r--r--desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild2
-rw-r--r--desktop/thunar-vcs-plugin/thunar-vcs-plugin.info6
-rw-r--r--desktop/vala-panel-appmenu/vala-panel-appmenu.SlackBuild6
-rw-r--r--desktop/vala-panel-appmenu/vala-panel-appmenu.info6
-rw-r--r--desktop/wbar/wbar.SlackBuild2
-rw-r--r--desktop/weston/README92
-rw-r--r--desktop/weston/README.SBo112
-rw-r--r--desktop/weston/weston-7.0.0-nopam.patch160
-rw-r--r--desktop/weston/weston.SlackBuild20
-rw-r--r--desktop/weston/weston.info8
-rw-r--r--desktop/wmCalClock/wmCalClock.SlackBuild2
-rw-r--r--desktop/wmMoonClock/wmMoonClock.SlackBuild2
-rw-r--r--desktop/wmSun/wmSun.SlackBuild2
-rw-r--r--desktop/wmakerconf/README4
-rw-r--r--desktop/wmakerconf/doinst.sh3
-rw-r--r--desktop/wmakerconf/slack-desc19
-rw-r--r--desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch82
-rw-r--r--desktop/wmakerconf/wmakerconf.SlackBuild95
-rw-r--r--desktop/wmakerconf/wmakerconf.info10
-rw-r--r--desktop/wminfo/wminfo.SlackBuild2
-rw-r--r--desktop/wmsm.app/wmsm.app.SlackBuild2
-rw-r--r--desktop/wmtop/wmtop.SlackBuild2
-rw-r--r--desktop/wmweather/wmweather.SlackBuild2
-rw-r--r--desktop/workrave/README4
-rw-r--r--desktop/workrave/doinst.sh19
-rw-r--r--desktop/workrave/slack-desc19
-rw-r--r--desktop/workrave/workrave.SlackBuild98
-rw-r--r--desktop/workrave/workrave.info10
-rw-r--r--desktop/yad/yad.SlackBuild18
-rw-r--r--desktop/yad/yad.info8
-rw-r--r--development/ChezScheme/ChezScheme.SlackBuild1
-rw-r--r--development/Coin/Coin.SlackBuild3
-rw-r--r--development/Coin/memhandler-initialization.patch20
-rw-r--r--development/FreeBASIC/FreeBASIC.SlackBuild7
-rw-r--r--development/MySQL-python/MySQL-python.SlackBuild2
-rw-r--r--development/SDL2_gfx/README3
-rw-r--r--development/SDL2_gfx/SDL2_gfx.SlackBuild99
-rw-r--r--development/SDL2_gfx/SDL2_gfx.info10
-rw-r--r--development/SDL2_gfx/slack-desc19
-rw-r--r--development/acpica/acpica.SlackBuild6
-rw-r--r--development/acpica/acpica.info6
-rw-r--r--development/android-tools/README4
-rw-r--r--development/android-tools/android-tools.SlackBuild70
-rw-r--r--development/android-tools/android-tools.info36
-rw-r--r--development/android-tools/bash_completion.fastboot90
-rw-r--r--development/android-tools/fix_build_core.patch155
-rw-r--r--development/android-tools/fix_build_selinux.patch26
-rw-r--r--development/android-tools/generate_build.rb461
-rw-r--r--development/anjuta/anjuta.SlackBuild2
-rw-r--r--development/apache-log4cxx/apache-log4cxx.SlackBuild1
-rw-r--r--development/apache-log4cxx/narrowing-fixes.patch.gzbin0 -> 1631 bytes
-rw-r--r--development/autogen/autogen.SlackBuild7
-rw-r--r--development/autogen/guile-2.2.patch78
-rw-r--r--development/avr-binutils/avr-binutils.SlackBuild18
-rw-r--r--development/avr-binutils/avr-binutils.info6
-rw-r--r--development/avr-binutils/avr-size.patch385
-rw-r--r--development/avr-gcc/avr-gcc.SlackBuild48
-rw-r--r--development/avr-gcc/avr-gcc.info8
-rw-r--r--development/bashdb/bashdb.SlackBuild4
-rw-r--r--development/bashdb/bashdb.info6
-rw-r--r--development/brotli/README6
-rw-r--r--development/brotli/brotli.SlackBuild101
-rw-r--r--development/brotli/brotli.info10
-rw-r--r--development/brotli/slack-desc19
-rw-r--r--development/camlp4/camlp4.SlackBuild18
-rw-r--r--development/camlp4/camlp4.info6
-rw-r--r--development/check/README8
-rw-r--r--development/check/check.SlackBuild107
-rw-r--r--development/check/check.info10
-rw-r--r--development/check/slack-desc19
-rw-r--r--development/coccinelle/coccinelle.SlackBuild5
-rw-r--r--development/coccinelle/coccinelle.info6
-rw-r--r--development/device-tree-compiler/device-tree-compiler.SlackBuild4
-rw-r--r--development/device-tree-compiler/device-tree-compiler.info6
-rw-r--r--development/docutils/README6
-rw-r--r--development/docutils/docutils.SlackBuild73
-rw-r--r--development/docutils/docutils.info10
-rw-r--r--development/docutils/slack-desc19
-rw-r--r--development/dune/README5
-rw-r--r--development/dune/dune.SlackBuild90
-rw-r--r--development/dune/dune.info10
-rw-r--r--development/dune/slack-desc19
-rw-r--r--development/freetds/freetds.SlackBuild2
-rw-r--r--development/freetds/freetds.info6
-rw-r--r--development/gcc5/README46
-rw-r--r--development/gcc5/c89.sh11
-rw-r--r--development/gcc5/c99.sh11
-rw-r--r--development/gcc5/ecj.sh5
-rw-r--r--development/gcc5/fastjar-patches/1000-fastjar-0.97-segfault.patch29
-rw-r--r--development/gcc5/fastjar-patches/1001-fastjar-0.97-len1.patch16
-rw-r--r--development/gcc5/fastjar-patches/1002-fastjar-0.97-filename0.patch14
-rw-r--r--development/gcc5/fastjar-patches/1003-fastjar-CVE-2010-0831.patch102
-rw-r--r--development/gcc5/fastjar-patches/1004-fastjar-man.patch27
-rw-r--r--development/gcc5/gcc5.SlackBuild569
-rw-r--r--development/gcc5/gcc5.info17
-rw-r--r--development/gcc5/libgcj-5.pc10
-rw-r--r--development/gcc5/patches/0001-i386-Move-struct-ix86_frame-to-machine_function.diff239
-rw-r--r--development/gcc5/patches/0002-i386-Use-reference-of-struct-ix86_frame-to-avoid-cop.diff72
-rw-r--r--development/gcc5/patches/0003-i386-More-use-reference-of-struct-ix86_frame-to-avoi.diff59
-rw-r--r--development/gcc5/patches/0004-i386-Don-t-use-reference-of-struct-ix86_frame.diff63
-rw-r--r--development/gcc5/patches/0005-x86-Add-mindirect-branch-doc.diff279
-rw-r--r--development/gcc5/patches/0005-x86-Add-mindirect-branch.diff1870
-rw-r--r--development/gcc5/patches/0006-x86-Add-mfunction-return-doc.diff300
-rw-r--r--development/gcc5/patches/0006-x86-Add-mfunction-return.diff1409
-rw-r--r--development/gcc5/patches/0007-x86-Add-mindirect-branch-register-doc.diff231
-rw-r--r--development/gcc5/patches/0007-x86-Add-mindirect-branch-register.diff812
-rw-r--r--development/gcc5/patches/0008-x86-Add-V-register-operand-modifier-doc.diff65
-rw-r--r--development/gcc5/patches/0008-x86-Add-V-register-operand-modifier.diff125
-rw-r--r--development/gcc5/patches/0009-x86-Disallow-mindirect-branch-mfunction-return-with-.diff275
-rw-r--r--development/gcc5/patches/0009-x86-Disallow-mindirect-branch-mfunction-return-with-doc.diff102
-rw-r--r--development/gcc5/patches/gcc-no_fixincludes.diff27
-rw-r--r--development/gcc5/patches/gcc.66782.diff124
-rw-r--r--development/gcc5/patches/gcc.69140.diff13
-rw-r--r--development/gcc5/patches/glibc2.28-ustat.diff31
-rw-r--r--development/gcc5/profile.d/gcc5.csh7
-rw-r--r--development/gcc5/profile.d/gcc5.sh7
-rw-r--r--development/gcc5/slack-desc.gcc519
-rw-r--r--development/geany-plugins/geany-plugins.SlackBuild5
-rw-r--r--development/geany-plugins/geany-plugins.info6
-rw-r--r--development/geany/geany.SlackBuild4
-rw-r--r--development/geany/geany.info6
-rw-r--r--development/gedit/gedit.SlackBuild1
-rw-r--r--development/glade/glade.SlackBuild4
-rw-r--r--development/glade/glade.info6
-rw-r--r--development/gnats/gnats.SlackBuild2
-rw-r--r--development/gnuradio/boost-1.70.0.patch36
-rw-r--r--development/gnuradio/boost-1.73.0.patch720
-rw-r--r--development/gnuradio/gnuradio.SlackBuild6
-rw-r--r--development/gnuradio/replace_boost_endian_check_with_cmake.patch45
-rw-r--r--development/gpsim/gpsim.SlackBuild2
-rw-r--r--development/gr-osmosdr/boost-1.73.patch20
-rw-r--r--development/gr-osmosdr/gr-osmosdr.SlackBuild3
-rw-r--r--development/gsoap/gsoap-libtool.patch73
-rw-r--r--development/gsoap/gsoap.SlackBuild4
-rw-r--r--development/gsoap/gsoap.info6
-rw-r--r--development/guile2.2/README10
-rw-r--r--development/guile2.2/guile2.2.SlackBuild138
-rw-r--r--development/guile2.2/guile2.2.info10
-rw-r--r--development/guile2.2/slack-desc19
-rw-r--r--development/hte/hte.SlackBuild24
-rw-r--r--development/hte/hte.info6
-rw-r--r--development/hte/hteditor-2.1.0-gcc-7.patch32
-rw-r--r--development/icecream/README12
-rw-r--r--development/icecream/doinst.sh30
-rw-r--r--development/icecream/icecream.SlackBuild133
-rw-r--r--development/icecream/icecream.info10
-rw-r--r--development/icecream/profile.d/icecream.csh2
-rw-r--r--development/icecream/profile.d/icecream.sh2
-rw-r--r--development/icecream/rc.icecc-scheduler50
-rw-r--r--development/icecream/rc.iceccd50
-rw-r--r--development/icecream/rc.icecream.conf8
-rw-r--r--development/icecream/slack-desc19
-rw-r--r--development/jdk/profile.d/jdk.csh1
-rw-r--r--development/jdk/profile.d/jdk.sh1
-rw-r--r--development/kicad/kicad.SlackBuild1
-rw-r--r--development/kicad/kicad_std-header_for_boost1.7.3.patch14
-rw-r--r--development/latrace/fix-scanner-config-for-flex-2.6.x.patch23
-rw-r--r--development/latrace/latrace.SlackBuild3
-rw-r--r--development/lmdb/README2
-rw-r--r--development/lmdb/lmdb.SlackBuild95
-rw-r--r--development/lmdb/lmdb.info10
-rw-r--r--development/lmdb/slack-desc19
-rw-r--r--development/meld3/meld3.SlackBuild4
-rw-r--r--development/meld3/meld3.info6
-rw-r--r--development/meld3/python-3.8.patch61
-rw-r--r--development/menhir/menhir.SlackBuild6
-rw-r--r--development/menhir/menhir.info6
-rw-r--r--development/meson/README9
-rw-r--r--development/meson/meson.SlackBuild91
-rw-r--r--development/meson/meson.info10
-rw-r--r--development/meson/slack-desc19
-rw-r--r--development/mozjs/README3
-rw-r--r--development/mozjs/mozjs.SlackBuild143
-rw-r--r--development/mozjs/mozjs.info10
-rw-r--r--development/mozjs/patches/moz38-dont-hardcode-libc-soname.patch15
-rw-r--r--development/mozjs/slack-desc19
-rw-r--r--development/mysql-pinba/mysql-pinba.SlackBuild2
-rw-r--r--development/mysql-workbench/mysql-workbench.SlackBuild5
-rw-r--r--development/ninja/README4
-rw-r--r--development/ninja/ninja.SlackBuild95
-rw-r--r--development/ninja/ninja.info10
-rw-r--r--development/ninja/slack-desc19
-rw-r--r--development/nvi/README5
-rw-r--r--development/nvi/nvi.SlackBuild109
-rw-r--r--development/nvi/nvi.info10
-rw-r--r--development/nvi/patches/nvi.diffs28
-rw-r--r--development/nvi/slack-desc19
-rw-r--r--development/ocaml/configure.patch25
-rw-r--r--development/ocaml/ocaml.SlackBuild15
-rw-r--r--development/ocaml/ocaml.info14
-rw-r--r--development/ocamlbuild/ocamlbuild.SlackBuild4
-rw-r--r--development/ocamlbuild/ocamlbuild.info6
-rw-r--r--development/odb/odb.SlackBuild3
-rw-r--r--development/odb/odb_gcc6.patch355
-rw-r--r--development/omake/omake-warn-error.diff11
-rw-r--r--development/omake/omake.SlackBuild32
-rw-r--r--development/omake/omake.info8
-rw-r--r--development/oniguruma/README3
-rw-r--r--development/oniguruma/oniguruma.SlackBuild104
-rw-r--r--development/oniguruma/oniguruma.info10
-rw-r--r--development/oniguruma/slack-desc19
-rw-r--r--development/opencl-headers/README3
-rw-r--r--development/opencl-headers/opencl-headers.SlackBuild57
-rw-r--r--development/opencl-headers/opencl-headers.info10
-rw-r--r--development/opencl-headers/slack-desc19
-rw-r--r--development/openocd/openocd.SlackBuild10
-rw-r--r--development/openocd/openocd.info6
-rw-r--r--development/perf/perf.SlackBuild2
-rw-r--r--development/perf/perf.info2
-rw-r--r--development/php-apcu/php-apcu.SlackBuild4
-rw-r--r--development/php-apcu/php-apcu.info6
-rw-r--r--development/poedit/poedit.SlackBuild6
-rw-r--r--development/poedit/poedit.info6
-rw-r--r--development/poedit/setvalue.diff11
-rw-r--r--development/re2c/README6
-rw-r--r--development/re2c/re2c.SlackBuild109
-rw-r--r--development/re2c/re2c.info10
-rw-r--r--development/re2c/slack-desc19
-rw-r--r--development/spice-protocol/spice-protocol.SlackBuild5
-rw-r--r--development/spice-protocol/spice-protocol.info6
-rw-r--r--development/swfmill/swfmill.SlackBuild2
-rw-r--r--development/tora/README2
-rw-r--r--development/tora/tora.SlackBuild14
-rw-r--r--development/tora/tora.info8
-rw-r--r--development/vala/README4
-rw-r--r--development/vala/patch_support-gtk318.diff50
-rw-r--r--development/vala/slack-desc19
-rw-r--r--development/vala/vala.SlackBuild100
-rw-r--r--development/vala/vala.info10
-rw-r--r--development/woff2/README1
-rw-r--r--development/woff2/slack-desc19
-rw-r--r--development/woff2/woff2.SlackBuild87
-rw-r--r--development/woff2/woff2.info10
-rw-r--r--development/xa/xa.SlackBuild2
-rw-r--r--development/xa/xa.info6
-rw-r--r--games/RetroArch/RetroArch.SlackBuild3
-rw-r--r--games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch22
-rw-r--r--games/alienarena/alienarena.SlackBuild30
-rw-r--r--games/alienarena/alienarena.info4
-rw-r--r--games/alienarena/checkout_code.sh6
-rw-r--r--games/arx-libertatis/arx-libertatis-1.1.2-cmake3.5.patch12
-rw-r--r--games/arx-libertatis/arx-libertatis.SlackBuild14
-rw-r--r--games/arx-libertatis/arx-libertatis.info8
-rw-r--r--games/assaultcube/assaultcube-gcc6.patch301
-rw-r--r--games/assaultcube/assaultcube.SlackBuild2
-rw-r--r--games/berusky2/berusky2.SlackBuild6
-rw-r--r--games/berusky2/berusky2.info6
-rw-r--r--games/blobwars/blobwars.SlackBuild2
-rw-r--r--games/bloodfrontier/bloodfrontier.SlackBuild2
-rw-r--r--games/brainparty/brainparty.SlackBuild3
-rw-r--r--games/brainparty/patches/gcc-6.patch47
-rw-r--r--games/chroma/chroma.SlackBuild19
-rw-r--r--games/chroma/gcc.patch30
-rw-r--r--games/crrcsim/crrcsim.SlackBuild3
-rw-r--r--games/crrcsim/fix_bug.patch12
-rw-r--r--games/desmume/desmume.SlackBuild27
-rw-r--r--games/desmume/desmume.info6
-rw-r--r--games/desmume/osmesa-header-fix.patch11
-rw-r--r--games/dolphin-emu/dolphin-emu.SlackBuild4
-rw-r--r--games/dolphin-emu/dolphin-emu.info6
-rw-r--r--games/etlegacy-from-source/README25
-rw-r--r--games/etlegacy-from-source/doinst.sh (renamed from office/juffed/doinst.sh)0
-rw-r--r--games/etlegacy-from-source/etlegacy-from-source.SlackBuild186
-rw-r--r--games/etlegacy-from-source/etlegacy-from-source.info16
-rw-r--r--games/etlegacy-from-source/files/etlegacy.desktop9
-rw-r--r--games/etlegacy-from-source/files/etlegacy.svg100
-rw-r--r--games/etlegacy-from-source/files/get_tarball_from_git.sh25
-rw-r--r--games/etlegacy-from-source/files/openurl.sh15
-rw-r--r--games/etlegacy-from-source/slack-desc19
-rw-r--r--games/f1spirit/03_gcc6.patch12
-rw-r--r--games/f1spirit/f1spirit.SlackBuild3
-rw-r--r--games/freeorion/freeorion.SlackBuild4
-rw-r--r--games/freeorion/freeorion.info6
-rw-r--r--games/frogatto/frogatto.SlackBuild6
-rw-r--r--games/gargoyle/gargoyle.SlackBuild2
-rw-r--r--games/glob2/c++14.patch46
-rw-r--r--games/glob2/glob2.SlackBuild3
-rw-r--r--games/gnubg/gnubg.SlackBuild2
-rw-r--r--games/goonies/gcc6.patch12
-rw-r--r--games/goonies/goonies.SlackBuild3
-rw-r--r--games/innoextract/innoextract.SlackBuild1
-rw-r--r--games/m64py/m64py.SlackBuild10
-rw-r--r--games/m64py/m64py.info8
-rw-r--r--games/micropolis/micropolis.SlackBuild2
-rw-r--r--games/mupen64plus/fix_multiple_definition_errors.patch11
-rw-r--r--games/mupen64plus/mupen64plus.SlackBuild3
-rw-r--r--games/neverball/gcc10.patch41
-rw-r--r--games/neverball/neverball.SlackBuild2
-rw-r--r--games/nlarn/nlarn.SlackBuild3
-rw-r--r--games/noteye/noteye.SlackBuild3
-rw-r--r--games/openlierox/http_curl.patch20
-rw-r--r--games/openlierox/openlierox.SlackBuild8
-rw-r--r--games/openlierox/openlierox.info8
-rw-r--r--games/openmw/openmw.SlackBuild4
-rw-r--r--games/openmw/openmw.info6
-rw-r--r--games/openttd/openttd.SlackBuild2
-rw-r--r--games/pingus/missing-header.patch22
-rw-r--r--games/pingus/pingus.SlackBuild3
-rw-r--r--games/pokerth/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch14
-rw-r--r--games/pokerth/pokerth-1.1.2-boost-1.66-remove-deprecated.patch26
-rw-r--r--games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix1.patch75
-rw-r--r--games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix2.patch52
-rw-r--r--games/pokerth/pokerth-1.1.2-boost-1.73-placeholders.patch18
-rw-r--r--games/pokerth/pokerth.SlackBuild37
-rw-r--r--games/pokerth/pokerth.info6
-rw-r--r--games/pysolfc/pillow6.patch47
-rw-r--r--games/pysolfc/pysolfc.SlackBuild2
-rw-r--r--games/quakespasm/README1
-rw-r--r--games/quakespasm/doinst.sh (renamed from python/python-future/doinst.sh)0
-rw-r--r--games/quakespasm/quakespasm.SlackBuild91
-rw-r--r--games/quakespasm/quakespasm.desktop9
-rw-r--r--games/quakespasm/quakespasm.info10
-rw-r--r--games/quakespasm/slack-desc19
-rw-r--r--games/rlvm/gcc.patch24
-rw-r--r--games/rlvm/rlvm.SlackBuild3
-rw-r--r--games/roadfighter/gcc.patch11
-rw-r--r--games/roadfighter/roadfighter.SlackBuild3
-rw-r--r--games/speed-dreams/speed-dreams-params-conversion.patch22
-rw-r--r--games/speed-dreams/speed-dreams.SlackBuild3
-rw-r--r--games/supertux/supertux-0.6.2_rc1-boost-1.73.patch25
-rw-r--r--games/supertux/supertux.SlackBuild11
-rw-r--r--games/supertux/supertux.info6
-rw-r--r--games/supertuxkart/mesa-18.3.patch23
-rw-r--r--games/supertuxkart/supertuxkart.SlackBuild3
-rw-r--r--games/torcs/torcs.SlackBuild2
-rw-r--r--games/trackballs/README2
-rw-r--r--games/trackballs/patches/abs.diff22
-rw-r--r--games/trackballs/patches/trackballs-1.1.4-guile20.patch310
-rw-r--r--games/trackballs/patches/trackballs-1.1.4-remove-old-sdl-workarounds.patch117
-rw-r--r--games/trackballs/trackballs.SlackBuild58
-rw-r--r--games/trackballs/trackballs.info10
-rw-r--r--games/uqm/uqm.SlackBuild6
-rw-r--r--games/vegastrike/cmake/FindGTK2.cmake946
-rw-r--r--games/vegastrike/cmake/FindPackageHandleStandardArgs.cmake466
-rw-r--r--games/vegastrike/cmake/FindPackageMessage.cmake48
-rw-r--r--games/vegastrike/cmake/SelectLibraryConfigurations.cmake80
-rw-r--r--games/vegastrike/patches/patch-0.5.1.r1_1760
-rw-r--r--games/vegastrike/patches/patch-0.5.1.r1_2616
-rw-r--r--games/vegastrike/patches/patch_partsfix-0.5.1.r1_1 (renamed from games/vegastrike/patches/patch_partsfix-0.5.1.r1_2)0
-rw-r--r--games/vegastrike/vegastrike.SlackBuild7
-rw-r--r--games/warmux/patches/return-null.patch11
-rw-r--r--games/warmux/warmux.SlackBuild5
-rw-r--r--games/widelands/widelands-gcc47.patch12
-rw-r--r--games/widelands/widelands.SlackBuild12
-rw-r--r--games/widelands/widelands.info6
-rw-r--r--games/xmoto/xmoto.SlackBuild2
-rw-r--r--games/xu4/gcc7.patch90
-rw-r--r--games/xu4/xu4.SlackBuild3
-rw-r--r--games/xye/xye.SlackBuild2
-rw-r--r--gis/gdal/gdal.SlackBuild2
-rw-r--r--gis/libLAS/Use_LIBLAS_BIG_ENDIAN.patch40
-rw-r--r--gis/libLAS/boost-1.73.patch36
-rw-r--r--gis/libLAS/libLAS.SlackBuild3
-rw-r--r--graphics/Blender/Blender.SlackBuild1
-rw-r--r--graphics/GraphicsMagick/README3
-rw-r--r--graphics/darktable/darktable.SlackBuild6
-rw-r--r--graphics/darktable/darktable.info6
-rw-r--r--graphics/enblend-enfuse/enblend-enfuse.SlackBuild2
-rw-r--r--graphics/flameshot/flameshot.SlackBuild2
-rw-r--r--graphics/flameshot/qpainter.patch22
-rw-r--r--graphics/gimagereader/cmake.patch10
-rw-r--r--graphics/gimagereader/gimagereader.SlackBuild2
-rw-r--r--graphics/gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild8
-rw-r--r--graphics/gimp-plugin-bimp/gimp-plugin-bimp.info6
-rw-r--r--graphics/goocanvas/goocanvas.SlackBuild1
-rw-r--r--graphics/gpaint/gpaint.SlackBuild1
-rw-r--r--graphics/graphite2/README8
-rw-r--r--graphics/graphite2/graphite2.SlackBuild96
-rw-r--r--graphics/graphite2/graphite2.info10
-rw-r--r--graphics/graphite2/slack-desc19
-rw-r--r--graphics/graphviz/graphviz.SlackBuild1
-rw-r--r--graphics/inkscape/README8
-rw-r--r--graphics/inkscape/fix_atomic_rel_error.patch10
-rw-r--r--graphics/inkscape/inkscape.SlackBuild62
-rw-r--r--graphics/inkscape/inkscape.info8
-rw-r--r--graphics/k3d/README1
-rw-r--r--graphics/k3d/gcc7.patch23
-rw-r--r--graphics/k3d/k3d.SlackBuild3
-rw-r--r--graphics/k3d/k3d.info2
-rw-r--r--graphics/kuickshow/kuickshow.SlackBuild8
-rw-r--r--graphics/librecad/librecad.SlackBuild11
-rw-r--r--graphics/librecad/librecad.info6
-rw-r--r--graphics/mypaint/mypaint.SlackBuild8
-rw-r--r--graphics/mypaint/mypaint.info8
-rw-r--r--graphics/nomacs/nomacs.SlackBuild3
-rw-r--r--graphics/opencollada/opencollada.SlackBuild3
-rw-r--r--graphics/opencollada/pcre.patch13
-rw-r--r--graphics/opencolorio/opencolorio.SlackBuild2
-rw-r--r--graphics/photoprint/photoprint.SlackBuild20
-rw-r--r--graphics/povray/povray.SlackBuild10
-rw-r--r--graphics/povray/povray.info6
-rw-r--r--graphics/rawstudio/rawstudio.SlackBuild2
-rw-r--r--graphics/rawtherapee/rawtherapee.SlackBuild2
-rw-r--r--graphics/rawtherapee/rawtherapee.info6
-rw-r--r--graphics/scantailor-advanced/scantailor-advanced.SlackBuild9
-rw-r--r--graphics/scantailor-advanced/scantailor-advanced.info6
-rw-r--r--graphics/scantailor/README6
-rw-r--r--graphics/scantailor/scantailor.SlackBuild86
-rw-r--r--graphics/scantailor/scantailor.desktop11
-rw-r--r--graphics/scantailor/scantailor.info10
-rw-r--r--graphics/scantailor/slack-desc19
-rw-r--r--graphics/simple-scan/libwebpmux.patch38
-rw-r--r--graphics/simple-scan/simple-scan.SlackBuild6
-rw-r--r--graphics/simple-scan/simple-scan.info8
-rw-r--r--graphics/simple-scan/slack-desc2
-rw-r--r--graphics/vulkan-sdk/README9
-rw-r--r--graphics/vulkan-sdk/slack-desc19
-rw-r--r--graphics/vulkan-sdk/vulkan-loader-cmake.patch13
-rw-r--r--graphics/vulkan-sdk/vulkan-sdk.SlackBuild206
-rw-r--r--graphics/vulkan-sdk/vulkan-sdk.info22
-rw-r--r--graphics/vulkan-sdk/vulkan-validationlayers-cmake.patch19
-rw-r--r--graphics/wayland-protocols/README9
-rw-r--r--graphics/wayland-protocols/slack-desc19
-rw-r--r--graphics/wayland-protocols/wayland-protocols.SlackBuild71
-rw-r--r--graphics/wayland-protocols/wayland-protocols.info10
-rw-r--r--graphics/yafaray-blender/yafaray-blender.SlackBuild28
-rw-r--r--graphics/yafaray-blender/yafaray-blender.info6
-rw-r--r--graphics/yafaray/README8
-rw-r--r--graphics/yafaray/yafaray.SlackBuild92
-rw-r--r--graphics/yafaray/yafaray.info8
-rw-r--r--ham/fldigi/fldigi.SlackBuild2
-rw-r--r--ham/soundmodem/soundmodem.SlackBuild2
-rw-r--r--ham/svxlink/gcc6.patch23
-rw-r--r--ham/svxlink/svxlink.SlackBuild5
-rw-r--r--libraries/Atlas-C++/Atlas-C++.SlackBuild2
-rw-r--r--libraries/CEGUI0.7/CEGUI0.7.SlackBuild2
-rw-r--r--libraries/FreeImage/010_avoid-raw-literal.diff44
-rw-r--r--libraries/FreeImage/FreeImage.SlackBuild6
-rw-r--r--libraries/FreeImage/FreeImage.info6
-rw-r--r--libraries/OpenAL/OpenAL.SlackBuild92
-rw-r--r--libraries/OpenAL/OpenAL.info10
-rw-r--r--libraries/OpenAL/README2
-rw-r--r--libraries/OpenAL/slack-desc19
-rw-r--r--libraries/OpenSceneGraph/0008-Fix_wxWidgets_gl.patch12
-rw-r--r--libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild3
-rw-r--r--libraries/PyQt5/PyQt5.SlackBuild125
-rw-r--r--libraries/PyQt5/PyQt5.info10
-rw-r--r--libraries/PyQt5/README2
-rw-r--r--libraries/PyQt5/patches/pyqt5-python2-crash.patch13
-rw-r--r--libraries/PyQt5/slack-desc19
-rw-r--r--libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild103
-rw-r--r--libraries/QScintilla-qt5/QScintilla-qt5.info10
-rw-r--r--libraries/QScintilla-qt5/README11
-rw-r--r--libraries/QScintilla-qt5/slack-desc19
-rw-r--r--libraries/SDL2/README9
-rw-r--r--libraries/SDL2/SDL2.SlackBuild99
-rw-r--r--libraries/SDL2/SDL2.info10
-rw-r--r--libraries/SDL2/slack-desc19
-rw-r--r--libraries/SDL2_image/README6
-rw-r--r--libraries/SDL2_image/SDL2_image.SlackBuild98
-rw-r--r--libraries/SDL2_image/SDL2_image.info10
-rw-r--r--libraries/SDL2_image/slack-desc19
-rw-r--r--libraries/SDL2_mixer/README13
-rw-r--r--libraries/SDL2_mixer/SDL2_mixer.SlackBuild98
-rw-r--r--libraries/SDL2_mixer/SDL2_mixer.info10
-rw-r--r--libraries/SDL2_mixer/slack-desc19
-rw-r--r--libraries/SDL2_net/README5
-rw-r--r--libraries/SDL2_net/SDL2_net.SlackBuild99
-rw-r--r--libraries/SDL2_net/SDL2_net.info10
-rw-r--r--libraries/SDL2_net/slack-desc19
-rw-r--r--libraries/SDL2_ttf/README6
-rw-r--r--libraries/SDL2_ttf/SDL2_ttf.SlackBuild99
-rw-r--r--libraries/SDL2_ttf/SDL2_ttf.info10
-rw-r--r--libraries/SDL2_ttf/slack-desc19
-rw-r--r--libraries/SDL_sound/README2
-rw-r--r--libraries/SDL_sound/SDL_sound.SlackBuild93
-rw-r--r--libraries/SDL_sound/SDL_sound.info10
-rw-r--r--libraries/SDL_sound/slack-desc19
-rw-r--r--libraries/SFGUI/SFGUI.SlackBuild18
-rw-r--r--libraries/SFGUI/SFGUI.info6
-rw-r--r--libraries/VTK/VTK.SlackBuild4
-rw-r--r--libraries/agg/agg.SlackBuild1
-rw-r--r--libraries/agg/patches/0016-bad-const.patch12
-rw-r--r--libraries/argon2/README11
-rw-r--r--libraries/argon2/argon2.SlackBuild94
-rw-r--r--libraries/argon2/argon2.info10
-rw-r--r--libraries/argon2/slack-desc19
-rw-r--r--libraries/avr-libc/avr-libc.SlackBuild15
-rw-r--r--libraries/avr-libc/avr-libc.info6
-rw-r--r--libraries/bamf/add_compile_warning_flags.patch71
-rw-r--r--libraries/bamf/bamf.SlackBuild6
-rw-r--r--libraries/bamf/bamf.info2
-rw-r--r--libraries/beignet/beignet.SlackBuild4
-rw-r--r--libraries/beignet/beignet.info6
-rw-r--r--libraries/beignet/llvm6.patch30
-rw-r--r--libraries/belle-sip/belle-sip.SlackBuild2
-rw-r--r--libraries/belle-sip/gcc9.patch19
-rw-r--r--libraries/ccrtp/ccrtp.SlackBuild2
-rw-r--r--libraries/ccrtp/ccrtp.info6
-rw-r--r--libraries/cffi/cffi.SlackBuild2
-rw-r--r--libraries/cffi/cffi.info6
-rw-r--r--libraries/cppo/README2
-rw-r--r--libraries/cppo/cppo.SlackBuild87
-rw-r--r--libraries/cppo/cppo.info10
-rw-r--r--libraries/cppo/slack-desc19
-rw-r--r--libraries/cracklib/README12
-rw-r--r--libraries/cracklib/cracklib.SlackBuild116
-rw-r--r--libraries/cracklib/cracklib.info12
-rw-r--r--libraries/cracklib/slack-desc19
-rw-r--r--libraries/cuneiform/cuneiform-gcc.patch98
-rw-r--r--libraries/cuneiform/cuneiform.SlackBuild14
-rw-r--r--libraries/cuneiform/strings.patch19
-rw-r--r--libraries/efivar/README1
-rw-r--r--libraries/efivar/efivar.SlackBuild95
-rw-r--r--libraries/efivar/efivar.info10
-rw-r--r--libraries/efivar/slack-desc19
-rw-r--r--libraries/enum34/README2
-rw-r--r--libraries/enum34/enum34.SlackBuild85
-rw-r--r--libraries/enum34/enum34.info10
-rw-r--r--libraries/enum34/slack-desc19
-rw-r--r--libraries/fuzzylite/fuzzylite.SlackBuild6
-rw-r--r--libraries/fuzzylite/fuzzylite.info6
-rw-r--r--libraries/gdl/gdl.SlackBuild4
-rw-r--r--libraries/gdl/gdl.info6
-rw-r--r--libraries/gstreamer-editing-services/gstreamer-editing-services.SlackBuild2
-rw-r--r--libraries/gstreamer-editing-services/gstreamer-editing-services.info6
-rw-r--r--libraries/gstreamermm/fix_warnings.patch15
-rw-r--r--libraries/gstreamermm/gstreamermm.SlackBuild3
-rw-r--r--libraries/gtkglext/0002-GCC-8-fixes.patch34
-rw-r--r--libraries/gtkglext/gtkglext.SlackBuild3
-rw-r--r--libraries/gtksourceview3/gtksourceview3.SlackBuild2
-rw-r--r--libraries/gtksourceview3/gtksourceview3.info8
-rw-r--r--libraries/gtksourceview4/README4
-rw-r--r--libraries/gtksourceview4/gtksourceview4.SlackBuild104
-rw-r--r--libraries/gtksourceview4/gtksourceview4.info10
-rw-r--r--libraries/gtksourceview4/slack-desc19
-rw-r--r--libraries/hpx/gcc7.patch23
-rw-r--r--libraries/hpx/hpx.SlackBuild4
-rw-r--r--libraries/http-parser/http-parser.SlackBuild2
-rw-r--r--libraries/hyphen/README1
-rw-r--r--libraries/hyphen/hyphen.SlackBuild94
-rw-r--r--libraries/hyphen/hyphen.info10
-rw-r--r--libraries/hyphen/slack-desc19
-rw-r--r--libraries/id3lib/README10
-rw-r--r--libraries/id3lib/id3lib.SlackBuild121
-rw-r--r--libraries/id3lib/id3lib.info10
-rw-r--r--libraries/id3lib/patches/id3lib.c_wrapper.patch58
-rw-r--r--libraries/id3lib/patches/id3lib.cppheaders.patch22
-rw-r--r--libraries/id3lib/patches/id3lib.manpages.patch198
-rw-r--r--libraries/id3lib/patches/id3lib.mkstemp.patch54
-rw-r--r--libraries/id3lib/patches/id3lib.nullpointer_check.patch12
-rw-r--r--libraries/id3lib/patches/id3lib.utf8_writing.patch38
-rw-r--r--libraries/id3lib/patches/id3lib.vbr_stack_smash.patch19
-rw-r--r--libraries/id3lib/slack-desc19
-rw-r--r--libraries/isl/README8
-rw-r--r--libraries/isl/isl.SlackBuild115
-rw-r--r--libraries/isl/isl.info10
-rw-r--r--libraries/isl/slack-desc19
-rw-r--r--libraries/jansson/README1
-rw-r--r--libraries/jansson/jansson.SlackBuild99
-rw-r--r--libraries/jansson/jansson.info10
-rw-r--r--libraries/jansson/slack-desc19
-rw-r--r--libraries/json-glib/README3
-rw-r--r--libraries/json-glib/json-glib.SlackBuild97
-rw-r--r--libraries/json-glib/json-glib.info10
-rw-r--r--libraries/json-glib/slack-desc19
-rw-r--r--libraries/keybinder/README5
-rw-r--r--libraries/keybinder/keybinder.SlackBuild100
-rw-r--r--libraries/keybinder/keybinder.info10
-rw-r--r--libraries/keybinder/slack-desc19
-rw-r--r--libraries/lablgtk/README2
-rw-r--r--libraries/lablgtk/lablgtk.SlackBuild10
-rw-r--r--libraries/lablgtk/lablgtk.info10
-rw-r--r--libraries/lame/CVE-2017-15018.patch.gzbin307 -> 0 bytes
-rw-r--r--libraries/lame/README5
-rw-r--r--libraries/lame/lame.SlackBuild118
-rw-r--r--libraries/lame/lame.info10
-rw-r--r--libraries/lame/slack-desc19
-rw-r--r--libraries/libart-lgpl/README3
-rw-r--r--libraries/libart-lgpl/libart-lgpl.SlackBuild100
-rw-r--r--libraries/libart-lgpl/libart-lgpl.info10
-rw-r--r--libraries/libart-lgpl/slack-desc20
-rw-r--r--libraries/libbluray/README15
-rw-r--r--libraries/libbluray/libbluray.SlackBuild111
-rw-r--r--libraries/libbluray/libbluray.info10
-rw-r--r--libraries/libbluray/slack-desc19
-rw-r--r--libraries/libc++/README5
-rw-r--r--libraries/libc++/libc++.SlackBuild116
-rw-r--r--libraries/libc++/libc++.info14
-rw-r--r--libraries/libc++/slack-desc19
-rw-r--r--libraries/libclaw/lib.patch11
-rw-r--r--libraries/libclaw/libclaw.SlackBuild6
-rw-r--r--libraries/libclaw/patches/01_libclaw-1.7.4-libdir.patch36
-rw-r--r--libraries/libclaw/patches/02_libclaw-1.7.4-gcc62.patch89
-rw-r--r--libraries/libclaw/patches/03_libclaw-1.7.4-gcc7.patch36
-rw-r--r--libraries/libcue/README1
-rw-r--r--libraries/libcue/libcue.SlackBuild93
-rw-r--r--libraries/libcue/libcue.info10
-rw-r--r--libraries/libcue/slack-desc19
-rw-r--r--libraries/libcuefile/libcuefile.SlackBuild18
-rw-r--r--libraries/libdbus-c++/gcc47.patch10
-rw-r--r--libraries/libdbus-c++/libdbus-c++.SlackBuild22
-rw-r--r--libraries/libdbus-c++/libdbus-c++.info6
-rw-r--r--libraries/libdbus-c++/nested_variant_map.patch11
-rw-r--r--libraries/libdbus-c++/patches/libdbus-c++-gcc7.patch11
-rw-r--r--libraries/libdbus-c++/patches/libdbus-c++-glibmm-2.43.patch13
-rw-r--r--libraries/libdbus-c++/patches/libdbus-c++-nodocdatetime.patch25
-rw-r--r--libraries/libdbus-c++/patches/libdbus-c++-noreturn.patch21
-rw-r--r--libraries/libdbus-c++/patches/libdbus-c++-pthread.patch11
-rw-r--r--libraries/libdbus-c++/patches/libdbus-c++-sover.patch28
-rw-r--r--libraries/libdbusmenu/libdbusmenu.SlackBuild1
-rw-r--r--libraries/libedit/README12
-rw-r--r--libraries/libedit/libedit.SlackBuild105
-rw-r--r--libraries/libedit/libedit.info10
-rw-r--r--libraries/libedit/slack-desc19
-rw-r--r--libraries/libevhtp/libevhtp.SlackBuild10
-rw-r--r--libraries/libevhtp/libevhtp.info6
-rw-r--r--libraries/libffado/libffado-2.4.2-python38.patch24
-rw-r--r--libraries/libffado/libffado-mixer.patch45
-rw-r--r--libraries/libffado/libffado.SlackBuild23
-rw-r--r--libraries/libffado/libffado.info8
-rw-r--r--libraries/libfilezilla/libfilezilla.SlackBuild2
-rw-r--r--libraries/libfilezilla/libfilezilla.info6
-rw-r--r--libraries/libfreehand/Add-missing-semicolon-to-fix-build-with-icu-65.1.patch29
-rw-r--r--libraries/libfreehand/libfreehand.SlackBuild2
-rw-r--r--libraries/libgexiv2/README3
-rw-r--r--libraries/libgexiv2/libgexiv2.SlackBuild95
-rw-r--r--libraries/libgexiv2/libgexiv2.info10
-rw-r--r--libraries/libgexiv2/slack-desc19
-rw-r--r--libraries/libgksu/libgksu.SlackBuild1
-rw-r--r--libraries/libgme/libgme.SlackBuild2
-rw-r--r--libraries/libgme/libgme.info6
-rw-r--r--libraries/libgnome/libgnome.SlackBuild6
-rw-r--r--libraries/libgnome/libgnome.info2
-rw-r--r--libraries/libgnomecanvas/libgnomecanvas.info2
-rw-r--r--libraries/libgnomeprint/libgnomeprint.SlackBuild1
-rw-r--r--libraries/libgnomeprint/libgnomeprint.info2
-rw-r--r--libraries/libgnomeprintui/libgnomeprintui.SlackBuild2
-rw-r--r--libraries/libgnomeui/libgnomeui.SlackBuild6
-rw-r--r--libraries/libidn2/README5
-rw-r--r--libraries/libidn2/libidn2.SlackBuild107
-rw-r--r--libraries/libidn2/libidn2.info10
-rw-r--r--libraries/libidn2/slack-desc19
-rw-r--r--libraries/libido3/libido3.SlackBuild3
-rw-r--r--libraries/libindicator3/libindicator3.SlackBuild3
-rw-r--r--libraries/libinput/README11
-rw-r--r--libraries/libinput/libinput.SlackBuild93
-rw-r--r--libraries/libinput/libinput.info10
-rw-r--r--libraries/libinput/slack-desc19
-rw-r--r--libraries/libircclient/libircclient.SlackBuild4
-rw-r--r--libraries/libkqueue/libkqueue.SlackBuild28
-rw-r--r--libraries/libkqueue/libkqueue.info6
-rw-r--r--libraries/libmemcached/libmemcached.SlackBuild2
-rw-r--r--libraries/libmp4v2/libmp4v2.SlackBuild2
-rw-r--r--libraries/libmusicbrainz/libmusicbrainz.SlackBuild2
-rw-r--r--libraries/libmusicbrainz5/libmusicbrainz5.SlackBuild3
-rw-r--r--libraries/libmusicbrainz5/no_wildcards.patch24
-rw-r--r--libraries/libmwaw/libmwaw.SlackBuild2
-rw-r--r--libraries/libnice/README12
-rw-r--r--libraries/libnice/libnice.SlackBuild99
-rw-r--r--libraries/libnice/libnice.info10
-rw-r--r--libraries/libnice/slack-desc19
-rw-r--r--libraries/liboauth/liboauth-1.0.3-openssl-1.1.0-2.patch147
-rw-r--r--libraries/liboauth/liboauth.SlackBuild3
-rw-r--r--libraries/libopenshot/512.patch51
-rw-r--r--libraries/libopenshot/libopenshot.SlackBuild1
-rw-r--r--libraries/libopusenc/README2
-rw-r--r--libraries/libopusenc/libopusenc.SlackBuild99
-rw-r--r--libraries/libopusenc/libopusenc.info10
-rw-r--r--libraries/libopusenc/slack-desc19
-rw-r--r--libraries/libpeas/libpeas.SlackBuild45
-rw-r--r--libraries/libpeas/libpeas.info6
-rw-r--r--libraries/libpwquality/README11
-rw-r--r--libraries/libpwquality/libpwquality.SlackBuild106
-rw-r--r--libraries/libpwquality/libpwquality.info10
-rw-r--r--libraries/libpwquality/slack-desc19
-rw-r--r--libraries/libqinfinity/libqinfinity.SlackBuild2
-rw-r--r--libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch342
-rw-r--r--libraries/libquicktime/libquicktime.SlackBuild3
-rw-r--r--libraries/libqxt/libqxt-gcc6.patch11
-rw-r--r--libraries/libqxt/libqxt.SlackBuild3
-rw-r--r--libraries/libreplaygain/libreplaygain.SlackBuild16
-rw-r--r--libraries/libsass/libsass.SlackBuild2
-rw-r--r--libraries/libsass/libsass.info6
-rw-r--r--libraries/libsearpc/libsearpc.SlackBuild14
-rw-r--r--libraries/libsearpc/libsearpc.info4
-rw-r--r--libraries/libsidplayfp/libsidplayfp.SlackBuild8
-rw-r--r--libraries/libsidplayfp/libsidplayfp.info6
-rw-r--r--libraries/libsodium/README2
-rw-r--r--libraries/libsodium/libsodium.SlackBuild98
-rw-r--r--libraries/libsodium/libsodium.info10
-rw-r--r--libraries/libsodium/slack-desc19
-rw-r--r--libraries/libsrtp/libsrtp.SlackBuild1
-rw-r--r--libraries/libtxc_dxtn/README5
-rw-r--r--libraries/libtxc_dxtn/libtxc_dxtn.SlackBuild96
-rw-r--r--libraries/libtxc_dxtn/libtxc_dxtn.info10
-rw-r--r--libraries/libtxc_dxtn/slack-desc19
-rw-r--r--libraries/libunicap/gcc10.patch25
-rw-r--r--libraries/libunicap/libunicap.SlackBuild2
-rw-r--r--libraries/libunwind/README9
-rw-r--r--libraries/libunwind/libunwind.SlackBuild104
-rw-r--r--libraries/libunwind/libunwind.info10
-rw-r--r--libraries/libunwind/slack-desc19
-rw-r--r--libraries/libuv/README1
-rw-r--r--libraries/libuv/libuv.SlackBuild96
-rw-r--r--libraries/libuv/libuv.info10
-rw-r--r--libraries/libuv/slack-desc19
-rw-r--r--libraries/libvirt-glib/libvirt-glib.SlackBuild2
-rw-r--r--libraries/libvirt-glib/libvirt-glib.info6
-rw-r--r--libraries/libvirt-python/libvirt-python.SlackBuild5
-rw-r--r--libraries/libvirt-python/libvirt-python.info8
-rw-r--r--libraries/libvirt/libvirt.SlackBuild10
-rw-r--r--libraries/libvirt/libvirt.info8
-rw-r--r--libraries/libwacom/README5
-rw-r--r--libraries/libwacom/libwacom.SlackBuild102
-rw-r--r--libraries/libwacom/libwacom.info10
-rw-r--r--libraries/libwacom/slack-desc19
-rw-r--r--libraries/libwebp/README18
-rw-r--r--libraries/libwebp/libwebp.SlackBuild98
-rw-r--r--libraries/libwebp/libwebp.info10
-rw-r--r--libraries/libwebp/slack-desc19
-rw-r--r--libraries/libwps/libwps.SlackBuild2
-rw-r--r--libraries/libxkbcommon/README11
-rw-r--r--libraries/libxkbcommon/libxkbcommon.SlackBuild93
-rw-r--r--libraries/libxkbcommon/libxkbcommon.info10
-rw-r--r--libraries/libxkbcommon/slack-desc19
-rw-r--r--libraries/libzdb/libzdb.SlackBuild1
-rw-r--r--libraries/libzrtpcpp/libzrtpcpp.SlackBuild4
-rw-r--r--libraries/libzrtpcpp/libzrtpcpp.info6
-rw-r--r--libraries/live555/live555.SlackBuild4
-rw-r--r--libraries/luacrypto/luacrypto.SlackBuild3
-rw-r--r--libraries/lxqt-build-tools/lxqt-build-tools.SlackBuild9
-rw-r--r--libraries/lxqt-build-tools/lxqt-build-tools.info6
-rw-r--r--libraries/med/med.SlackBuild1
-rw-r--r--libraries/menu-cache/menu-cache.SlackBuild2
-rw-r--r--libraries/menu-cache/patches/Support-gcc10-compilation.patch108
-rw-r--r--libraries/npth/README11
-rw-r--r--libraries/npth/npth.SlackBuild95
-rw-r--r--libraries/npth/npth.info10
-rw-r--r--libraries/npth/slack-desc19
-rw-r--r--libraries/nx-libs/nx-libs.SlackBuild4
-rw-r--r--libraries/nx-libs/nx-libs.info6
-rw-r--r--libraries/oath-toolkit/oath-toolkit-new-glibc-check.patch25
-rw-r--r--libraries/oath-toolkit/oath-toolkit.SlackBuild1
-rw-r--r--libraries/ocaml-camomile/ocaml-camomile.SlackBuild49
-rw-r--r--libraries/ocaml-camomile/ocaml-camomile.info6
-rw-r--r--libraries/ocaml-findlib/ocaml-findlib.SlackBuild8
-rw-r--r--libraries/ocaml-findlib/ocaml-findlib.info10
-rw-r--r--libraries/ocl-icd/README19
-rw-r--r--libraries/ocl-icd/ocl-icd.SlackBuild110
-rw-r--r--libraries/ocl-icd/ocl-icd.info10
-rw-r--r--libraries/ocl-icd/slack-desc19
-rw-r--r--libraries/opal/README2
-rw-r--r--libraries/opal/ffmpeg2.patch398
-rw-r--r--libraries/opal/opal.SlackBuild12
-rw-r--r--libraries/openbabel/openbabel.SlackBuild14
-rw-r--r--libraries/openbabel/openbabel.info6
-rw-r--r--libraries/pangox-compat/pangox-compat.SlackBuild21
-rw-r--r--libraries/pangox-compat/pangox-compat.info6
-rw-r--r--libraries/pangox-compat/patches/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch39
-rw-r--r--libraries/pangox-compat/patches/0002-disable-shaper.patch15
-rw-r--r--libraries/pcre2/README2
-rw-r--r--libraries/pcre2/pcre2.SlackBuild103
-rw-r--r--libraries/pcre2/pcre2.info10
-rw-r--r--libraries/pcre2/slack-desc19
-rw-r--r--libraries/php-pgsql/php-pgsql.SlackBuild10
-rw-r--r--libraries/php-pgsql/php-pgsql.info6
-rw-r--r--libraries/physfs/physfs.SlackBuild4
-rw-r--r--libraries/podofo/podofo.SlackBuild2
-rw-r--r--libraries/poppler-qt5/poppler-qt5.SlackBuild54
-rw-r--r--libraries/poppler-qt5/poppler-qt5.info6
-rw-r--r--libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch39
-rw-r--r--libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch2951
-rw-r--r--libraries/ptlib/ptlib-2.10.11-openssl11.patch212
-rw-r--r--libraries/ptlib/ptlib-gcc8.patch12
-rw-r--r--libraries/ptlib/ptlib.SlackBuild8
-rw-r--r--libraries/ptlib/ssl3.patch19
-rw-r--r--libraries/python3-PyQt5/README2
-rw-r--r--libraries/python3-PyQt5/python3-PyQt5.SlackBuild110
-rw-r--r--libraries/python3-PyQt5/python3-PyQt5.info10
-rw-r--r--libraries/python3-PyQt5/slack-desc19
-rw-r--r--libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild6
-rw-r--r--libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info6
-rw-r--r--libraries/python3-pillow/README8
-rw-r--r--libraries/python3-pillow/python3-pillow.SlackBuild107
-rw-r--r--libraries/python3-pillow/python3-pillow.info10
-rw-r--r--libraries/python3-pillow/slack-desc19
-rw-r--r--libraries/qca-qt5/Add_support_for_OpenSSL_1.1.0.diff.gzbin10948 -> 0 bytes
-rw-r--r--libraries/qca-qt5/README11
-rw-r--r--libraries/qca-qt5/qca-qt5.SlackBuild118
-rw-r--r--libraries/qca-qt5/qca-qt5.info10
-rw-r--r--libraries/qca-qt5/qca.tlsunittest.cpp.diff.gzbin632 -> 0 bytes
-rw-r--r--libraries/qca-qt5/slack-desc19
-rw-r--r--libraries/qmltermwidget/gcc-10.patch46
-rw-r--r--libraries/qmltermwidget/qmltermwidget.SlackBuild4
-rw-r--r--libraries/qt5-styleplugins/patches/0001-fix-build-against-Qt-5.15.patch44
-rw-r--r--libraries/qt5-styleplugins/patches/0002-fix-gtk2-background.patch25
-rw-r--r--libraries/qt5-styleplugins/qt5-styleplugins.SlackBuild3
-rw-r--r--libraries/qt5-webkit/README3
-rw-r--r--libraries/qt5-webkit/doinst.sh9
-rw-r--r--libraries/qt5-webkit/qt5-webkit.SlackBuild107
-rw-r--r--libraries/qt5-webkit/qt5-webkit.info10
-rw-r--r--libraries/qt5-webkit/slack-desc19
-rw-r--r--libraries/qt5/README134
-rw-r--r--libraries/qt5/README.ccache46
-rw-r--r--libraries/qt5/desktop/assistant-qt5.desktop8
-rw-r--r--libraries/qt5/desktop/designer-qt5.desktop10
-rw-r--r--libraries/qt5/desktop/linguist-qt5.desktop9
-rw-r--r--libraries/qt5/desktop/qdbusviewer-qt5.desktop9
-rw-r--r--libraries/qt5/doinst.sh9
-rw-r--r--libraries/qt5/patches/qt5.mysql.h.diff12
-rw-r--r--libraries/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch14
-rw-r--r--libraries/qt5/profile.d/qt5.csh17
-rw-r--r--libraries/qt5/profile.d/qt5.sh17
-rw-r--r--libraries/qt5/qt5.SlackBuild319
-rw-r--r--libraries/qt5/qt5.info10
-rw-r--r--libraries/qt5/slack-desc19
-rw-r--r--libraries/qtermwidget/qtermwidget.SlackBuild4
-rw-r--r--libraries/qtermwidget/qtermwidget.info6
-rw-r--r--libraries/qwt/qwt.SlackBuild2
-rw-r--r--libraries/rapidjson/rapidjson.SlackBuild2
-rw-r--r--libraries/rudiments/rudiments.SlackBuild8
-rw-r--r--libraries/rudiments/rudiments.info6
-rw-r--r--libraries/sdformat/cmake.patch20
-rw-r--r--libraries/sdformat/sdformat.SlackBuild3
-rw-r--r--libraries/t4k_common/916060_bugfix.patch32
-rw-r--r--libraries/t4k_common/t4k_common.SlackBuild3
-rw-r--r--libraries/tcl-tls/tcl-tls.SlackBuild10
-rw-r--r--libraries/tcl-tls/tcl-tls.info8
-rw-r--r--libraries/totem-pl-parser/totem-pl-parser.SlackBuild42
-rw-r--r--libraries/totem-pl-parser/totem-pl-parser.info8
-rw-r--r--libraries/ucl/ucl.SlackBuild1
-rw-r--r--libraries/ucommon/ucommon.SlackBuild2
-rw-r--r--libraries/ucommon/ucommon.info6
-rw-r--r--libraries/vte2/README7
-rw-r--r--libraries/vte2/fix_meta_alt_keybinding.patch74
-rw-r--r--libraries/vte2/slack-desc19
-rw-r--r--libraries/vte2/vte.escape.cpu.usage.diff89
-rw-r--r--libraries/vte2/vte2.SlackBuild109
-rw-r--r--libraries/vte2/vte2.info10
-rw-r--r--libraries/vte3/README7
-rw-r--r--libraries/vte3/slack-desc19
-rw-r--r--libraries/vte3/vte3.SlackBuild101
-rw-r--r--libraries/vte3/vte3.info10
-rw-r--r--libraries/wayland/README16
-rw-r--r--libraries/wayland/slack-desc19
-rw-r--r--libraries/wayland/wayland.SlackBuild112
-rw-r--r--libraries/wayland/wayland.info10
-rw-r--r--libraries/webkit2gtk/webkit2gtk.SlackBuild4
-rw-r--r--libraries/webkit2gtk/webkit2gtk.info8
-rw-r--r--libraries/webkitgtk/bison-3.7.1.patch18
-rw-r--r--libraries/webkitgtk/icu4c-65.1.patch39
-rw-r--r--libraries/webkitgtk/webkitgtk.SlackBuild8
-rw-r--r--libraries/webkitgtk3/bison-3.7.1.patch18
-rw-r--r--libraries/webkitgtk3/icu4c-65.1.patch39
-rw-r--r--libraries/webkitgtk3/webkitgtk3.SlackBuild10
-rw-r--r--libraries/wpebackend-fdo/README7
-rw-r--r--libraries/wpebackend-fdo/slack-desc19
-rw-r--r--libraries/wpebackend-fdo/wpebackend-fdo.SlackBuild94
-rw-r--r--libraries/wpebackend-fdo/wpebackend-fdo.info10
-rw-r--r--libraries/wvstreams/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch50
-rw-r--r--libraries/wvstreams/patches/05_gcc.diff13
-rw-r--r--libraries/wvstreams/patches/openssl-buildfix.patch16
-rw-r--r--libraries/wvstreams/wvstreams.SlackBuild9
-rw-r--r--libraries/wxsvg/wxsvg.SlackBuild4
-rw-r--r--libraries/wxsvg/wxsvg.info6
-rw-r--r--libraries/xf86-input-libinput/README20
-rw-r--r--libraries/xf86-input-libinput/slack-desc19
-rw-r--r--libraries/xf86-input-libinput/xf86-input-libinput.SlackBuild116
-rw-r--r--libraries/xf86-input-libinput/xf86-input-libinput.info10
-rw-r--r--libraries/xulrunner/README12
-rw-r--r--libraries/xulrunner/ftfntfmt.patch35
-rw-r--r--libraries/xulrunner/gold/gold2
-rw-r--r--libraries/xulrunner/gold/ld2
-rw-r--r--libraries/xulrunner/slack-desc19
-rw-r--r--libraries/xulrunner/xulrunner.SlackBuild162
-rw-r--r--libraries/xulrunner/xulrunner.info10
-rw-r--r--misc/dmg2img/0001-openssl-1.1-compatibility.patch219
-rw-r--r--misc/dmg2img/dmg2img.SlackBuild3
-rw-r--r--misc/glogg/glogg.SlackBuild4
-rw-r--r--misc/glogg/glogg.info8
-rw-r--r--misc/gourmet/gourmet.SlackBuild5
-rw-r--r--misc/gourmet/gourmet.info2
-rw-r--r--misc/gourmet/slack-desc2
-rw-r--r--misc/gourmet/tostring-to-tobytes.patch26
-rw-r--r--misc/ibus-unikey/ibus-unikey.SlackBuild2
-rw-r--r--misc/krename/krename.SlackBuild3
-rw-r--r--misc/krename/null.patch12
-rw-r--r--misc/stardict-tools/stardict-tools.SlackBuild3
-rw-r--r--misc/xca/xca.SlackBuild4
-rw-r--r--misc/yapet/gcc6.patch11
-rw-r--r--misc/yapet/yapet.SlackBuild3
-rw-r--r--misc/zinnia/zinnia-fixes-gcc6-compile.patch22
-rw-r--r--misc/zinnia/zinnia.SlackBuild3
-rw-r--r--multimedia/aegisub/aegisub.SlackBuild8
-rw-r--r--multimedia/aegisub/boost.patch34
-rw-r--r--multimedia/aegisub/icu.patch11
-rw-r--r--multimedia/avidemux/avidemux.SlackBuild2
-rw-r--r--multimedia/avidemux/qt-5.15.diff11
-rw-r--r--multimedia/bombono-dvd/bombono-dvd.SlackBuild2
-rw-r--r--multimedia/bombono-dvd/patches/fix_operator_ambiguity.patch352
-rw-r--r--multimedia/bombono-dvd/patches/fix_throw_specifications.patch24
-rw-r--r--multimedia/cantata/cantata.SlackBuild2
-rw-r--r--multimedia/cantata/cantata.info6
-rw-r--r--multimedia/cinelerra/README2
-rw-r--r--multimedia/cinelerra/cinelerra.SlackBuild28
-rw-r--r--multimedia/cinelerra/cinelerra.desktop10
-rw-r--r--multimedia/cinelerra/cinelerra.info8
-rw-r--r--multimedia/cinelerra/slack-desc6
-rw-r--r--multimedia/dvdauthor/dvdauthor-0.7.2-imagemagick7.patch74
-rw-r--r--multimedia/dvdauthor/dvdauthor.SlackBuild2
-rw-r--r--multimedia/dvdstyler/dvdstyler.SlackBuild4
-rw-r--r--multimedia/dvdstyler/dvdstyler.info6
-rw-r--r--multimedia/dvgrab/dvgrab.SlackBuild2
-rw-r--r--multimedia/farsight2/farsight2.SlackBuild2
-rw-r--r--multimedia/farstream/README7
-rw-r--r--multimedia/farstream/farstream.SlackBuild101
-rw-r--r--multimedia/farstream/farstream.info10
-rw-r--r--multimedia/farstream/slack-desc19
-rw-r--r--multimedia/ffmpeg/README70
-rw-r--r--multimedia/ffmpeg/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch11
-rw-r--r--multimedia/ffmpeg/ffmpeg-3.2.4-openjpeg2.3.patch102
-rw-r--r--multimedia/ffmpeg/ffmpeg.SlackBuild261
-rw-r--r--multimedia/ffmpeg/ffmpeg.info10
-rw-r--r--multimedia/ffmpeg/slack-desc19
-rw-r--r--multimedia/ffmpeg4/README86
-rw-r--r--multimedia/ffmpeg4/ffmpeg4.SlackBuild238
-rw-r--r--multimedia/ffmpeg4/ffmpeg4.info10
-rw-r--r--multimedia/ffmpeg4/slack-desc19
-rw-r--r--multimedia/gnash/gnash.SlackBuild42
-rw-r--r--multimedia/gnash/gnash.info8
-rw-r--r--multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch25
-rw-r--r--multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch31
-rw-r--r--multimedia/gnash/patch/gcc47.patch11
-rw-r--r--multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch24
-rw-r--r--multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch63
-rw-r--r--multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch12
-rw-r--r--multimedia/gnash/patch/gnash-0.8.10-klash.patch12
-rw-r--r--multimedia/gnash/patch/gnash-boost.patch14
-rw-r--r--multimedia/gpac/gpac-ffmpeg-4.0.patch42
-rw-r--r--multimedia/gpac/gpac.SlackBuild6
-rw-r--r--multimedia/gst-libav/README2
-rw-r--r--multimedia/gst-libav/gst-libav.SlackBuild96
-rw-r--r--multimedia/gst-libav/gst-libav.info10
-rw-r--r--multimedia/gst-libav/slack-desc19
-rw-r--r--multimedia/gst-plugins-bad/README16
-rw-r--r--multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild49
-rw-r--r--multimedia/gst-plugins-bad/gst-plugins-bad.info6
-rw-r--r--multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild41
-rw-r--r--multimedia/gst-plugins-ugly/gst-plugins-ugly.info6
-rw-r--r--multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild2
-rw-r--r--multimedia/gst0-ffmpeg/orc-0.4.30.patch26
-rw-r--r--multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild2
-rw-r--r--multimedia/kdenlive/kdenlive.SlackBuild3
-rw-r--r--multimedia/mkvtoolnix/mkvtoolnix.SlackBuild2
-rw-r--r--multimedia/mkvtoolnix/mkvtoolnix.info6
-rw-r--r--multimedia/mlt/mlt.SlackBuild6
-rw-r--r--multimedia/mythtv/libvpxenc.patch42
-rw-r--r--multimedia/mythtv/mythtv.SlackBuild8
-rw-r--r--multimedia/mythtv/mythtv.info8
-rw-r--r--multimedia/oggvideotools/oggvideotools.SlackBuild2
-rw-r--r--multimedia/rtmpdump/rtmpdump.SlackBuild8
-rw-r--r--multimedia/smpeg/smpeg.SlackBuild4
-rw-r--r--multimedia/subtitleeditor/subtitleeditor.SlackBuild16
-rw-r--r--multimedia/subtitleeditor/subtitleeditor.info8
-rw-r--r--multimedia/transcode/transcode-1.1.7-ffmpeg4.patch508
-rw-r--r--multimedia/transcode/transcode-imagemagick7.patch794
-rw-r--r--multimedia/transcode/transcode.SlackBuild7
-rw-r--r--multimedia/tvheadend/tvheadend.SlackBuild5
-rw-r--r--multimedia/tvheadend/tvheadend.info6
-rw-r--r--multimedia/tvtime/tvtime.SlackBuild23
-rw-r--r--multimedia/tvtime/tvtime.info6
-rw-r--r--multimedia/vcdimager/vcdimager.SlackBuild8
-rw-r--r--multimedia/vcdimager/vcdimager.info6
-rw-r--r--multimedia/vlc/README13
-rw-r--r--multimedia/vlc/qt-5.15.patch38
-rw-r--r--multimedia/vlc/vlc.SlackBuild13
-rw-r--r--network/MEGAsync/MEGAsync.SlackBuild6
-rw-r--r--network/MEGAsync/MEGAsync.info10
-rw-r--r--network/MEGAsync/fix-double-declaration-of-tgkill.patch26
-rw-r--r--network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild1
-rw-r--r--network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild117
-rw-r--r--network/NetworkManager-openvpn/NetworkManager-openvpn.info10
-rw-r--r--network/NetworkManager-openvpn/README5
-rw-r--r--network/NetworkManager-openvpn/slack-desc19
-rw-r--r--network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild8
-rw-r--r--network/NetworkManager-pptp/NetworkManager-pptp.info6
-rw-r--r--network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild3
-rw-r--r--network/NetworkManager-vpnc/NetworkManager-vpnc.info6
-rw-r--r--network/aMule/aMule.SlackBuild26
-rw-r--r--network/aMule/aMule.info6
-rw-r--r--network/bip/bip.SlackBuild2
-rw-r--r--network/bitcoin/bitcoin.SlackBuild2
-rw-r--r--network/bwm-ng/bwm-ng.SlackBuild3
-rw-r--r--network/bwm-ng/fix_gcc7_inline.patch40
-rw-r--r--network/ccnet/ccnet.SlackBuild10
-rw-r--r--network/ccnet/ccnet.info6
-rw-r--r--network/cherokee/cherokee.SlackBuild8
-rw-r--r--network/cherokee/cherokee.info6
-rw-r--r--network/dobbscoin/dobbscoin.SlackBuild9
-rw-r--r--network/dovecot/README27
-rw-r--r--network/dovecot/doinst.sh26
-rw-r--r--network/dovecot/dovecot.SlackBuild133
-rw-r--r--network/dovecot/dovecot.info10
-rw-r--r--network/dovecot/rc.dovecot55
-rw-r--r--network/dovecot/slack-desc19
-rw-r--r--network/dsniff/24_Fix-OpenSSL1.1.0-Build.patch202
-rw-r--r--network/dsniff/dsniff.SlackBuild2
-rw-r--r--network/ekiga/ekiga-4.0.1-boost-signals2.patch2179
-rw-r--r--network/ekiga/ekiga-4.0.1-libresolv.patch13
-rw-r--r--network/ekiga/ekiga.SlackBuild4
-rw-r--r--network/emacs-w3m/emacs-w3m.SlackBuild8
-rw-r--r--network/emacs-w3m/emacs-w3m.info6
-rw-r--r--network/falkon/falkon.SlackBuild7
-rw-r--r--network/falkon/falkon.info6
-rw-r--r--network/falkon/qt-5.14.patch24
-rw-r--r--network/falkon/qt-5.15.patch26
-rw-r--r--network/fcgiwrap/fcgiwrap.SlackBuild2
-rw-r--r--network/filezilla/filezilla.SlackBuild5
-rw-r--r--network/filezilla/filezilla.info6
-rw-r--r--network/filezilla/interface_Mainfrm_h_include_list.patch12
-rw-r--r--network/fqterm/fqterm.SlackBuild32
-rw-r--r--network/fqterm/fqterm.info6
-rw-r--r--network/freerdp/freerdp.SlackBuild2
-rw-r--r--network/grsync/grsync.SlackBuild2
-rw-r--r--network/hping3/hping3.SlackBuild2
-rw-r--r--network/httrack/httrack.SlackBuild2
-rw-r--r--network/httrack/httrack.info6
-rw-r--r--network/hylafax/gcc.patch12
-rw-r--r--network/hylafax/hylafax.SlackBuild2
-rw-r--r--network/ifstatus/README10
-rw-r--r--network/ifstatus/ifstatus.SlackBuild91
-rw-r--r--network/ifstatus/ifstatus.info10
-rw-r--r--network/ifstatus/ifstatus.patch66
-rw-r--r--network/ifstatus/slack-desc19
-rw-r--r--network/iperf/iperf.SlackBuild29
-rw-r--r--network/iperf/iperf.info6
-rw-r--r--network/iperf/patches/0_iperf-2.0.8-debuginfo.patch17
-rw-r--r--network/iperf/patches/1_iperf-2.0.8-bindfail.patch42
-rw-r--r--network/iperf/patches/2_iperf-2.0.8-math.patch75
-rw-r--r--network/jigdo/jigdo-0.7.3-gcc7.patch39
-rw-r--r--network/jigdo/jigdo.SlackBuild3
-rw-r--r--network/jitsi/jitsi.SlackBuild18
-rw-r--r--network/jitsi/jitsi.info8
-rw-r--r--network/kmess/README5
-rw-r--r--network/kmess/doinst.sh10
-rw-r--r--network/kmess/giflib-5.0.patch95
-rw-r--r--network/kmess/kmess.SlackBuild100
-rw-r--r--network/kmess/kmess.info10
-rw-r--r--network/kmess/slack-desc19
-rw-r--r--network/knock/knock.SlackBuild26
-rw-r--r--network/knock/knock.info6
-rw-r--r--network/krb5/EXPORT13
-rw-r--r--network/krb5/README10
-rw-r--r--network/krb5/README.krb552
-rw-r--r--network/krb5/doinst.sh26
-rw-r--r--network/krb5/krb5.SlackBuild116
-rw-r--r--network/krb5/krb5.info10
-rw-r--r--network/krb5/rc.kadmind54
-rw-r--r--network/krb5/rc.krb5kdc54
-rw-r--r--network/krb5/slack-desc19
-rw-r--r--network/leechcraft/README26
-rw-r--r--network/leechcraft/doinst.sh22
-rw-r--r--network/leechcraft/leechcraft.SlackBuild111
-rw-r--r--network/leechcraft/leechcraft.info10
-rw-r--r--network/leechcraft/slack-desc19
-rw-r--r--network/linuxdcpp/linuxdcpp.SlackBuild2
-rw-r--r--network/memcached/memcached.SlackBuild2
-rw-r--r--network/midori/README10
-rw-r--r--network/midori/doinst.sh16
-rw-r--r--network/midori/midori.SlackBuild47
-rw-r--r--network/midori/midori.info10
-rw-r--r--network/midori/slack-desc6
-rw-r--r--network/mldonkey/mldonkey.SlackBuild20
-rw-r--r--network/mldonkey/mldonkey.info6
-rw-r--r--network/mosh/mosh.SlackBuild2
-rw-r--r--network/museek+/README23
-rw-r--r--network/museek+/doinst.sh26
-rw-r--r--network/museek+/museek+.SlackBuild90
-rw-r--r--network/museek+/museek+.info10
-rw-r--r--network/museek+/museek-python.diff44
-rw-r--r--network/museek+/rc.museekd105
-rw-r--r--network/museek+/slack-desc19
-rw-r--r--network/ncrack/ncrack.SlackBuild2
-rw-r--r--network/nextcloud-server/nextcloud-server.SlackBuild2
-rw-r--r--network/nextcloud-server/nextcloud-server.info6
-rw-r--r--network/nghttp2/README4
-rw-r--r--network/nghttp2/nghttp2.SlackBuild102
-rw-r--r--network/nghttp2/nghttp2.info10
-rw-r--r--network/nghttp2/slack-desc19
-rw-r--r--network/opendkim/opendkim.SlackBuild3
-rw-r--r--network/opendkim/openssl_1.1.0_compat.patch90
-rw-r--r--network/opensmtpd/aliases34
-rw-r--r--network/opensmtpd/fix-crash-on-authentication.patch43
-rw-r--r--network/opensmtpd/openbsd64-020-smtpd.patch31
-rw-r--r--network/opensmtpd/openbsd65-029-smptd-tls.patch52
-rw-r--r--network/opensmtpd/openbsd65-031-smtpd-envelope.patch199
-rw-r--r--network/opensmtpd/openbsd66-019-smtpd-exec.patch46
-rw-r--r--network/opensmtpd/opensmtpd.SlackBuild31
-rw-r--r--network/opensmtpd/opensmtpd.info6
-rw-r--r--network/owncloud-client/owncloud-client.SlackBuild2
-rw-r--r--network/phodav/phodav.SlackBuild18
-rw-r--r--network/phodav/phodav.info6
-rw-r--r--network/pidgin-musictracker/pidgin-musictracker.SlackBuild2
-rw-r--r--network/pidgin-sipe/pidgin-sipe.SlackBuild2
-rw-r--r--network/pidgin-sipe/pidgin-sipe.info6
-rw-r--r--network/postfix/README39
-rw-r--r--network/postfix/doinst.sh40
-rw-r--r--network/postfix/patches/postconf.diff31
-rw-r--r--network/postfix/postfix.SlackBuild199
-rw-r--r--network/postfix/postfix.info10
-rw-r--r--network/postfix/rc.postfix67
-rw-r--r--network/postfix/slack-desc19
-rw-r--r--network/pptp/pptp.SlackBuild2
-rw-r--r--network/pptp/pptp.info6
-rw-r--r--network/qTox/qTox.SlackBuild2
-rw-r--r--network/remmina/remmina.SlackBuild2
-rw-r--r--network/rtorrent/README2
-rw-r--r--network/rtorrent/rtorrent.SlackBuild10
-rw-r--r--network/s-nail/README16
-rw-r--r--network/s-nail/doinst.sh13
-rw-r--r--network/s-nail/s-nail.SlackBuild135
-rw-r--r--network/s-nail/s-nail.info10
-rw-r--r--network/s-nail/slack-desc19
-rw-r--r--network/seafile-client/seafile-client.SlackBuild103
-rw-r--r--network/seafile-client/seafile-client.info10
-rw-r--r--network/seafile-client/slack-desc19
-rw-r--r--network/seafile/README (renamed from network/seafile-client/README)0
-rw-r--r--network/seafile/seafile.SlackBuild102
-rw-r--r--network/seafile/seafile.info10
-rw-r--r--network/seafile/slack-desc19
-rw-r--r--network/socat/README12
-rw-r--r--network/socat/slack-desc19
-rw-r--r--network/socat/socat.SlackBuild101
-rw-r--r--network/socat/socat.info10
-rw-r--r--network/spice-gtk/spice-gtk.SlackBuild7
-rw-r--r--network/spice-gtk/spice-gtk.info6
-rw-r--r--network/spice/spice.SlackBuild2
-rw-r--r--network/spice/spice.info6
-rw-r--r--network/sqlrelay/sqlrelay.SlackBuild8
-rw-r--r--network/sqlrelay/sqlrelay.info6
-rw-r--r--network/squid/rc.squid2
-rw-r--r--network/squid/squid.SlackBuild33
-rw-r--r--network/squid/squid.conf7806
-rw-r--r--network/squid/squid.conf.documented7806
-rw-r--r--network/squid/squid.info6
-rw-r--r--network/squid/squid.logrotate2
-rw-r--r--network/sshfs-fuse/README12
-rw-r--r--network/sshfs-fuse/slack-desc19
-rw-r--r--network/sshfs-fuse/sshfs-fuse.SlackBuild114
-rw-r--r--network/sshfs-fuse/sshfs-fuse.info10
-rw-r--r--network/sshfs-fuse/sshfs.1.gzbin5085 -> 0 bytes
-rw-r--r--network/synergy/030_openssl.diff11
-rw-r--r--network/synergy/synergy.SlackBuild1
-rw-r--r--network/tor/rc.tor2
-rw-r--r--network/vde2/vde2.SlackBuild3
-rw-r--r--network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch92
-rw-r--r--network/verlihub/verlihub-gcc7.patch18
-rw-r--r--network/verlihub/verlihub.SlackBuild3
-rw-r--r--network/x11spice/README16
-rw-r--r--network/x11spice/slack-desc11
-rw-r--r--network/x11spice/x11spice.SlackBuild104
-rw-r--r--network/x11spice/x11spice.info10
-rw-r--r--network/x2goserver/x2goserver.SlackBuild2
-rw-r--r--network/x2goserver/x2goserver.info6
-rw-r--r--network/zeek/zeek.SlackBuild7
-rw-r--r--office/LibreOffice/LibreOffice.SlackBuild13
-rw-r--r--office/LibreOffice/LibreOffice.info12
-rw-r--r--office/LibreOffice/README28
-rw-r--r--office/LibreOffice/no-check-if-root.diff30
-rw-r--r--office/apvlv/apvlv.SlackBuild25
-rw-r--r--office/apvlv/apvlv.info6
-rw-r--r--office/asymptote/asymptote.SlackBuild2
-rw-r--r--office/asymptote/asymptote.info8
-rw-r--r--office/calibre/calibre.SlackBuild8
-rw-r--r--office/calibre/calibre.info8
-rw-r--r--office/calibre/patches/qt-5.15.patch40
-rw-r--r--office/calibre/patches/remove-desktop-integration.patch13
-rw-r--r--office/coolreader/coolreader.SlackBuild29
-rw-r--r--office/coolreader/coolreader.info6
-rw-r--r--office/coolreader/inifile.diff21
-rw-r--r--office/evince/evince.SlackBuild25
-rw-r--r--office/evince/evince.info6
-rw-r--r--office/evince/shim.h25
-rw-r--r--office/fbreader/fbreader.SlackBuild3
-rw-r--r--office/gbgoffice/gbgoffice.SlackBuild1
-rw-r--r--office/gbgoffice/patches/12_gcc6.patch21
-rw-r--r--office/gnokii/gnokii-0.6.31-gcc7.patch17
-rw-r--r--office/gnokii/gnokii.SlackBuild3
-rw-r--r--office/gnucash-docs/README2
-rw-r--r--office/gnucash-docs/gnucash-docs.SlackBuild2
-rw-r--r--office/gnucash-docs/gnucash-docs.info6
-rw-r--r--office/gnucash-legacy/gnucash-legacy.info2
-rw-r--r--office/gnucash/gnucash.SlackBuild2
-rw-r--r--office/gnucash/gnucash.info6
-rw-r--r--office/gnumeric/gnumeric.SlackBuild4
-rw-r--r--office/juffed/README6
-rw-r--r--office/juffed/juffed.SlackBuild98
-rw-r--r--office/juffed/juffed.info10
-rw-r--r--office/juffed/slack-desc19
-rw-r--r--office/kbgoffice/gcc6.patch17
-rw-r--r--office/kbgoffice/kbgoffice.SlackBuild3
-rw-r--r--office/mu/mu.SlackBuild4
-rw-r--r--office/mu/mu.info6
-rw-r--r--office/pdfjam/README4
-rw-r--r--office/pdfjam/pdfjam.SlackBuild56
-rw-r--r--office/pdfjam/pdfjam.info10
-rw-r--r--office/pdfjam/slack-desc19
-rw-r--r--office/pdftk/README7
-rw-r--r--office/pdftk/pdftk-1.44-add_custom_optflags.patch26
-rw-r--r--office/pdftk/pdftk-2.02-use-gcc5.patch15
-rw-r--r--office/pdftk/pdftk.SlackBuild11
-rw-r--r--office/pdftk/pdftk.info2
-rw-r--r--office/referencer/referencer-lib_path.patch11
-rw-r--r--office/referencer/referencer.SlackBuild3
-rw-r--r--office/sc-im/README2
-rw-r--r--office/sc-im/sc-im.SlackBuild99
-rw-r--r--office/sc-im/sc-im.info10
-rw-r--r--office/sc-im/slack-desc19
-rw-r--r--office/scribus/scribus.SlackBuild10
-rw-r--r--office/scribus/scribus.info6
-rw-r--r--office/texlive/README14
-rw-r--r--office/texlive/README.tlpkg17
-rw-r--r--office/texlive/doinst.sh5
-rw-r--r--office/texlive/patches/tabu.sty.diff32
-rw-r--r--office/texlive/prep/texmf_get.sh1146
-rw-r--r--office/texlive/slack-desc19
-rw-r--r--office/texlive/texlive.SlackBuild253
-rw-r--r--office/texlive/texlive.info12
-rw-r--r--perl/Net-SSLeay/Net-SSLeay.SlackBuild93
-rw-r--r--perl/Net-SSLeay/Net-SSLeay.info10
-rw-r--r--perl/Net-SSLeay/README5
-rw-r--r--perl/Net-SSLeay/slack-desc19
-rw-r--r--perl/perl-Authen-SASL/README5
-rw-r--r--perl/perl-Authen-SASL/perl-Authen-SASL.SlackBuild107
-rw-r--r--perl/perl-Authen-SASL/perl-Authen-SASL.info10
-rw-r--r--perl/perl-Authen-SASL/slack-desc19
-rw-r--r--perl/perl-Crypt-OpenSSL-Guess/README4
-rw-r--r--perl/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.SlackBuild109
-rw-r--r--perl/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.info10
-rw-r--r--perl/perl-Crypt-OpenSSL-Guess/slack-desc19
-rw-r--r--perl/perl-Crypt-OpenSSL-RSA/perl-Crypt-OpenSSL-RSA.SlackBuild2
-rw-r--r--perl/perl-Crypt-OpenSSL-RSA/perl-Crypt-OpenSSL-RSA.info8
-rw-r--r--perl/perl-DateTime-Format-Strptime/perl-DateTime-Format-Strptime.SlackBuild1
-rw-r--r--perl/perl-Devel-CheckLib/README2
-rw-r--r--perl/perl-Devel-CheckLib/perl-Devel-CheckLib.SlackBuild98
-rw-r--r--perl/perl-Devel-CheckLib/perl-Devel-CheckLib.info10
-rw-r--r--perl/perl-Devel-CheckLib/slack-desc19
-rw-r--r--perl/perl-File-Slurp/perl-File-Slurp.SlackBuild4
-rw-r--r--perl/perl-File-Slurp/perl-File-Slurp.info6
-rw-r--r--perl/perl-Gnome2-Vte/perl-Gnome2-Vte.info2
-rw-r--r--perl/perl-IO-Socket-SSL/README10
-rw-r--r--perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.SlackBuild86
-rw-r--r--perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info10
-rw-r--r--perl/perl-IO-Socket-SSL/slack-desc19
-rw-r--r--perl/perl-Image-Magick/README6
-rw-r--r--perl/perl-Image-Magick/perl-Image-Magick.SlackBuild106
-rw-r--r--perl/perl-Image-Magick/perl-Image-Magick.info10
-rw-r--r--perl/perl-Image-Magick/slack-desc19
-rw-r--r--perl/perl-Module-Runtime/perl-Module-Runtime.SlackBuild16
-rw-r--r--perl/perl-Module-Runtime/perl-Module-Runtime.info6
-rw-r--r--perl/perl-Pod-Coverage/perl-Pod-Coverage.info2
-rw-r--r--perl/perl-Pod-Parser/README7
-rw-r--r--perl/perl-Pod-Parser/perl-Pod-Parser.SlackBuild97
-rw-r--r--perl/perl-Pod-Parser/perl-Pod-Parser.info10
-rw-r--r--perl/perl-Pod-Parser/slack-desc19
-rw-r--r--perl/perl-Razor2-Client-Agent/perl-Razor2-Client-Agent.SlackBuild2
-rw-r--r--perl/perl-cairo/perl-cairo.SlackBuild2
-rw-r--r--perl/perl-libnet/README3
-rw-r--r--perl/perl-libnet/libnet-3.08-Do-not-create-Net-libnet.cfg.patch43
-rw-r--r--perl/perl-libnet/perl-libnet.SlackBuild105
-rw-r--r--perl/perl-libnet/perl-libnet.info10
-rw-r--r--perl/perl-libnet/slack-desc19
-rw-r--r--python/Mako/Mako.SlackBuild75
-rw-r--r--python/Mako/Mako.info10
-rw-r--r--python/Mako/README11
-rw-r--r--python/Mako/slack-desc19
-rw-r--r--python/Pygments/Pygments.SlackBuild81
-rw-r--r--python/Pygments/Pygments.info10
-rw-r--r--python/Pygments/README11
-rw-r--r--python/Pygments/slack-desc19
-rw-r--r--python/cryptography/cryptography.SlackBuild2
-rw-r--r--python/cryptography/cryptography.info8
-rw-r--r--python/css-parser/README3
-rw-r--r--python/css-parser/css-parser.SlackBuild83
-rw-r--r--python/css-parser/css-parser.info10
-rw-r--r--python/css-parser/slack-desc19
-rw-r--r--python/curtsies/curtsies.SlackBuild2
-rw-r--r--python/curtsies/curtsies.info6
-rw-r--r--python/dbus-python3/README6
-rw-r--r--python/dbus-python3/dbus-python3.SlackBuild101
-rw-r--r--python/dbus-python3/dbus-python3.info10
-rw-r--r--python/dbus-python3/slack-desc19
-rw-r--r--python/gst-python/gst-python.SlackBuild8
-rw-r--r--python/gst-python/gst-python.info6
-rw-r--r--python/gst-python3/fix-builds-with-python-3.8.patch43
-rw-r--r--python/gst-python3/gst-python3.SlackBuild29
-rw-r--r--python/gst-python3/gst-python3.info6
-rw-r--r--python/halberd/halberd.SlackBuild3
-rw-r--r--python/halberd/make-pdf-manual.diff14
-rw-r--r--python/idna/README3
-rw-r--r--python/idna/idna.SlackBuild89
-rw-r--r--python/idna/idna.info10
-rw-r--r--python/idna/slack-desc19
-rw-r--r--python/packaging/README1
-rw-r--r--python/packaging/packaging.SlackBuild86
-rw-r--r--python/packaging/packaging.info10
-rw-r--r--python/packaging/slack-desc19
-rw-r--r--python/pip/README24
-rw-r--r--python/pip/pip.SlackBuild71
-rw-r--r--python/pip/pip.info10
-rw-r--r--python/pip/pip.sh9
-rw-r--r--python/pip/slack-desc19
-rw-r--r--python/ply/README2
-rw-r--r--python/ply/ply.SlackBuild90
-rw-r--r--python/ply/ply.info10
-rw-r--r--python/ply/slack-desc19
-rw-r--r--python/py3cairo/README8
-rw-r--r--python/py3cairo/py3cairo.SlackBuild108
-rw-r--r--python/py3cairo/py3cairo.info10
-rw-r--r--python/py3cairo/pycairo-1.10.0-waf_python_3_4-1.patch19
-rw-r--r--python/py3cairo/pycairo-1.10.0-waf_unpack-1.patch20
-rw-r--r--python/py3cairo/slack-desc19
-rw-r--r--python/pygobject3-python3/README3
-rw-r--r--python/pygobject3-python3/pygobject3-python3.SlackBuild100
-rw-r--r--python/pygobject3-python3/pygobject3-python3.info10
-rw-r--r--python/pygobject3-python3/slack-desc19
-rw-r--r--python/pyicu/pyicu.SlackBuild2
-rw-r--r--python/pyicu/pyicu.info6
-rw-r--r--python/pyparsing/README5
-rw-r--r--python/pyparsing/pyparsing.SlackBuild87
-rw-r--r--python/pyparsing/pyparsing.info10
-rw-r--r--python/pyparsing/slack-desc19
-rw-r--r--python/python-certifi/README10
-rw-r--r--python/python-certifi/python-certifi.SlackBuild86
-rw-r--r--python/python-certifi/python-certifi.info10
-rw-r--r--python/python-certifi/slack-desc19
-rw-r--r--python/python-chardet/README3
-rw-r--r--python/python-chardet/python-chardet.SlackBuild76
-rw-r--r--python/python-chardet/python-chardet.info10
-rw-r--r--python/python-chardet/slack-desc19
-rw-r--r--python/python-distro/README3
-rw-r--r--python/python-distro/python-distro.SlackBuild91
-rw-r--r--python/python-distro/python-distro.info10
-rw-r--r--python/python-distro/slack-desc19
-rw-r--r--python/python-future/README3
-rw-r--r--python/python-future/python-future.SlackBuild87
-rw-r--r--python/python-future/python-future.info10
-rw-r--r--python/python-future/slack-desc19
-rw-r--r--python/python-gattlib/dont_hardcode_python_versions.patch19
-rw-r--r--python/python-gattlib/python-gattlib.SlackBuild2
-rw-r--r--python/python-notify2/README4
-rw-r--r--python/python-notify2/python-notify2.SlackBuild91
-rw-r--r--python/python-notify2/python-notify2.info10
-rw-r--r--python/python-notify2/slack-desc19
-rw-r--r--python/python-requests/README4
-rw-r--r--python/python-requests/python-requests.SlackBuild91
-rw-r--r--python/python-requests/python-requests.info10
-rw-r--r--python/python-requests/slack-desc19
-rw-r--r--python/python-urllib3/README12
-rw-r--r--python/python-urllib3/python-urllib3.SlackBuild89
-rw-r--r--python/python-urllib3/python-urllib3.info10
-rw-r--r--python/python-urllib3/slack-desc19
-rw-r--r--python/python-xlib/python-xlib.SlackBuild8
-rw-r--r--python/python-xlib/setup.patch61
-rw-r--r--python/python2-pillow/README5
-rw-r--r--python/python2-pillow/python2-pillow.SlackBuild88
-rw-r--r--python/python2-pillow/python2-pillow.info10
-rw-r--r--python/python2-pillow/slack-desc19
-rw-r--r--python/python3-Cython/README5
-rw-r--r--python/python3-Cython/python3-Cython.SlackBuild89
-rw-r--r--python/python3-Cython/python3-Cython.info10
-rw-r--r--python/python3-Cython/slack-desc19
-rw-r--r--python/python3-appdirs/README2
-rw-r--r--python/python3-appdirs/python3-appdirs.SlackBuild86
-rw-r--r--python/python3-appdirs/python3-appdirs.info10
-rw-r--r--python/python3-appdirs/slack-desc19
-rw-r--r--python/python3-certifi/README2
-rw-r--r--python/python3-certifi/python3-certifi.SlackBuild90
-rw-r--r--python/python3-certifi/python3-certifi.info10
-rw-r--r--python/python3-certifi/slack-desc19
-rw-r--r--python/python3-future/README3
-rw-r--r--python/python3-future/doinst.sh3
-rw-r--r--python/python3-future/python3-future.SlackBuild87
-rw-r--r--python/python3-future/python3-future.info10
-rw-r--r--python/python3-future/slack-desc19
-rw-r--r--python/python3-packaging/README2
-rw-r--r--python/python3-packaging/python3-packaging.SlackBuild89
-rw-r--r--python/python3-packaging/python3-packaging.info10
-rw-r--r--python/python3-packaging/slack-desc19
-rw-r--r--python/python3-pyparsing/README8
-rw-r--r--python/python3-pyparsing/python3-pyparsing.SlackBuild88
-rw-r--r--python/python3-pyparsing/python3-pyparsing.info10
-rw-r--r--python/python3-pyparsing/slack-desc19
-rw-r--r--python/python3-six/README4
-rw-r--r--python/python3-six/python3-six.SlackBuild76
-rw-r--r--python/python3-six/python3-six.info10
-rw-r--r--python/python3-six/slack-desc19
-rw-r--r--python/python3/README18
-rw-r--r--python/python3/patches/python3.no-static-library.diff50
-rw-r--r--python/python3/patches/python3.readline.set_pre_input_hook.diff12
-rw-r--r--python/python3/patches/python3.x86_64.diff156
-rw-r--r--python/python3/python3.SlackBuild157
-rw-r--r--python/python3/python3.info10
-rw-r--r--python/python3/slack-desc19
-rw-r--r--python/pyxdg/README3
-rw-r--r--python/pyxdg/pyxdg.SlackBuild75
-rw-r--r--python/pyxdg/pyxdg.info10
-rw-r--r--python/pyxdg/slack-desc19
-rw-r--r--python/six/README6
-rw-r--r--python/six/six.SlackBuild83
-rw-r--r--python/six/six.info10
-rw-r--r--python/six/slack-desc19
-rw-r--r--python/thunarx-python/thunarx-python.SlackBuild8
-rw-r--r--python/thunarx-python/thunarx-python.info6
-rw-r--r--python/typing/README4
-rw-r--r--python/typing/slack-desc19
-rw-r--r--python/typing/typing.SlackBuild90
-rw-r--r--python/typing/typing.info10
-rw-r--r--system/acpi_call/acpi_call.SlackBuild3
-rw-r--r--system/audit/audit.SlackBuild4
-rw-r--r--system/audit/audit.info6
-rw-r--r--system/brasero/brasero.SlackBuild2
-rw-r--r--system/bulk_extractor/bulk_extractor.SlackBuild6
-rw-r--r--system/bulk_extractor/bulk_extractor.info6
-rw-r--r--system/caprice32/caprice32.SlackBuild2
-rw-r--r--system/colord/colord.SlackBuild5
-rw-r--r--system/conky/conky-1.10.6-gcc7.patch11
-rw-r--r--system/conky/conky.SlackBuild3
-rw-r--r--system/cups-bjnp/cups-bjnp.SlackBuild2
-rw-r--r--system/dahdi-complete/dahdi-complete.SlackBuild17
-rw-r--r--system/dahdi-complete/dahdi-complete.info6
-rw-r--r--system/dash/README4
-rw-r--r--system/dash/dash.SlackBuild90
-rw-r--r--system/dash/dash.info10
-rw-r--r--system/dash/slack-desc19
-rw-r--r--system/ddcutil/ddcutil.SlackBuild5
-rw-r--r--system/ddcutil/ddcutil.info6
-rw-r--r--system/dymo-cups-drivers/cups-ppd-header.patch40
-rw-r--r--system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild3
-rw-r--r--system/dynamips/dynamips.SlackBuild1
-rw-r--r--system/ecryptfs-utils/ecryptfs-utils.SlackBuild4
-rw-r--r--system/ecryptfs-utils/openssl.patch76
-rw-r--r--system/efitools/efitools.SlackBuild11
-rw-r--r--system/efitools/efitools.info6
-rw-r--r--system/evilvte/evilvte.info2
-rw-r--r--system/extundelete/extundelete-e2fsprogs-1.44.1.patch12
-rw-r--r--system/extundelete/extundelete.SlackBuild2
-rw-r--r--system/f2fs_tools/README1
-rw-r--r--system/f2fs_tools/f2fs_tools.SlackBuild88
-rw-r--r--system/f2fs_tools/f2fs_tools.info10
-rw-r--r--system/f2fs_tools/slack-desc19
-rw-r--r--system/facter/facter.SlackBuild2
-rw-r--r--system/file-roller/file-roller.SlackBuild34
-rw-r--r--system/file-roller/file-roller.info6
-rw-r--r--system/foremost/foremost.SlackBuild2
-rw-r--r--system/foremost/gcc10.patch99
-rw-r--r--system/fuse3/README10
-rw-r--r--system/fuse3/fuse3.SlackBuild100
-rw-r--r--system/fuse3/fuse3.info10
-rw-r--r--system/fuse3/slack-desc19
-rw-r--r--system/fwupdate/fwupdate.SlackBuild3
-rw-r--r--system/geoclue/geoclue.SlackBuild1
-rw-r--r--system/gnome-terminal/gnome-terminal.info2
-rw-r--r--system/gnome-vfs/gnome-vfs.SlackBuild2
-rw-r--r--system/gnome-vfs/openssl-1.1.patch26
-rw-r--r--system/gnomint/doinst.sh9
-rw-r--r--system/gnomint/gnomint.SlackBuild9
-rw-r--r--system/gnomint/patches/01-ldd.patch14
-rw-r--r--system/gnomint/patches/01_cflags.patch15
-rw-r--r--system/gnomint/patches/02-cflags.patch28
-rw-r--r--system/gnomint/patches/02_682432.patch16
-rw-r--r--system/gnomint/patches/03_fix-autoreconf.patch16
-rw-r--r--system/gnomint/patches/04_gsettings-port.patch383
-rw-r--r--system/gnomint/patches/05_export-private-key-crash.patch83
-rw-r--r--system/gnomint/patches/06_desktop-file.patch22
-rw-r--r--system/gnomint/patches/07_spelling-errors.patch39
-rw-r--r--system/gnomint/patches/08_gtk3-port.patch7655
-rw-r--r--system/gnomint/patches/09_gcc-10.patch33
-rw-r--r--system/gnomint/patches/gnutls3.patch31
-rw-r--r--system/guefi/README3
-rw-r--r--system/guefi/guefi.SlackBuild91
-rw-r--r--system/guefi/guefi.info10
-rw-r--r--system/guefi/slack-desc19
-rw-r--r--system/hack-font-ttf/README7
-rw-r--r--system/hack-font-ttf/doinst.sh11
-rw-r--r--system/hack-font-ttf/hack-font-ttf.SlackBuild64
-rw-r--r--system/hack-font-ttf/hack-font-ttf.info10
-rw-r--r--system/hack-font-ttf/slack-desc19
-rw-r--r--system/haveged/README27
-rw-r--r--system/haveged/doinst.sh28
-rw-r--r--system/haveged/haveged.SlackBuild121
-rw-r--r--system/haveged/haveged.info10
-rw-r--r--system/haveged/rc.haveged47
-rw-r--r--system/haveged/slack-desc19
-rw-r--r--system/innotop/README6
-rw-r--r--system/innotop/innotop.SlackBuild74
-rw-r--r--system/innotop/innotop.info10
-rw-r--r--system/innotop/slack-desc19
-rw-r--r--system/inxi/README4
-rw-r--r--system/inxi/inxi.SlackBuild68
-rw-r--r--system/inxi/inxi.info10
-rw-r--r--system/inxi/slack-desc19
-rw-r--r--system/iscan-data/README2
-rw-r--r--system/iscan-data/iscan-data.SlackBuild100
-rw-r--r--system/iscan-data/iscan-data.info10
-rw-r--r--system/iscan-data/slack-desc19
-rw-r--r--system/iscan/README4
-rw-r--r--system/iscan/doinst.sh29
-rw-r--r--system/iscan/iscan.SlackBuild144
-rw-r--r--system/iscan/iscan.info10
-rw-r--r--system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch12
-rw-r--r--system/iscan/patches/iscan_png15.patch52
-rw-r--r--system/iscan/patches/jpegstream.cc.patch21
-rw-r--r--system/iscan/slack-desc19
-rw-r--r--system/jdupes/jdupes.SlackBuild1
-rw-r--r--system/jmtpfs/README10
-rw-r--r--system/jmtpfs/jmtpfs.SlackBuild91
-rw-r--r--system/jmtpfs/jmtpfs.info10
-rw-r--r--system/jmtpfs/slack-desc19
-rw-r--r--system/lbzip2/README2
-rw-r--r--system/lbzip2/lbzip2.SlackBuild121
-rw-r--r--system/lbzip2/lbzip2.info10
-rw-r--r--system/lbzip2/slack-desc19
-rw-r--r--system/lilyterm/lilyterm.SlackBuild2
-rw-r--r--system/lilyterm/lilyterm.info8
-rw-r--r--system/lxtask/fix-no-common.patch73
-rw-r--r--system/lxtask/lxtask.SlackBuild3
-rw-r--r--system/lxterminal/lxterminal.info2
-rw-r--r--system/lz4/README9
-rw-r--r--system/lz4/lz4.SlackBuild95
-rw-r--r--system/lz4/lz4.info10
-rw-r--r--system/lz4/slack-desc19
-rw-r--r--system/man-db/README13
-rw-r--r--system/man-db/README.Slackware49
-rw-r--r--system/man-db/doinst.sh48
-rw-r--r--system/man-db/dont_write_in_usr.diff50
-rw-r--r--system/man-db/man-db.SlackBuild223
-rw-r--r--system/man-db/man-db.cron30
-rw-r--r--system/man-db/man-db.csh12
-rw-r--r--system/man-db/man-db.info12
-rw-r--r--system/man-db/man-db.sh16
-rw-r--r--system/man-db/man_db.conf.new.gzbin2404 -> 0 bytes
-rw-r--r--system/man-db/slack-desc19
-rw-r--r--system/mlocate/README31
-rw-r--r--system/mlocate/doinst.sh24
-rw-r--r--system/mlocate/mlocate-run-updatedb4
-rw-r--r--system/mlocate/mlocate.SlackBuild120
-rw-r--r--system/mlocate/mlocate.cron2
-rw-r--r--system/mlocate/mlocate.info10
-rw-r--r--system/mlocate/slack-desc19
-rw-r--r--system/mlocate/updatedb.conf.new4
-rw-r--r--system/mongodb/mongodb.SlackBuild2
-rw-r--r--system/mongodb/mongodb.info6
-rw-r--r--system/noto-fonts/66-noto-mono.conf16
-rw-r--r--system/noto-fonts/66-noto-sans.conf16
-rw-r--r--system/noto-fonts/66-noto-serif.conf16
-rw-r--r--system/noto-fonts/README14
-rw-r--r--system/noto-fonts/doinst.sh11
-rw-r--r--system/noto-fonts/noto-fonts.SlackBuild75
-rw-r--r--system/noto-fonts/noto-fonts.info10
-rw-r--r--system/noto-fonts/slack-desc19
-rw-r--r--system/nss-pam-ldapd/README5
-rw-r--r--system/nss-pam-ldapd/doinst.sh26
-rw-r--r--system/nss-pam-ldapd/nss-pam-ldapd.SlackBuild117
-rw-r--r--system/nss-pam-ldapd/nss-pam-ldapd.info10
-rw-r--r--system/nss-pam-ldapd/rc.nss-pam-ldapd37
-rw-r--r--system/nss-pam-ldapd/slack-desc19
-rw-r--r--system/nvidia-legacy304-kernel/4.14_kernel.patch26
-rw-r--r--system/nvidia-legacy304-kernel/4.15_kernel.patch48
-rw-r--r--system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild4
-rw-r--r--system/nvidia-legacy390-driver/nvidia-switch1
-rw-r--r--system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild1
-rw-r--r--system/nvme-cli/README6
-rw-r--r--system/nvme-cli/doinst.sh14
-rw-r--r--system/nvme-cli/nvme-cli.SlackBuild100
-rw-r--r--system/nvme-cli/nvme-cli.info10
-rw-r--r--system/nvme-cli/slack-desc19
-rw-r--r--system/opam/README13
-rw-r--r--system/opam/opam.SlackBuild10
-rw-r--r--system/opam/opam.info6
-rw-r--r--system/open-vm-tools/open-vm-tools.SlackBuild2
-rw-r--r--system/p7zip/p7zip.SlackBuild2
-rw-r--r--system/packagekit/doinst.sh1
-rw-r--r--system/packagekit/packagekit.SlackBuild3
-rw-r--r--system/packagekit/packagekit.info8
-rw-r--r--system/parallel/README9
-rw-r--r--system/parallel/parallel.SlackBuild99
-rw-r--r--system/parallel/parallel.info10
-rw-r--r--system/parallel/slack-desc19
-rw-r--r--system/patchelf/README3
-rw-r--r--system/patchelf/patchelf.SlackBuild97
-rw-r--r--system/patchelf/patchelf.info10
-rw-r--r--system/patchelf/slack-desc19
-rw-r--r--system/percona-xtrabackup/README2
-rw-r--r--system/percona-xtrabackup/percona-xtrabackup.SlackBuild155
-rw-r--r--system/percona-xtrabackup/percona-xtrabackup.info10
-rw-r--r--system/percona-xtrabackup/slack-desc19
-rw-r--r--system/qemu/qemu.SlackBuild6
-rw-r--r--system/qemu/qemu.info6
-rw-r--r--system/qterminal/qterminal.SlackBuild4
-rw-r--r--system/qterminal/qterminal.info6
-rw-r--r--system/roxterm/roxterm.info2
-rw-r--r--system/rxvt-unicode/README8
-rw-r--r--system/rxvt-unicode/rxvt-unicode.SlackBuild162
-rw-r--r--system/rxvt-unicode/rxvt-unicode.desktop9
-rw-r--r--system/rxvt-unicode/rxvt-unicode.info10
-rw-r--r--system/rxvt-unicode/slack-desc19
-rw-r--r--system/rxvt-unicode/urxvt.xpm141
-rw-r--r--system/sbsigntools/autogen.patch277
-rw-r--r--system/sbsigntools/ccan_makefile.patch20
-rw-r--r--system/sbsigntools/fix_efi_arch.patch26
-rw-r--r--system/sbsigntools/sbsigntools.SlackBuild33
-rw-r--r--system/sbsigntools/sbsigntools.info8
-rw-r--r--system/spacefm/glibc-2.28.patch12
-rw-r--r--system/spacefm/spacefm.SlackBuild3
-rw-r--r--system/t1utils/README17
-rw-r--r--system/t1utils/slack-desc19
-rw-r--r--system/t1utils/t1utils.SlackBuild100
-rw-r--r--system/t1utils/t1utils.info10
-rw-r--r--system/terminator/terminator.info2
-rw-r--r--system/tinyterm/tinyterm.info2
-rw-r--r--system/ttyrec/ttyrec-1.0.8-flags.patch19
-rw-r--r--system/ttyrec/ttyrec-1.0.8-glibc-2.30.patch30
-rw-r--r--system/ttyrec/ttyrec-1.0.8.RHEL5.patch33
-rw-r--r--system/ttyrec/ttyrec.SlackBuild6
-rw-r--r--system/uhd/uhd.SlackBuild14
-rw-r--r--system/uhd/uhd.info8
-rw-r--r--system/unison/unison.SlackBuild4
-rw-r--r--system/unison/unison.info6
-rw-r--r--system/vhba-module/vhba-module.SlackBuild2
-rw-r--r--system/virt-manager/Add-Slackware-to-OS-choices.patch53
-rw-r--r--system/virt-manager/virt-manager.SlackBuild10
-rw-r--r--system/virt-manager/virt-manager.info8
-rw-r--r--system/virtualbox-addons/rc.vboxadd.diff303
-rw-r--r--system/virtualbox-addons/virtualbox-addons.SlackBuild44
-rw-r--r--system/virtualbox-addons/virtualbox-addons.info6
-rw-r--r--system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild4
-rw-r--r--system/virtualbox-extension-pack/virtualbox-extension-pack.info6
-rw-r--r--system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild22
-rw-r--r--system/virtualbox-kernel-addons/virtualbox-kernel-addons.info6
-rw-r--r--system/virtualbox-kernel/virtualbox-kernel.SlackBuild23
-rw-r--r--system/virtualbox-kernel/virtualbox-kernel.info6
-rw-r--r--system/virtualbox/006-rdesktop-vrdp-keymap-path.patch4
-rw-r--r--system/virtualbox/10-virtualbox.rules5
-rw-r--r--system/virtualbox/LocalConfig.kmk11
-rw-r--r--system/virtualbox/vboxdrv.sh-setup.diff360
-rw-r--r--system/virtualbox/virtualbox-6.1.6-qt-5.15.patch92
-rw-r--r--system/virtualbox/virtualbox-gsoap.patch40
-rw-r--r--system/virtualbox/virtualbox.SlackBuild43
-rw-r--r--system/virtualbox/virtualbox.info18
-rw-r--r--system/xdg-dbus-proxy/README3
-rw-r--r--system/xdg-dbus-proxy/slack-desc19
-rw-r--r--system/xdg-dbus-proxy/xdg-dbus-proxy.SlackBuild100
-rw-r--r--system/xdg-dbus-proxy/xdg-dbus-proxy.info10
-rw-r--r--system/xnp2/gcc6.patch17
-rw-r--r--system/xnp2/xnp2.SlackBuild3
-rw-r--r--system/zerofree/README7
-rw-r--r--system/zerofree/slack-desc19
-rw-r--r--system/zerofree/zerofree.892
-rw-r--r--system/zerofree/zerofree.SlackBuild100
-rw-r--r--system/zerofree/zerofree.info12
-rw-r--r--system/zstd/README5
-rw-r--r--system/zstd/slack-desc19
-rw-r--r--system/zstd/zstd.SlackBuild107
-rw-r--r--system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gzbin325 -> 0 bytes
-rw-r--r--system/zstd/zstd.info10
1831 files changed, 40090 insertions, 49032 deletions
diff --git a/README b/README
index 2708bcc7d7..b1cf535a55 100644
--- a/README
+++ b/README
@@ -1,3 +1,19 @@
+SBo-git - slackbuilds repository for slackware-current
+- - -
+
+this is an unofficial fork of master branch from slackbuilds.org's
+git repository (http://slackbuilds.org/cgit/slackbuilds/).
+
+here I put my unofficial mods to their slackbuilds to run on
+slackware-current with sbopkg (http://www.sbopkg.org).
+
+Check https://github.com/Ponce/slackbuilds/wiki for additional informations.
+
+See https://github.com/Ponce/slackbuilds/wiki/configuring-the-current-repository-with-sbopkg
+for instructions on how to use this repository with sbopkg.
+
+original README from slackbuilds.org follows:
+---------------------------------------------
See https://slackbuilds.org/howto/ for instructions on
how to use the contents of this directory.
diff --git a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
index 6010e6a9ab..661a0ea039 100644
--- a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
+++ b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
@@ -69,6 +69,12 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# For boost >= 1.73.0
+patch -p1 < $CWD/boost-1.73.patch
+
+# For qt-5.15.x, thanks to kingbeowulf!
+sed -i '/^#include <QPainter>$/a #include <QPainterPath>' src/qt/trafficgraphwidget.cpp
+
if [ "${QRENC:-no}" = "yes" ]; then
useqr="--with-qrencode"
else
diff --git a/academic/Gridcoin-Research/boost-1.73.patch b/academic/Gridcoin-Research/boost-1.73.patch
new file mode 100644
index 0000000000..d47fe78a6e
--- /dev/null
+++ b/academic/Gridcoin-Research/boost-1.73.patch
@@ -0,0 +1,54 @@
+diff -Naur Gridcoin-Research-4.0.6.0.orig/src/qt/clientmodel.cpp Gridcoin-Research-4.0.6.0/src/qt/clientmodel.cpp
+--- Gridcoin-Research-4.0.6.0.orig/src/qt/clientmodel.cpp 2019-10-22 20:36:49.000000000 +0200
++++ Gridcoin-Research-4.0.6.0/src/qt/clientmodel.cpp 2020-05-12 08:45:16.926818550 +0200
+@@ -270,9 +270,9 @@
+ // Connect signals to client
+ uiInterface.NotifyBlocksChanged.connect(boost::bind(NotifyBlocksChanged, this));
+ uiInterface.BannedListChanged.connect(boost::bind(BannedListChanged, this));
+- uiInterface.NotifyNumConnectionsChanged.connect(boost::bind(NotifyNumConnectionsChanged, this, _1));
+- uiInterface.NotifyAlertChanged.connect(boost::bind(NotifyAlertChanged, this, _1, _2));
+- uiInterface.NotifyScraperEvent.connect(boost::bind(NotifyScraperEvent, this, _1, _2, _3));
++ uiInterface.NotifyNumConnectionsChanged.connect(boost::bind(NotifyNumConnectionsChanged, this, boost::placeholders::_1));
++ uiInterface.NotifyAlertChanged.connect(boost::bind(NotifyAlertChanged, this, boost::placeholders::_1, boost::placeholders::_2));
++ uiInterface.NotifyScraperEvent.connect(boost::bind(NotifyScraperEvent, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
+ }
+
+ void ClientModel::unsubscribeFromCoreSignals()
+@@ -280,7 +280,7 @@
+ // Disconnect signals from client
+ uiInterface.NotifyBlocksChanged.disconnect(boost::bind(NotifyBlocksChanged, this));
+ uiInterface.BannedListChanged.disconnect(boost::bind(BannedListChanged, this));
+- uiInterface.NotifyNumConnectionsChanged.disconnect(boost::bind(NotifyNumConnectionsChanged, this, _1));
+- uiInterface.NotifyAlertChanged.disconnect(boost::bind(NotifyAlertChanged, this, _1, _2));
+- uiInterface.NotifyScraperEvent.disconnect(boost::bind(NotifyScraperEvent, this, _1, _2, _3));
++ uiInterface.NotifyNumConnectionsChanged.disconnect(boost::bind(NotifyNumConnectionsChanged, this, boost::placeholders::_1));
++ uiInterface.NotifyAlertChanged.disconnect(boost::bind(NotifyAlertChanged, this, boost::placeholders::_1, boost::placeholders::_2));
++ uiInterface.NotifyScraperEvent.disconnect(boost::bind(NotifyScraperEvent, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
+ }
+diff -Naur Gridcoin-Research-4.0.6.0.orig/src/qt/walletmodel.cpp Gridcoin-Research-4.0.6.0/src/qt/walletmodel.cpp
+--- Gridcoin-Research-4.0.6.0.orig/src/qt/walletmodel.cpp 2019-10-22 20:36:49.000000000 +0200
++++ Gridcoin-Research-4.0.6.0/src/qt/walletmodel.cpp 2020-05-12 08:47:46.494818550 +0200
+@@ -369,17 +369,17 @@
+ void WalletModel::subscribeToCoreSignals()
+ {
+ // Connect signals to wallet
+- wallet->NotifyStatusChanged.connect(boost::bind(&NotifyKeyStoreStatusChanged, this, _1));
+- wallet->NotifyAddressBookChanged.connect(boost::bind(NotifyAddressBookChanged, this, _1, _2, _3, _4, _5));
+- wallet->NotifyTransactionChanged.connect(boost::bind(NotifyTransactionChanged, this, _1, _2, _3));
++ wallet->NotifyStatusChanged.connect(boost::bind(&NotifyKeyStoreStatusChanged, this, boost::placeholders::_1));
++ wallet->NotifyAddressBookChanged.connect(boost::bind(NotifyAddressBookChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5));
++ wallet->NotifyTransactionChanged.connect(boost::bind(NotifyTransactionChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
+ }
+
+ void WalletModel::unsubscribeFromCoreSignals()
+ {
+ // Disconnect signals from wallet
+- wallet->NotifyStatusChanged.disconnect(boost::bind(&NotifyKeyStoreStatusChanged, this, _1));
+- wallet->NotifyAddressBookChanged.disconnect(boost::bind(NotifyAddressBookChanged, this, _1, _2, _3, _4, _5));
+- wallet->NotifyTransactionChanged.disconnect(boost::bind(NotifyTransactionChanged, this, _1, _2, _3));
++ wallet->NotifyStatusChanged.disconnect(boost::bind(&NotifyKeyStoreStatusChanged, this, boost::placeholders::_1));
++ wallet->NotifyAddressBookChanged.disconnect(boost::bind(NotifyAddressBookChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5));
++ wallet->NotifyTransactionChanged.disconnect(boost::bind(NotifyTransactionChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
+ }
+
+ // WalletModel::UnlockContext implementation
diff --git a/academic/antiprism/antiprism.SlackBuild b/academic/antiprism/antiprism.SlackBuild
index 271184a166..f3c6c291e6 100644
--- a/academic/antiprism/antiprism.SlackBuild
+++ b/academic/antiprism/antiprism.SlackBuild
@@ -55,7 +55,7 @@ find -L . \
sed "/^docdir/s|= .*|= @docdir@|" -i Makefile.in
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--libdir=/usr/lib$LIBDIRSUFFIX \
diff --git a/academic/geda-gaf/geda-gaf.info b/academic/geda-gaf/geda-gaf.info
index 3664fa7fb5..1362c53982 100644
--- a/academic/geda-gaf/geda-gaf.info
+++ b/academic/geda-gaf/geda-gaf.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.
MD5SUM="fa8a807615decf47027e22a217dd0ded"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="guile1.8"
MAINTAINER="Stephen Van Berg"
EMAIL="stephen_van_berg@earlicker.com"
diff --git a/academic/gelemental/gcc.patch b/academic/gelemental/gcc.patch
new file mode 100644
index 0000000000..eeb16293d9
--- /dev/null
+++ b/academic/gelemental/gcc.patch
@@ -0,0 +1,12 @@
+diff -Naur gelemental-1.2.0.orig/src/dialogs.cc gelemental-1.2.0/src/dialogs.cc
+--- gelemental-1.2.0.orig/src/dialogs.cc 2007-09-25 06:49:33.000000000 +0200
++++ gelemental-1.2.0/src/dialogs.cc 2017-07-27 21:45:34.356776770 +0200
+@@ -247,7 +247,7 @@
+ const Gtk::TreePath& tpath, bool)
+ {
+ Gtk::TreeIter iter = store->get_iter (tpath);
+- return iter ? iter->get_value (cols.property) : false;
++ return iter ? static_cast<bool>(iter->get_value (cols.property)) : false;
+ }
+
+
diff --git a/academic/gelemental/gelemental.SlackBuild b/academic/gelemental/gelemental.SlackBuild
index e4b332e18a..d2ae765eb6 100644
--- a/academic/gelemental/gelemental.SlackBuild
+++ b/academic/gelemental/gelemental.SlackBuild
@@ -70,6 +70,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Fix for the newer gcc
+patch -p1 -i $CWD/gcc.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS -std=c++11" \
./configure \
diff --git a/academic/genius/README b/academic/genius/README
index d4a270574c..fa2fa4b67b 100644
--- a/academic/genius/README
+++ b/academic/genius/README
@@ -7,5 +7,5 @@ or educational tool. The syntax is very intuitive and
is designed to mimic how mathematics is usually written.
If you would like the GUI interface as well, it requires
-libgnomeui and gtksourceview. If you have these dependencies,
+libgnomeui, gtksourceview and vte2. If you have these dependencies,
pass the variable of GNOME=YES (or anything that isn't NO ;)
diff --git a/academic/genometools/genometools.SlackBuild b/academic/genometools/genometools.SlackBuild
index f4af4db0f9..117e1bb420 100644
--- a/academic/genometools/genometools.SlackBuild
+++ b/academic/genometools/genometools.SlackBuild
@@ -76,7 +76,7 @@ find -L . \
sed -i "s:lib/libgenometools:lib${LIBDIRSUFFIX}/libgenometools:g" Makefile
sed -i "s:\$(prefix)/lib:\$(prefix)/lib${LIBDIRSUFFIX}:g" Makefile
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=format-truncation=" \
CXXFLAGS="$SLKCFLAGS" \
make $BUILDARCH \
prefix=/usr
diff --git a/academic/primer3/primer3.SlackBuild b/academic/primer3/primer3.SlackBuild
index d3ae1b399c..514f65fd23 100644
--- a/academic/primer3/primer3.SlackBuild
+++ b/academic/primer3/primer3.SlackBuild
@@ -75,13 +75,11 @@ patch -p1 -i $CWD/gcc-7.patch
cd ./src
# Use our CFLAGS
-sed -i "/^CFLAGS/s/=/+=/" Makefile
+sed -i -e "s|-O2|$SLKCFLAGS|" -e "s|-g -Wall|-fpermissive|" Makefile
# Look for configuration files in /usr/share instead of /opt
sed -i "s:/opt/primer3_config:/usr/share/$PRGNAM/primer3_config:g" thal_main.c primer3_boulder_main.c
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
make
# This is recommended, but the tests take a really long time. Be patient
diff --git a/academic/root/root.SlackBuild b/academic/root/root.SlackBuild
index bb507f0536..e0ec409dca 100644
--- a/academic/root/root.SlackBuild
+++ b/academic/root/root.SlackBuild
@@ -18,7 +18,7 @@
# Modified by the slackbuilds.org project
PRGNAM=root
-VERSION=${VERSION:-5.34.36}
+VERSION=${VERSION:-6.10.02}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -79,9 +79,9 @@ fi
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM
+rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM\_v$VERSION.source.tar.gz
-cd $PRGNAM
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -134,9 +134,8 @@ mkdir -p $PKG$PYTHONDIR
mv \
$PKG$PREFIX/lib$LIBDIRSUFFIX/*.py \
$PKG$PREFIX/lib$LIBDIRSUFFIX/*.pyc \
- $PKG$PREFIX/lib$LIBDIRSUFFIX/python/genreflex \
+ $PKG$PREFIX/lib$LIBDIRSUFFIX/*.pyo \
$PKG$PYTHONDIR
-rm -fr $PKG$PREFIX/lib$LIBDIRSUFFIX/python
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneded 2> /dev/null || true
diff --git a/academic/root/root.info b/academic/root/root.info
index 450e1bde00..7df5c81738 100644
--- a/academic/root/root.info
+++ b/academic/root/root.info
@@ -1,10 +1,10 @@
PRGNAM="root"
-VERSION="5.34.36"
+VERSION="6.10.02"
HOMEPAGE="http://root.cern.ch/drupal/"
-DOWNLOAD="https://root.cern.ch/download/root_v5.34.36.source.tar.gz"
-MD5SUM="6a1ad549b3b79b10bbb1f116b49067ee"
+DOWNLOAD="https://root.cern.ch/download/root_v6.10.02.source.tar.gz"
+MD5SUM="19f2285c845a48355db779938fb4db99"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="ftgl"
+REQUIRES="ftgl unixODBC"
MAINTAINER="Jože Zobec"
EMAIL="jozze.zepl@gmail.com"
diff --git a/academic/tophat/make_pair.patch b/academic/tophat/make_pair.patch
new file mode 100644
index 0000000000..44b71d1059
--- /dev/null
+++ b/academic/tophat/make_pair.patch
@@ -0,0 +1,24 @@
+diff -uBw -aur tophat-2.1.1/src/juncs_db.cpp tophat-2.1.1-patched/src/juncs_db.cpp
+--- tophat-2.1.1/src/juncs_db.cpp 2016-02-14 19:21:17.354079000 +0100
++++ tophat-2.1.1-patched/src/juncs_db.cpp 2016-06-02 11:26:34.097425159 +0200
+@@ -338,7 +338,7 @@
+ uint32_t left_coord = atoi(scan_left_coord);
+ uint32_t right_coord = atoi(scan_right_coord);
+ bool antisense = *orientation == '-';
+- junctions.insert(make_pair<Junction, JunctionStats>(Junction(ref_id, left_coord, right_coord, antisense), JunctionStats()));
++ junctions.insert(make_pair(Junction(ref_id, left_coord, right_coord, antisense), JunctionStats()));
+ }
+ }
+
+diff -uBw -aur tophat-2.1.1/src/tophat_reports.cpp tophat-2.1.1-patched/src/tophat_reports.cpp
+--- tophat-2.1.1/src/tophat_reports.cpp 2016-02-23 22:20:44.320710000 +0100
++++ tophat-2.1.1-patched/src/tophat_reports.cpp 2016-06-02 11:26:22.057239478 +0200
+@@ -2705,7 +2705,7 @@
+ junction_stat.gtf_match = true;
+ junction_stat.accepted = true;
+
+- gtf_junctions.insert(make_pair<Junction, JunctionStats>(Junction(ref_id, left_coord, right_coord, antisense), junction_stat));
++ gtf_junctions.insert(make_pair(Junction(ref_id, left_coord, right_coord, antisense), junction_stat));
+ }
+ }
+ fprintf(stderr, "Loaded %d GFF junctions from %s.\n", (int)(gtf_junctions.size()), gtf_juncs.c_str());
diff --git a/academic/tophat/tophat.SlackBuild b/academic/tophat/tophat.SlackBuild
index f32fb590f5..e3e97fcc85 100644
--- a/academic/tophat/tophat.SlackBuild
+++ b/academic/tophat/tophat.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Thanks archlinux
+patch -p1 < $CWD/make_pair.patch
+
./autogen.sh
CFLAGS="$SLKCFLAGS" \
diff --git a/academic/ugene/ugene-1.22.0-dont_hardcode_includes.patch b/academic/ugene/ugene-1.22.0-dont_hardcode_includes.patch
new file mode 100644
index 0000000000..6bc26e1f19
--- /dev/null
+++ b/academic/ugene/ugene-1.22.0-dont_hardcode_includes.patch
@@ -0,0 +1,24 @@
+diff -up ugene-1.22.0/src/libs_3rdparty/samtools/samtools.pri.dont_hardcode_includes ugene-1.22.0/src/libs_3rdparty/samtools/samtools.pri
+--- ugene-1.22.0/src/libs_3rdparty/samtools/samtools.pri.dont_hardcode_includes 2016-03-31 07:21:56.000000000 -0500
++++ ugene-1.22.0/src/libs_3rdparty/samtools/samtools.pri 2016-06-02 17:49:02.383069490 -0500
+@@ -3,7 +3,7 @@ UGENE_RELATIVE_DESTDIR = ''
+
+ TEMPLATE = lib
+ CONFIG +=thread debug_and_release staticlib warn_off
+-INCLUDEPATH += src src/samtools ../../include /usr/include
++INCLUDEPATH += src src/samtools ../../include
+ win32 : INCLUDEPATH += src/samtools/win32
+ DEFINES+="_FILE_OFFSET_BITS=64" _LARGEFILE64_SOURCE _USE_KNETFILE
+ win32 : DEFINES += _USE_MATH_DEFINES "inline=__inline" "__func__=__FUNCTION__" "R_OK=4" "atoll=_atoi64" "alloca=_alloca"
+diff -up ugene-1.22.0/src/plugins_3rdparty/variants/variants.pri.dont_hardcode_includes ugene-1.22.0/src/plugins_3rdparty/variants/variants.pri
+--- ugene-1.22.0/src/plugins_3rdparty/variants/variants.pri.dont_hardcode_includes 2016-03-31 07:22:09.000000000 -0500
++++ ugene-1.22.0/src/plugins_3rdparty/variants/variants.pri 2016-06-02 20:26:35.265356432 -0500
+@@ -20,7 +20,7 @@ use_bundled_zlib() {
+ win32 : LIBS += -lwsock32
+
+
+-INCLUDEPATH += src ../../include /usr/include
++INCLUDEPATH += src ../../include
+ INCLUDEPATH += ../../libs_3rdparty/samtools/src/samtools
+ INCLUDEPATH += ../../libs_3rdparty/samtools/src
+ INCLUDEPATH += ../../libs_3rdparty/samtools/src/samtools/bcftools
diff --git a/academic/ugene/ugene.SlackBuild b/academic/ugene/ugene.SlackBuild
index c9c8a749b1..b7ebda5a85 100644
--- a/academic/ugene/ugene.SlackBuild
+++ b/academic/ugene/ugene.SlackBuild
@@ -73,6 +73,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Thanks fedora
+patch -p1 < $CWD/ugene-1.22.0-dont_hardcode_includes.patch
+
# Fix libraries and man pages paths
sed -i "s:/lib:/lib${LIBDIRSUFFIX}:g" src/ugene_globals.pri
sed -i "s:/share/man:/man:g" src/ugene_globals.pri
diff --git a/accessibility/easystroke/easystroke.SlackBuild b/accessibility/easystroke/easystroke.SlackBuild
index 29b04e812b..3e2f2fedcc 100644
--- a/accessibility/easystroke/easystroke.SlackBuild
+++ b/accessibility/easystroke/easystroke.SlackBuild
@@ -59,6 +59,7 @@ sed -i 's|-lboost_serialization-mt|-lboost_serialization|' Makefile
# Thanks to ARCH Linux
patch -p1 < $CWD/lambda.patch
+patch -p1 < $CWD/gcc7-build-fix.patch
make CXX="g++ $SLKCFLAGS" CC="gcc -std=c99 $SLKCFLAGS" PREFIX=/usr
diff --git a/accessibility/easystroke/gcc7-build-fix.patch b/accessibility/easystroke/gcc7-build-fix.patch
new file mode 100644
index 0000000000..b66bcb4edf
--- /dev/null
+++ b/accessibility/easystroke/gcc7-build-fix.patch
@@ -0,0 +1,40 @@
+From 9e2c32390c5c253aade3bb703e51841748d2c37e Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Sat, 28 Jan 2017 01:26:00 +0000
+Subject: [PATCH] Remove abs(float) function that clashes with std::abs(float)
+
+Depending on which C++ standard library headers have been included there
+might an abs(float) function already declared in the global namespace,
+so the definition in this file conflicts with it. This cause a build
+failure with GCC 7, which conforms more closely to the C++ standard with
+respect to overloads of abs.
+
+Including <cmath> and adding a using-declaration for std::abs ensures
+that the standard std::abs(float) function is available. This solution
+should be portable to all compilers.
+---
+ handler.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/handler.cc b/handler.cc
+index 8830ea2..685b1ff 100644
+--- a/handler.cc
++++ b/handler.cc
+@@ -23,6 +23,8 @@
+ #include <X11/extensions/XTest.h>
+ #include <X11/XKBlib.h>
+ #include <X11/Xproto.h>
++#include <cmath> // std::abs(float)
++using std::abs;
+
+ XState *xstate = nullptr;
+
+@@ -533,8 +535,6 @@ class WaitForPongHandler : public Handler, protected Timeout {
+ virtual Grabber::State grab_mode() { return parent->grab_mode(); }
+ };
+
+-static inline float abs(float x) { return x > 0 ? x : -x; }
+-
+ class AbstractScrollHandler : public Handler {
+ bool have_x, have_y;
+ float last_x, last_y;
diff --git a/accessibility/flite/flite.info b/accessibility/flite/flite.info
index 4b6c62b261..05d4e52227 100644
--- a/accessibility/flite/flite.info
+++ b/accessibility/flite/flite.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://festvox.org/flite/packed/flite-2.1/flite-2.1-release.tar.bz2"
MD5SUM="915ac91068fc962f4a0e8aa26164cc8a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="texi2html"
MAINTAINER="B. Watson"
EMAIL="yalhcru@gmail.com"
diff --git a/accessibility/jpilot/jpilot.SlackBuild b/accessibility/jpilot/jpilot.SlackBuild
index 78eeb3f868..e2dd848145 100644
--- a/accessibility/jpilot/jpilot.SlackBuild
+++ b/accessibility/jpilot/jpilot.SlackBuild
@@ -25,13 +25,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=jpilot
-VERSION=${VERSION:-1.8.1}
+VERSION=${VERSION:-1.8.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,15 +60,16 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $TMP rm -rf $PRGNAM-$VERSION
+cd $TMP
+rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS -std=gnu89" \
CXXFLAGS="$SLKCFLAGS -std=gnu89" \
@@ -84,10 +85,8 @@ CXXFLAGS="$SLKCFLAGS -std=gnu89" \
make
make install-strip DESTDIR=$PKG
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mv $PKG/usr/share/doc $PKG/usr
mv $PKG/usr/doc/jpilot $PKG/usr/doc/jpilot-$VERSION
diff --git a/accessibility/jpilot/jpilot.info b/accessibility/jpilot/jpilot.info
index 4030813d5e..9d14b884f0 100644
--- a/accessibility/jpilot/jpilot.info
+++ b/accessibility/jpilot/jpilot.info
@@ -1,8 +1,8 @@
PRGNAM="jpilot"
-VERSION="1.8.1"
+VERSION="1.8.2"
HOMEPAGE="http://www.jpilot.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/jpilot-1.8.1.tar.gz"
-MD5SUM="ac59a5708f37e30d39e85b1fcedd266f"
+DOWNLOAD="http://jpilot.org/tarballs/jpilot-1.8.2.tar.gz"
+MD5SUM="8b539d8943ac75c7890fc5c071e89adb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/accessibility/xsel/xsel.SlackBuild b/accessibility/xsel/xsel.SlackBuild
index 67a373675a..2ff4a0386f 100644
--- a/accessibility/xsel/xsel.SlackBuild
+++ b/accessibility/xsel/xsel.SlackBuild
@@ -54,7 +54,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=stringop-truncation" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/audio/aacgain/aacgain.SlackBuild b/audio/aacgain/aacgain.SlackBuild
index 2a138e95c9..a13e12ca97 100644
--- a/audio/aacgain/aacgain.SlackBuild
+++ b/audio/aacgain/aacgain.SlackBuild
@@ -120,7 +120,7 @@ cd ../mp4v2
patch -p2 -i ../$PRGNAM/mp4v2.patch
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive -Wno-narrowing" \
./configure \
--build=$ARCH-slackware-linux
diff --git a/audio/alsamodularsynth/alsamodularsynth.SlackBuild b/audio/alsamodularsynth/alsamodularsynth.SlackBuild
index 60c79fccb5..088d4c44dd 100644
--- a/audio/alsamodularsynth/alsamodularsynth.SlackBuild
+++ b/audio/alsamodularsynth/alsamodularsynth.SlackBuild
@@ -31,7 +31,7 @@ TARNAM=ams
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,6 +72,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+export CC=clang
+export CXX=clang++
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
LIBS="-ldl" \
diff --git a/audio/audacious-aac/audacious-aac.SlackBuild b/audio/audacious-aac/audacious-aac.SlackBuild
index fa61144a3d..686aee386c 100644
--- a/audio/audacious-aac/audacious-aac.SlackBuild
+++ b/audio/audacious-aac/audacious-aac.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=audacious-aac
-VERSION=${VERSION:-3.7.2}
+VERSION=${VERSION:-3.8.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -31,7 +31,7 @@ SRCNAM=audacious-plugins
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
ARCHOPTS="--disable-sse2"
elif [ "$ARCH" = "i686" ]; then
diff --git a/audio/audacious-aac/audacious-aac.info b/audio/audacious-aac/audacious-aac.info
index 6b6130fe82..a55c639a2d 100644
--- a/audio/audacious-aac/audacious-aac.info
+++ b/audio/audacious-aac/audacious-aac.info
@@ -1,8 +1,8 @@
PRGNAM="audacious-aac"
-VERSION="3.7.2"
+VERSION="3.8.2"
HOMEPAGE="https://audacious-media-player.org/"
-DOWNLOAD="https://distfiles.audacious-media-player.org/audacious-plugins-3.7.2.tar.bz2"
-MD5SUM="6ae2f17885897e717b8bbafc32858e2f"
+DOWNLOAD="https://distfiles.audacious-media-player.org/audacious-plugins-3.8.2.tar.bz2"
+MD5SUM="20710cd19fa08c4bffb6cb33002872df"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="faad2"
diff --git a/audio/audacious-cue/audacious-cue.SlackBuild b/audio/audacious-cue/audacious-cue.SlackBuild
index a3a796cd74..8d018fdadb 100644
--- a/audio/audacious-cue/audacious-cue.SlackBuild
+++ b/audio/audacious-cue/audacious-cue.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=audacious-cue
-VERSION=${VERSION:-3.7.2}
+VERSION=${VERSION:-3.8.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -31,7 +31,7 @@ SRCNAM=audacious-plugins
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
ARCHOPTS="--disable-sse2"
elif [ "$ARCH" = "i686" ]; then
diff --git a/audio/audacious-cue/audacious-cue.info b/audio/audacious-cue/audacious-cue.info
index 3ae7eef3e3..31b7a1a12c 100644
--- a/audio/audacious-cue/audacious-cue.info
+++ b/audio/audacious-cue/audacious-cue.info
@@ -1,8 +1,8 @@
PRGNAM="audacious-cue"
-VERSION="3.7.2"
+VERSION="3.8.2"
HOMEPAGE="https://audacious-media-player.org/"
-DOWNLOAD="https://distfiles.audacious-media-player.org/audacious-plugins-3.7.2.tar.bz2"
-MD5SUM="6ae2f17885897e717b8bbafc32858e2f"
+DOWNLOAD="https://distfiles.audacious-media-player.org/audacious-plugins-3.8.2.tar.bz2"
+MD5SUM="20710cd19fa08c4bffb6cb33002872df"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libcue"
diff --git a/audio/audacious-ffmpeg/README b/audio/audacious-ffmpeg/README
deleted file mode 100644
index 04da987f9f..0000000000
--- a/audio/audacious-ffmpeg/README
+++ /dev/null
@@ -1,4 +0,0 @@
-audacious-ffmpeg (ffmpeg Decoder Plugin used by the Audacious player)
-
-This plugin adds all audio ffmpeg decoders to the Audacious media
-player that comes with Slackware stock packages
diff --git a/audio/audacious-ffmpeg/audacious-ffmpeg.SlackBuild b/audio/audacious-ffmpeg/audacious-ffmpeg.SlackBuild
deleted file mode 100644
index 3f2e63c205..0000000000
--- a/audio/audacious-ffmpeg/audacious-ffmpeg.SlackBuild
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for audacious-ffmpeg
-
-# Copyright 2016 Johannes Schoepfer, Germany
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=audacious-ffmpeg
-VERSION=${VERSION:-3.7.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=audacious-plugins
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
- ARCHOPTS="--disable-sse2"
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
- ARCHOPTS="--disable-sse2"
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
- ARCHOPTS=""
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
- ARCHOPTS=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Patch Makefile to build only aac plugin
-patch -p1 <$CWD/patches/enable_only_ffmpeg_plugin.diff || exit 1
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --disable-aac \
- --program-prefix= \
- --program-suffix= \
- ${ARCHOPTS} \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/audacious-ffmpeg/audacious-ffmpeg.info b/audio/audacious-ffmpeg/audacious-ffmpeg.info
deleted file mode 100644
index 2b48d0fbe7..0000000000
--- a/audio/audacious-ffmpeg/audacious-ffmpeg.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="audacious-ffmpeg"
-VERSION="3.7.2"
-HOMEPAGE="https://audacious-media-player.org/"
-DOWNLOAD="https://distfiles.audacious-media-player.org/audacious-plugins-3.7.2.tar.bz2"
-MD5SUM="6ae2f17885897e717b8bbafc32858e2f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="ffmpeg"
-MAINTAINER="Johannes Schoepfer"
-EMAIL="slackbuilds@schoepfer.info"
diff --git a/audio/audacious-ffmpeg/patches/enable_only_ffmpeg_plugin.diff b/audio/audacious-ffmpeg/patches/enable_only_ffmpeg_plugin.diff
deleted file mode 100644
index feb3fab813..0000000000
--- a/audio/audacious-ffmpeg/patches/enable_only_ffmpeg_plugin.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- audacious-plugins-3.6.1/Makefile.ORIG 2015-04-04 02:02:06.000000000 +0200
-+++ audacious-plugins-3.6.1/Makefile 2015-04-23 19:59:48.072721987 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS = src po
-+SUBDIRS = src/ffaudio
-
- DISTCLEAN = buildsys.mk config.h config.log config.status extra.mk
-
diff --git a/audio/audacious-ffmpeg/slack-desc b/audio/audacious-ffmpeg/slack-desc
deleted file mode 100644
index e14234a198..0000000000
--- a/audio/audacious-ffmpeg/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-audacious-ffmpeg: audacious-ffmpeg (ffmpeg Decoder Plugin)
-audacious-ffmpeg:
-audacious-ffmpeg: This plugin adds all audio ffmpeg decoders to the Audacious media
-audacious-ffmpeg: player that comes with Slackware stock packages
-audacious-ffmpeg:
-audacious-ffmpeg: Homepage: https://audacious-media-player.org/
-audacious-ffmpeg:
-audacious-ffmpeg:
-audacious-ffmpeg:
-audacious-ffmpeg:
-audacious-ffmpeg:
diff --git a/audio/audacity/audacity.SlackBuild b/audio/audacity/audacity.SlackBuild
index 8daaf2c3c6..072f1e0fe6 100644
--- a/audio/audacity/audacity.SlackBuild
+++ b/audio/audacity/audacity.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for audacity
# Copyright 2006-2010 Chess Griffin <chess@chessgriffin.com>
-# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>
+# Copyright 2011-2020 Matteo Bernardini <ponce@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -31,8 +31,8 @@
PRGNAM=audacity
SRCNAM=Audacity
-VERSION=${VERSION:-2.3.2}
-MANVER=${MANVER:-2.3.2}
+VERSION=${VERSION:-2.4.1}
+MANVER=${MANVER:-2.4.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -96,7 +96,7 @@ autoreconf -fi
# libsoxr is the new default resampling library
LDFLAGS="-L/usr/lib$LIBDIRSUFFIX" \
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/audio/audacity/audacity.info b/audio/audacity/audacity.info
index 4919a914c4..1f94706fa5 100644
--- a/audio/audacity/audacity.info
+++ b/audio/audacity/audacity.info
@@ -1,10 +1,10 @@
PRGNAM="audacity"
-VERSION="2.3.2"
+VERSION="2.4.1"
HOMEPAGE="https://www.audacityteam.org"
-DOWNLOAD="https://github.com/audacity/audacity/archive/Audacity-2.3.2/audacity-Audacity-2.3.2.tar.gz \
- http://ponce.cc/slackware/sources/repo/audacity-manual-2.3.2.zip"
-MD5SUM="ca1b5b5258e7a8839ca72bb20093b31b \
- e26f7f919b2ebc01f89d4f22bfae410f"
+DOWNLOAD="https://github.com/audacity/audacity/archive/Audacity-2.4.1/audacity-Audacity-2.4.1.tar.gz \
+ http://ponce.cc/slackware/sources/repo/audacity-manual-2.4.1.zip"
+MD5SUM="c02a12a9f14f2db223f84e99e17b4850 \
+ b3640ddc811e0d3c6b22c9b411743f39"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lame wxGTK3"
diff --git a/audio/butt/butt.SlackBuild b/audio/butt/butt.SlackBuild
index 9d99d8d770..b174b5319c 100644
--- a/audio/butt/butt.SlackBuild
+++ b/audio/butt/butt.SlackBuild
@@ -54,7 +54,7 @@ find . \
-exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix $PREFIX \
--docdir $DOCDIR
diff --git a/audio/calf-ladspa/calf-ladspa.SlackBuild b/audio/calf-ladspa/calf-ladspa.SlackBuild
index f78f393bc7..2d85f57020 100644
--- a/audio/calf-ladspa/calf-ladspa.SlackBuild
+++ b/audio/calf-ladspa/calf-ladspa.SlackBuild
@@ -98,7 +98,7 @@ patch -p1 < $CWD/disable-jack-and-fluidsynth.diff
# This patch replaces them with C-style MIN and MAX macros. Not actually
# needed on Slack 14.2, so it's commented out, but I'm checking the actual
# patch into git so I won't lose track of it.
-#patch -p1 < $CWD/minmax.diff
+patch -p1 < $CWD/minmax.diff
autoreconf -if
diff --git a/audio/clementine/clementine.SlackBuild b/audio/clementine/clementine.SlackBuild
index aeeeac98c2..ef9414a9d7 100644
--- a/audio/clementine/clementine.SlackBuild
+++ b/audio/clementine/clementine.SlackBuild
@@ -25,7 +25,8 @@
# Modified by SlackBuilds.org
PRGNAM=clementine
-VERSION=${VERSION:-1.4.0rc1}
+VERSION=${VERSION:-1.4.0rc1_257_g236cfa7ad}
+SRCVER=$(echo $VERSION | tr _ - )
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -61,9 +62,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.xz
+cd $PRGNAM-$SRCVER
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/audio/clementine/clementine.info b/audio/clementine/clementine.info
index 597af387fa..1f177b52b8 100644
--- a/audio/clementine/clementine.info
+++ b/audio/clementine/clementine.info
@@ -1,8 +1,8 @@
PRGNAM="clementine"
-VERSION="1.4.0rc1"
+VERSION="1.4.0rc1_257_g236cfa7ad"
HOMEPAGE="http://www.clementine-player.org"
-DOWNLOAD="https://github.com/clementine-player/Clementine/releases/download/1.4.0rc1/clementine-1.4.0rc1.tar.xz"
-MD5SUM="c58d09300081854485749cb8c8b18d61"
+DOWNLOAD="https://github.com/clementine-player/Clementine/releases/download/1.4.0rc1-257-g236cfa7ad/clementine-1.4.0rc1-257-g236cfa7ad.tar.xz"
+MD5SUM="81363947454aea17d084e596c39abdc3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="chromaprint cryptopp libechonest protobuf qt5"
diff --git a/audio/darkice/darkice.SlackBuild b/audio/darkice/darkice.SlackBuild
index b9829076da..887e4fa8d4 100644
--- a/audio/darkice/darkice.SlackBuild
+++ b/audio/darkice/darkice.SlackBuild
@@ -71,7 +71,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/audio/easytag/README b/audio/easytag/README
deleted file mode 100644
index 9ec30f8195..0000000000
--- a/audio/easytag/README
+++ /dev/null
@@ -1,5 +0,0 @@
-EasyTAG is a utility for viewing and editing tags for MP3, MP2, FLAC,
-Ogg Vorbis, Speex and Opus, MP4/AAC, MusePack, Monkey's Audio and
-WavPack files. Its simple and nice GTK+ interface makes tagging easy.
-
-libmp4v2 is an optional dependency.
diff --git a/audio/easytag/doinst.sh b/audio/easytag/doinst.sh
deleted file mode 100644
index aea0f894eb..0000000000
--- a/audio/easytag/doinst.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
- /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
diff --git a/audio/easytag/easytag.SlackBuild b/audio/easytag/easytag.SlackBuild
deleted file mode 100644
index ea809d52a8..0000000000
--- a/audio/easytag/easytag.SlackBuild
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for easytag
-
-# Copyright 2006 Halim Issa <yallaone@gmail.com>
-# Copyright 2013-2014 LEVAI Daniel <leva@ecentrum.hu>
-# Copyright 2017, 2020 Dominik Drobek <dominik.drobek (at) o2.pl>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=easytag
-VERSION=${VERSION:-2.2.6}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-DOCS="AUTHORS ChangeLog COPYING HACKING INSTALL README NEWS THANKS TODO"
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/$PRGNAM.info > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.info
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/easytag/easytag.info b/audio/easytag/easytag.info
deleted file mode 100644
index af34e67c0a..0000000000
--- a/audio/easytag/easytag.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="easytag"
-VERSION="2.2.6"
-HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
-DOWNLOAD="https://download.gnome.org/sources/easytag/2.2/easytag-2.2.6.tar.xz"
-MD5SUM="204b50cb46afa9b40f89774e8dda5f62"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="id3lib"
-MAINTAINER="Dominik Drobek"
-EMAIL="dominik.drobek (at) o2.pl"
diff --git a/audio/easytag/slack-desc b/audio/easytag/slack-desc
deleted file mode 100644
index f495c309e2..0000000000
--- a/audio/easytag/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-easytag: easytag (Tag editor for audio files)
-easytag:
-easytag: EasyTAG is a utility for viewing and editing tags for MP3, MP2, FLAC,
-easytag: Ogg Vorbis, Speex and Opus, MP4/AAC, MusePack, Monkey's Audio and
-easytag: WavPack files. Its simple and nice GTK+ interface makes tagging easy.
-easytag:
-easytag: Homepage: https://wiki.gnome.org/Apps/EasyTAG
-easytag:
-easytag:
-easytag:
-easytag:
diff --git a/audio/fluidsynth/README b/audio/fluidsynth/README
deleted file mode 100644
index 763cff5472..0000000000
--- a/audio/fluidsynth/README
+++ /dev/null
@@ -1,19 +0,0 @@
-fluidsynth (software synthesizer)
-
-FluidSynth is a software real-time synthesizer based on the Soundfont
-2 specifications. FluidSynth reads and handles MIDI events from the
-MIDI input device. It is the software analogue of a MIDI synthesizer.
-FluidSynth can also play MIDI files using a Soundfont.
-
-Optional dependencies: ladspa_sdk, lash, portaudio, jack, SDL2. These
-are autodetected at build time, but can be disabled via the environment.
-
-Build options (environment variables):
-
-JACK=yes|no - support JACK audio output, if present. Default: yes.
-LADSPA=yes|no - support LADSPA plugins, if present. Default: yes.
-LASH=yes|no - support LASH session management, if present. Default: yes.
-OSS=yes|no - support old-style OSS audio output. Default: no.
-PORTAUDIO=yes|no - support PortAudio audio output, if present. Default: yes.
-PULSE=yes|no - support PulseAudio audio output. Default: yes.
-SDL2=yes|no - support SDL2 audio output, if present. Default: yes.
diff --git a/audio/fluidsynth/fluidsynth.SlackBuild b/audio/fluidsynth/fluidsynth.SlackBuild
deleted file mode 100644
index 0a761f2ca3..0000000000
--- a/audio/fluidsynth/fluidsynth.SlackBuild
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for fluidsynth
-
-# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2020 B. Watson
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# 20200404 bkw: take over maintenance, update for v2.1.1
-
-PRGNAM=fluidsynth
-VERSION=${VERSION:-2.1.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-mkdir build
-cd build
- cmake \
- -DCMAKE_C_FLAGS="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
- -DCMAKE_EXE_LINKER_FLAGS="-ltermcap" \
- -DCMAKE_SHARED_LINKER_FLAGS="-ltermcap" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX="$LIBDIRSUFFIX" \
- -DDOC_INSTALL_DIR="doc" \
- -DMAN_INSTALL_DIR="man/man1" \
- -Denable-ladspa="${LADSPA:-yes}" \
- -Denable-pulseaudio="${PULSE:-yes}" \
- -Denable-oss="${OSS:-no}" \
- -Denable-jack="${JACK:-yes}" \
- -Denable-sdl2="${SDL2:-yes}" \
- -Denable-portaudio="${PORTAUDIO:-yes}" \
- -Denable-systemd=no \
- ..
-
- make
- make install/strip DESTDIR=$PKG
-cd -
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-DOCS="AUTHORS ChangeLog COPYING NEWS README THANKS TODO CONTRIBUTING.md LICENSE README.md"
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-for i in $DOCS; do
- [ -e "$i" ] && cp -a "$i" $PKG/usr/doc/$PRGNAM-$VERSION
-done
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/fluidsynth/fluidsynth.info b/audio/fluidsynth/fluidsynth.info
deleted file mode 100644
index 1dcf2e78a2..0000000000
--- a/audio/fluidsynth/fluidsynth.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fluidsynth"
-VERSION="2.1.1"
-HOMEPAGE="http://www.fluidsynth.org/"
-DOWNLOAD="https://github.com/FluidSynth/fluidsynth/archive/v2.1.1/fluidsynth-2.1.1.tar.gz"
-MD5SUM="165902909092c818a24517de6a4f2f83"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/audio/fluidsynth/slack-desc b/audio/fluidsynth/slack-desc
deleted file mode 100644
index 4228b2cd1d..0000000000
--- a/audio/fluidsynth/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-fluidsynth: fluidsynth (software synthesizer)
-fluidsynth:
-fluidsynth: FluidSynth is a software real-time synthesizer based on the
-fluidsynth: Soundfont 2 specifications. FluidSynth reads and handles MIDI
-fluidsynth: events from the MIDI input device. It is the software analogue
-fluidsynth: of a MIDI synthesizer. FluidSynth can also play MIDI files
-fluidsynth: using a Soundfont.
-fluidsynth:
-fluidsynth: Homepage: http://www.fluidsynth.org/
-fluidsynth:
-fluidsynth:
diff --git a/audio/lash/lash.SlackBuild b/audio/lash/lash.SlackBuild
index 281ad2b76e..0c6c668dde 100644
--- a/audio/lash/lash.SlackBuild
+++ b/audio/lash/lash.SlackBuild
@@ -80,6 +80,8 @@ if $( which texi2html >/dev/null 2>&1 ); then
manual=docs/lash-manual-html-one-page/lash-manual.html
fi
+export LDFLAGS="-ldl -lm"
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/audio/mac/gcc6.patch b/audio/mac/gcc6.patch
new file mode 100644
index 0000000000..e22d1c1f53
--- /dev/null
+++ b/audio/mac/gcc6.patch
@@ -0,0 +1,181 @@
+From: Peter Levine <plevine457@gmail.com>
+--- mac-3.99-u4-b5-s7/src/Shared/NoWindows.h.old 2016-09-18 21:37:56.049105791 -0400
++++ mac-3.99-u4-b5-s7/src/Shared/NoWindows.h 2016-09-18 21:55:29.666295506 -0400
+@@ -39,8 +39,8 @@
+ typedef const wchar_t * LPCWSTR;
+
+ #define ZeroMemory(POINTER, BYTES) memset(POINTER, 0, BYTES);
+-#define max(a,b) (((a) > (b)) ? (a) : (b))
+-#define min(a,b) (((a) < (b)) ? (a) : (b))
++#define max_macro(a,b) (((a) > (b)) ? (a) : (b))
++#define min_macro(a,b) (((a) < (b)) ? (a) : (b))
+
+ #define __stdcall
+ #define CALLBACK
+--- mac-3.99-u4-b5-s7/src/Shared/CircleBuffer.cpp.old 2016-09-18 21:43:44.270495095 -0400
++++ mac-3.99-u4-b5-s7/src/Shared/CircleBuffer.cpp 2016-09-18 21:44:47.960148731 -0400
+@@ -45,7 +45,7 @@
+
+ if (pBuffer != NULL && nBytes > 0)
+ {
+- int nHeadBytes = min(m_nEndCap - m_nHead, nBytes);
++ int nHeadBytes = min_macro(m_nEndCap - m_nHead, nBytes);
+ int nFrontBytes = nBytes - nHeadBytes;
+
+ memcpy(&pBuffer[0], &m_pBuffer[m_nHead], nHeadBytes);
+@@ -72,7 +72,7 @@
+
+ int CCircleBuffer::RemoveHead(int nBytes)
+ {
+- nBytes = min(MaxGet(), nBytes);
++ nBytes = min_macro(MaxGet(), nBytes);
+ m_nHead += nBytes;
+ if (m_nHead >= m_nEndCap)
+ m_nHead -= m_nEndCap;
+@@ -81,7 +81,7 @@
+
+ int CCircleBuffer::RemoveTail(int nBytes)
+ {
+- nBytes = min(MaxGet(), nBytes);
++ nBytes = min_macro(MaxGet(), nBytes);
+ m_nTail -= nBytes;
+ if (m_nTail < 0)
+ m_nTail += m_nEndCap;
+--- mac-3.99-u4-b5-s7/src/MACLib/APECompress.cpp.old 2016-09-18 21:48:40.916547811 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/APECompress.cpp 2016-09-18 21:51:43.670733601 -0400
+@@ -117,7 +117,7 @@
+ return ERROR_UNDEFINED;
+
+ // calculate how many bytes to copy and add that much to the buffer
+- int nBytesToProcess = min(nBytesAvailable, nBytes - nBytesDone);
++ int nBytesToProcess = min_macro(nBytesAvailable, nBytes - nBytesDone);
+ memcpy(pBuffer, &pData[nBytesDone], nBytesToProcess);
+
+ // unlock the buffer (fail if not successful)
+@@ -162,7 +162,7 @@
+
+ while ((m_nBufferTail - m_nBufferHead) >= nThreshold)
+ {
+- int nFrameBytes = min(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead);
++ int nFrameBytes = min_macro(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead);
+
+ if (nFrameBytes == 0)
+ break;
+--- mac-3.99-u4-b5-s7/src/MACLib/APEDecompress.cpp.old 2016-09-18 21:46:56.962072960 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/APEDecompress.cpp 2016-09-18 22:01:14.402044817 -0400
+@@ -35,8 +35,8 @@
+ m_bErrorDecodingCurrentFrame = FALSE;
+
+ // set the "real" start and finish blocks
+- m_nStartBlock = (nStartBlock < 0) ? 0 : min(nStartBlock, GetInfo(APE_INFO_TOTAL_BLOCKS));
+- m_nFinishBlock = (nFinishBlock < 0) ? GetInfo(APE_INFO_TOTAL_BLOCKS) : min(nFinishBlock, GetInfo(APE_INFO_TOTAL_BLOCKS));
++ m_nStartBlock = (nStartBlock < 0) ? 0 : min_macro(nStartBlock, GetInfo(APE_INFO_TOTAL_BLOCKS));
++ m_nFinishBlock = (nFinishBlock < 0) ? GetInfo(APE_INFO_TOTAL_BLOCKS) : min_macro(nFinishBlock, GetInfo(APE_INFO_TOTAL_BLOCKS));
+ m_bIsRanged = (m_nStartBlock != 0) || (m_nFinishBlock != GetInfo(APE_INFO_TOTAL_BLOCKS));
+ }
+
+@@ -85,7 +85,7 @@
+
+ // cap
+ int nBlocksUntilFinish = m_nFinishBlock - m_nCurrentBlock;
+- const int nBlocksToRetrieve = min(nBlocks, nBlocksUntilFinish);
++ const int nBlocksToRetrieve = min_macro(nBlocks, nBlocksUntilFinish);
+
+ // get the data
+ unsigned char * pOutputBuffer = (unsigned char *) pBuffer;
+@@ -99,7 +99,7 @@
+
+ // analyze how much to remove from the buffer
+ const int nFrameBufferBlocks = m_nFrameBufferFinishedBlocks;
+- nBlocksThisPass = min(nBlocksLeft, nFrameBufferBlocks);
++ nBlocksThisPass = min_macro(nBlocksLeft, nFrameBufferBlocks);
+
+ // remove as much as possible
+ if (nBlocksThisPass > 0)
+@@ -182,7 +182,7 @@
+
+ int nFrameOffsetBlocks = m_nCurrentFrameBufferBlock % GetInfo(APE_INFO_BLOCKS_PER_FRAME);
+ int nFrameBlocksLeft = nFrameBlocks - nFrameOffsetBlocks;
+- int nBlocksThisPass = min(nFrameBlocksLeft, nBlocksLeft);
++ int nBlocksThisPass = min_macro(nFrameBlocksLeft, nBlocksLeft);
+
+ // start the frame if we need to
+ if (nFrameOffsetBlocks == 0)
+--- mac-3.99-u4-b5-s7/src/MACLib/APESimple.cpp.old 2016-09-18 21:47:16.972925909 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/APESimple.cpp 2016-09-18 21:52:39.022779503 -0400
+@@ -193,7 +193,7 @@
+ nBytesRead = 1;
+ while ((nBytesLeft > 0) && (nBytesRead > 0))
+ {
+- int nBytesToRead = min(16384, nBytesLeft);
++ int nBytesToRead = min_macro(16384, nBytesLeft);
+ if (pIO->Read(spBuffer, nBytesToRead, &nBytesRead) != ERROR_SUCCESS)
+ return ERROR_IO_READ;
+
+--- mac-3.99-u4-b5-s7/src/MACLib/APETag.cpp.old 2016-09-18 21:55:53.331533348 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/APETag.cpp 2016-09-18 21:58:21.508345586 -0400
+@@ -16,7 +16,7 @@
+ memcpy(m_spFieldNameUTF16, pFieldName, (wcslen(pFieldName) + 1) * sizeof(str_utf16));
+
+ // data (we'll always allocate two extra bytes and memset to 0 so we're safely NULL terminated)
+- m_nFieldValueBytes = max(nFieldBytes, 0);
++ m_nFieldValueBytes = max_macro(nFieldBytes, 0);
+ m_spFieldValue.Assign(new char [m_nFieldValueBytes + 2], TRUE);
+ memset(m_spFieldValue, 0, m_nFieldValueBytes + 2);
+ if (m_nFieldValueBytes > 0)
+--- mac-3.99-u4-b5-s7/src/MACLib/BitArray.cpp.old 2016-09-18 21:53:24.090030009 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/BitArray.cpp 2016-09-18 22:00:13.500083252 -0400
+@@ -113,7 +113,7 @@
+ m_nCurrentBitIndex = (m_nCurrentBitIndex & 31);
+
+ // zero the rest of the memory (may not need the +1 because of frame byte alignment)
+- memset(&m_pBitArray[1], 0, min(nBytesToWrite + 1, BIT_ARRAY_BYTES - 1));
++ memset(&m_pBitArray[1], 0, min_macro(nBytesToWrite + 1, BIT_ARRAY_BYTES - 1));
+ }
+
+ // return a success
+@@ -247,7 +247,7 @@
+ BitArrayState.k++;
+
+ // figure the pivot value
+- int nPivotValue = max(nOriginalKSum / 32, 1);
++ int nPivotValue = max_macro(nOriginalKSum / 32, 1);
+ int nOverflow = nEncode / nPivotValue;
+ int nBase = nEncode - (nOverflow * nPivotValue);
+
+--- mac-3.99-u4-b5-s7/src/MACLib/MACProgressHelper.cpp.old 2016-09-18 21:56:44.606337012 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/MACProgressHelper.cpp 2016-09-18 21:59:55.854310134 -0400
+@@ -35,7 +35,7 @@
+ m_nCurrentStep = nCurrentStep;
+
+ // figure the percentage done
+- float fPercentageDone = float(m_nCurrentStep) / float(max(m_nTotalSteps, 1));
++ float fPercentageDone = float(m_nCurrentStep) / float(max_macro(m_nTotalSteps, 1));
+ int nPercentageDone = (int) (fPercentageDone * 1000 * 100);
+ if (nPercentageDone > 100000) nPercentageDone = 100000;
+
+--- mac-3.99-u4-b5-s7/src/MACLib/Prepare.cpp.old 2016-09-18 21:56:29.974394222 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/Prepare.cpp 2016-09-18 21:59:28.214726465 -0400
+@@ -177,9 +177,9 @@
+
+ if (LPeak == 0) { *pSpecialCodes |= SPECIAL_FRAME_LEFT_SILENCE; }
+ if (RPeak == 0) { *pSpecialCodes |= SPECIAL_FRAME_RIGHT_SILENCE; }
+- if (max(LPeak, RPeak) > *pPeakLevel)
++ if (max_macro(LPeak, RPeak) > *pPeakLevel)
+ {
+- *pPeakLevel = max(LPeak, RPeak);
++ *pPeakLevel = max_macro(LPeak, RPeak);
+ }
+
+ // check for pseudo-stereo files
+--- mac-3.99-u4-b5-s7/src/MACLib/UnBitArray.cpp.old 2016-09-18 21:56:16.548445898 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/UnBitArray.cpp 2016-09-18 21:58:56.148161050 -0400
+@@ -110,7 +110,7 @@
+ if (m_nVersion >= 3990)
+ {
+ // figure the pivot value
+- int nPivotValue = max(BitArrayState.nKSum / 32, 1);
++ int nPivotValue = max_macro(BitArrayState.nKSum / 32, 1);
+
+ // get the overflow
+ int nOverflow = 0;
diff --git a/audio/mac/mac.SlackBuild b/audio/mac/mac.SlackBuild
index eb2e3ada5b..c2bcab4668 100644
--- a/audio/mac/mac.SlackBuild
+++ b/audio/mac/mac.SlackBuild
@@ -78,6 +78,8 @@ if [ "${FORCE_SLACK_CFLAGS:-no}" = "yes" ]; then
sed -i 's,-O3\>,,' configure
fi
+patch -p1 < $CWD/gcc6.patch
+
LDFLAGS="-Wl,-s" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/audio/mixxx/mixxx.SlackBuild b/audio/mixxx/mixxx.SlackBuild
index d29e4a1da6..4cf6bbeab5 100644
--- a/audio/mixxx/mixxx.SlackBuild
+++ b/audio/mixxx/mixxx.SlackBuild
@@ -72,6 +72,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# scons is now python3 based
+sed -i "s|from features|from .features|" build/depends.py
+
# Fix library installation path
sed -i "s|'lib'|'lib$LIBDIRSUFFIX'|" build/depends.py src/SConscript || exit 1
sed -i "s|usr/lib|usr/lib$LIBDIRSUFFIX|" src/SConscript || exit 1
diff --git a/audio/mp3blaster/mp3blaster.SlackBuild b/audio/mp3blaster/mp3blaster.SlackBuild
index 7f1e3c8e0e..6aa96b6017 100644
--- a/audio/mp3blaster/mp3blaster.SlackBuild
+++ b/audio/mp3blaster/mp3blaster.SlackBuild
@@ -71,6 +71,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# https://www.linuxquestions.org/questions/slackware-14/ncurses-6-1_20190420-slackware64-current-and-mp3blaster-4175654414/#post5998040
+sed -i "s|lncurses|lncursesw|" configure
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS -std=c++11 -Wno-narrowing" \
./configure \
diff --git a/audio/musepack-tools/musepack-tools.SlackBuild b/audio/musepack-tools/musepack-tools.SlackBuild
index def1358310..6a56dbb32b 100644
--- a/audio/musepack-tools/musepack-tools.SlackBuild
+++ b/audio/musepack-tools/musepack-tools.SlackBuild
@@ -57,7 +57,7 @@ patch -p1 < $CWD/musepack-tools-475.patch
mkdir -p build
cd build
cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -fcommon" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DCMAKE_BUILD_TYPE=Release ..
diff --git a/audio/opus-tools/README b/audio/opus-tools/README
deleted file mode 100644
index 4f031bf99a..0000000000
--- a/audio/opus-tools/README
+++ /dev/null
@@ -1,2 +0,0 @@
-opus-tools provides command-line utilities to encode, inspect and
-decode .opus files.
diff --git a/audio/opus-tools/opus-tools.SlackBuild b/audio/opus-tools/opus-tools.SlackBuild
deleted file mode 100644
index 1e4fff59f7..0000000000
--- a/audio/opus-tools/opus-tools.SlackBuild
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for opus-tools
-
-# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=opus-tools
-VERSION=${VERSION:-0.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-DOCS="AUTHORS COPYING"
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/opus-tools/opus-tools.info b/audio/opus-tools/opus-tools.info
deleted file mode 100644
index 5e0ce3365d..0000000000
--- a/audio/opus-tools/opus-tools.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="opus-tools"
-VERSION="0.2"
-HOMEPAGE="http://www.opus-codec.org"
-DOWNLOAD="https://ftp.mozilla.org/pub/mozilla.org/opus/opus-tools-0.2.tar.gz"
-MD5SUM="ff2d0536e960cabbfb8ca7c8c1759b6c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libopusenc"
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
diff --git a/audio/opus-tools/slack-desc b/audio/opus-tools/slack-desc
deleted file mode 100644
index 39aaf10819..0000000000
--- a/audio/opus-tools/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-opus-tools: opus-tools (utilities for opus)
-opus-tools:
-opus-tools: opus-tools provides command-line utilities to encode, inspect and
-opus-tools: decode .opus files.
-opus-tools:
-opus-tools: homepage: http://www.opus-codec.org
-opus-tools:
-opus-tools:
-opus-tools:
-opus-tools:
-opus-tools:
diff --git a/audio/opus/README b/audio/opus/README
deleted file mode 100644
index df5dd26216..0000000000
--- a/audio/opus/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Opus is a totally open, royalty-free, highly versatile audio codec.
-It is standardized by the Internet Engineering Task Force (IETF)
-as RFC 6716 which incorporated technology from Skype's SILK codec
-and Xiph.Org's CELT codec.
diff --git a/audio/opus/opus.SlackBuild b/audio/opus/opus.SlackBuild
deleted file mode 100644
index c21b459dc4..0000000000
--- a/audio/opus/opus.SlackBuild
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for opus
-
-# Copyright 2012-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=opus
-VERSION=${VERSION:-1.3.1}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-static \
- --enable-intrinsics \
- --enable-rtcd \
- --enable-custom-modes \
- --enable-float-approx \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/opus/opus.info b/audio/opus/opus.info
deleted file mode 100644
index 55e1ce1c0d..0000000000
--- a/audio/opus/opus.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="opus"
-VERSION="1.3.1"
-HOMEPAGE="https://opus-codec.org/"
-DOWNLOAD="https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz"
-MD5SUM="d7c07db796d21c9cf1861e0c2b0c0617"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/audio/opus/slack-desc b/audio/opus/slack-desc
deleted file mode 100644
index fb36dc8f15..0000000000
--- a/audio/opus/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-opus: opus (Audio Codec)
-opus:
-opus: Opus is a totally open, royalty-free, highly versatile audio codec.
-opus: It is standardized by the Internet Engineering Task Force (IETF)
-opus: as RFC 6716 which incorporated technology from Skype's SILK codec
-opus: and Xiph.Org's CELT codec.
-opus:
-opus: Project site: https://opus-codec.org/
-opus:
-opus:
-opus:
diff --git a/audio/opusfile/README b/audio/opusfile/README
deleted file mode 100644
index 4c32609f79..0000000000
--- a/audio/opusfile/README
+++ /dev/null
@@ -1,2 +0,0 @@
-opusfile provides application developers with a high-level API for
-decoding and seeking in .opus files.
diff --git a/audio/opusfile/opusfile.SlackBuild b/audio/opusfile/opusfile.SlackBuild
deleted file mode 100644
index 761a3806e9..0000000000
--- a/audio/opusfile/opusfile.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for opusfile
-
-# Copyright 2013-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=opusfile
-VERSION=${VERSION:-0.12}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-DOCS="AUTHORS COPYING README.md"
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/opusfile/opusfile.info b/audio/opusfile/opusfile.info
deleted file mode 100644
index 8dddaafba7..0000000000
--- a/audio/opusfile/opusfile.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="opusfile"
-VERSION="0.12"
-HOMEPAGE="http://www.opus-codec.org"
-DOWNLOAD="https://github.com/xiph/opusfile/releases/download/v0.12/opusfile-0.12.tar.gz"
-MD5SUM="45e8c62f6cd413395223c82f06bfa8ec"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="opus"
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
diff --git a/audio/opusfile/slack-desc b/audio/opusfile/slack-desc
deleted file mode 100644
index e77532d058..0000000000
--- a/audio/opusfile/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-opusfile: opusfile (opus decoding API)
-opusfile:
-opusfile: opusfile provides application developers with a high-level API for
-opusfile: decoding and seeking in .opus files.
-opusfile:
-opusfile: homepage: http://www.opus-codec.org
-opusfile:
-opusfile:
-opusfile:
-opusfile:
-opusfile:
diff --git a/audio/oss/glibc-2.23.patch b/audio/oss/glibc-2.23.patch
new file mode 100644
index 0000000000..c9dc65b111
--- /dev/null
+++ b/audio/oss/glibc-2.23.patch
@@ -0,0 +1,19 @@
+commit ad097a606d8b6ba46e0bcd12b284ca355592ac44
+Author: hash <hashn0n@users.noreply.github.com>
+Date: Sun Sep 24 19:53:49 2017 +0300
+
+ Fix os_cmd/Linux/ossdetect/ossdetect.c compile problem with
+ >=sys-libs/glibc-2.23, need to include sys/sysmacros.h
+
+diff --git a/os_cmd/Linux/ossdetect/ossdetect.c b/os_cmd/Linux/ossdetect/ossdetect.c
+index 86b86ba..1dce64a 100644
+--- a/os_cmd/Linux/ossdetect/ossdetect.c
++++ b/os_cmd/Linux/ossdetect/ossdetect.c
+@@ -12,6 +12,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/dir.h>
+
+ #define PCI_PASS 0
diff --git a/audio/oss/oss.SlackBuild b/audio/oss/oss.SlackBuild
index d1f7570439..ee164b6337 100644
--- a/audio/oss/oss.SlackBuild
+++ b/audio/oss/oss.SlackBuild
@@ -5,7 +5,7 @@
# Written by Dugan Chen (thedoogster [at] gmail [dot] com).
PRGNAM=oss
-VERSION=${VERSION:-4.2.2011}
+VERSION=${VERSION:-4.2.2019}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -56,18 +56,12 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+patch -p1 < $CWD/glibc-2.23.patch
+
if [ $ARCH = "x86_64" ]; then
- sed -i 's,OSSLIBDIR=\"/usr/lib/oss\",OSSLIBDIR=\"/usr/lib64/oss\",g' configure
+ sed -i 's,OSSLIBDIR=\"/usr/lib/oss\",OSSLIBDIR=\"/usr/lib64/oss\",g' configure || exit 1
fi
-# Patches from OSS Forums
-
-# Linux 4.0 and above fix by oss117
-patch -p1 < $CWD/oss-v4.2-linux-4.0.patch
-
-# GCC 5 fix by alexdw
-patch -p0 < $CWD/gcc-5.patch
-
mkdir build && cd build
../configure
CFLAGS="$SLKCFLAGS" make build
diff --git a/audio/oss/oss.info b/audio/oss/oss.info
index 8ca0c0652d..9ac3570098 100644
--- a/audio/oss/oss.info
+++ b/audio/oss/oss.info
@@ -1,8 +1,8 @@
PRGNAM="oss"
-VERSION="4.2.2011"
+VERSION="4.2.2019"
HOMEPAGE="http://www.opensound.com"
-DOWNLOAD="http://www.4front-tech.com/developer/sources/stable/gpl/oss-v4.2-build2011-src-gpl.tar.bz2"
-MD5SUM="68f80d569739a10281a8284dded12acc"
+DOWNLOAD="http://www.opensound.com/developer/sources/stable/gpl/oss-v4.2-build2019-src-gpl.tar.bz2"
+MD5SUM="330efdeee7567e6587e1a4a13f91eb5f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/audio/pithos/doinst.sh b/audio/pithos/doinst.sh
index 4a25de5e6f..e924bab47c 100644
--- a/audio/pithos/doinst.sh
+++ b/audio/pithos/doinst.sh
@@ -8,3 +8,9 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
fi
fi
+if [ -e usr/share/glib-2.0/schemas ]; then
+ if [ -x /usr/bin/glib-compile-schemas ]; then
+ /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+ fi
+fi
+
diff --git a/audio/pithos/pithos.SlackBuild b/audio/pithos/pithos.SlackBuild
index 32579cffe5..0d7c1f9b1e 100644
--- a/audio/pithos/pithos.SlackBuild
+++ b/audio/pithos/pithos.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for pithos
-# Copyright 2013 Robby Workman, Northport, Alabama, USA
+# Copyright 2013,2017 Robby Workman, Tuscaloosa, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=pithos
-VERSION=${VERSION:-git_ed501485}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.4.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,15 +61,25 @@ mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
+chown -R root:root $PRGNAM-$VERSION
+find -L $PRGNAM-$VERSION \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-python setup.py install --root=$PKG
+mkdir -p $PRGNAM-$VERSION/build
+meson \
+ --prefix=/usr \
+ --libdir=/usr/lib64 \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ $PRGNAM-$VERSION \
+ $PRGNAM-$VERSION/build
+
+DESTDIR=$PKG ninja -C $PRGNAM-$VERSION/build install
cat $CWD/contrib/pithosctl > $PKG/usr/bin/pithosctl
chmod 0755 $PKG/usr/bin/pithosctl
@@ -78,7 +88,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PRGNAM-$VERSION/README.md $PRGNAM-$VERSION/license $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/audio/pithos/pithos.info b/audio/pithos/pithos.info
index c276852bd2..198bec9218 100644
--- a/audio/pithos/pithos.info
+++ b/audio/pithos/pithos.info
@@ -1,10 +1,10 @@
PRGNAM="pithos"
-VERSION="git_ed501485"
-HOMEPAGE="http://kevinmehall.net/p/pithos/"
-DOWNLOAD="http://harrier.slackbuilds.org/misc/pithos-git_ed501485.tar.xz"
-MD5SUM="fb7f45ff93b5aab7b60e5b943d7bb024"
+VERSION="1.4.0"
+HOMEPAGE="https://github.com/pithos/pithos"
+DOWNLOAD="https://github.com/pithos/pithos/releases/download/1.4.0/pithos-1.4.0.tar.xz"
+MD5SUM="2324a9ed104682fb2417f662a82cc8bb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="gst0-python gst0-ffmpeg"
+REQUIRES="meson gst-python gst-libav"
MAINTAINER="Robby Workman"
EMAIL="rworkman@slackbuilds.org"
diff --git a/audio/pithos/slack-desc b/audio/pithos/slack-desc
index 3ac97f0f7d..c55001e893 100644
--- a/audio/pithos/slack-desc
+++ b/audio/pithos/slack-desc
@@ -13,7 +13,7 @@ pithos: lightweight than the Pandora.com web client and integrates with
pithos: desktop features such as media keys, notifications, and the sound
pithos: menu.
pithos:
-pithos: Homepage: http://kevinmehall.net/p/pithos/
+pithos: Homepage: https://github.com/pithos/pithos
pithos:
pithos:
pithos:
diff --git a/audio/qastools/qastools.SlackBuild b/audio/qastools/qastools.SlackBuild
index a5893a42d1..fdf0fb574f 100644
--- a/audio/qastools/qastools.SlackBuild
+++ b/audio/qastools/qastools.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Slackware build script for qastools
-# Copyright 2012-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2012-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=qastools
-VERSION=${VERSION:-0.21.0}
+VERSION=${VERSION:-0.23.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -53,16 +53,16 @@ else
LIBDIRSUFFIX=""
fi
-DOCS="CHANGELOG COPYING README TODO"
+DOCS="CHANGELOG COPYING README.md TODO"
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf ${PRGNAM}_${VERSION}
-tar xvf $CWD/${PRGNAM}_${VERSION}.tar.?z*
-cd ${PRGNAM}_${VERSION}
+rm -rf ${PRGNAM}-v${VERSION}
+tar xvf $CWD/${PRGNAM}-v${VERSION}.tar.?z*
+cd ${PRGNAM}-v${VERSION}
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/audio/qastools/qastools.info b/audio/qastools/qastools.info
index 31fa3bdad4..9e974190c8 100644
--- a/audio/qastools/qastools.info
+++ b/audio/qastools/qastools.info
@@ -1,8 +1,8 @@
PRGNAM="qastools"
-VERSION="0.21.0"
+VERSION="0.23.0"
HOMEPAGE="https://xwmw.org/qastools/"
-DOWNLOAD="http://downloads.sf.net/qastools/qastools_0.21.0.tar.xz"
-MD5SUM="2f7ed45f58a401df51db7e0031a486aa"
+DOWNLOAD="https://gitlab.com/sebholt/qastools/-/archive/v0.23.0/qastools-v0.23.0.tar.gz"
+MD5SUM="4f96f820ec555f4a7e738164b6473fa9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="qt5"
diff --git a/audio/rhythmbox/rhythmbox.SlackBuild b/audio/rhythmbox/rhythmbox.SlackBuild
index d5edbf5d43..ee06ab67ae 100644
--- a/audio/rhythmbox/rhythmbox.SlackBuild
+++ b/audio/rhythmbox/rhythmbox.SlackBuild
@@ -6,7 +6,7 @@
# Modified by SlackBuilds.org
PRGNAM=rhythmbox
-VERSION=${VERSION:-3.2.1}
+VERSION=${VERSION:-3.4.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/audio/rhythmbox/rhythmbox.info b/audio/rhythmbox/rhythmbox.info
index a846862e6f..70845a561b 100644
--- a/audio/rhythmbox/rhythmbox.info
+++ b/audio/rhythmbox/rhythmbox.info
@@ -1,8 +1,8 @@
PRGNAM="rhythmbox"
-VERSION="3.2.1"
+VERSION="3.4.3"
HOMEPAGE="http://projects.gnome.org/rhythmbox/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/3.2/rhythmbox-3.2.1.tar.xz"
-MD5SUM="74739fcc59b91b129f0ffda85b90ec4a"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/3.4/rhythmbox-3.4.3.tar.xz"
+MD5SUM="79a775cffcf320fcdefa74bf6b2d1d32"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libpeas json-glib python3 totem-pl-parser"
diff --git a/audio/rumor/gcc7.diff b/audio/rumor/gcc7.diff
new file mode 100644
index 0000000000..a8c54f20c0
--- /dev/null
+++ b/audio/rumor/gcc7.diff
@@ -0,0 +1,12 @@
+diff -Naur rumor-1.0.5.orig/src/notator.cc rumor-1.0.5.new/src/notator.cc
+--- rumor-1.0.5.orig/src/notator.cc 2010-11-15 18:40:22.000000000 +0100
++++ rumor-1.0.5.new/src/notator.cc 2017-05-31 15:51:42.014855383 +0200
+@@ -334,7 +334,7 @@
+ }
+ } else {
+ OctaveTic=(RefPitch_wt>AbsPitch_wt?',':'\'');
+- NumTics=(abs(RefPitch_wt-AbsPitch_wt)+3)/7;
++ NumTics=(RefPitch_wt-AbsPitch_wt+3)/7;
+ RefPitch_wt=AbsPitch_wt;
+ }
+ for (int i=0; i<NumTics; i++){
diff --git a/audio/rumor/rumor.SlackBuild b/audio/rumor/rumor.SlackBuild
index daeebef2b9..d3ee309487 100644
--- a/audio/rumor/rumor.SlackBuild
+++ b/audio/rumor/rumor.SlackBuild
@@ -49,6 +49,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Thanks to archlinux
+patch -p1 < $CWD/gcc7.diff
+
./autogen.sh
CFLAGS="$SLKCFLAGS" \
diff --git a/audio/shell-fm/README b/audio/shell-fm/README
deleted file mode 100644
index fdf6eca651..0000000000
--- a/audio/shell-fm/README
+++ /dev/null
@@ -1,12 +0,0 @@
-shell-fm is a lightweight, console-based player for Last.FM radio streams.
-It's pretty small (the binary is currently a little smaller than 60K, or
-50K when stripped) and it has most features the "official" player has, if
-not even a few more. Additional features are, for example:
-
-network interface (control shell-fm remotely)
-autoban (automatically ban all tracks of an artist you don't like)
-bookmark stations (quickly jump to bookmarked stations with a single key)
-... probably more
-
-*NOTE: Last-FM have changed their API so that only PAID subscribers
-can listen to streams in shell-fm.
diff --git a/audio/shell-fm/shell-fm.SlackBuild b/audio/shell-fm/shell-fm.SlackBuild
deleted file mode 100644
index ec32035f7d..0000000000
--- a/audio/shell-fm/shell-fm.SlackBuild
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for shell-fm
-
-# Copyright 2009-2013 David Woodfall <dave@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=shell-fm
-VERSION=${VERSION:-0.8}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL AUTHORS RELEASE \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/shell-fm/shell-fm.info b/audio/shell-fm/shell-fm.info
deleted file mode 100644
index 18bfe97a26..0000000000
--- a/audio/shell-fm/shell-fm.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="shell-fm"
-VERSION="0.8"
-HOMEPAGE="https://github.com/jkramer/shell-fm"
-DOWNLOAD="https://github.com/jkramer/shell-fm/archive/v0.8/shell-fm-0.8.tar.gz"
-MD5SUM="6d6aca71fb8a33562ecf614a10a45255"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/audio/shell-fm/slack-desc b/audio/shell-fm/slack-desc
deleted file mode 100644
index 3bf0b1a989..0000000000
--- a/audio/shell-fm/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-shell-fm: shell-fm (a command line last.fm player)
-shell-fm:
-shell-fm: shell-fm is a lightweight, console-based player for Last.FM radio
-shell-fm: streams. It's pretty small (the binary is currently a little smaller
-shell-fm: than 60K, or 50K when stripped) and it has most features the
-shell-fm: "official" player has, if not even a few more.
-shell-fm:
-shell-fm: Homepage: https://github.com/jkramer/shell-fm
-shell-fm:
-shell-fm:
-shell-fm:
diff --git a/audio/sidplayfp/sidplayfp.SlackBuild b/audio/sidplayfp/sidplayfp.SlackBuild
index ae706d48f7..dd201aac7e 100644
--- a/audio/sidplayfp/sidplayfp.SlackBuild
+++ b/audio/sidplayfp/sidplayfp.SlackBuild
@@ -25,13 +25,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=sidplayfp
-VERSION=${VERSION:-1.3.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.4.3}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/audio/sidplayfp/sidplayfp.info b/audio/sidplayfp/sidplayfp.info
index 8c8d1ac6dd..1c16a8fcd7 100644
--- a/audio/sidplayfp/sidplayfp.info
+++ b/audio/sidplayfp/sidplayfp.info
@@ -1,8 +1,8 @@
PRGNAM="sidplayfp"
-VERSION="1.3.0"
+VERSION="1.4.3"
HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-DOWNLOAD="https://sourceforge.net/projects/sidplay-residfp/files/sidplayfp/1.3/sidplayfp-1.3.0.tar.gz"
-MD5SUM="65ae736d372860223bee9bceb00a3b91"
+DOWNLOAD="https://downloads.sourceforge.net/sidplay-residfp/sidplayfp-1.4.3.tar.gz"
+MD5SUM="be020b5927c80c4269273895400a8120"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libsidplayfp"
diff --git a/audio/speex/README b/audio/speex/README
deleted file mode 100644
index 339c23c818..0000000000
--- a/audio/speex/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Speex is an Open Source/Free Software patent-free audio compression
-format designed for speech. The Speex Project aims to lower the barrier
-of entry for voice applications by providing a free alternative to
-expensive proprietary speech codecs. Moreover, Speex is well-adapted
-to Internet applications and provides useful features that are not
-present in most other codecs. Finally, Speex is part of the GNU
-Project and is available under the revised BSD license.
diff --git a/audio/speex/slack-desc b/audio/speex/slack-desc
deleted file mode 100644
index a675982e71..0000000000
--- a/audio/speex/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-speex: speex (an audio compression format designed for speech)
-speex:
-speex: Speex is an Open Source/Free Software patent-free audio compression
-speex: format designed for speech. The Speex Project aims to lower the
-speex: barrier of entry for voice applications by providing a free
-speex: alternative to expensive proprietary speech codecs. Moreover, Speex
-speex: is well-adapted to Internet applications and provides useful features
-speex: that are not present in most other codecs. Finally, Speex is part of
-speex: the GNU Project and is available under the revised BSD license.
-speex:
-speex: homepage: https://speex.org/
diff --git a/audio/speex/speex.SlackBuild b/audio/speex/speex.SlackBuild
deleted file mode 100644
index dba755fb36..0000000000
--- a/audio/speex/speex.SlackBuild
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for speex
-
-# Copyright (c) 2007 Alex Lysenka <me@alkos333.net>
-# Copyright (c) 2012 Vliegendehuiskat
-# Copyright (c) 2014-2016 Matteo Bernardini <ponce@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by SlackBuilds.org
-
-PRGNAM=speex
-VERSION=${VERSION:-1.2.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Fix end-of-line encoding.
-sed -i 's/\r//' README.TI-DSP
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-SPEEXDSP_CFLAGS="-I$PKG/usr/include" \
-SPEEXDSP_LIBS="-L$PKG/usr/lib${LIBDIRSUFFIX} -lspeexdsp" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-static=no \
- --enable-binaries \
- --build=$ARCH-slackware-linux
-
-# Hack to also make it look in the right directory on multilib systems
-make LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -L$PKG/usr/lib${LIBDIRSUFFIX} -lspeexdsp"
-make install DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 '{}' \;
-
-# Fix libspeex.la (if present)
-sed -i "s|-L$PKG.*/lib${LIBDIRSUFFIX} ||" $PKG/usr/lib${LIBDIRSUFFIX}/libspeex.la || true
-
-cp -a \
- AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc -type f -exec chown root:root {} \; -exec chmod 644 {} \;
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/speex/speex.info b/audio/speex/speex.info
deleted file mode 100644
index 0fb235e318..0000000000
--- a/audio/speex/speex.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="speex"
-VERSION="1.2.0"
-HOMEPAGE="https://speex.org"
-DOWNLOAD="https://ftp.osuosl.org/pub/xiph/releases/speex/speex-1.2.0.tar.gz"
-MD5SUM="8ab7bb2589110dfaf0ed7fa7757dc49c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
diff --git a/audio/xmms2/xmms2.SlackBuild b/audio/xmms2/xmms2.SlackBuild
index fcd1ede0a8..21a5a5e300 100644
--- a/audio/xmms2/xmms2.SlackBuild
+++ b/audio/xmms2/xmms2.SlackBuild
@@ -7,7 +7,7 @@
# Updated by Andrew Brouwers, abrouwers at gmail d0t com (13.0, 64-bit)
PRGNAM=xmms2
-VERSION=${VERSION:-"20150712_942b17f"}
+VERSION=${VERSION:-"20170827_dedc33d"}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/audio/xmms2/xmms2.info b/audio/xmms2/xmms2.info
index dc459ddf91..514ce65356 100644
--- a/audio/xmms2/xmms2.info
+++ b/audio/xmms2/xmms2.info
@@ -1,10 +1,10 @@
PRGNAM="xmms2"
-VERSION="20150712_942b17f"
+VERSION="20170827_dedc33d"
HOMEPAGE="http://wiki.xmms2.xmms.se/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/xmms2-20150712_942b17f.tar.xz"
-MD5SUM="8a5c43ef18fdaf24f6853ced83ce1620"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/xmms2-20170827_dedc33d.tar.xz"
+MD5SUM="082e47f3ca4f40b5c0029e8a3f0a7d55"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="perl-Pod-Parser"
MAINTAINER="Matteo Bernardini"
EMAIL="ponce@slackbuilds.org"
diff --git a/business/ledger/ledger.SlackBuild b/business/ledger/ledger.SlackBuild
index 04a1c1b7aa..47712533f8 100644
--- a/business/ledger/ledger.SlackBuild
+++ b/business/ledger/ledger.SlackBuild
@@ -36,7 +36,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-./acprep --prefix=/usr update
+cmake \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ .
make install DESTDIR=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/desktop/arc-theme/README b/desktop/arc-theme/README
index a9fc04447a..70bf665cae 100644
--- a/desktop/arc-theme/README
+++ b/desktop/arc-theme/README
@@ -1,3 +1,5 @@
Arc is a flat theme with transparent elements for GTK 3, GTK 2 and
Gnome-Shell which supports GTK 3 and GTK 2 based desktop
environments like Gnome, Unity, Budgie, Pantheon, XFCE, Mate, etc.
+
+inkscape, optipng and sassc are build-time dependencies.
diff --git a/desktop/arc-theme/arc-theme.SlackBuild b/desktop/arc-theme/arc-theme.SlackBuild
index d3a596f6b3..a8104558dc 100644
--- a/desktop/arc-theme/arc-theme.SlackBuild
+++ b/desktop/arc-theme/arc-theme.SlackBuild
@@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=arc-theme
-VERSION=${VERSION:-20170302}
+VERSION=${VERSION:-20190917}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -56,13 +56,15 @@ else
LIBDIRSUFFIX=""
fi
+gnome_shell="--disable-gnome-shell" ; [[ $(which gnome-shell) ]] && gnome_shell=""
+
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -71,16 +73,18 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-sh autogen.sh
+sed -i "s|export-png=|export-type=png --export-filename=|" common/*/*.am
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
+ $gnome_shell \
--build=$ARCH-slackware-linux
make
diff --git a/desktop/arc-theme/arc-theme.info b/desktop/arc-theme/arc-theme.info
index e653a09f81..c760871724 100644
--- a/desktop/arc-theme/arc-theme.info
+++ b/desktop/arc-theme/arc-theme.info
@@ -1,10 +1,10 @@
PRGNAM="arc-theme"
-VERSION="20170302"
-HOMEPAGE="https://github.com/horst3180/arc-theme/"
-DOWNLOAD="https://github.com/horst3180/arc-theme/archive/20170302/arc-theme-20170302.tar.gz"
-MD5SUM="fe3e397ffc3633c1b5ba3b1d6e2456a7"
+VERSION="20190917"
+HOMEPAGE="https://github.com/arc-design/arc-theme"
+DOWNLOAD="https://github.com/arc-design/arc-theme/releases/download/20190917/arc-theme-20190917.tar.xz"
+MD5SUM="160c0a746735a84dce6b3824209fc699"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="inkscape murrine optipng sassc"
MAINTAINER="Marcel Saegebarth"
EMAIL="marc@mos6581.de"
diff --git a/desktop/arc-theme/slack-desc b/desktop/arc-theme/slack-desc
index a4387212a0..aa89e5c313 100644
--- a/desktop/arc-theme/slack-desc
+++ b/desktop/arc-theme/slack-desc
@@ -12,7 +12,7 @@ arc-theme: Arc is a flat theme with transparent elements for GTK 3, GTK 2 and
arc-theme: Gnome-Shell which supports GTK 3 and GTK 2 based desktop
arc-theme: environments like Gnome, Unity, Budgie, Pantheon, XFCE, Mate, etc.
arc-theme:
-arc-theme: Homepage: https://github.com/horst3180/arc-theme/
+arc-theme: Homepage: https://github.com/arc-design/arc-theme
arc-theme:
arc-theme:
arc-theme:
diff --git a/desktop/cairo-dock-plugins/README b/desktop/cairo-dock-plugins/README
index d758f4c722..496a240ad9 100644
--- a/desktop/cairo-dock-plugins/README
+++ b/desktop/cairo-dock-plugins/README
@@ -3,4 +3,4 @@ plug-ins for Cairo-Dock It provides some new functionnalities like
controling music players or note-taking, a clock or a desktop
switcher but also some views, dialogs and desklets skins, etc.
-vala, python3 and mono are optional dependencies.
+libetpan, vala, python3 and mono are optional dependencies.
diff --git a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild
index 1ef6650ec5..11c932e67e 100644
--- a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild
+++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cairo-dock-plugins
-VERSION=${VERSION:-3.3.2}
+VERSION=${VERSION:-3.4.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -59,9 +59,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf cairo-dock-plug-ins-$VERSION
tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+cd cairo-dock-plug-ins-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,25 +69,31 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Thanks to fedora and archlinux
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+sed -i -e 's|-Wno-all||' Dbus/interfaces/vala/src/CMakeLists.txt
+
+mkdir build
+cd build
cmake \
-DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release .
+ -DCMAKE_BUILD_TYPE=Release ..
make VERBOSE=1
make install DESTDIR=$PKG
+cd ..
# Sheesh. Donchaloveruby?
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1
+RUBY_SITELIBDIR=$(ruby -e 'print RbConfig::CONFIG["sitelibdir"]')
+mkdir -p $PKG$RUBY_SITELIBDIR
if [ -d $PKG/usr/usr ]; then
- mv $PKG/usr/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1/CDApplet.rb \
- $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1
+ mv $PKG/usr$RUBY_SITELIBDIR/CDApplet.rb $PKG$RUBY_SITELIBDIR/
rm -rf $PKG/usr/usr
elif [ -e $PKG/usr/CDApplet.rb ]; then
- mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1
- mv $PKG/usr/CDApplet.rb $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1
+ mv $PKG/usr/CDApplet.rb $PKG$RUBY_SITELIBDIR/
fi
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/desktop/cairo-dock-plugins/cairo-dock-plugins.info b/desktop/cairo-dock-plugins/cairo-dock-plugins.info
index b28117ab5d..3fb0f52e51 100644
--- a/desktop/cairo-dock-plugins/cairo-dock-plugins.info
+++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.info
@@ -1,8 +1,8 @@
PRGNAM="cairo-dock-plugins"
-VERSION="3.3.2"
+VERSION="3.4.1"
HOMEPAGE="http://www.glx-dock.org"
-DOWNLOAD="https://launchpad.net/cairo-dock-plug-ins/3.3/3.3.2/+download/cairo-dock-plugins-3.3.2.tar.gz"
-MD5SUM="3c40afe91cba65da68a70e5e78b76c24"
+DOWNLOAD="https://github.com/Cairo-Dock/cairo-dock-plug-ins/archive/3.4.1/cairo-dock-plugins-3.4.1.tar.gz"
+MD5SUM="434941926f9205fd8562a15b6ac5f243"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="cairo-dock"
diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch
new file mode 100644
index 0000000000..846b4176fd
--- /dev/null
+++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch
@@ -0,0 +1,40 @@
+From 9043010e2cdd384ff5de5f5f116229557d15721c Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedorapeople.org>
+Date: Fri, 6 Mar 2015 19:06:34 +0900
+Subject: [PATCH] demo_ruby: fix traceback when changing themes
+
+Fix the "crash" when changing like:
+./demo_ruby:108:in `reload': undefined local variable or method `myApplet' for #<Applet:0x00000002e6c060> (NameError)
+ from /usr/share/ruby/vendor_ruby/CDApplet.rb:203:in `_on_reload'
+ from /usr/share/ruby/vendor_ruby/CDApplet.rb:274:in `block in _connect_to_dock'
+ from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/introspect.rb:325:in `call'
+ from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/introspect.rb:325:in `block in on_signal'
+ from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:665:in `call'
+ from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:665:in `block in process'
+ from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:663:in `each'
+ from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:663:in `process'
+ from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:855:in `block in run'
+ from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:846:in `each'
+ from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:846:in `run'
+ from /usr/share/ruby/vendor_ruby/CDApplet.rb:83:in `run'
+ from ./demo_ruby:127:in `<main>'
+---
+ Dbus/demos/demo_ruby/demo_ruby | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Dbus/demos/demo_ruby/demo_ruby b/Dbus/demos/demo_ruby/demo_ruby
+index 2df5cda..a9374bd 100755
+--- a/Dbus/demos/demo_ruby/demo_ruby
++++ b/Dbus/demos/demo_ruby/demo_ruby
+@@ -105,7 +105,7 @@ class Applet < CDApplet
+ end
+ def reload
+ p "[+] our module was reloaded, welcome back!"
+- self.icon.AddDataRenderer("gauge", 1, myApplet.config['theme'])
++ self.icon.AddDataRenderer("gauge", 1, self.configuration['theme'])
+ self.icon.RenderValues([Float(self.counter)/self.configuration['max_value']])
+ self.sub_icons.RemoveSubIcon("any")
+ self.sub_icons.AddSubIcons(["icon 1", "firefox-3.0", "id1", "icon 2", "natilus", "id2", "icon 3", "thunderbird", "id3"])
+--
+2.1.0
+
diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch
new file mode 100644
index 0000000000..035143fd3d
--- /dev/null
+++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch
@@ -0,0 +1,52 @@
+From 402a2d7bb657be4ad4072f07612e008e846d5e97 Mon Sep 17 00:00:00 2001
+From: Fabounet <fabounet03@gmail.com>
+Date: Sun, 22 May 2016 21:13:21 +0200
+Subject: [PATCH] [1581725] Updated the weather URL we retrieve data from
+
+---
+ weather/src/applet-config.c | 2 +-
+ weather/src/applet-read-data.c | 3 ---
+ weather/src/applet-struct.h | 3 +++
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/weather/src/applet-config.c b/weather/src/applet-config.c
+index c9a33c2..0a27a8a 100755
+--- a/weather/src/applet-config.c
++++ b/weather/src/applet-config.c
+@@ -174,7 +174,7 @@ static void _on_got_location_data (const gchar *cLocationData, GldiModuleInstanc
+ gldi_task_discard (myData.pGetLocationTask);
+ myData.pGetLocationTask = NULL;
+ }
+-#define CD_WEATHER_BASE_URL "http://xml.weather.com"
++
+ static void _cd_weather_search_for_location (GtkEntry *pEntry, GldiModuleInstance *myApplet)
+ {
+ const gchar *cLocationName = gtk_entry_get_text (pEntry);
+diff --git a/weather/src/applet-read-data.c b/weather/src/applet-read-data.c
+index 0bbdce7..8ca8d21 100755
+--- a/weather/src/applet-read-data.c
++++ b/weather/src/applet-read-data.c
+@@ -30,9 +30,6 @@
+ #include "applet-load-icons.h"
+ #include "applet-read-data.h"
+
+-#define CD_WEATHER_BASE_URL "http://xml.weather.com"
+-
+-
+ static xmlDocPtr _cd_weather_open_xml_buffer (const gchar *cData, xmlNodePtr *root_node, const gchar *cRootNodeName, GError **erreur)
+ {
+ if (cData == NULL || *cData == '\0')
+diff --git a/weather/src/applet-struct.h b/weather/src/applet-struct.h
+index e96191e..02ba3d0 100755
+--- a/weather/src/applet-struct.h
++++ b/weather/src/applet-struct.h
+@@ -29,6 +29,9 @@
+
+ #define WEATHER_DEFAULT_NAME "weather"
+
++#define CD_WEATHER_BASE_URL "http://wxdata.weather.com/wxdata"
++
++
+ #define _display(cValue) ((cValue) == NULL || *((gchar*)cValue) == 'N' ? "?" : (const gchar*)(cValue))
+
+ struct _AppletConfig {
diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-mono.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-mono.patch
new file mode 100644
index 0000000000..637c1ca494
--- /dev/null
+++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-mono.patch
@@ -0,0 +1,106 @@
+diff -rupN cairo-dock-plug-ins-3.4.1.orig/CMakeLists.txt cairo-dock-plug-ins-3.4.1/CMakeLists.txt
+--- cairo-dock-plug-ins-3.4.1.orig/CMakeLists.txt 2015-03-12 09:43:57.171067365 +0100
++++ cairo-dock-plug-ins-3.4.1/CMakeLists.txt 2015-03-12 09:46:20.717120675 +0100
+@@ -573,11 +573,11 @@ if (enable-mono-interface)
+ if (NOT GMCS_EXECUTABLE OR NOT EXISTS ${GMCS_EXECUTABLE})
+ message (STATUS "Could not find Mono compiler gmcs, won't build Mono interface.")
+ else()
+- pkg_check_modules (MONO_PACKAGE glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0)
++ pkg_check_modules (MONO_PACKAGE dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-3.0)
+ if (NOT MONO_PACKAGE_FOUND)
+- message (STATUS "Could not find glib-sharp-2.0, ndesk-dbus-1.0 or ndesk-dbus-glib-1.0; won't be built Mono interface.")
+- message (WARNING "These modules are required to compile DBus applet with Mono interface: glib-sharp-2.0, ndesk-dbus-1.0 and ndesk-dbus-glib-1.0")
+- set (MODULES_MISSING "${MODULES_MISSING} glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0")
++ message (STATUS "Could not find dbus-sharp-2.0, dbus-sharp-glib-2.0 or glib-sharp-3.0; won't be built Mono interface.")
++ message (WARNING "These modules are required to compile DBus applet with Mono interface: dbus-sharp-2.0, dbus-sharp-glib-2.0 and glib-sharp-3.0")
++ set (MODULES_MISSING "${MODULES_MISSING} dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-3.0")
+ else()
+ set (MONO_FOUND TRUE)
+ set (with_mono yes)
+diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CDApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CDApplet.cs
+--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CDApplet.cs 2015-03-12 09:52:56.491934965 +0100
++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CDApplet.cs 2015-03-12 09:56:50.191652099 +0100
+@@ -21,7 +21,7 @@
+ // Make your own class derive from a CDApplet, and override the functions you need (the ones which don't start with an underscore).
+
+ // Compile it with the following command, then rename 'demo_mono.exe' to 'demo_mono'.
+-// gmcs /target:library CDApplet.cs ISubApplet.cs IApplet.cs -pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0
++// gmcs /target:library CDApplet.cs ISubApplet.cs IApplet.cs -pkg:dbus-sharp-2.0 -pkg:dbus-sharp-glib-2.0 -pkg:glib-sharp-3.0
+ //////////////////////////
+ ////// dependancies //////
+ //////////////////////////
+@@ -29,7 +29,7 @@ using System; // Environment
+ using System.IO; // Path, Directory
+ using System.Reflection;
+ using GLib;
+-using NDesk.DBus;
++using DBus;
+ using CairoDock.Applet;
+
+ //namespace CairoDock.Applet
+@@ -258,8 +258,8 @@ public class CDApplet
+
+ private void _connect_to_dock ()
+ {
+- NDesk.DBus.BusG.Init();
+- NDesk.DBus.Bus bus = NDesk.DBus.Bus.Session;
++ DBus.BusG.Init();
++ DBus.Bus bus = DBus.Bus.Session;
+ this.icon = bus.GetObject<IApplet> ("org.cairodock.CairoDock", new ObjectPath (this.cBusPath));
+ this.icon.on_click += new OnClickEvent (on_click);
+ this.icon.on_middle_click += new OnMiddleClickEvent (on_middle_click);
+diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CMakeLists.txt cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CMakeLists.txt
+--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CMakeLists.txt 2015-03-12 09:52:56.491934965 +0100
++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CMakeLists.txt 2015-03-12 09:54:07.418777441 +0100
+@@ -3,7 +3,7 @@
+
+ execute_process(COMMAND ${GMCS_EXECUTABLE}
+ -target:library
+- -pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0
++ -pkg:dbus-sharp-2.0 -pkg:dbus-sharp-glib-2.0 -pkg:glib-sharp-3.0
+ -out:${CMAKE_CURRENT_BINARY_DIR}/CDApplet.dll
+ ${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/ISubApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/IApplet.cs)
+ ### find how to register to GAC ...
+diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/demos/demo_mono/demo_mono.cs cairo-dock-plug-ins-3.4.1/Dbus/demos/demo_mono/demo_mono.cs
+--- cairo-dock-plug-ins-3.4.1.orig/Dbus/demos/demo_mono/demo_mono.cs 2015-03-12 09:59:41.064312097 +0100
++++ cairo-dock-plug-ins-3.4.1/Dbus/demos/demo_mono/demo_mono.cs 2015-03-12 10:02:39.473424651 +0100
+@@ -138,7 +138,7 @@ public class Applet : CDApplet
+ public override void on_build_menu ()
+ {
+ Console.WriteLine("*** build menu");
+- /// Warning : teh AddMenuItems fails with NDesk-DBus 0.6.0; until this is fixed, use the PopulateMenu method.
++ /// Warning : the AddMenuItems fails with DBus Sharp 0.6.0; until this is fixed, use the PopulateMenu method.
+ /**Dictionary<string, object>[] pItems = new Dictionary<string, object>[] {
+ new Dictionary<string, object>()
+ {
+diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/IApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/IApplet.cs
+--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/IApplet.cs 2015-03-12 09:59:41.067645289 +0100
++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/IApplet.cs 2015-03-12 10:00:35.395334804 +0100
+@@ -1,6 +1,6 @@
+ using System;
+ using System.Collections.Generic; // Dictionnary
+-using NDesk.DBus;
++using DBus;
+
+ namespace CairoDock.Applet
+ {
+@@ -27,7 +27,7 @@ namespace CairoDock.Applet
+ Left
+ }
+
+- [NDesk.DBus.Interface("org.cairodock.CairoDock.applet")]
++ [DBus.Interface("org.cairodock.CairoDock.applet")]
+ public interface IApplet
+ {
+ object Get(string cProperty);
+diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/ISubApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/ISubApplet.cs
+--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/ISubApplet.cs 2015-03-12 09:59:41.067645289 +0100
++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/ISubApplet.cs 2015-03-12 10:00:16.522802989 +0100
+@@ -1,6 +1,6 @@
+ using System;
+ using System.Collections.Generic; // Dictionnary
+-using NDesk.DBus;
++using DBus;
+
+ namespace CairoDock.Applet
+ {
diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-port-WebKit2.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-port-WebKit2.patch
new file mode 100644
index 0000000000..bec6e5fcac
--- /dev/null
+++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-port-WebKit2.patch
@@ -0,0 +1,77 @@
+--- cairo-dock-plugins-3.4.1/CMakeLists.txt.wk2 2017-04-01 03:09:09.171381809 +0900
++++ cairo-dock-plugins-3.4.1/CMakeLists.txt 2017-04-01 03:09:09.172381805 +0900
+@@ -1391,7 +1391,7 @@
+ set (with_weblets no)
+ enable_if_not_defined (enable-weblets)
+ if (enable-weblets)
+- set (WEBKIT_MODULE webkitgtk-3.0)
++ set (WEBKIT_MODULE webkit2gtk-4.0)
+ pkg_check_modules (WEBKIT ${WEBKIT_MODULE})
+ if (NOT WEBKIT_FOUND)
+ message (STATUS "Could not find ${WEBKIT_MODULE}; Cairo-Dock won't be built with Weblets applet.")
+--- cairo-dock-plugins-3.4.1/weblets/src/applet-struct.h.wk2 2015-02-20 01:13:47.000000000 +0900
++++ cairo-dock-plugins-3.4.1/weblets/src/applet-struct.h 2017-04-01 03:09:09.172381805 +0900
+@@ -28,7 +28,7 @@
+ #include "config.h"
+ #endif
+
+-#include <webkit/webkit.h>
++#include <webkit2/webkit2.h>
+
+ //\___________ structure containing the applet's configuration parameters.
+ struct _AppletConfig {
+--- cairo-dock-plugins-3.4.1/weblets/src/applet-widget.c.wk2 2015-02-20 01:13:47.000000000 +0900
++++ cairo-dock-plugins-3.4.1/weblets/src/applet-widget.c 2017-04-01 03:14:59.380001735 +0900
+@@ -62,13 +62,19 @@
+ return gldi_dialog_new (&attr);
+ }
+
+-/* Will be called when loading of the page is finished*/
+-void load_finished_cb(WebKitWebView *pWebKitView, WebKitWebFrame* widget
++/* Will be called when loading of the page is changed*/
++void load_changed_cb(WebKitWebView *pWebKitView, WebKitLoadEvent load_event
+ , GldiModuleInstance *myApplet)
+ {
+- cd_debug ("weblets : (re)load finished\n");
+- // update scrollbars status
+- show_hide_scrollbars(myApplet);
++ switch (load_event) {
++ case WEBKIT_LOAD_FINISHED:
++ cd_debug ("weblets : (re)load finished\n");
++ // update scrollbars status
++ show_hide_scrollbars(myApplet);
++ break;
++ default:
++ break;
++ }
+ }
+
+ /* Build the embedded widget */
+@@ -80,8 +86,8 @@
+ myData.pWebKitView = WEBKIT_WEB_VIEW (webkit_web_view_new ());
+ gtk_container_add (GTK_CONTAINER (myData.pGtkMozEmbed), GTK_WIDGET (myData.pWebKitView));
+ g_signal_connect(G_OBJECT(myData.pWebKitView),
+- "load_finished",
+- G_CALLBACK (load_finished_cb),
++ "load-changed",
++ G_CALLBACK (load_changed_cb),
+ myApplet);
+ gtk_widget_show_all (myData.pGtkMozEmbed);
+
+@@ -120,10 +126,14 @@
+ }
+ }
+
+- webkit_web_view_open(WEBKIT_WEB_VIEW(myData.pWebKitView), myConfig.cURI_to_load?myConfig.cURI_to_load:"http://www.google.com");
++ webkit_web_view_load_uri(WEBKIT_WEB_VIEW(myData.pWebKitView), myConfig.cURI_to_load?myConfig.cURI_to_load:"http://www.google.com");
+ }
+ /* available since rev. 30985, from fev. 2008 */
+- webkit_web_view_set_transparent(myData.pWebKitView, myConfig.bIsTransparent);
++ {
++ GdkRGBA rgba = {0};
++ if (myConfig.bIsTransparent) rgba.alpha = 0.5;
++ webkit_web_view_set_background_color(myData.pWebKitView, &rgba);
++ }
+
+ return TRUE;
+ }
diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch
new file mode 100644
index 0000000000..0a2ea720d1
--- /dev/null
+++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch
@@ -0,0 +1,137 @@
+--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c.glibc 2016-12-11 16:10:41.656840262 +0900
++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c 2016-12-11 16:23:31.875117800 +0900
+@@ -17,6 +17,7 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++#include "applet-time_h-struct.h"
+ #include <string.h>
+
+ #include "applet-struct.h"
+--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c.glibc 2016-12-11 16:10:41.657840257 +0900
++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c 2016-12-11 16:22:24.465443591 +0900
+@@ -17,6 +17,7 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++#include "applet-time_h-struct.h"
+ #include "stdlib.h"
+
+ #include "applet-struct.h"
+--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c.glibc 2015-02-20 01:13:47.000000000 +0900
++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c 2016-12-11 16:24:08.991938415 +0900
+@@ -17,6 +17,7 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++#include "applet-time_h-struct.h"
+ #include <stdlib.h>
+ #include <string.h>
+
+@@ -66,4 +67,4 @@
+
+
+ return GLDI_NOTIFICATION_LET_PASS;
+-}
+\ ファイル末尾ã«æ”¹è¡ŒãŒã‚ã‚Šã¾ã›ã‚“
++}
+--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c.glibc 2015-02-20 01:13:47.000000000 +0900
++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c 2016-12-11 16:23:55.137005376 +0900
+@@ -19,6 +19,7 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++#include "applet-time_h-struct.h"
+ #include <stdlib.h>
+ #ifndef __FreeBSD__
+ #include <endian.h>
+--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h.glibc 2016-12-11 16:10:41.657840257 +0900
++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h 2016-12-11 16:22:59.589273837 +0900
+@@ -21,6 +21,7 @@
+ #ifndef __CD_APPLET_STRUCT__
+ #define __CD_APPLET_STRUCT__
+
++#include "applet-time_h-struct.h"
+ #include <sys/types.h>
+ #include <alsa/asoundlib.h>
+ #define _STRUCT_TIMEVAL
+--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h.glibc 2016-12-11 16:11:55.464483550 +0900
++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h 2016-12-11 16:19:52.003180440 +0900
+@@ -0,0 +1,27 @@
++/**
++* This file is a part of the Cairo-Dock project
++*
++* Copyright : (C) see the 'copyright' file.
++* E-mail : see the 'copyright' file.
++*
++* This program is free software; you can redistribute it and/or
++* modify it under the terms of the GNU General Public License
++* as published by the Free Software Foundation; either version 3
++* of the License, or (at your option) any later version.
++*
++* This program is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++* You should have received a copy of the GNU General Public License
++* along with this program. If not, see <http://www.gnu.org/licenses/>.
++*/
++
++#ifndef __CD_APPLET_TIME_H_STRUCT__
++#define __CD_APPLET_TIME_H_STRUCT__
++
++#define _POSIX_C_SOURCE 200809L
++#include <time.h>
++
++#endif
++
+--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c.glibc 2015-02-20 01:13:47.000000000 +0900
++++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c 2016-12-11 16:20:44.168928323 +0900
+@@ -20,6 +20,7 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++#include "applet-time_h-struct.h"
+ #include <stdlib.h>
+
+ #include "applet-struct.h"
+--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h.glibc 2015-02-20 01:13:47.000000000 +0900
++++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h 2016-12-11 16:19:47.713201174 +0900
+@@ -20,6 +20,7 @@
+ #ifndef __CD_APPLET_STRUCT__
+ #define __CD_APPLET_STRUCT__
+
++#include "applet-time_h-struct.h"
+ #include <sys/types.h>
+ #include <alsa/asoundlib.h>
+ #define _STRUCT_TIMEVAL
+--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h.glibc 2016-12-11 16:11:55.464483550 +0900
++++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h 2016-12-11 16:19:52.003180440 +0900
+@@ -0,0 +1,27 @@
++/**
++* This file is a part of the Cairo-Dock project
++*
++* Copyright : (C) see the 'copyright' file.
++* E-mail : see the 'copyright' file.
++*
++* This program is free software; you can redistribute it and/or
++* modify it under the terms of the GNU General Public License
++* as published by the Free Software Foundation; either version 3
++* of the License, or (at your option) any later version.
++*
++* This program is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++* You should have received a copy of the GNU General Public License
++* along with this program. If not, see <http://www.gnu.org/licenses/>.
++*/
++
++#ifndef __CD_APPLET_TIME_H_STRUCT__
++#define __CD_APPLET_TIME_H_STRUCT__
++
++#define _POSIX_C_SOURCE 200809L
++#include <time.h>
++
++#endif
++
diff --git a/desktop/cairo-dock/cairo-dock.SlackBuild b/desktop/cairo-dock/cairo-dock.SlackBuild
index f12d52fb2d..9935833256 100644
--- a/desktop/cairo-dock/cairo-dock.SlackBuild
+++ b/desktop/cairo-dock/cairo-dock.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cairo-dock
-VERSION=${VERSION:-3.3.2}
+VERSION=${VERSION:-3.4.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -59,9 +59,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-core-$VERSION
tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+cd $PRGNAM-core-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,16 +69,19 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+mkdir build
+cd build
cmake \
-DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DCMAKE_INSTALL_PREFIX=/usr \
-DMAN_INSTALL_DIR=/usr/man \
- -DCMAKE_BUILD_TYPE=Release .
+ -DCMAKE_BUILD_TYPE=Release ..
make VERBOSE=1
make install DESTDIR=$PKG
+cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/desktop/cairo-dock/cairo-dock.info b/desktop/cairo-dock/cairo-dock.info
index d439b98f7a..1c6f1ba104 100644
--- a/desktop/cairo-dock/cairo-dock.info
+++ b/desktop/cairo-dock/cairo-dock.info
@@ -1,8 +1,8 @@
PRGNAM="cairo-dock"
-VERSION="3.3.2"
+VERSION="3.4.1"
HOMEPAGE="http://www.glx-dock.org"
-DOWNLOAD="https://launchpad.net/cairo-dock-core/3.3/3.3.2/+download/cairo-dock-3.3.2.tar.gz"
-MD5SUM="aae077803322049e2488ca7c2980cd0d"
+DOWNLOAD="https://github.com/Cairo-Dock/cairo-dock-core/archive/3.4.1/cairo-dock-3.4.1.tar.gz"
+MD5SUM="63285f2744a76354cea9cc4c012b3c11"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="gtkglext"
diff --git a/desktop/ceti-2-theme/README b/desktop/ceti-2-theme/README
deleted file mode 100644
index 81caf7d90f..0000000000
--- a/desktop/ceti-2-theme/README
+++ /dev/null
@@ -1,10 +0,0 @@
-ceti-2-theme (GTK2|GTK3 themes)
-
-ceti-2 is a theme for GTK 3, GTK 2 and Gnome-Shell. It supports GTK 3
-and GTK 2 based desktop environments like Gnome, Unity, Budgie,
-Pantheon, etc.
-
-It is the Official continuation of ceti for Gnome 3.14, 3.16 and 3.18.
-It has been completely revamped and is now based on Vertex.
-
-Optional dependencies: gtk-engines, gtk-engines-unico.
diff --git a/desktop/ceti-2-theme/ceti-2-theme.SlackBuild b/desktop/ceti-2-theme/ceti-2-theme.SlackBuild
deleted file mode 100644
index 82f4825ac7..0000000000
--- a/desktop/ceti-2-theme/ceti-2-theme.SlackBuild
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for ceti-2-theme.
-#
-# Copyright 2016-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM="ceti-2-theme"
-VERSION=${VERSION:-20150923}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-CWD=$(pwd)
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-./autogen.sh \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-silent-rules \
- --disable-gnome-shell \
- --disable-unity \
- --build=$ARCH-slackware-linux
-
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp AUTHORS COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/ceti-2-theme/ceti-2-theme.info b/desktop/ceti-2-theme/ceti-2-theme.info
deleted file mode 100644
index e75ed7fab2..0000000000
--- a/desktop/ceti-2-theme/ceti-2-theme.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ceti-2-theme"
-VERSION="20150923"
-HOMEPAGE="https://github.com/horst3180/Ceti-2-theme"
-DOWNLOAD="https://github.com/horst3180/ceti-2-theme/archive/20150923/ceti-2-theme-20150923.tar.gz"
-MD5SUM="5da8e4e6c2260113b12fafc0a682b389"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="murrine"
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
diff --git a/desktop/ceti-2-theme/doinst.sh b/desktop/ceti-2-theme/doinst.sh
deleted file mode 100644
index aea0f894eb..0000000000
--- a/desktop/ceti-2-theme/doinst.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
- /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
diff --git a/desktop/ceti-2-theme/slack-desc b/desktop/ceti-2-theme/slack-desc
deleted file mode 100644
index efcdc3ee26..0000000000
--- a/desktop/ceti-2-theme/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-ceti-2-theme: ceti-2-theme (GTK2|GTK3 themes)
-ceti-2-theme:
-ceti-2-theme: ceti-2 is a theme for GTK 3, GTK 2 and Gnome-Shell. It supports GTK 3
-ceti-2-theme: and GTK 2 based desktop environments like Gnome, Unity, Budgie,
-ceti-2-theme: Pantheon, etc.
-ceti-2-theme:
-ceti-2-theme: It is the Official continuation of Ceti for Gnome 3.14, 3.16 and 3.18.
-ceti-2-theme: It has been completely revamped and is now based on Vertex.
-ceti-2-theme:
-ceti-2-theme: Home page: https://github.com/horst3180/Ceti-2-theme
-ceti-2-theme:
diff --git a/desktop/devilspie/devilspie.SlackBuild b/desktop/devilspie/devilspie.SlackBuild
index 471bd18014..5334d2b91d 100644
--- a/desktop/devilspie/devilspie.SlackBuild
+++ b/desktop/devilspie/devilspie.SlackBuild
@@ -55,7 +55,7 @@ sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am
autoreconf -i
LDFLAGS="-lX11" \
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=format-y2k" \
CPPFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff b/desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff
deleted file mode 100644
index 5c8f5e341a..0000000000
--- a/desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur dmenu-4.8-orig/config.mk dmenu-4.8/config.mk
---- dmenu-4.8-orig/config.mk 2018-03-14 13:26:40.000000000 -0600
-+++ dmenu-4.8/config.mk 2018-04-01 18:03:50.431134881 -0600
-@@ -4,6 +4,7 @@
- # paths
- PREFIX = /usr/local
- MANPREFIX = ${PREFIX}/share/man
-+LIBDIR = /usr/local/lib
-
- X11INC = /usr/X11R6/include
- X11LIB = /usr/X11R6/lib
-@@ -20,11 +21,12 @@
-
- # includes and libs
- INCS = -I${X11INC} -I${FREETYPEINC}
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-+LIBS = -L${LIBDIR} -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-
- # flags
-+OPTS ?= -Os
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-+CFLAGS = -std=c99 -pedantic -Wall ${OPTS} ${INCS} ${CPPFLAGS}
- LDFLAGS = -s ${LIBS}
-
- # compiler and linker
diff --git a/desktop/dmenu/dmenu-4.9-libdir_cflags_fixups.diff b/desktop/dmenu/dmenu-4.9-libdir_cflags_fixups.diff
new file mode 100644
index 0000000000..8618a911de
--- /dev/null
+++ b/desktop/dmenu/dmenu-4.9-libdir_cflags_fixups.diff
@@ -0,0 +1,25 @@
+--- dmenu-4.9-orig/config.mk 2019-02-02 05:55:02.000000000 -0700
++++ dmenu-4.9/config.mk 2020-04-19 13:12:15.427727907 -0600
+@@ -4,6 +4,7 @@
+ # paths
+ PREFIX = /usr/local
+ MANPREFIX = $(PREFIX)/share/man
++LIBDIR = /usr/local/lib
+
+ X11INC = /usr/X11R6/include
+ X11LIB = /usr/X11R6/lib
+@@ -20,11 +21,12 @@
+
+ # includes and libs
+ INCS = -I$(X11INC) -I$(FREETYPEINC)
+-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
++LIBS = -L$(LIBDIR) -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
+
+ # flags
++OPTS ?= -Os
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
+-CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
++CFLAGS = -std=c99 -pedantic -Wall $(OPTS) $(INCS) $(CPPFLAGS)
+ LDFLAGS = $(LIBS)
+
+ # compiler and linker
diff --git a/desktop/dmenu/dmenu.SlackBuild b/desktop/dmenu/dmenu.SlackBuild
index 290289798d..f251b62b8a 100644
--- a/desktop/dmenu/dmenu.SlackBuild
+++ b/desktop/dmenu/dmenu.SlackBuild
@@ -24,7 +24,7 @@
# Modified by Phillip Warner for version >= 4.0
PRGNAM=dmenu
-VERSION=${VERSION:-4.8}
+VERSION=${VERSION:-4.9}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -71,7 +71,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Fixup the CFLAGS and LIBDIR settings to prevent multilib conflicts
-patch -p1 < $CWD/dmenu-4.8-libdir_cflags_fixups.diff
+patch -p1 < $CWD/dmenu-4.9-libdir_cflags_fixups.diff
make install \
OPTS="$SLKCFLAGS" \
diff --git a/desktop/dmenu/dmenu.info b/desktop/dmenu/dmenu.info
index 04b4630d18..1eaa82ac00 100644
--- a/desktop/dmenu/dmenu.info
+++ b/desktop/dmenu/dmenu.info
@@ -1,8 +1,8 @@
PRGNAM="dmenu"
-VERSION="4.8"
+VERSION="4.9"
HOMEPAGE="http://tools.suckless.org/dmenu"
-DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.8.tar.gz"
-MD5SUM="72da14fb2b07c18bc74bffcc19dcaf42"
+DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.9.tar.gz"
+MD5SUM="9a537ec9a3a2ce9f08963d66b56cc030"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/desktop/ffmpegthumbnailer/README b/desktop/ffmpegthumbnailer/README
deleted file mode 100644
index 127d8f1bd4..0000000000
--- a/desktop/ffmpegthumbnailer/README
+++ /dev/null
@@ -1,4 +0,0 @@
-FFmpegthumbnailer is a lightweight video thumbnailer that can be used by file
-managers to create thumbnails for your video files. The thumbnailer uses
-ffmpeg to decode frames from the video files, so supported videoformats
-depend on the configuration flags of ffmpeg.
diff --git a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild b/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild
deleted file mode 100644
index 7a0f0a2b93..0000000000
--- a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for FFmpegthumbnailer
-
-# Copyright 2007-2009 Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# Copyright 2012-2017 Heinz Wiesinger, Amsterdam, The Netherlands
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=ffmpegthumbnailer
-VERSION=${VERSION:-2.2.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-mkdir build
-cd build
- cmake \
- -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \
- -DCMAKE_C_FLAGS="${SLKCFLAGS}" \
- -DCMAKE_INSTALL_PREFIX="/usr" \
- -DCMAKE_INSTALL_LIBDIR="lib${LIBDIRSUFFIX}" \
- -DCMAKE_INSTALL_MANDIR="man" \
- -DENABLE_GIO="yes" \
- -DENABLE_THUMBNAILER="yes" \
- ..
-
- make VERBOSE=1
- make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info b/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info
deleted file mode 100644
index 13bf41d9a8..0000000000
--- a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ffmpegthumbnailer"
-VERSION="2.2.0"
-HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer"
-DOWNLOAD="https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/2.2.0/ffmpegthumbnailer-2.2.0.tar.bz2"
-MD5SUM="ed3754b3b8b9af93a93c490e17def0d0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="ffmpeg"
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
diff --git a/desktop/ffmpegthumbnailer/slack-desc b/desktop/ffmpegthumbnailer/slack-desc
deleted file mode 100644
index 3ff7f2e6c6..0000000000
--- a/desktop/ffmpegthumbnailer/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-ffmpegthumbnailer: ffmpegthumbnailer (Lightweight Video Thumbnailer)
-ffmpegthumbnailer:
-ffmpegthumbnailer: FFmpegthumbnailer is a lightweight video thumbnailer that can be
-ffmpegthumbnailer: used by file managers to create thumbnails for your video files.
-ffmpegthumbnailer: The thumbnailer uses ffmpeg to decode frames from the video files,
-ffmpegthumbnailer: so supported videoformats depend on the configuration flags of
-ffmpegthumbnailer: ffmpeg.
-ffmpegthumbnailer:
-ffmpegthumbnailer: Homepage: https://github.com/dirkvdb/ffmpegthumbnailer
-ffmpegthumbnailer:
-ffmpegthumbnailer:
diff --git a/desktop/i3/i3.SlackBuild b/desktop/i3/i3.SlackBuild
index 5e80e76749..938268447e 100644
--- a/desktop/i3/i3.SlackBuild
+++ b/desktop/i3/i3.SlackBuild
@@ -27,7 +27,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=i3
-VERSION=${VERSION:-4.17.1}
+VERSION=${VERSION:-4.18.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/desktop/i3/i3.info b/desktop/i3/i3.info
index c0a43c3691..2f0c1fa5cb 100644
--- a/desktop/i3/i3.info
+++ b/desktop/i3/i3.info
@@ -1,8 +1,8 @@
PRGNAM="i3"
-VERSION="4.17.1"
+VERSION="4.18.1"
HOMEPAGE="https://www.i3wm.org"
-DOWNLOAD="https://i3wm.org/downloads/i3-4.17.1.tar.bz2"
-MD5SUM="e550959e0900087b43fb366c35c2ed8b"
+DOWNLOAD="https://i3wm.org/downloads/i3-4.18.1.tar.bz2"
+MD5SUM="bca54bb6b352e4eda0cc667904248170"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="dmenu libev libxkbcommon xcb-util-xrm yajl perl-JSON-XS perl-AnyEvent"
diff --git a/desktop/lumina/lumina.SlackBuild b/desktop/lumina/lumina.SlackBuild
index ab2dc77cb1..6f4311fc72 100644
--- a/desktop/lumina/lumina.SlackBuild
+++ b/desktop/lumina/lumina.SlackBuild
@@ -81,6 +81,7 @@ qmake-qt5 \
QMAKE_CFLAGS_ISYSTEM= \
QMAKE_CFLAGS="$SLKCFLAGS" \
QMAKE_CXXFLAGS="$SLKCFLAGS" \
+ QMAKE_CFLAGS_ISYSTEM= \
QT5LIBDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \
CONFIG+=WITH_I18N \
L_ETCDIR=/etc
diff --git a/desktop/lxpanel/lxpanel.info b/desktop/lxpanel/lxpanel.info
index be31b8a229..82815dcf8a 100644
--- a/desktop/lxpanel/lxpanel.info
+++ b/desktop/lxpanel/lxpanel.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://downloads.sf.net/lxde/lxpanel-0.10.0.tar.xz"
MD5SUM="e6a1f9bd5cf39812e1c5d2453a34a7c5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="libfm"
+REQUIRES="keybinder libfm"
MAINTAINER="Matteo Bernardini"
EMAIL="ponce@slackbuilds.org"
diff --git a/desktop/neofetch/README b/desktop/neofetch/README
deleted file mode 100644
index 7064e16d60..0000000000
--- a/desktop/neofetch/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Neofetch is a CLI system information tool written in BASH. Neofetch
-displays information about your system next to an image, your OS logo,
-or any ascii file of your choice. The main purpose of neofetch is to be
-used in screenshots to show other users what OS/Distro you're running,
-what Theme/Icons you're using and etc.
-
-To see any optional dependencies that you might need, you can view it in
-https://github.com/dylanaraps/neofetch/wiki/Dependencies
diff --git a/desktop/neofetch/neofetch.SlackBuild b/desktop/neofetch/neofetch.SlackBuild
deleted file mode 100644
index 812f0ff8b2..0000000000
--- a/desktop/neofetch/neofetch.SlackBuild
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for neofetch
-# Copyright 2019 Muhammad Herdiansyah, Jakarta
-#
-# Redistribution and use of this script, with or without modification,
-# is permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=neofetch
-VERSION=${VERSION:-7.0.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-DOCS="LICENSE.md README.md"
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-chmod 644 $DOCS
-
-DESTDIR=$PKG MANDIR=/usr/man make install || exit
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/neofetch/neofetch.info b/desktop/neofetch/neofetch.info
deleted file mode 100644
index 9e90148dbd..0000000000
--- a/desktop/neofetch/neofetch.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="neofetch"
-VERSION="7.0.0"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-DOWNLOAD="https://github.com/dylanaraps/neofetch/archive/7.0.0/neofetch-7.0.0.tar.gz"
-MD5SUM="b4e1231561d15be12f334de607c4327e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Muhammad Herdiansyah"
-EMAIL="herdiansyah@netc.eu"
diff --git a/desktop/neofetch/slack-desc b/desktop/neofetch/slack-desc
deleted file mode 100644
index d9504b847b..0000000000
--- a/desktop/neofetch/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-neofetch: neofetch (simple system information script)
-neofetch:
-neofetch: neofetch is a script similar to screenfetch. This script can be used
-neofetch: to generate any information about your system, it will auto-detect
-neofetch: your system and print it to the terminal next to an image, a distro
-neofetch: logo or an ASCII art of your choice.
-neofetch:
-neofetch: Home page: https://github.com/dylanaraps/neofetch
-neofetch:
-neofetch: Bugs? Report to: https://github.com/dylanaraps/neofetch/issues
-neofetch:
diff --git a/desktop/picom/README b/desktop/picom/README
new file mode 100644
index 0000000000..a32a53c5af
--- /dev/null
+++ b/desktop/picom/README
@@ -0,0 +1,6 @@
+Picom is a compositor for X, and a fork of compton (stuff will
+retain the original name inside the package).
+
+Out of frustration with the low count of standalone lightweight
+compositors, picom was forked from Dana Jansens' fork of xcompmgr
+and refactored. Bugs were fixed and features were added.
diff --git a/desktop/seafile-gui/doinst.sh b/desktop/picom/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/desktop/seafile-gui/doinst.sh
+++ b/desktop/picom/doinst.sh
diff --git a/desktop/picom/picom.SlackBuild b/desktop/picom/picom.SlackBuild
new file mode 100644
index 0000000000..e83e135345
--- /dev/null
+++ b/desktop/picom/picom.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for picom
+
+# Copyright 2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=picom
+VERSION=${VERSION:-20200318_33a5cc6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+meson build . -D build_docs=true -D b_ndebug=true --prefix=/usr
+DESTDIR=$PKG ninja -C build install
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+install -D -m 0644 $PRGNAM.sample.conf $PKG/etc/$PRGNAM.conf
+install -D -m 0644 $PRGNAM-dbus.desktop $PKG/usr/share/applications/$PRGNAM-dbus.desktop
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ desc.txt dbus-examples $PRGNAM.sample.conf COPYING LICENSES \
+ $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/picom/picom.info b/desktop/picom/picom.info
new file mode 100644
index 0000000000..eda72ba2c4
--- /dev/null
+++ b/desktop/picom/picom.info
@@ -0,0 +1,10 @@
+PRGNAM="picom"
+VERSION="20200318_33a5cc6"
+HOMEPAGE="https://github.com/yshui/picom/"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/picom-20200318_33a5cc6.tar.xz"
+MD5SUM="702b29246bd22887cfb73686fb31a74c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libconfig libev libxdg-basedir setconf uthash"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/desktop/picom/slack-desc b/desktop/picom/slack-desc
new file mode 100644
index 0000000000..a996bb5019
--- /dev/null
+++ b/desktop/picom/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+picom: picom (X compositor)
+picom:
+picom: Picom is a compositor for X, and a fork of compton.
+picom:
+picom: homepage: https://github.com/yshui/picom/
+picom:
+picom:
+picom:
+picom:
+picom:
+picom:
diff --git a/desktop/polybar/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch b/desktop/polybar/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch
new file mode 100644
index 0000000000..81783617b9
--- /dev/null
+++ b/desktop/polybar/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch
@@ -0,0 +1,44 @@
+From 00165e1a6d5dd61bc153e1352b21ec07fc81245d Mon Sep 17 00:00:00 2001
+From: patrick96 <p.ziegler96@gmail.com>
+Date: Sun, 11 Feb 2018 21:27:52 +0100
+Subject: [PATCH] fix(generators): Add support for eventstruct
+
+Newer xcb-proto commits after the 1.12 release require the 'eventstruct'
+key in the output dictionary, otherwise the generator crashes.
+
+I don't see a need for xpp to actually support the eventstruct key and
+thus it uses a NOP lambda function
+---
+ generators/cpp_client.py | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/generators/cpp_client.py b/generators/cpp_client.py
+index 20d116f..709e8d8 100644
+--- a/generators/cpp_client.py
++++ b/generators/cpp_client.py
+@@ -3130,15 +3130,16 @@ def cpp_type_classes():
+ # }
+
+ # Must create an "output" dictionary before any xcbgen imports.
+-output = {'open' : c_open,
+- 'close' : c_close,
+- 'simple' : c_simple, # lambda x, y: None,
+- 'enum' : lambda x, y: None,
+- 'struct' : lambda x, y: None,
+- 'union' : lambda x, y: None,
+- 'request' : c_request,
+- 'event' : cpp_event,
+- 'error' : cpp_error,
++output = {'open' : c_open,
++ 'close' : c_close,
++ 'simple' : c_simple, # lambda x, y: None,
++ 'enum' : lambda x, y: None,
++ 'struct' : lambda x, y: None,
++ 'union' : lambda x, y: None,
++ 'request' : c_request,
++ 'event' : cpp_event,
++ 'error' : cpp_error,
++ 'eventstruct' : lambda x, y: None,
+ }
+
+ # Boilerplate below this point
diff --git a/desktop/polybar/polybar.SlackBuild b/desktop/polybar/polybar.SlackBuild
index b86a3cabea..9856cb3da0 100644
--- a/desktop/polybar/polybar.SlackBuild
+++ b/desktop/polybar/polybar.SlackBuild
@@ -75,6 +75,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+( cd lib/xpp
+ patch -p1 < $CWD/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch )
+
# Fixes install location
sed -i -e '/share\/doc\/polybar/s/share\///' doc/CMakeLists.txt
sed -i -e "/DESTINATION doc\/polybar/s/polybar/$PRGNAM-$VERSION/" doc/CMakeLists.txt
@@ -87,7 +90,7 @@ mkdir -p build
cd build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=implicit-fallthrough -Wno-error=stringop-truncation -Wno-error=deprecated-copy" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release ..
make -j1
diff --git a/desktop/rss-glx/patches/pixelcity-cpp.patch b/desktop/rss-glx/patches/pixelcity-cpp.patch
new file mode 100644
index 0000000000..1c56e61050
--- /dev/null
+++ b/desktop/rss-glx/patches/pixelcity-cpp.patch
@@ -0,0 +1,15 @@
+Index: rss-glx-0.9.1/src/Makefile.am
+===================================================================
+--- rss-glx-0.9.1.orig/src/Makefile.am
++++ rss-glx-0.9.1/src/Makefile.am
+@@ -38,7 +38,9 @@ matrixview_CFLAGS = @Wand_CFLAGS@
+ matrixview_LDADD = @BZIP2@ @PTHREAD_LIBS@ @Wand_LIBS@
+ plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
+ pixelcity_SOURCES = driver.c
+-pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
++pixelcity_LDADD = -LPixelCity -lPixelCity @quesoglc_LIBS@
++# Dummy file, not built. Forces g++ linking
++nodist_EXTRA_pixelcity_SOURCES = dummy.cpp
+ skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
+ solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
+ spirographx_SOURCES = driver.c spirographx.c
diff --git a/desktop/rss-glx/patches/rss-glx-0.9.1-imagemagick-7.patch b/desktop/rss-glx/patches/rss-glx-0.9.1-imagemagick-7.patch
new file mode 100644
index 0000000000..c92eb1e1d3
--- /dev/null
+++ b/desktop/rss-glx/patches/rss-glx-0.9.1-imagemagick-7.patch
@@ -0,0 +1,178 @@
+--- a/configure.in
++++ b/configure.in
+@@ -38,6 +38,8 @@
+ AC_PROG_LIBTOOL
+ AC_PROG_LN_S
+
++PKG_PROG_PKG_CONFIG
++
+ # Checks for libraries.
+ AC_CHECK_LIB([m], [pow],,AC_MSG_ERROR(-lm was not found but required.))
+
+@@ -81,7 +83,15 @@
+ AC_CHECK_FUNCS(random_r nrand48)
+
+ # Check for ImageMagick.
+-PKG_CHECK_MODULES(Wand, Wand >= 6.4)
++PKG_CHECK_MODULES(Wand, [Wand >= 6.4],,
++ [PKG_CHECK_MODULES(Wand, MagickWand >= 6.4)]
++)
++
++old_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$Wand_CFLAGS"
++AC_CHECK_HEADERS([magick/api.h] [wand/magick-wand.h],,
++ AC_CHECK_HEADERS([MagickCore/MagickCore.h] [MagickWand/MagickWand.h])
++)
++CPPFLAGS="$old_CPPFLAGS"
+
+ if test -d src/skyrocket_sounds ; then
+ AC_ARG_ENABLE(sound, [ --disable-sound Don't compile with sound.])
+--- a/src/TexMgr.cpp
++++ b/src/TexMgr.cpp
+@@ -25,8 +25,19 @@
+ #endif
+ #include <cstdlib>
+
++#ifdef HAVE_MAGICK_API_H
++#ifdef HAVE_WAND_MAGICK_WAND_H
+ #include <magick/api.h>
+ #include <wand/magick-wand.h>
++#endif /* HAVE_WAND_MAGICK_WAND_H */
++#endif /* HAVE_MAGICK_API_H */
++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H
++#ifdef HAVE_MAGICKWAND_MAGICKWAND_H
++#include <MagickCore/MagickCore.h>
++#include <MagickWand/MagickWand.h>
++#endif /* HAVE_MAGICKWAND_MAGICKWAND_H */
++#endif /* HAVE_MAGICKCORE_MAGICKCORE_H */
++
+ #include <dirent.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -255,10 +266,18 @@
+ // Directory scanning + image loading code in a separate function callable either from loadNextImage or another thread if pthreads is available.
+ void TexMgr::loadNextImageFromDisk() {
+ MagickWand *magick_wand = NewMagickWand();
++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H
++ ExceptionInfo *exception;
++#else
+ ExceptionInfo exception;
++#endif
+ int dirLoop = 0;
+
++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H
++ exception = AcquireExceptionInfo ();
++#else
+ GetExceptionInfo (&exception);
++#endif
+
+ int imageLoaded = 0;
+ do {
+@@ -317,7 +336,11 @@
+ nextH = ohh;
+ }
+
++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H
++ ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, oww, ohh, "RGBA", CharPixel, nextTex, exception);
++#else
+ ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, oww, ohh, "RGBA", CharPixel, nextTex, &exception);
++#endif
+
+ magick_wand = DestroyMagickWand (magick_wand);
+
+--- a/src/matrixview.c
++++ b/src/matrixview.c
+@@ -84,8 +84,19 @@
+ float *texcoords;
+ unsigned char *colors;
+
++#ifdef HAVE_MAGICK_API_H
++#ifdef HAVE_WAND_MAGICK_WAND_H
+ #include <magick/api.h>
+ #include <wand/magick-wand.h>
++#endif /* HAVE_WAND_MAGICK_WAND_H */
++#endif /* HAVE_MAGICK_API_H */
++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H
++#ifdef HAVE_MAGICKWAND_MAGICKWAND_H
++#include <MagickCore/MagickCore.h>
++#include <MagickWand/MagickWand.h>
++#endif /* HAVE_MAGICKWAND_MAGICKWAND_H */
++#endif /* HAVE_MAGICKCORE_MAGICKCORE_H */
++
+ #include <dirent.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -99,10 +110,18 @@
+ // Directory scanning + image loading code in a separate function callable either from loadNextImage or another thread if pthreads is available.
+ void loadNextImageFromDisk() {
+ MagickWand *magick_wand = NewMagickWand();
++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H
++ ExceptionInfo *exception;
++#else
+ ExceptionInfo exception;
++#endif
+ int dirLoop = 0;
+
++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H
++ exception = AcquireExceptionInfo ();
++#else
+ GetExceptionInfo (&exception);
++#endif
+
+ int imageLoaded = 0;
+ do {
+@@ -159,7 +178,11 @@
+ if (!next_pic)
+ next_pic = (unsigned char *)malloc (text_x * text_y);
+
++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H
++ ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, text_x, text_y, "I", CharPixel, next_pic, exception);
++#else
+ ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, text_x, text_y, "I", CharPixel, next_pic, &exception);
++#endif
+
+ magick_wand = DestroyMagickWand (magick_wand);
+ }
+@@ -211,11 +234,19 @@
+ pthread_cond_signal(next_pic_cond);
+ }
+ } else {
++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H
++ ExceptionInfo *exception;
++#else
+ ExceptionInfo exception;
++#endif
+ Image *image = NULL, *scaled_image;
+ ImageInfo *image_info;
+
++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H
++ exception = AcquireExceptionInfo ();
++#else
+ GetExceptionInfo (&exception);
++#endif
+
+ if (!pics)
+ LOAD_TEXTURE (pics, cpics, cpics_compressedsize, cpics_size)
+@@ -227,6 +258,15 @@
+ image_info = CloneImageInfo ((ImageInfo *) NULL);
+ image_info->size = AcquireMagickMemory(sizeof("90x70"));
+ strcpy(image_info->size, "90x70");
++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H
++ image = AcquireImage(image_info, exception);
++
++ ImportImagePixels(image, 0, 0, 90, 70, "I", CharPixel, (unsigned char *)(pics + ((random () & 15) * (90 * 70))), exception);
++
++ scaled_image = ScaleImage (image, text_x, text_y, exception);
++
++ ExportImagePixels (scaled_image, 0, 0, text_x, text_y, "I", CharPixel, pic, exception);
++#else
+ image = AcquireImage(image_info);
+
+ ImportImagePixels(image, 0, 0, 90, 70, "I", CharPixel, (unsigned char *)(pics + ((random () & 15) * (90 * 70))));
+@@ -234,6 +274,7 @@
+ scaled_image = ScaleImage (image, text_x, text_y, &exception);
+
+ ExportImagePixels (scaled_image, 0, 0, text_x, text_y, "I", CharPixel, pic, &exception);
++#endif
+
+ DestroyImage (image);
+ DestroyImage (scaled_image);
diff --git a/desktop/rss-glx/rss-glx.SlackBuild b/desktop/rss-glx/rss-glx.SlackBuild
index 45b8891604..5f55e74f89 100644
--- a/desktop/rss-glx/rss-glx.SlackBuild
+++ b/desktop/rss-glx/rss-glx.SlackBuild
@@ -69,6 +69,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+
# Magick Wand detection is broken.
./autogen.sh
Wand_CFLAGS=$(pkg-config --cflags "Wand >= 6.2") \
diff --git a/desktop/rss-guard/01_min_qt_required_is_5.9.patch b/desktop/rss-guard/01_min_qt_required_is_5.9.patch
new file mode 100644
index 0000000000..e54b533774
--- /dev/null
+++ b/desktop/rss-guard/01_min_qt_required_is_5.9.patch
@@ -0,0 +1,56 @@
+diff --git a/rssguard.pro b/rssguard.pro
+index 21a897c7..f8eb8d28 100755
+--- a/rssguard.pro
++++ b/rssguard.pro
+@@ -41,8 +41,8 @@ TARGET = rssguard
+
+ message(rssguard: Welcome RSS Guard qmake script.)
+
+-lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 7) {
+- warning(rssguard: At least Qt \"5.7.0\" is required!!!)
++lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 9) {
++ warning(rssguard: At least Qt \"5.9.0\" is required!!!)
+ }
+
+ APP_NAME = "RSS Guard"
+diff --git a/src/miscellaneous/textfactory.cpp b/src/miscellaneous/textfactory.cpp
+index 53451d63..f371d02d 100755
+--- a/src/miscellaneous/textfactory.cpp
++++ b/src/miscellaneous/textfactory.cpp
+@@ -10,10 +10,11 @@
+
+ #include <QDir>
+ #include <QLocale>
+-#include <QRandomGenerator>
+ #include <QString>
+ #include <QStringList>
+
++#include <random>
++
+ quint64 TextFactory::s_encryptionKey = 0x0;
+
+ TextFactory::TextFactory() = default;
+@@ -128,7 +129,10 @@ quint64 TextFactory::initializeSecretEncryptionKey() {
+ QString encryption_file_path = qApp->settings()->pathName() + QDir::separator() + ENCRYPTION_FILE_NAME;
+
+ try {
+- s_encryptionKey = quint64(QString(IOFactory::readFile(encryption_file_path)).toLongLong());
++ s_encryptionKey = quint64(QString(IOFactory::readFile(encryption_file_path)).toULongLong());
++
++ auto aa = s_encryptionKey;
++ auto bb = false;
+ }
+ catch (ApplicationException&) {
+ // Well, key does not exist or is invalid, generate and save one.
+@@ -148,5 +152,10 @@ quint64 TextFactory::initializeSecretEncryptionKey() {
+ }
+
+ quint64 TextFactory::generateSecretEncryptionKey() {
+- return QRandomGenerator().generate64();
++ std::random_device rd;
++ std::mt19937 mt(rd());
++ std::uniform_int<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL,
++ std::numeric_limits<quint64>().max());
++
++ return dist(mt);
+ }
diff --git a/desktop/rss-guard/02_fix_random_class_name.patch b/desktop/rss-guard/02_fix_random_class_name.patch
new file mode 100644
index 0000000000..06c49f7aba
--- /dev/null
+++ b/desktop/rss-guard/02_fix_random_class_name.patch
@@ -0,0 +1,24 @@
+From d347ba63072ab13c0dbc1792d1a2b837af997a46 Mon Sep 17 00:00:00 2001
+From: Martin Rotter <rotter@praktik.cz>
+Date: Thu, 6 Jun 2019 11:35:25 +0200
+Subject: [PATCH] Fix random class name
+
+---
+ src/miscellaneous/textfactory.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/miscellaneous/textfactory.cpp b/src/miscellaneous/textfactory.cpp
+index 48597235..1ac6f049 100755
+--- a/src/miscellaneous/textfactory.cpp
++++ b/src/miscellaneous/textfactory.cpp
+@@ -151,8 +151,8 @@ quint64 TextFactory::initializeSecretEncryptionKey() {
+ quint64 TextFactory::generateSecretEncryptionKey() {
+ std::random_device rd;
+ std::mt19937 mt(rd());
+- std::uniform_int<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL,
+- std::numeric_limits<quint64>().max());
++ std::uniform_int_distribution<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL,
++ std::numeric_limits<quint64>().max());
+
+ return dist(mt);
+ }
diff --git a/desktop/rss-guard/rss-guard.SlackBuild b/desktop/rss-guard/rss-guard.SlackBuild
index 470d4565c4..6dee54d811 100644
--- a/desktop/rss-guard/rss-guard.SlackBuild
+++ b/desktop/rss-guard/rss-guard.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for rss-guard
#
-# Copyright 2012-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2012-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
PRGNAM=rss-guard
SRCNAM=rssguard
-VERSION=${VERSION:-3.3.5}
+VERSION=${VERSION:-3.5.9}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -70,18 +70,21 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/01_min_qt_required_is_5.9.patch
+patch -p1 < $CWD/02_fix_random_class_name.patch
+
mkdir -p build
cd build
qmake-qt5 PREFIX=/usr ..
make
- make release-install INSTALL_ROOT=$PKG
+ make install INSTALL_ROOT=$PKG
cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PKG/usr/share/$SRCNAM/information/* $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION/
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/desktop/rss-guard/rss-guard.info b/desktop/rss-guard/rss-guard.info
index 4589139345..24591de685 100644
--- a/desktop/rss-guard/rss-guard.info
+++ b/desktop/rss-guard/rss-guard.info
@@ -1,8 +1,8 @@
PRGNAM="rss-guard"
-VERSION="3.3.5"
+VERSION="3.5.9"
HOMEPAGE="https://github.com/martinrotter/rssguard"
-DOWNLOAD="https://github.com/martinrotter/rssguard/archive/3.3.5.tar.gz"
-MD5SUM="9ac44a786afe7b9c5a94e1a81120ada8"
+DOWNLOAD="https://github.com/martinrotter/rssguard/archive/3.5.9/rssguard-3.5.9.tar.gz"
+MD5SUM="fb9b713a18a2bb85e7a4f7ce40a054b0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="qt5"
diff --git a/desktop/seafile-gui/README b/desktop/seafile-client/README
index 94ced6564e..94ced6564e 100644
--- a/desktop/seafile-gui/README
+++ b/desktop/seafile-client/README
diff --git a/graphics/scantailor/doinst.sh b/desktop/seafile-client/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/graphics/scantailor/doinst.sh
+++ b/desktop/seafile-client/doinst.sh
diff --git a/desktop/seafile-client/seafile-client.SlackBuild b/desktop/seafile-client/seafile-client.SlackBuild
new file mode 100644
index 0000000000..a50bcb3248
--- /dev/null
+++ b/desktop/seafile-client/seafile-client.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for seafile-client.
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=seafile-client
+VERSION=${VERSION:-6.2.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release .
+make
+make install/strip DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/seafile-client/seafile-client.info b/desktop/seafile-client/seafile-client.info
new file mode 100644
index 0000000000..92933b6c01
--- /dev/null
+++ b/desktop/seafile-client/seafile-client.info
@@ -0,0 +1,10 @@
+PRGNAM="seafile-client"
+VERSION="6.2.5"
+HOMEPAGE="http://seafile.com/"
+DOWNLOAD="https://github.com/haiwen/seafile-client/archive/v6.2.5/seafile-client-6.2.5.tar.gz"
+MD5SUM="3f3cd465109e1d49888fbca310033a3b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qt5 seafile"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/desktop/seafile-client/slack-desc b/desktop/seafile-client/slack-desc
new file mode 100644
index 0000000000..2f39a14e33
--- /dev/null
+++ b/desktop/seafile-client/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+seafile-client: seafile-client (Seafile Desktop Client)
+seafile-client:
+seafile-client: Graphical desktop client for the Seafile next-generation open
+seafile-client: source cloud storage system with advanced support for file syncing,
+seafile-client: privacy protection and teamwork.
+seafile-client:
+seafile-client: Homepage: http://seafile.com/
+seafile-client:
+seafile-client:
+seafile-client:
+seafile-client:
diff --git a/desktop/seafile-gui/seafile-gui.SlackBuild b/desktop/seafile-gui/seafile-gui.SlackBuild
deleted file mode 100644
index 9b7e62a867..0000000000
--- a/desktop/seafile-gui/seafile-gui.SlackBuild
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for "seafile-client".
-
-# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=seafile-gui
-SRCNAM=seafile-client
-VERSION=${VERSION:-4.4.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release .
-make
-make install/strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/seafile-gui/seafile-gui.info b/desktop/seafile-gui/seafile-gui.info
deleted file mode 100644
index a878209924..0000000000
--- a/desktop/seafile-gui/seafile-gui.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="seafile-gui"
-VERSION="4.4.2"
-HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/seafile-client/archive/v4.4.2.tar.gz"
-MD5SUM="8749f059e9209df31e662c9325c735e5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="seafile-client"
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
diff --git a/desktop/seafile-gui/slack-desc b/desktop/seafile-gui/slack-desc
deleted file mode 100644
index 4de44d8853..0000000000
--- a/desktop/seafile-gui/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-seafile-gui: seafile-gui (Seafile Desktop Client)
-seafile-gui:
-seafile-gui: Graphical desktop client for the Seafile next-generation open
-seafile-gui: source cloud storage system with advanced support for file syncing,
-seafile-gui: privacy protection and teamwork.
-seafile-gui:
-seafile-gui: Homepage: http://seafile.com/
-seafile-gui:
-seafile-gui:
-seafile-gui:
-seafile-gui:
diff --git a/desktop/searchmonkey/patch.txt b/desktop/searchmonkey/patch.txt
new file mode 100644
index 0000000000..08d9959efd
--- /dev/null
+++ b/desktop/searchmonkey/patch.txt
@@ -0,0 +1,11 @@
+--- ./mainwindow.cpp 2010-05-16 11:42:14.000000000 -0400
++++ ./mainwindow.cpp.new 2016-09-06 21:07:18.462298114 -0400
+@@ -781,7 +781,7 @@
+ ******************************************************************************/
+ void MainWindow::find () throw() {
+
+- auto autoSettingsReset asr(sui); // dtor calls sui->reset()
++
+
+ bool modeAdvanced = ui->actionAdvanced->isChecked();
+ qDebug() << "modeAdvanced-" << modeAdvanced;
diff --git a/desktop/searchmonkey/searchmonkey.SlackBuild b/desktop/searchmonkey/searchmonkey.SlackBuild
index ad3cfb261e..fe80e6f627 100644
--- a/desktop/searchmonkey/searchmonkey.SlackBuild
+++ b/desktop/searchmonkey/searchmonkey.SlackBuild
@@ -69,6 +69,7 @@ find -L . \
-exec chmod 644 {} \;
patch -p1 --verbose <$CWD/searchmonkey-2.0.0-gcc4.7.patch
+patch -p1 --verbose <$CWD/patch.txt
qmake \
QMAKE_CFLAGS="$SLKCFLAGS" \
diff --git a/desktop/ssr/README b/desktop/ssr/README
deleted file mode 100644
index c2c12e2b81..0000000000
--- a/desktop/ssr/README
+++ /dev/null
@@ -1,6 +0,0 @@
-SimpleScreenRecorder is a feature-rich screen recorder for Linux that supports
-X11 and OpenGL.
-
-For JACK audio support (requires jack) set JACK=TRUE.
-
-To build with Qt5 (requires qt5) set QT5=TRUE.
diff --git a/desktop/ssr/doinst.sh b/desktop/ssr/doinst.sh
deleted file mode 100644
index 726ffe403b..0000000000
--- a/desktop/ssr/doinst.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
diff --git a/desktop/ssr/slack-desc b/desktop/ssr/slack-desc
deleted file mode 100644
index 22f1467c53..0000000000
--- a/desktop/ssr/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-ssr: ssr (screen recorder)
-ssr:
-ssr: SimpleScreenRecorder is a feature-rich screen recorder for Linux.
-ssr:
-ssr:
-ssr:
-ssr:
-ssr:
-ssr:
-ssr:
-ssr:
diff --git a/desktop/ssr/ssr.SlackBuild b/desktop/ssr/ssr.SlackBuild
deleted file mode 100644
index 9e35e632c0..0000000000
--- a/desktop/ssr/ssr.SlackBuild
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-# SlackBuild script for ssr
-
-# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=ssr
-VERSION=${VERSION:-0.4.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir build
-cd build
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DWITH_PULSEAUDIO=TRUE \
- -DWITH_JACK="${JACK:-FALSE}" \
- -DWITH_QT5="${QT5:-FALSE}" \
- ..
-
- make install DESTDIR=$PKG
-cd -
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mv $PKG/usr/share/man $PKG/usr
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS.md CHANGELOG.md COPYING notes.txt README.md todo.txt \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/ssr/ssr.info b/desktop/ssr/ssr.info
deleted file mode 100644
index 3fd83cacf3..0000000000
--- a/desktop/ssr/ssr.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ssr"
-VERSION="0.4.2"
-HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/"
-DOWNLOAD="https://github.com/MaartenBaert/ssr/archive/0.4.2/ssr-0.4.2.tar.gz"
-MD5SUM="c43eb407d13006e0173f087ba5111214"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="ffmpeg"
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
diff --git a/desktop/suru-plus-icon-theme/README b/desktop/suru-plus-icon-theme/README
new file mode 100644
index 0000000000..bc31a6a5bb
--- /dev/null
+++ b/desktop/suru-plus-icon-theme/README
@@ -0,0 +1,3 @@
+Suru++ is a cyberpunkish, elegant, futuristic, macOS-like,
+Papirus-like and modern Suru icons based on Suru Icons
+by Sam Hewitt.
diff --git a/desktop/suru-plus-icon-theme/doinst.sh b/desktop/suru-plus-icon-theme/doinst.sh
new file mode 100644
index 0000000000..4110f5514d
--- /dev/null
+++ b/desktop/suru-plus-icon-theme/doinst.sh
@@ -0,0 +1,5 @@
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/desktop/suru-plus-icon-theme/slack-desc b/desktop/suru-plus-icon-theme/slack-desc
new file mode 100644
index 0000000000..97b1322469
--- /dev/null
+++ b/desktop/suru-plus-icon-theme/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+suru-plus-icon-theme: suru-plus-icon-theme (Extensive SVG icons set)
+suru-plus-icon-theme:
+suru-plus-icon-theme: Suru++ is a cyberpunkish, elegant, futuristic, macOS-like,
+suru-plus-icon-theme: Papirus-like and modern Suru icons based on Suru Icons
+suru-plus-icon-theme: by Sam Hewitt.
+suru-plus-icon-theme:
+suru-plus-icon-theme: homepage: https://github.com/gusbemacbe/suru-plus
+suru-plus-icon-theme:
+suru-plus-icon-theme:
+suru-plus-icon-theme:
+suru-plus-icon-theme:
diff --git a/desktop/suru-plus-icon-theme/suru-plus-icon-theme.SlackBuild b/desktop/suru-plus-icon-theme/suru-plus-icon-theme.SlackBuild
new file mode 100644
index 0000000000..665e22dc69
--- /dev/null
+++ b/desktop/suru-plus-icon-theme/suru-plus-icon-theme.SlackBuild
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+# Slackware build script for suru-plus-icon-theme
+
+# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=suru-plus-icon-theme
+SRCNAM=suru-plus
+VERSION=${VERSION:-30.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG $SRCNAM-$VERSION
+mkdir -p $PKG/usr/share/icons $OUTPUT
+cd $TMP
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cp -a eSuru++ Suru++ Suru++-Light $PKG/usr/share/icons/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING CREDITS LICENSE *.md tools $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/suru-plus-icon-theme/suru-plus-icon-theme.info b/desktop/suru-plus-icon-theme/suru-plus-icon-theme.info
new file mode 100644
index 0000000000..045be3da36
--- /dev/null
+++ b/desktop/suru-plus-icon-theme/suru-plus-icon-theme.info
@@ -0,0 +1,10 @@
+PRGNAM="suru-plus-icon-theme"
+VERSION="30.0"
+HOMEPAGE="https://github.com/gusbemacbe/suru-plus"
+DOWNLOAD="https://github.com/gusbemacbe/suru-plus/archive/v30.0/suru-plus-30.0.tar.gz"
+MD5SUM="aba1a105215425e843b60b8edae38241"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild b/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild
index fd27c5b191..4b3135bcda 100644
--- a/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild
+++ b/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=thunar-archive-plugin
-VERSION=${VERSION:-0.3.1}
+VERSION=${VERSION:-0.4.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/desktop/thunar-archive-plugin/thunar-archive-plugin.info b/desktop/thunar-archive-plugin/thunar-archive-plugin.info
index 7181974b68..88e6670e73 100644
--- a/desktop/thunar-archive-plugin/thunar-archive-plugin.info
+++ b/desktop/thunar-archive-plugin/thunar-archive-plugin.info
@@ -1,8 +1,8 @@
PRGNAM="thunar-archive-plugin"
-VERSION="0.3.1"
+VERSION="0.4.0"
HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
-DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.3/thunar-archive-plugin-0.3.1.tar.bz2"
-MD5SUM="425f4faaace6dc7a4716a35b7795463a"
+DOWNLOAD="http://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.4/thunar-archive-plugin-0.4.0.tar.bz2"
+MD5SUM="0a7738a3a5f84bf218ece3ffb5241c63"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="xarchiver"
diff --git a/desktop/thunar-dropbox/README b/desktop/thunar-dropbox/README
deleted file mode 100644
index 23795731f9..0000000000
--- a/desktop/thunar-dropbox/README
+++ /dev/null
@@ -1 +0,0 @@
-Thunar-dropbox is a Thunar plugin that adds context-menu items from dropbox.
diff --git a/desktop/thunar-dropbox/doinst.sh b/desktop/thunar-dropbox/doinst.sh
deleted file mode 100644
index 19400050fd..0000000000
--- a/desktop/thunar-dropbox/doinst.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
-
diff --git a/desktop/thunar-dropbox/slack-desc b/desktop/thunar-dropbox/slack-desc
deleted file mode 100644
index 2f60412719..0000000000
--- a/desktop/thunar-dropbox/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-thunar-dropbox: thunar-dropbox (dropbox plugin for thunar)
-thunar-dropbox:
-thunar-dropbox: Thunar Dropbox is a plugin for thunar that adds context-menu
-thunar-dropbox: items from dropbox.
-thunar-dropbox:
-thunar-dropbox: http://www.softwarebakery.com/maato/thunar-dropbox.html
-thunar-dropbox:
-thunar-dropbox:
-thunar-dropbox:
-thunar-dropbox:
-thunar-dropbox:
diff --git a/desktop/thunar-dropbox/thunar-dropbox.SlackBuild b/desktop/thunar-dropbox/thunar-dropbox.SlackBuild
deleted file mode 100644
index 0f9be96ad8..0000000000
--- a/desktop/thunar-dropbox/thunar-dropbox.SlackBuild
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Thunar Dropbox
-
-# Copyright 2010 Murat D. Kadirov <banderols@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-PRGNAM=thunar-dropbox
-VERSION=${VERSION:-0.2.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-./waf configure --prefix=/usr --libdir=/usr/lib${LIBDIRSUFFIX}
-./waf build
-./waf install --destdir=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/thunar-dropbox/thunar-dropbox.info b/desktop/thunar-dropbox/thunar-dropbox.info
deleted file mode 100644
index 1d8bd2a7f3..0000000000
--- a/desktop/thunar-dropbox/thunar-dropbox.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="thunar-dropbox"
-VERSION="0.2.1"
-HOMEPAGE="http://www.softwarebakery.com/maato/thunar-dropbox.html"
-DOWNLOAD="http://www.softwarebakery.com/maato/files/thunar-dropbox/thunar-dropbox-0.2.1.tar.bz2"
-MD5SUM="52bb2caa26afaf80835a56b9ad3d2155"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Murat D. Kadirov"
-EMAIL="banderols@gmail.com"
diff --git a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.patch b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.patch
deleted file mode 100644
index 78db9be2b6..0000000000
--- a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Nur thunar-media-tags-plugin-0.2.1.orig/configure thunar-media-tags-plugin-0.2.1/configure
---- thunar-media-tags-plugin-0.2.1.orig/configure 2013-05-11 04:57:03.000000000 -0500
-+++ thunar-media-tags-plugin-0.2.1/configure 2013-06-17 01:40:43.467622887 -0500
-@@ -14529,45 +14529,7 @@
-
- TAGLIBC_LIBS=""
- TAGLIBC_CFLAGS=""
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for taglib_file_new in -ltag_c" >&5
--$as_echo_n "checking for taglib_file_new in -ltag_c... " >&6; }
--if ${ac_cv_lib_tag_c_taglib_file_new+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltag_c $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char taglib_file_new ();
--int
--main ()
--{
--return taglib_file_new ();
-- ;
-- return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_lib_tag_c_taglib_file_new=yes
--else
-- ac_cv_lib_tag_c_taglib_file_new=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tag_c_taglib_file_new" >&5
--$as_echo "$ac_cv_lib_tag_c_taglib_file_new" >&6; }
--if test "x$ac_cv_lib_tag_c_taglib_file_new" = xyes; then :
--
-- ac_fn_c_check_header_mongrel "$LINENO" "taglib/tag_c.h" "ac_cv_header_taglib_tag_c_h" "$ac_includes_default"
-+ac_fn_c_check_header_mongrel "$LINENO" "taglib/tag_c.h" "ac_cv_header_taglib_tag_c_h" "$ac_includes_default"
- if test "x$ac_cv_header_taglib_tag_c_h" = xyes; then :
-
- TAGLIBC_LIBS="-ltag_c"
-@@ -14579,10 +14541,6 @@
-
-
-
--else
-- -lm
--fi
--
-
-
-
diff --git a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.patch b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.patch
new file mode 100644
index 0000000000..2d626e0ddd
--- /dev/null
+++ b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.patch
@@ -0,0 +1,61 @@
+diff -Naur thunar-media-tags-plugin-0.3.0.orig/configure thunar-media-tags-plugin-0.3.0/configure
+--- thunar-media-tags-plugin-0.3.0.orig/configure 2018-02-14 21:50:48.000000000 +0100
++++ thunar-media-tags-plugin-0.3.0/configure 2019-08-29 09:11:23.390608000 +0200
+@@ -15292,45 +15292,8 @@
+
+ TAGLIBC_LIBS=""
+ TAGLIBC_CFLAGS=""
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for taglib_file_new in -ltag_c" >&5
+-$as_echo_n "checking for taglib_file_new in -ltag_c... " >&6; }
+-if ${ac_cv_lib_tag_c_taglib_file_new+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltag_c $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char taglib_file_new ();
+-int
+-main ()
+-{
+-return taglib_file_new ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_tag_c_taglib_file_new=yes
+-else
+- ac_cv_lib_tag_c_taglib_file_new=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tag_c_taglib_file_new" >&5
+-$as_echo "$ac_cv_lib_tag_c_taglib_file_new" >&6; }
+-if test "x$ac_cv_lib_tag_c_taglib_file_new" = xyes; then :
+
+- ac_fn_c_check_header_mongrel "$LINENO" "taglib/tag_c.h" "ac_cv_header_taglib_tag_c_h" "$ac_includes_default"
++ac_fn_c_check_header_mongrel "$LINENO" "taglib/tag_c.h" "ac_cv_header_taglib_tag_c_h" "$ac_includes_default"
+ if test "x$ac_cv_header_taglib_tag_c_h" = xyes; then :
+
+ TAGLIBC_LIBS="-ltag_c"
+@@ -15342,10 +15305,6 @@
+
+
+
+-else
+- -lm
+-fi
+-
+
+
+
diff --git a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.SlackBuild b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.SlackBuild
index d2837715b7..6ca665ed24 100644
--- a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.SlackBuild
+++ b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=thunar-media-tags-plugin
-VERSION=${VERSION:-0.2.1}
+VERSION=${VERSION:-0.3.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -70,7 +70,7 @@ find -L . \
-exec chmod 644 {} \;
# Fix taglib linking - thanks, Roberto Neri! :)
-patch -p1 < $CWD/thunar-media-tags-plugin-0.2.1.patch
+patch -p1 < $CWD/thunar-media-tags-plugin-0.3.0.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.info b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.info
index 4c2c75bd65..9c9c226e6d 100644
--- a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.info
+++ b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.info
@@ -1,8 +1,8 @@
PRGNAM="thunar-media-tags-plugin"
-VERSION="0.2.1"
+VERSION="0.3.0"
HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin"
-DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-media-tags-plugin/0.2/thunar-media-tags-plugin-0.2.1.tar.bz2"
-MD5SUM="0106e900714f86ccbafdc72238d3cf8d"
+DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-media-tags-plugin/0.3/thunar-media-tags-plugin-0.3.0.tar.bz2"
+MD5SUM="5e332113e4b0e548ee7abd87629667f7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild b/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild
index 80e9013173..187524a742 100644
--- a/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild
+++ b/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=thunar-vcs-plugin
-VERSION=${VERSION:-0.1.5}
+VERSION=${VERSION:-0.2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/desktop/thunar-vcs-plugin/thunar-vcs-plugin.info b/desktop/thunar-vcs-plugin/thunar-vcs-plugin.info
index c3bc3fadd6..d2a9625e7e 100644
--- a/desktop/thunar-vcs-plugin/thunar-vcs-plugin.info
+++ b/desktop/thunar-vcs-plugin/thunar-vcs-plugin.info
@@ -1,8 +1,8 @@
PRGNAM="thunar-vcs-plugin"
-VERSION="0.1.5"
+VERSION="0.2.0"
HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin"
-DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-vcs-plugin/0.1/thunar-vcs-plugin-0.1.5.tar.bz2"
-MD5SUM="2dd39b28039430c3b3c568c12672441f"
+DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-vcs-plugin/0.2/thunar-vcs-plugin-0.2.0.tar.bz2"
+MD5SUM="e19cca5efdab3ad38ed4cb99dfd8afe8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/desktop/vala-panel-appmenu/vala-panel-appmenu.SlackBuild b/desktop/vala-panel-appmenu/vala-panel-appmenu.SlackBuild
index 84fcee6489..15ebf56467 100644
--- a/desktop/vala-panel-appmenu/vala-panel-appmenu.SlackBuild
+++ b/desktop/vala-panel-appmenu/vala-panel-appmenu.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=vala-panel-appmenu
-VERSION=${VERSION:-0.5.6}
+VERSION=${VERSION:-20191009_060f7ac}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -69,6 +69,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i "s|X11\ WAYLAND|X11|" CMakeLists.txt
+sed -i "s|\ \${WAYLAND_INCLUDE}||" subprojects/appmenu-gtk-module/src/CMakeLists.txt
mkdir -p build
cd build
cmake \
diff --git a/desktop/vala-panel-appmenu/vala-panel-appmenu.info b/desktop/vala-panel-appmenu/vala-panel-appmenu.info
index 6f74381b18..a4c512de18 100644
--- a/desktop/vala-panel-appmenu/vala-panel-appmenu.info
+++ b/desktop/vala-panel-appmenu/vala-panel-appmenu.info
@@ -1,8 +1,8 @@
PRGNAM="vala-panel-appmenu"
-VERSION="0.5.6"
+VERSION="20191009_060f7ac"
HOMEPAGE="https://github.com/rilian-la-te/vala-panel-appmenu"
-DOWNLOAD="https://github.com/rilian-la-te/vala-panel-appmenu/releases/download/0.5.6/vala-panel-appmenu-0.5.6.tar.gz"
-MD5SUM="0ec763e3fa1a8e1179868dfa4c522f4a"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/vala-panel-appmenu-20191009_060f7ac.tar.xz"
+MD5SUM="faaffc16f9f5872ee60e8c0891b44b51"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="vala bamf"
diff --git a/desktop/wbar/wbar.SlackBuild b/desktop/wbar/wbar.SlackBuild
index 09fd3d2bc5..d16ff8a236 100644
--- a/desktop/wbar/wbar.SlackBuild
+++ b/desktop/wbar/wbar.SlackBuild
@@ -74,7 +74,7 @@ find -L . \
sed -i 's|pidof|/sbin/pidof|g' src/config/Run.cc
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -Wno-error=literal-suffix" \
./configure \
--prefix=/usr \
--exec-prefix=/usr \
diff --git a/desktop/weston/README b/desktop/weston/README
index 5c0ccf7dcc..19af6655a8 100644
--- a/desktop/weston/README
+++ b/desktop/weston/README
@@ -1,11 +1,3 @@
-Weston: reference implementation of a Wayland compositor.
-==========================================================
-
-This README is current as of Weston 7.0.0.
-
-Introduction
-------------
-
Weston is the reference implementation of a Wayland compositor, as well
as a useful environment in and of itself.
@@ -19,84 +11,8 @@ A small suite of example or demo clients are also provided: though they
can be useful in themselves, their main purpose is to be an example or
test case for others building compositors or clients.
+This is the bleeding edge version of this SlackBuild that is ONLY compatible
+with Slackware Current which has been relatively newly PAM-ified as of the
+time of writing (May, 2020).
-Slackware-specific Information
-------------------------------
-
-*****************************************
-IMPORTANT: MANUAL INTERVENTION REQUIRED.
-*****************************************
-
-This SlackBuild of Weston takes a fairly "hands off" approach, and there
-are a few things users need to be aware of.
-
-Firstly, it is, by default, patched to remove the PAM dependency. This
-necessitates the elimination of the "-u" option of `weston-launch`, as
-PAM is required for that feature to function.
-
-To launch Weston, here are some required steps.
-
-1. You must add a group to your system called "weston-launch". You may
-do so, for instance, by running the following as root:
-
- # groupadd weston-launch
-
-2. Add users to the "weston-launch" group that you would like to be able
-to run weston-launch:
-
- # usermod -a -G weston-launch $USER
-
-3. The `weston-launch` must be setuid root. This comes with the standard
-warnings associated with doing so.
-
- # chmod +s /usr/bin/weston-launch
-
-4. If you do not have another script exporting XDG_RUNTIME_DIR, you
-should enable the one that comes with this SlackBuild:
-
- # chmod +x /etc/profile.d/weston.sh
- (or .csh, depending on your shell)
-
-Once you've logged out and back in as a normal user that has been added to the
-"weston-launch" group from a virtual console, you should be able to run
-`weston-launch` from that virtual console, and Weston will then launch and run
-directly in that console.
-
-You can use the Ctrl+Alt+Backspace keyboard combination to kill Weston.
-
-
-PAM
----
-
-Ordinarily, PAM is a mandatory dependency for Weston. This SlackBuild of
-Weston is, by default, patched to remove that dependency. If you happen to
-have PAM installed on your system and would like to build Weston with PAM
-support, make sure the USE_PAM variable is set to "true" (nb: nothing else,
-such as "1", "yes", "on", etc. will work) before running the SlackBuild.
-For example:
-
- # USE_PAM=true ./weston.SlackBuild
-
-
-Optional Dependencies
----------------------
-
-Above and beyond the hard dependencies listed in the .info file, Weston
-contains many optional dependencies. Kindly consult the documentation
-for a complete list.
-
-At the present time, the only optional dependency that this SlackBuild
-accounts for is colord, which is disabled by default. That is because
-colord pulls in many large dependencies, most of which are present on
--current (at the time of writing) but not on 14.2, so disabling it seems
-like a sensible default on a balance of convenience.
-
-If you would like to enable colord functionality in this SlackBuild,
-set the USE_COLORD variable to "true" before running the SlackBuild.
-
-
-Known Issues
-------------
-
-I have not had success getting Weston to launch with the proprietary nvidia
-drivers in use. YMMV. I have had the best luck with the Intel KMS drivers.
+Please see README.SBo for more detailed instructions and information.
diff --git a/desktop/weston/README.SBo b/desktop/weston/README.SBo
new file mode 100644
index 0000000000..4d1f41110b
--- /dev/null
+++ b/desktop/weston/README.SBo
@@ -0,0 +1,112 @@
+Weston: reference implementation of a Wayland compositor.
+==========================================================
+
+This README is current as of Weston 8.0.0.
+
+*** NOTE ***
+------------
+
+This is the bleeding edge version of this SlackBuild that is ONLY compatible
+with Slackware Current which has been relatively newly PAM-ified as of the
+time of writing (May, 2020).
+
+If you are running Slackware stable (14.2 at the time of writing), you are NOT
+in the right place. Please utilize the Slackbuild from slackbuilds.org ( git:
+https://git.slackbuilds.org/slackbuilds/ ).
+
+In addition to this SlackBuild not working unless your Slackware install is
+PAM-ified, Weston >= 8.0.0 will not work on Slackware 14.2 as the graphics
+stack is simply too old.
+
+Introduction
+------------
+
+Weston is the reference implementation of a Wayland compositor, as well
+as a useful environment in and of itself.
+
+Out of the box, Weston provides a very basic desktop, or a full-featured
+environment for non-desktop uses such as automotive, embedded,
+in-flight, industrial, kiosks, set-top boxes and TVs. It also provides a
+library allowing other projects to build their own full-featured
+environments on top of Weston's core.
+
+A small suite of example or demo clients are also provided: though they
+can be useful in themselves, their main purpose is to be an example or
+test case for others building compositors or clients.
+
+
+Slackware-specific Information
+------------------------------
+
+*****************************************
+IMPORTANT: MANUAL INTERVENTION REQUIRED.
+*****************************************
+
+This SlackBuild of Weston takes a fairly "hands off" approach, and there
+are a few things users need to be aware of.
+
+To launch Weston, here are some required steps.
+
+Please note that setting weston-launch suid root is NOT required any longer
+under PAM-ified Slackware Current.
+
+1. If you do not have another script exporting XDG_RUNTIME_DIR, you
+should enable the one that comes with this SlackBuild:
+
+ # chmod +x /etc/profile.d/weston.sh
+ (or .csh, depending on your shell)
+
+(NOTE: You may want to grep your /etc/profile.d directory for other
+scripts setting XDG_RUNTIME_DIR before doing this. AlienBob's ktown Plasma5
+install, for instance, already includes a script that sets up XDG_RUNTIME_DIR,
+so doubling up by doing Step 1 above may cause unwanted behaviour.)
+
+
+2. Logout (if necessary) and re-login as root.
+
+Once you've logged out and back in as root, run:
+
+ `exec weston-launch -u $USER`
+
+where $USER is the username of the normal user you would like to launch Weston
+as.
+
+To launch with Xwayland support, run:
+
+ `exec weston-launch -u $USER -- --xwayland`
+
+You can use the Ctrl+Alt+Backspace keyboard combination to kill Weston.
+
+
+Optional Dependencies
+---------------------
+
+At the present time, the only optional dependency for this SlackBuild is
+colord, which is disabled by default. That is because colord pulls in many
+dependencies, while building Weston without colord requires no dependencies at
+all on Slackware current, which may be more desirable for users that just want
+to quickly test out Wayland by getting Weston up and running.
+
+If you would like to enable colord functionality in this SlackBuild,
+set the USE_COLORD variable to "true" before running the SlackBuild.
+
+
+Known Issues
+------------
+
+* I have not had success getting Weston to launch with the proprietary nvidia
+drivers in use. YMMV. I have had the best luck with the Intel KMS drivers.
+
+* In testing 8.0.0 on the newly PAM-ified Slackware current, I have found that
+after running Ctrl+Alt+Backspace to quit, I am brought back to a blank,
+black screen. If this happens, try waiting a few seconds and then hit
+Ctrl+Alt+F2 (for instance) followed by Ctrl+Alt+F1 to get back to the console.
+
+* I want to stress and emphasize that this is still relatively experimental
+software, that talks to your hardware at a fairly low level. For the most
+part, I have not had any major issues, but I have seen some odd bugs and
+behaviour, including Weston hard-locking my system upon exit and having to
+reboot. I have also returned to my shell to find that some keystrokes I had
+inputted while using Weston had been inputted into my console with a series of
+"Command not found" errors. I do not believe Weston has been widely tested on
+non-systemd/logind systems such as Slackware. Use at your own risk.
diff --git a/desktop/weston/weston-7.0.0-nopam.patch b/desktop/weston/weston-7.0.0-nopam.patch
deleted file mode 100644
index 8ad7b3639c..0000000000
--- a/desktop/weston/weston-7.0.0-nopam.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -Naur weston-7.0.0.orig/libweston/meson.build weston-7.0.0/libweston/meson.build
---- weston-7.0.0.orig/libweston/meson.build 2019-08-23 16:59:16.000000000 -0400
-+++ weston-7.0.0/libweston/meson.build 2019-10-17 22:22:55.415927653 -0400
-@@ -199,16 +199,11 @@
- )
-
- if get_option('weston-launch')
-- dep_pam = cc.find_library('pam')
--
-- if not cc.has_function('pam_open_session', dependencies: dep_pam)
-- error('pam_open_session not found for weston-launch')
-- endif
-
- executable(
- 'weston-launch',
- 'weston-launch.c',
-- dependencies: [dep_pam, systemd_dep, dep_libdrm],
-+ dependencies: [systemd_dep, dep_libdrm],
- include_directories: include_directories('..'),
- install: true
- )
-diff -Naur weston-7.0.0.orig/libweston/weston-launch.c weston-7.0.0/libweston/weston-launch.c
---- weston-7.0.0.orig/libweston/weston-launch.c 2019-08-23 16:59:16.000000000 -0400
-+++ weston-7.0.0/libweston/weston-launch.c 2019-10-17 22:52:18.991891665 -0400
-@@ -51,7 +51,6 @@
-
- #include <pwd.h>
- #include <grp.h>
--#include <security/pam_appl.h>
-
- #ifdef HAVE_SYSTEMD_LOGIN
- #include <systemd/sd-login.h>
-@@ -100,8 +99,6 @@
- #endif
-
- struct weston_launch {
-- struct pam_conv pc;
-- pam_handle_t *ph;
- int tty;
- int ttynr;
- int sock[2];
-@@ -193,47 +190,6 @@
- }
-
- static int
--pam_conversation_fn(int msg_count,
-- const struct pam_message **messages,
-- struct pam_response **responses,
-- void *user_data)
--{
-- return PAM_SUCCESS;
--}
--
--static int
--setup_pam(struct weston_launch *wl)
--{
-- int err;
--
-- wl->pc.conv = pam_conversation_fn;
-- wl->pc.appdata_ptr = wl;
--
-- err = pam_start("login", wl->pw->pw_name, &wl->pc, &wl->ph);
-- if (err != PAM_SUCCESS) {
-- fprintf(stderr, "failed to start pam transaction: %d: %s\n",
-- err, pam_strerror(wl->ph, err));
-- return -1;
-- }
--
-- err = pam_set_item(wl->ph, PAM_TTY, ttyname(wl->tty));
-- if (err != PAM_SUCCESS) {
-- fprintf(stderr, "failed to set PAM_TTY item: %d: %s\n",
-- err, pam_strerror(wl->ph, err));
-- return -1;
-- }
--
-- err = pam_open_session(wl->ph, 0);
-- if (err != PAM_SUCCESS) {
-- fprintf(stderr, "failed to open pam session: %d: %s\n",
-- err, pam_strerror(wl->ph, err));
-- return -1;
-- }
--
-- return 0;
--}
--
--static int
- setup_launcher_socket(struct weston_launch *wl)
- {
- if (socketpair(AF_LOCAL, SOCK_SEQPACKET, 0, wl->sock) < 0) {
-@@ -431,14 +387,6 @@
- close(wl->signalfd);
- close(wl->sock[0]);
-
-- if (wl->new_user) {
-- err = pam_close_session(wl->ph, 0);
-- if (err)
-- fprintf(stderr, "pam_close_session failed: %d: %s\n",
-- err, pam_strerror(wl->ph, err));
-- pam_end(wl->ph, err);
-- }
--
- if (ioctl(wl->tty, KDSKBMUTE, 0) &&
- ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
- fprintf(stderr, "failed to restore keyboard mode: %s\n",
-@@ -660,15 +608,6 @@
- setenv("HOME", wl->pw->pw_dir, 1);
- setenv("SHELL", wl->pw->pw_shell, 1);
-
-- env = pam_getenvlist(wl->ph);
-- if (env) {
-- for (i = 0; env[i]; ++i) {
-- if (putenv(env[i]) != 0)
-- fprintf(stderr, "putenv %s failed\n", env[i]);
-- }
-- free(env);
-- }
--
- /*
- * We open a new session, so it makes sense
- * to run a new login shell
-@@ -739,8 +678,6 @@
- help(const char *name)
- {
- fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
-- fprintf(stderr, " -u, --user Start session as specified username,\n"
-- " e.g. -u joe, requires root.\n");
- fprintf(stderr, " -t, --tty Start session on alternative tty,\n"
- " e.g. -t /dev/tty4, requires -u option.\n");
- fprintf(stderr, " -v, --verbose Be verbose\n");
-@@ -754,7 +691,6 @@
- int i, c;
- char *tty = NULL;
- struct option opts[] = {
-- { "user", required_argument, NULL, 'u' },
- { "tty", required_argument, NULL, 't' },
- { "verbose", no_argument, NULL, 'v' },
- { "help", no_argument, NULL, 'h' },
-@@ -766,11 +702,7 @@
- while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
- switch (c) {
- case 'u':
-- wl.new_user = optarg;
-- if (getuid() != 0) {
-- fprintf(stderr, "weston: Permission denied. -u allowed for root only\n");
-- exit(EXIT_FAILURE);
-- }
-+ fprintf(stderr, "weston: -u is unsupported in this weston-launch build\n");
- break;
- case 't':
- tty = optarg;
-@@ -822,9 +754,6 @@
- if (setup_tty(&wl, tty) < 0)
- exit(EXIT_FAILURE);
-
-- if (wl.new_user && setup_pam(&wl) < 0)
-- exit(EXIT_FAILURE);
--
- if (setup_launcher_socket(&wl) < 0)
- exit(EXIT_FAILURE);
-
diff --git a/desktop/weston/weston.SlackBuild b/desktop/weston/weston.SlackBuild
index d44a73d774..b3a5c474cc 100644
--- a/desktop/weston/weston.SlackBuild
+++ b/desktop/weston/weston.SlackBuild
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=weston
-VERSION=${VERSION:-7.0.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-8.0.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -60,19 +60,9 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
-# If you have PAM installed on your system and would like to make use
-# of it, run this as USE_PAM=true ./weston.Slackbuild
-# otherwise, a patch will be applied to remove the PAM dependency.
-
-USE_PAM=${USE_PAM:-false}
-
-if [ "$USE_PAM" != 'true' ]; then
- patch -p1 < $CWD/weston-7.0.0-nopam.patch
-fi
-
# Make sure ownerships and permissions are sane:
chown -R root:root .
find -L . \
@@ -189,9 +179,9 @@ EOF
# Install some documentation and finish up.
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README.md CONTRIBUTING.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING.md COPYING DCO-1.1.txt README.md notes.txt $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
+cat $CWD/README.SBo > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/weston/weston.info b/desktop/weston/weston.info
index b9bf225c8f..2b0bfddeb7 100644
--- a/desktop/weston/weston.info
+++ b/desktop/weston/weston.info
@@ -1,10 +1,10 @@
PRGNAM="weston"
-VERSION="7.0.0"
+VERSION="8.0.0"
HOMEPAGE="https://wayland.freedesktop.org/"
-DOWNLOAD="https://wayland.freedesktop.org/releases/weston-7.0.0.tar.xz"
-MD5SUM="cbfda483bc2501d0831af3f33c707850"
+DOWNLOAD="https://github.com/wayland-project/weston/archive/8.0.0/weston-8.0.0.tar.gz"
+MD5SUM="f8a67cd7902589e7a4e33b008ca88757"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="libinput libwebp libxkbcommon wayland wayland-protocols"
+REQUIRES=""
MAINTAINER="Logan Rathbone"
EMAIL="poprocks@gmail.com"
diff --git a/desktop/wmCalClock/wmCalClock.SlackBuild b/desktop/wmCalClock/wmCalClock.SlackBuild
index b742c2b5bf..e9d2116c19 100644
--- a/desktop/wmCalClock/wmCalClock.SlackBuild
+++ b/desktop/wmCalClock/wmCalClock.SlackBuild
@@ -54,7 +54,7 @@ find -L . \
cd Src
make \
- CFLAGS="$SLKCFLAGS" \
+ CFLAGS="$SLKCFLAGS -fcommon" \
INCDIR="-I/usr/include/X11" \
LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11"
mkdir -p $PKG/usr/{bin,man/man1}
diff --git a/desktop/wmMoonClock/wmMoonClock.SlackBuild b/desktop/wmMoonClock/wmMoonClock.SlackBuild
index 72d0829603..897b14e6e2 100644
--- a/desktop/wmMoonClock/wmMoonClock.SlackBuild
+++ b/desktop/wmMoonClock/wmMoonClock.SlackBuild
@@ -56,7 +56,7 @@ find -L . \
cd Src
mkdir -p $PKG/usr/{bin,man/man1}
make \
- CFLAGS="$SLKCFLAGS" \
+ CFLAGS="$SLKCFLAGS -fcommon" \
INCDIR="-I/usr/include/X11" \
LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11"
make install DESTDIR=$PKG/usr
diff --git a/desktop/wmSun/wmSun.SlackBuild b/desktop/wmSun/wmSun.SlackBuild
index abd74e5aeb..b8e5395186 100644
--- a/desktop/wmSun/wmSun.SlackBuild
+++ b/desktop/wmSun/wmSun.SlackBuild
@@ -55,7 +55,7 @@ find -L . \
cd wmSun
mkdir -p $PKG/usr/{bin,man/man1}
make \
- COPTS="$SLKCFLAGS" \
+ COPTS="$SLKCFLAGS -fcommon" \
INCDIR="-I/usr/include/X11" \
LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11"
make install DESTDIR=$PKG/usr
diff --git a/desktop/wmakerconf/README b/desktop/wmakerconf/README
deleted file mode 100644
index 4853bb11a7..0000000000
--- a/desktop/wmakerconf/README
+++ /dev/null
@@ -1,4 +0,0 @@
-WMakerConf (short for Window Maker Configurator) is a configuration
-utility for the Window Maker window manager.
-
-WMakerConf requires WindowMaker to be installed (it's part of Slackware).
diff --git a/desktop/wmakerconf/doinst.sh b/desktop/wmakerconf/doinst.sh
deleted file mode 100644
index 2e82bb7622..0000000000
--- a/desktop/wmakerconf/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
-fi
diff --git a/desktop/wmakerconf/slack-desc b/desktop/wmakerconf/slack-desc
deleted file mode 100644
index 60fed0e4d6..0000000000
--- a/desktop/wmakerconf/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-wmakerconf: wmakerconf (GTK+ based configuration tool for Window Maker)
-wmakerconf:
-wmakerconf: WMakerConf (short for Window Maker Configurator) is a configuration
-wmakerconf: utility for the Window Maker window manager.
-wmakerconf:
-wmakerconf: homepage: http://wmakerconf.sourceforge.net
-wmakerconf:
-wmakerconf:
-wmakerconf:
-wmakerconf:
-wmakerconf:
diff --git a/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch b/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch
deleted file mode 100644
index 5b598c3c15..0000000000
--- a/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur wmakerconf-2.12.orig/src/menu.c wmakerconf-2.12/src/menu.c
---- wmakerconf-2.12.orig/src/menu.c 2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/menu.c 2012-02-10 17:35:03.917287748 +0100
-@@ -500,10 +500,10 @@
- * No return value.
- */
- {
-- if (!WMWritePropListToFile (orig_wmaker, orig_wmaker_fname, YES))
-+ if (!WMWritePropListToFile(orig_wmaker, orig_wmaker_fname))
- warning (_("Can't revert to backupfile of `WindowMaker'. "
- "Please manually revert from file WindowMaker.bak."));
-- if (orig_rootmenu && !WMWritePropListToFile (orig_rootmenu, orig_rootmenu_fname, YES))
-+ if (orig_rootmenu && !WMWritePropListToFile(orig_rootmenu, orig_rootmenu_fname))
- warning (_("Can't revert to backupfile of `WMRootMenu'. "
- "Please manually revert from file WMRootMenu.bak."));
- gtk_main_quit ();
-diff -Naur wmakerconf-2.12.orig/src/rootmenu.c wmakerconf-2.12/src/rootmenu.c
---- wmakerconf-2.12.orig/src/rootmenu.c 2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/rootmenu.c 2012-02-10 17:35:03.929287391 +0100
-@@ -365,7 +365,7 @@
- node_freeitem, NULL);
- g_node_destroy (node);
-
-- if (WMWritePropListToFile (menu, filename, YES))
-+ if (WMWritePropListToFile(menu, filename))
- {
- menu_changed = NO;
- message (_("Window Maker root menu file '%s' saved."), filename);
-diff -Naur wmakerconf-2.12.orig/src/themebrowser.c wmakerconf-2.12/src/themebrowser.c
---- wmakerconf-2.12.orig/src/themebrowser.c 2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/themebrowser.c 2012-02-10 17:35:56.515722786 +0100
-@@ -2705,7 +2705,7 @@
- oldfiles = g_list_remove (oldfiles, tmp);
- Free (tmp);
- }
-- if (!WMWritePropListToFile (theme, stylename, YES))
-+ if (!WMWritePropListToFile(theme, stylename))
- {
- dialog_popup (DIALOG_ERROR, NULL, NULL,
- _("Can't save theme file\n`%s'\n"
-diff -Naur wmakerconf-2.12.orig/src/window.c wmakerconf-2.12/src/window.c
---- wmakerconf-2.12.orig/src/window.c 2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/window.c 2012-02-10 17:35:03.953286677 +0100
-@@ -1069,7 +1069,7 @@
- WMReleasePropList (all_keys);
- }
-
-- if (WMWritePropListToFile (newwm, orig_wmaker_fname, YES))
-+ if (WMWritePropListToFile(newwm, orig_wmaker_fname))
- {
- changed = NO;
- message (_("Window Maker config file '%s' saved."),
-diff -Naur wmakerconf-2.12.orig/src/wmconfig.c wmakerconf-2.12/src/wmconfig.c
---- wmakerconf-2.12.orig/src/wmconfig.c 2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/wmconfig.c 2012-02-10 17:35:03.957286559 +0100
-@@ -216,7 +216,7 @@
- /*
- * Generate backup file "'path'.bak"
- */
-- if (WMWritePropListToFile (orig_rootmenu, new, YES))
-+ if (WMWritePropListToFile(orig_rootmenu, new))
- message (_("Backupfile `%s' generated."), new);
- else
- error (_("Can't write backupfile `%s'."), new);
-@@ -280,7 +280,7 @@
- if (!windowmaker)
- {
- windowmaker = global_windowmaker;
-- if (WMWritePropListToFile (windowmaker, orig_wmaker_fname, YES))
-+ if (WMWritePropListToFile(windowmaker, orig_wmaker_fname))
- warning (_("New WindowMaker configuration file `%s' created."),
- orig_wmaker_fname);
- else
-@@ -294,7 +294,7 @@
- /*
- * Generate backup file "'path'.bak"
- */
-- if (WMWritePropListToFile (windowmaker, new, YES))
-+ if (WMWritePropListToFile(windowmaker, new))
- message (_("Backupfile `%s' generated."), new);
- else
- error (_("Can't write backupfile `%s'."), new);
diff --git a/desktop/wmakerconf/wmakerconf.SlackBuild b/desktop/wmakerconf/wmakerconf.SlackBuild
deleted file mode 100644
index a971aba9b7..0000000000
--- a/desktop/wmakerconf/wmakerconf.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for wmakerconf
-# Written by Cezary M. Kruk (c.kruk@bigfoot.com)
-#
-# Modified by the SlackBuilds.org project.
-
-PRGNAM=wmakerconf
-VERSION=${VERSION:-2.12}
-BUILD=${BUILD:-3}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Fix for building over windowmaer >= 0.95.2
-# http://sourceforge.net/tracker/?func=detail&aid=3522083&group_id=196469&atid=957581
-patch -p1 < $CWD/wmakerconf-2.12-wmaker-0.95_support.patch
-
-# Fix linking to X11 libs
-sed -e "/^LIBS =/s/$/ -lX11/" -i src/Makefile.in
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --with-wmakeretcprefix=/etc/X11 \
- --localstatedir=/var \
- --mandir=/usr/man \
- --disable-debug \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS COPYING ChangeLog INSTALL MANUAL NEWS NLS-TEAM1 README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmakerconf/wmakerconf.info b/desktop/wmakerconf/wmakerconf.info
deleted file mode 100644
index 4052e2da2e..0000000000
--- a/desktop/wmakerconf/wmakerconf.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="wmakerconf"
-VERSION="2.12"
-HOMEPAGE="http://wmakerconf.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/wmakerconf/wmakerconf_2.12.tar.gz"
-MD5SUM="252114b5ee5fc5bec99477497ee045cc"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Cezary M. Kruk"
-EMAIL="c.kruk@bigfoot.com"
diff --git a/desktop/wminfo/wminfo.SlackBuild b/desktop/wminfo/wminfo.SlackBuild
index 4ee642a4b6..5058af6cb2 100644
--- a/desktop/wminfo/wminfo.SlackBuild
+++ b/desktop/wminfo/wminfo.SlackBuild
@@ -56,7 +56,7 @@ cd wminfo
./configure --prefix=/usr
make \
LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" \
- CFLAGS="$SLKCFLAGS -fgnu89-inline"
+ CFLAGS="$SLKCFLAGS -fgnu89-inline -fcommon"
# Copy executable to the correct location
mkdir -p $PKG/usr/bin
diff --git a/desktop/wmsm.app/wmsm.app.SlackBuild b/desktop/wmsm.app/wmsm.app.SlackBuild
index f11e4996e2..9c4f7eb1f1 100644
--- a/desktop/wmsm.app/wmsm.app.SlackBuild
+++ b/desktop/wmsm.app/wmsm.app.SlackBuild
@@ -54,7 +54,7 @@ find -L . \
cd wmsm
make \
- CFLAGS="$SLKCFLAGS -fgnu89-inline" \
+ CFLAGS="$SLKCFLAGS -fgnu89-inline -fcommon" \
INCDIR="-I/usr/include/X11" \
LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11"
# Executable is copied to the correct location
diff --git a/desktop/wmtop/wmtop.SlackBuild b/desktop/wmtop/wmtop.SlackBuild
index 26413c4b92..3434d0a1de 100644
--- a/desktop/wmtop/wmtop.SlackBuild
+++ b/desktop/wmtop/wmtop.SlackBuild
@@ -56,7 +56,7 @@ make \
PREFIX=/usr \
INCS="-I/usr/include" \
LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" \
- OPTS="$SLKCFLAGS -fgnu89-inline" \
+ OPTS="$SLKCFLAGS -fgnu89-inline -fcommon" \
linux
mkdir -p $PKG/usr/bin $PKG/usr/man/man1
diff --git a/desktop/wmweather/wmweather.SlackBuild b/desktop/wmweather/wmweather.SlackBuild
index b7f8d24235..5f347e662a 100644
--- a/desktop/wmweather/wmweather.SlackBuild
+++ b/desktop/wmweather/wmweather.SlackBuild
@@ -51,7 +51,7 @@ find -L . \
-exec chmod 644 {} \;
cd src
- CFLAGS="$SLKCFLAGS" \
+ CFLAGS="$SLKCFLAGS -fcommon" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/desktop/workrave/README b/desktop/workrave/README
new file mode 100644
index 0000000000..446e900f7e
--- /dev/null
+++ b/desktop/workrave/README
@@ -0,0 +1,4 @@
+Workrave is a program that assists in the recovery and prevention of
+Repetitive Strain Injury (RSI).
+The program frequently alerts you to take micro-pauses, rest breaks
+and restricts you to your daily limit.
diff --git a/desktop/workrave/doinst.sh b/desktop/workrave/doinst.sh
new file mode 100644
index 0000000000..b34040d04c
--- /dev/null
+++ b/desktop/workrave/doinst.sh
@@ -0,0 +1,19 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+# If other icon themes are installed, then add to/modify this as needed
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
+
+if [ -e usr/share/glib-2.0/schemas ]; then
+ if [ -x /usr/bin/glib-compile-schemas ]; then
+ /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+ fi
+fi
+
+# If needed -- be sure to sed @LIBDIR@ inside the build script
+chroot . /usr/bin/gio-querymodules @LIBDIR@/gio/modules/ 1> /dev/null 2> /dev/null
diff --git a/desktop/workrave/slack-desc b/desktop/workrave/slack-desc
new file mode 100644
index 0000000000..a6374fc7cf
--- /dev/null
+++ b/desktop/workrave/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+workrave: workrave (work breaks alerts)
+workrave:
+workrave: Workrave is a program that assists in the recovery and prevention of
+workrave: Repetitive Strain Injury (RSI).
+workrave: The program frequently alerts you to take micro-pauses, rest breaks
+workrave: and restricts you to your daily limit.
+workrave:
+workrave: homepage: http://workrave.org
+workrave:
+workrave:
+workrave:
diff --git a/desktop/workrave/workrave.SlackBuild b/desktop/workrave/workrave.SlackBuild
new file mode 100644
index 0000000000..ec4764038a
--- /dev/null
+++ b/desktop/workrave/workrave.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for workrave
+
+# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=workrave
+VERSION=${VERSION:-1.10.34}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s|@LIBDIR@|/usr/lib$LIBDIRSUFFIX|" $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/workrave/workrave.info b/desktop/workrave/workrave.info
new file mode 100644
index 0000000000..f464aa52a0
--- /dev/null
+++ b/desktop/workrave/workrave.info
@@ -0,0 +1,10 @@
+PRGNAM="workrave"
+VERSION="1.10.34"
+HOMEPAGE="http://workrave.org"
+DOWNLOAD="https://github.com/rcaelers/workrave/releases/download/v1_10_34/workrave-1.10.34.tar.gz"
+MD5SUM="25914f54ea1e6395da7b88be2f189093"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="Jinja2"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/desktop/yad/yad.SlackBuild b/desktop/yad/yad.SlackBuild
index 0b08f08e7a..d96ebb91ee 100644
--- a/desktop/yad/yad.SlackBuild
+++ b/desktop/yad/yad.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for yad
# Copyright 2010-2014 Charles <SlackBuilds@catcons.co.uk>
-# Copyright 2015-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2015-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=yad
-VERSION=${VERSION:-0.40.0}
+VERSION=${VERSION:-4.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -55,8 +55,8 @@ else
LIBDIRSUFFIX=""
fi
-GTK=${GTK:-2}
-if pkg-config --exists webkit-1.0 ; then HTML="--enable-html" ; else HTML="" ; fi
+if pkg-config --exists webkit2gtk-4.0 ; then HTML="--enable-html" ; else HTML="" ; fi
+if pkg-config --exists gtksourceview-3.0 ; then SOURCEVIEW="--enable-sourceview" ; else SOURCEVIEW="" ; fi
set -e
@@ -73,6 +73,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+autoreconf -vif
+intltoolize
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -84,8 +87,11 @@ CXXFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--with-rgb=/usr/share/X11/rgb.txt \
--enable-icon-browser \
- --with-gtk=gtk$GTK \
+ --enable-pfd \
+ --enable-tray \
+ --enable-spell \
$HTML \
+ $SOURCEVIEW \
--build=$ARCH-slackware-linux
make
@@ -95,7 +101,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README* THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/desktop/yad/yad.info b/desktop/yad/yad.info
index a5a5b9d17e..2498c778cb 100644
--- a/desktop/yad/yad.info
+++ b/desktop/yad/yad.info
@@ -1,8 +1,8 @@
PRGNAM="yad"
-VERSION="0.40.0"
-HOMEPAGE="https://sourceforge.net/projects/yad-dialog/"
-DOWNLOAD="https://downloads.sf.net/yad-dialog/yad-0.40.0.tar.xz"
-MD5SUM="82d458a2e1695dd0709f71ad26109812"
+VERSION="4.1"
+HOMEPAGE="https://github.com/v1cont/yad/"
+DOWNLOAD="https://github.com/v1cont/yad/archive/4.1/yad-4.1.tar.gz"
+MD5SUM="8b16119570fb03e3804bb6b33108eb9c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/ChezScheme/ChezScheme.SlackBuild b/development/ChezScheme/ChezScheme.SlackBuild
index 604a2dfd75..a30137c407 100644
--- a/development/ChezScheme/ChezScheme.SlackBuild
+++ b/development/ChezScheme/ChezScheme.SlackBuild
@@ -86,6 +86,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
./configure \
+ CFLAGS="-Wno-error=implicit-fallthrough=" \
$WSIZE \
$THREADS \
--installprefix=/usr \
diff --git a/development/Coin/Coin.SlackBuild b/development/Coin/Coin.SlackBuild
index 96953fa909..eb99408893 100644
--- a/development/Coin/Coin.SlackBuild
+++ b/development/Coin/Coin.SlackBuild
@@ -61,6 +61,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Thanks Fedora
+patch -p1 < $CWD/memhandler-initialization.patch
+
# Thanks Debian
patch -p1 < $CWD/coin-include_and_js.patch
diff --git a/development/Coin/memhandler-initialization.patch b/development/Coin/memhandler-initialization.patch
new file mode 100644
index 0000000000..4c346487ed
--- /dev/null
+++ b/development/Coin/memhandler-initialization.patch
@@ -0,0 +1,20 @@
+--- Coin-3.1.3/src/misc/SbHash.h.init 2010-03-02 22:20:09.000000000 +0900
++++ Coin-3.1.3/src/misc/SbHash.h 2016-04-22 16:52:39.888883757 +0900
+@@ -89,6 +89,8 @@
+ cc_memalloc_deallocate(entry->memhandler, ptr);
+ }
+ SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {}
++ SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler)
++ : key(key), obj(obj), memhandler(memhandler) {}
+
+ Key key;
+ Type obj;
+@@ -218,7 +220,7 @@
+ /* Key not already in the hash table; insert a new
+ * entry as the first element in the bucket
+ */
+- entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj);
++ entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler);
+ entry->next = this->buckets[i];
+ this->buckets[i] = entry;
+
diff --git a/development/FreeBASIC/FreeBASIC.SlackBuild b/development/FreeBASIC/FreeBASIC.SlackBuild
index b851e000e0..97ffce4878 100644
--- a/development/FreeBASIC/FreeBASIC.SlackBuild
+++ b/development/FreeBASIC/FreeBASIC.SlackBuild
@@ -89,13 +89,10 @@ if [ "$ARCH" = "x86_64" ]; then
$PKG/usr/lib/${PRGNAM,,}
fi
-# fix linking with libtinfo over libncurses
+# fix linking libtinfo over the newer version - WARNING, UGLY SHIT! -ponce
ln -sf \
- /usr/lib${LIBDIRSUFFIX}/libncurses.so.5 \
+ /usr/lib${LIBDIRSUFFIX}/libtinfo.so.6 \
$PKG/usr/lib${LIBDIRSUFFIX}/libtinfo.so.5
-ln -sf \
- /usr/lib${LIBDIRSUFFIX}/libtinfo.so.5 \
- $PKG/usr/lib${LIBDIRSUFFIX}/libtinfo.so
# gzip man page
gzip -c doc/fbc.1 > $PKG/usr/man/man1/fbc.1.gz
diff --git a/development/MySQL-python/MySQL-python.SlackBuild b/development/MySQL-python/MySQL-python.SlackBuild
index c367b99dc9..cc212f17be 100644
--- a/development/MySQL-python/MySQL-python.SlackBuild
+++ b/development/MySQL-python/MySQL-python.SlackBuild
@@ -57,7 +57,7 @@ patch -p1 < $CWD/patches/no_distribute_download.patch
# Include my_config.h first
patch -p1 < $CWD/patches/MySQL-python-1.2.4-include-my_config-first.patch
-python setup.py install --root=$PKG
+CPPFLAGS="-I/usr/include/mysql/server" python setup.py install --root=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/development/SDL2_gfx/README b/development/SDL2_gfx/README
deleted file mode 100644
index 6be21f40d1..0000000000
--- a/development/SDL2_gfx/README
+++ /dev/null
@@ -1,3 +0,0 @@
-SDL graphics drawing primitives and other support functions
-wrapped up in an addon library for the Simple Direct Media
-(SDL) cross-platform API layer.
diff --git a/development/SDL2_gfx/SDL2_gfx.SlackBuild b/development/SDL2_gfx/SDL2_gfx.SlackBuild
deleted file mode 100644
index cdf7a8fb56..0000000000
--- a/development/SDL2_gfx/SDL2_gfx.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for SDL2_gfx
-
-# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=SDL2_gfx
-VERSION=${VERSION:-1.0.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-./autogen.sh
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/SDL2_gfx/SDL2_gfx.info b/development/SDL2_gfx/SDL2_gfx.info
deleted file mode 100644
index 2f64868bd2..0000000000
--- a/development/SDL2_gfx/SDL2_gfx.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="SDL2_gfx"
-VERSION="1.0.4"
-HOMEPAGE="http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"
-DOWNLOAD="http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-1.0.4.tar.gz"
-MD5SUM="15f9866c6464ca298f28f62fe5b36d9f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="SDL2"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/development/SDL2_gfx/slack-desc b/development/SDL2_gfx/slack-desc
deleted file mode 100644
index 72864f2da7..0000000000
--- a/development/SDL2_gfx/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-SDL2_gfx: SDL2_gfx (addon library for the SDL2)
-SDL2_gfx:
-SDL2_gfx: SDL graphics drawing primitives and other support functions
-SDL2_gfx: wrapped up in an addon library for the Simple Direct Media (SDL)
-SDL2_gfx: cross-platform API layer.
-SDL2_gfx:
-SDL2_gfx: Homepage:
-SDL2_gfx: http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/
-SDL2_gfx:
-SDL2_gfx:
-SDL2_gfx:
diff --git a/development/acpica/acpica.SlackBuild b/development/acpica/acpica.SlackBuild
index f3ffc6d06f..6e097577c4 100644
--- a/development/acpica/acpica.SlackBuild
+++ b/development/acpica/acpica.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for acpica
-# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2018 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=acpica
-VERSION=${VERSION:-20170531}
+VERSION=${VERSION:-20180105}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -74,7 +74,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
cd generate/unix
- CFLAGS="$SLKCFLAGS" \
+ CFLAGS="$SLKCFLAGS -Wno-error=format-overflow -Wno-error=stringop-truncation" \
CXXFLAGS="$SLKCFLAGS" \
make BITS=$BITS
diff --git a/development/acpica/acpica.info b/development/acpica/acpica.info
index dea5cd5d50..3ac0a61986 100644
--- a/development/acpica/acpica.info
+++ b/development/acpica/acpica.info
@@ -1,8 +1,8 @@
PRGNAM="acpica"
-VERSION="20170531"
+VERSION="20180105"
HOMEPAGE="http://www.acpica.org"
-DOWNLOAD="https://acpica.org/sites/acpica/files/acpica-unix2-20170531.tar.gz"
-MD5SUM="46c4c93435ad1d8c4eb5bacde17503b8"
+DOWNLOAD="https://acpica.org/sites/acpica/files/acpica-unix2-20180105.tar.gz"
+MD5SUM="5aa086f71f4b5273c0932a1e04419a37"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/android-tools/README b/development/android-tools/README
index e7d793fe84..fa0406782b 100644
--- a/development/android-tools/README
+++ b/development/android-tools/README
@@ -1,2 +1,2 @@
-These are the adb, fastboot, mkbootimg and make_ext4fs tools from the
-android sdk.
+These are the adb, fastboot, mkbootimg, unpack_bootimg, mke2fs.android,
+e2fsdroid, avbtool and ext2simg tools from the android sdk.
diff --git a/development/android-tools/android-tools.SlackBuild b/development/android-tools/android-tools.SlackBuild
index 8e141f5fbd..8fde5c30a4 100644
--- a/development/android-tools/android-tools.SlackBuild
+++ b/development/android-tools/android-tools.SlackBuild
@@ -25,13 +25,17 @@
PRGNAM=android-tools
-VERSION=${VERSION:-8.0.0_r24}
-SRC1=core-6cd85e2a89347e0a107f59e38ece61fa19e6da78.tar.gz
-SRC2=extras-af2dce5151ad478673401211dd71ae1579d2b5be.tar.gz
-SRC3=selinux-be29c2550c3ff6551a56048c075a88da01b46cab.tar.gz
-SRC4=f2fs-tools-b8baf1712d991541141bb0bdddd625f527e6d41f.tar.gz
-SRC5=boringssl-58e449904e248f34bdfc2be7a609c58bcb0257b7.tar.gz
-
+VERSION=${VERSION:-29.0.5}
+SRC1=avb-355c69ae673220da533696c44acbfa489702d1ff.tar.gz
+SRC2=base-d634d2306033599c00b83e68c9ecb60e3206d40c.tar.gz
+SRC3=boringssl-a7a75f208caea8a303615724d4cc5f4e8dfb9695.tar.gz
+SRC4=core-fa4254a53a368a8f9b6604442eace6a7b6b63b6d.tar.gz
+SRC5=e2fsprogs-5fab03bbdc3789515748af8181b9e82dd99beb3b.tar.gz
+SRC6=extras-6748c3dd53494096ffeebfeeb12e3b3efad90a83.tar.gz
+SRC7=f2fs-tools-39ec3b4c2edc136d32392ddc7a7f222b4c68e88c.tar.gz
+SRC8=mkbootimg-e29814dcf6434e8d14379062e4ea1c1b58ff11d0.tar.gz
+SRC9=native-b9005758dcf78f89c6640ffb119b5b527a417928.tar.gz
+SRC10=selinux-9e188fde016babc76150098e0ab288e053cf92e2.tar.gz
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -71,34 +75,36 @@ rm -rf $TMP/android-tools
mkdir $TMP/android-tools
cd $TMP/android-tools
+mkdir avb
+tar -xvf $CWD/$SRC1 -C avb
+mkdir base
+tar -xvf $CWD/$SRC2 -C base
+mkdir boringssl
+tar -xvf $CWD/$SRC3 -C boringssl
mkdir core
-tar -xvf $CWD/$SRC1 -C core
+tar -xvf $CWD/$SRC4 -C core
+mkdir e2fsprogs
+tar -xvf $CWD/$SRC5 -C e2fsprogs
mkdir extras
-tar -xvf $CWD/$SRC2 -C extras
-mkdir selinux
-tar -xvf $CWD/$SRC3 -C selinux
+tar -xvf $CWD/$SRC6 -C extras
mkdir f2fs-tools
-tar -xvf $CWD/$SRC4 -C f2fs-tools
-mkdir boringssl
-tar -xvf $CWD/$SRC5 -C boringssl
-
-#git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/system/core
-#git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/system/extras
-#git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/external/libselinux
-#git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/external/f2fs-tools
+tar -xvf $CWD/$SRC7 -C f2fs-tools
+mkdir mkbootimg
+tar -xvf $CWD/$SRC8 -C mkbootimg
+mkdir native
+tar -xvf $CWD/$SRC9 -C native
+mkdir selinux
+tar -xvf $CWD/$SRC10 -C selinux
+cp -a $CWD/deployagent.jar .
# generate_build.rb borrowed from Arch Linux
# And thanks to Alan Alberghini for the make_ext4fs patch.
-PKGVER=$VERSION ruby $CWD/generate_build.rb > build.ninja
+PKGVER=$VERSION LDFLAGS='-Wl,-z,relro,-z,now' ruby $CWD/generate_build.rb > build.ninja
cd core
patch -p1 < $CWD/fix_build_core.patch
cd ..
-cd selinux
-patch -p1 < $CWD/fix_build_selinux.patch
-cd ..
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -110,16 +116,22 @@ find . \
mkdir -p boringssl/build
cd boringssl/build
cmake -GNinja ..
-ninja
+ninja crypto/libcrypto.a
cd ../..
ninja
mkdir -p $PKG/usr/bin
-install -Dm 755 adb $PKG/usr/bin/adb
-install -Dm 755 fastboot $PKG/usr/bin/fastboot
-install -Dm 755 core/mkbootimg/mkbootimg $PKG/usr/bin/mkbootimg
-install -Dm 755 make_ext4fs $PKG/usr/bin/make_ext4fs
+install -D -m 0755 adb $PKG/usr/bin/adb
+install -D -m 0755 fastboot $PKG/usr/bin/fastboot
+install -D -m 0755 mke2fs.android $PKG/usr/bin/mke2fs.android
+install -D -m 0755 e2fsdroid $PKG/usr/bin/e2fsdroid
+install -D -m 0755 ext2simg $PKG/usr/bin/ext2simg
+install -D -m 0755 avb/avbtool $PKG/usr/bin/avbtool
+install -D -m 0755 mkbootimg/mkbootimg.py $PKG/usr/bin/mkbootimg
+install -D -m 0755 mkbootimg/unpack_bootimg.py $PKG/usr/bin/unpack_bootimg
+
+install -D -m 0644 $CWD/bash_completion.fastboot $PKG/usr/share/bash-completion/completions/fastboot
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/development/android-tools/android-tools.info b/development/android-tools/android-tools.info
index ba44d787e2..7d268581cd 100644
--- a/development/android-tools/android-tools.info
+++ b/development/android-tools/android-tools.info
@@ -1,18 +1,30 @@
PRGNAM="android-tools"
-VERSION="8.0.0_r24"
+VERSION="29.0.5"
HOMEPAGE="http://developer.android.com/sdk/"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/8.0.0_r24/core-6cd85e2a89347e0a107f59e38ece61fa19e6da78.tar.gz \
- https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/8.0.0_r24/extras-af2dce5151ad478673401211dd71ae1579d2b5be.tar.gz \
- https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/8.0.0_r24/f2fs-tools-b8baf1712d991541141bb0bdddd625f527e6d41f.tar.gz \
- https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/8.0.0_r24/selinux-be29c2550c3ff6551a56048c075a88da01b46cab.tar.gz \
- https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/8.0.0_r24/boringssl-58e449904e248f34bdfc2be7a609c58bcb0257b7.tar.gz"
-MD5SUM="b5b3857b5edae7305f5348e1db148b61 \
- 19bdc27835ed340fdbb4205d6af8e721 \
- 2ebe16bb82a5b24706d78d9e16d66f6e \
- 0599c72a1ff3142ad6baed8886d074a3 \
- 83ed1371eee7769f29b767c217e865e7"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/avb-355c69ae673220da533696c44acbfa489702d1ff.tar.gz \
+ http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/base-d634d2306033599c00b83e68c9ecb60e3206d40c.tar.gz \
+ http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/boringssl-a7a75f208caea8a303615724d4cc5f4e8dfb9695.tar.gz \
+ http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/core-fa4254a53a368a8f9b6604442eace6a7b6b63b6d.tar.gz \
+ http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/e2fsprogs-5fab03bbdc3789515748af8181b9e82dd99beb3b.tar.gz \
+ http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/extras-6748c3dd53494096ffeebfeeb12e3b3efad90a83.tar.gz \
+ http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/f2fs-tools-39ec3b4c2edc136d32392ddc7a7f222b4c68e88c.tar.gz \
+ http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/mkbootimg-e29814dcf6434e8d14379062e4ea1c1b58ff11d0.tar.gz \
+ http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/native-b9005758dcf78f89c6640ffb119b5b527a417928.tar.gz \
+ http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/selinux-9e188fde016babc76150098e0ab288e053cf92e2.tar.gz \
+ http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/deployagent.jar"
+MD5SUM="6800e83627f1046be645fc8c7ba027d5 \
+ e816083df667905b865c248a8a20c2e7 \
+ a20c134ee4310e600384b7d0a60c2db6 \
+ 34fb01c210c7371833da14f1d7a970e6 \
+ 3b559a1c803c94079b177065b7424457 \
+ cdd9d7b4956e5da607bb1e94cb929065 \
+ 880a1708785515fe1447b1bf6b020093 \
+ f912725e4d01596c2a2d0fa3fe772d8e \
+ 3daf9cf55dceb85ca06ae116e61800b4 \
+ 28a8438bc0856def465f6456781a5275 \
+ bb500620af2f3716a61100f7b5c445fa"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="gtest ninja pcre2"
+REQUIRES="gtest ninja pcre2 protobuf3"
MAINTAINER="Philip van der Hoeven"
EMAIL="philip@vd-hoeven.nl"
diff --git a/development/android-tools/bash_completion.fastboot b/development/android-tools/bash_completion.fastboot
new file mode 100644
index 0000000000..bc59ee8636
--- /dev/null
+++ b/development/android-tools/bash_completion.fastboot
@@ -0,0 +1,90 @@
+## Bash completion for the Android SDK tools.
+##
+## Copyright (c) 2009 Matt Brubeck
+##
+## Permission is hereby granted, free of charge, to any person obtaining a copy
+## of this software and associated documentation files (the "Software"), to deal
+## in the Software without restriction, including without limitation the rights
+## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+## copies of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
+##
+## The above copyright notice and this permission notice shall be included in
+## all copies or substantial portions of the Software.
+##
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+## THE SOFTWARE.
+
+
+function _fastboot()
+{
+ local cur prev opts cmds c subcommand device_selected
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
+ opts="-w -s -p -c -i -b -n"
+ cmds="update flashall flash erase getvar boot devices \
+ reboot reboot-bootloader oem continue"
+ subcommand=""
+ partition_list="boot recovery system userdata bootloader radio"
+ device_selected=""
+
+ # Look for the subcommand.
+ c=1
+ while [ $c -lt $COMP_CWORD ]; do
+ word="${COMP_WORDS[c]}"
+ if [ "$word" = "-s" ]; then
+ device_selected=true
+ fi
+ for cmd in $cmds; do
+ if [ "$cmd" = "$word" ]; then
+ subcommand="$word"
+ fi
+ done
+ c=$((++c))
+ done
+
+ case "${subcommand}" in
+ '')
+ case "${prev}" in
+ -s)
+ # Use 'fastboot devices' to list serial numbers.
+ COMPREPLY=( $(compgen -W "$(fastboot devices|cut -f1)" -- ${cur} ) )
+ return 0
+ ;;
+ esac
+ case "${cur}" in
+ -*)
+ COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ if [ -z "$device_selected" ]; then
+ local num_devices=$(( $(fastboot devices 2>/dev/null|wc -l) ))
+ if [ "$num_devices" -gt "1" ]; then
+ # With multiple devices, you must choose a device first.
+ COMPREPLY=( $(compgen -W "-s" -- ${cur}) )
+ return 0
+ fi
+ fi
+ COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
+ return 0
+ ;;
+ flash)
+ # partition name
+ COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
+ return 0
+ ;;
+ erase)
+ # partition name
+ COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
+ return 0
+ ;;
+ esac
+}
+complete -o default -F _fastboot fastboot
diff --git a/development/android-tools/fix_build_core.patch b/development/android-tools/fix_build_core.patch
index b67a540199..fede1c09cc 100644
--- a/development/android-tools/fix_build_core.patch
+++ b/development/android-tools/fix_build_core.patch
@@ -1,16 +1,49 @@
+diff --git a/adb/adb.cpp b/adb/adb.cpp
+index 1ec145b25c..b6e943f6ee 100644
+--- a/adb/adb.cpp
++++ b/adb/adb.cpp
+@@ -44,8 +44,6 @@
+ #include <android-base/parsenetaddress.h>
+ #include <android-base/stringprintf.h>
+ #include <android-base/strings.h>
+-#include <build/version.h>
+-#include <platform_tools_version.h>
+
+ #include "adb_auth.h"
+ #include "adb_io.h"
+@@ -66,10 +64,10 @@ std::string adb_version() {
+ // Don't change the format of this --- it's parsed by ddmlib.
+ return android::base::StringPrintf(
+ "Android Debug Bridge version %d.%d.%d\n"
+- "Version %s-%s\n"
++ "Version %s\n"
+ "Installed as %s\n",
+ ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION,
+- PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str(),
++ PLATFORM_TOOLS_VERSION,
+ android::base::GetExecutablePath().c_str());
+ }
+
+diff --git a/adb/client/main.cpp b/adb/client/main.cpp
+index 0c5c28f1b3..b6a1281521 100644
+--- a/adb/client/main.cpp
++++ b/adb/client/main.cpp
+@@ -118,10 +118,6 @@ int adb_server_main(int is_daemon, const std::string& socket_spec, int ack_reply
+ init_transport_registration();
+ init_reconnect_handler();
+
+- if (!getenv("ADB_MDNS") || strcmp(getenv("ADB_MDNS"), "0") != 0) {
+- init_mdns_transport_discovery();
+- }
+-
+ if (!getenv("ADB_USB") || strcmp(getenv("ADB_USB"), "0") != 0) {
+ usb_init();
+ } else {
diff --git a/adb/client/usb_libusb.cpp b/adb/client/usb_libusb.cpp
-index 7025f283c..66fad6564 100644
+index 53f01a0ce5..b4c3aadc28 100644
--- a/adb/client/usb_libusb.cpp
+++ b/adb/client/usb_libusb.cpp
-@@ -21,6 +21,7 @@
- #include <stdint.h>
-
- #include <atomic>
-+#include <condition_variable>
- #include <chrono>
- #include <memory>
- #include <mutex>
-@@ -28,7 +29,7 @@
+@@ -30,7 +30,7 @@
#include <thread>
#include <unordered_map>
@@ -19,63 +52,53 @@ index 7025f283c..66fad6564 100644
#include <android-base/file.h>
#include <android-base/logging.h>
-diff --git a/adb/sysdeps/posix/network.cpp b/adb/sysdeps/posix/network.cpp
-index 45da5af4a..516c716d9 100644
---- a/adb/sysdeps/posix/network.cpp
-+++ b/adb/sysdeps/posix/network.cpp
-@@ -16,6 +16,7 @@
-
- #include "sysdeps/network.h"
-
-+#include <cstring>
- #include <errno.h>
- #include <netinet/in.h>
- #include <sys/socket.h>
-diff --git a/base/errors_unix.cpp b/base/errors_unix.cpp
-index 296995efe..48269b675 100644
---- a/base/errors_unix.cpp
-+++ b/base/errors_unix.cpp
-@@ -17,6 +17,7 @@
- #include "android-base/errors.h"
-
- #include <errno.h>
-+#include <string.h>
+diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
+index 2fe3b1a9e0..a61b221ce3 100644
+--- a/fastboot/fastboot.cpp
++++ b/fastboot/fastboot.cpp
+@@ -59,10 +59,8 @@
+ #include <android-base/stringprintf.h>
+ #include <android-base/strings.h>
+ #include <android-base/unique_fd.h>
+-#include <build/version.h>
+ #include <libavb/libavb.h>
+ #include <liblp/liblp.h>
+-#include <platform_tools_version.h>
+ #include <sparse/sparse.h>
+ #include <ziparchive/zip_archive.h>
- namespace android {
- namespace base {
-diff --git a/base/file.cpp b/base/file.cpp
-index 2f697a1cc..81aef5758 100644
---- a/base/file.cpp
-+++ b/base/file.cpp
-@@ -22,6 +22,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <string.h>
+@@ -1783,7 +1781,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
+ setvbuf(stdout, nullptr, _IONBF, 0);
+ setvbuf(stderr, nullptr, _IONBF, 0);
+ } else if (name == "version") {
+- fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str());
++ fprintf(stdout, "fastboot version %s\n", PLATFORM_TOOLS_VERSION);
+ fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str());
+ return 0;
+ #if !defined(_WIN32)
+diff --git a/fastboot/fs.cpp b/fastboot/fs.cpp
+index 8c0aa6bf4e..3ad5b53568 100644
+--- a/fastboot/fs.cpp
++++ b/fastboot/fs.cpp
+@@ -117,7 +117,7 @@ static int generate_ext4_image(const char* fileName, long long partSize,
+ static constexpr int block_size = 4096;
+ const std::string exec_dir = android::base::GetExecutableDirectory();
- #include <memory>
- #include <mutex>
-diff --git a/base/logging.cpp b/base/logging.cpp
-index 6357b4ba7..3c7dbce13 100644
---- a/base/logging.cpp
-+++ b/base/logging.cpp
-@@ -23,6 +23,7 @@
- #include <fcntl.h>
- #include <libgen.h>
- #include <time.h>
-+#include <string.h>
+- const std::string mke2fs_path = exec_dir + "/mke2fs";
++ const std::string mke2fs_path = exec_dir + "/mke2fs.android";
+ std::vector<const char*> mke2fs_args = {mke2fs_path.c_str(), "-t", "ext4", "-b"};
- // For getprogname(3) or program_invocation_short_name.
- #if defined(__ANDROID__) || defined(__APPLE__)
-diff --git a/libsparse/sparse_read.cpp b/libsparse/sparse_read.cpp
-index bd668735a..76cf43299 100644
---- a/libsparse/sparse_read.cpp
-+++ b/libsparse/sparse_read.cpp
-@@ -18,6 +18,7 @@
- #define _LARGEFILE64_SOURCE 1
+ std::string block_size_str = std::to_string(block_size);
+diff --git a/libcutils/include/cutils/threads.h b/libcutils/include/cutils/threads.h
+index ba4846e33b..f3fccc4895 100644
+--- a/libcutils/include/cutils/threads.h
++++ b/libcutils/include/cutils/threads.h
+@@ -33,8 +33,6 @@ extern "C" {
+ // Deprecated: use android::base::GetThreadId instead, which doesn't truncate on Mac/Windows.
+ //
- #include <algorithm>
-+#include <cstring>
- #include <inttypes.h>
- #include <fcntl.h>
- #include <stdarg.h>
+-extern pid_t gettid();
+-
+ //
+ // Deprecated: use `_Thread_local` in C or `thread_local` in C++.
+ //
diff --git a/development/android-tools/fix_build_selinux.patch b/development/android-tools/fix_build_selinux.patch
deleted file mode 100644
index 429f87ce57..0000000000
--- a/development/android-tools/fix_build_selinux.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/libsepol/src/private.h b/libsepol/src/private.h
-index b884c23b..447fa64b 100644
---- a/libsepol/src/private.h
-+++ b/libsepol/src/private.h
-@@ -14,7 +14,7 @@
- #endif
-
- #include <errno.h>
--#include <dso.h>
-+#include "dso.h"
-
- #ifdef __APPLE__
- #define __BYTE_ORDER BYTE_ORDER
-diff --git a/libsepol/src/util.c b/libsepol/src/util.c
-index b00251c6..68e7c6a0 100644
---- a/libsepol/src/util.c
-+++ b/libsepol/src/util.c
-@@ -27,7 +27,7 @@
- #include <sepol/policydb/flask_types.h>
- #include <sepol/policydb/policydb.h>
- #include <sepol/policydb/util.h>
--#include <dso.h>
-+#include "dso.h"
-
- struct val_to_name {
- unsigned int val;
diff --git a/development/android-tools/generate_build.rb b/development/android-tools/generate_build.rb
index cb3e1e685c..2c74ee00cc 100644
--- a/development/android-tools/generate_build.rb
+++ b/development/android-tools/generate_build.rb
@@ -5,57 +5,78 @@
# This script tries to mimic Android build rules.
def expand(dir, files)
- files.map{|f| File.join(dir,f)}
+ files.map { |f| File.join(dir, f) }
end
# Compiles sources to *.o files.
# Returns array of output *.o filenames
-def compile(sources, cflags)
+def compile(sources, cflags, params = {})
outputs = []
for s in sources
ext = File.extname(s)
case ext
- when '.c'
- cc = 'cc'
- lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
- when '.cpp', '.cc'
- cc = 'cxx'
- lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS'
+ when ".c"
+ cc = "cc"
+ lang_flags = "-std=gnu11 $CFLAGS $CPPFLAGS"
+ when ".cpp", ".cc"
+ cc = "cxx"
+ lang_flags = "-std=gnu++2a $CXXFLAGS $CPPFLAGS"
else
- raise "Unknown extension #{ext}"
+ raise "Unknown extension #{ext}"
end
- output = s + '.o'
+ output = s + ".o"
outputs << output
- puts "build #{output}: #{cc} #{s}\n cflags = #{lang_flags} #{cflags}"
+ order_deps = if params[:order_deps]
+ " || " + params[:order_deps].join(" ")
+ else
+ ""
+ end
+
+ puts "build #{output}: #{cc} #{s}#{order_deps}\n cflags = #{lang_flags} #{cflags}"
end
return outputs
end
+# Generate proto and compile it
+def protoc(source)
+ basename = File.join(File.dirname(source), File.basename(source, ".proto"))
+ cfile = basename + ".pb.cc"
+ hfile = basename + ".pb.h"
+ ofile = cfile + ".o"
+ puts "build #{cfile} #{hfile}: protoc #{source}"
+ puts "build #{ofile}: cc #{cfile}\n cflags = -std=gnu++2a $CXXFLAGS $CPPFLAGS -I."
+
+ return hfile, cfile, ofile
+end
+
# dir - directory where ninja file is located
# lib - static library path relative to dir
def subninja(dir, lib)
puts "subninja #{dir}build.ninja"
- return lib.each{|l| dir + l}
+ return lib.each { |l| dir + l }
end
# Links object files
def link(output, objects, ldflags)
- puts "build #{output}: link #{objects.join(' ')}\n ldflags = #{ldflags} $LDFLAGS"
+ puts "build #{output}: link #{objects.join(" ")}\n ldflags = #{ldflags} $LDFLAGS"
end
-puts "# This set of commands generated by generate_build.rb script\n\n"
-puts "CC = #{ENV['CC'] || 'clang'}"
-puts "CXX = #{ENV['CXX'] || 'clang++'}\n\n"
-puts "CFLAGS = #{ENV['CFLAGS']}"
-puts "CXXFLAGS = #{ENV['CXXFLAGS']}"
-puts "LDFLAGS = #{ENV['LDFLAGS']}"
-puts "PKGVER = #{ENV['PKGVER']}\n\n"
-
+def genheader(input, variable, output)
+ puts "build #{output}: genheader #{input}\n var = #{variable}"
+end
-puts """
+puts "# This set of commands generated by generate_build.rb script\n\n"
+puts "CC = #{ENV["CC"] || "clang"}"
+puts "CXX = #{ENV["CXX"] || "clang++"}\n\n"
+puts "CFLAGS = #{ENV["CFLAGS"]}"
+puts "CXXFLAGS = #{ENV["CXXFLAGS"]}"
+puts "LDFLAGS = #{ENV["LDFLAGS"]}"
+puts "PLATFORM_TOOLS_VERSION = #{ENV["PLATFORM_TOOLS_VERSION"]}\n\n"
+
+puts "" "
rule cc
command = $CC $cflags -c $in -o $out
@@ -65,8 +86,14 @@ rule cxx
rule link
command = $CXX $ldflags $LDFLAGS $in -o $out
+rule protoc
+ command = protoc --cpp_out=. $in
+
+rule genheader
+ command = (echo 'unsigned char $var[] = {' && xxd -i <$in && echo '};') > $out
-"""
+
+" ""
adbdfiles = %w(
adb.cpp
@@ -74,210 +101,366 @@ adbdfiles = %w(
adb_listeners.cpp
adb_trace.cpp
adb_utils.cpp
- bugreport.cpp
- line_printer.cpp
+ fdevent/fdevent.cpp
+ fdevent/fdevent_poll.cpp
+ fdevent/fdevent_epoll.cpp
+ shell_service_protocol.cpp
sockets.cpp
transport.cpp
transport_local.cpp
transport_usb.cpp
- transport_mdns_unsupported.cpp
- fdevent.cpp
- adb_auth_host.cpp
- shell_service_protocol.cpp
)
-libadbd = compile(expand('core/adb', adbdfiles), '-DADB_VERSION="\"$PKGVER\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include')
+libadbd = compile(expand("core/adb", adbdfiles), '-DPLATFORM_TOOLS_VERSION="\"$PLATFORM_TOOLS_VERSION\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include -Icore/diagnose_usb/include')
+
+apkent_h, apkent_c, apkent_o = protoc("core/adb/fastdeploy/proto/ApkEntry.proto")
+
+deployagent_inc = "core/adb/client/deployagent.inc"
+genheader("deployagent.jar", "kDeployAgent", deployagent_inc)
+
+deployagentscript_inc = "core/adb/client/deployagentscript.inc"
+genheader("core/adb/fastdeploy/deployagent/deployagent.sh", "kDeployAgentScript", deployagentscript_inc)
adbfiles = %w(
- console.cpp
- socket_spec.cpp
- commandline.cpp
- adb_client.cpp
- services.cpp
- file_sync_client.cpp
- sysdeps_unix.cpp
- sysdeps/errno.cpp
- sysdeps/posix/network.cpp
+ client/adb_client.cpp
+ client/adb_install.cpp
+ client/auth.cpp
+ client/bugreport.cpp
+ client/commandline.cpp
+ client/console.cpp
+ client/fastdeploy.cpp
+ client/fastdeploycallbacks.cpp
+ client/file_sync_client.cpp
+ client/line_printer.cpp
client/main.cpp
client/usb_dispatch.cpp
- client/usb_linux.cpp
client/usb_libusb.cpp
+ client/usb_linux.cpp
+ fastdeploy/deploypatchgenerator/apk_archive.cpp
+ fastdeploy/deploypatchgenerator/deploy_patch_generator.cpp
+ fastdeploy/deploypatchgenerator/patch_utils.cpp
+ services.cpp
+ socket_spec.cpp
+ sysdeps/errno.cpp
+ sysdeps/posix/network.cpp
+ sysdeps_unix.cpp
+)
+libadb = compile(expand("core/adb", adbfiles), "-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include -Ibase/libs/androidfw/include -Inative/include", :order_deps => [apkent_h, deployagent_inc, deployagentscript_inc])
+
+androidfwfiles = %w(
+ LocaleData.cpp
+ ResourceTypes.cpp
+ TypeWrappers.cpp
+ ZipFileRO.cpp
)
-libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb')
+libandroidfw = compile(expand("base/libs/androidfw", androidfwfiles), "-Icore/base/include -Ibase/libs/androidfw/include -Icore/libutils/include -Icore/liblog/include -Icore/libsystem/include -Inative/include -Icore/libcutils/include -Icore/libziparchive/include")
basefiles = %w(
+ chrono_utils.cpp
+ errors_unix.cpp
file.cpp
logging.cpp
+ mapped_file.cpp
parsenetaddress.cpp
stringprintf.cpp
strings.cpp
- errors_unix.cpp
test_utils.cpp
+ threads.cpp
)
-libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include')
+libbase = compile(expand("core/base", basefiles), "-DADB_HOST=1 -Icore/base/include -Icore/include")
logfiles = %w(
- log_event_write.c
- fake_log_device.c
- log_event_list.c
- logger_write.c
- config_write.c
- config_read.c
- logger_lock.c
- local_logger.c
- fake_writer.c
- logger_name.c
- stderr_write.c
- logprint.c
+ fake_log_device.cpp
+ fake_writer.cpp
+ log_event_list.cpp
+ log_event_write.cpp
+ logger_lock.cpp
+ logger_name.cpp
+ logger_write.cpp
+ logprint.cpp
)
-liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include')
+liblog = compile(expand("core/liblog", logfiles), "-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include")
cutilsfiles = %w(
- load_file.c
- canned_fs_config.c
+ android_get_control_file.cpp
+ canned_fs_config.cpp
fs_config.cpp
- socket_local_client_unix.c
- socket_network_client_unix.c
- socket_local_server_unix.c
- sockets_unix.cpp
- socket_inaddr_any_server_unix.c
+ load_file.cpp
+ socket_inaddr_any_server_unix.cpp
+ socket_local_client_unix.cpp
+ socket_local_server_unix.cpp
+ socket_network_client_unix.cpp
sockets.cpp
- android_get_control_file.cpp
- threads.c
+ sockets_unix.cpp
+ threads.cpp
)
-libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/include -Icore/libcutils/include')
+libcutils = compile(expand("core/libcutils", cutilsfiles), "-D_GNU_SOURCE -Icore/libcutils/include -Icore/include -Icore/base/include")
diagnoseusbfiles = %w(
diagnose_usb.cpp
)
-libdiagnoseusb = compile(expand('core/adb', diagnoseusbfiles), '-Icore/include -Icore/base/include')
+libdiagnoseusb = compile(expand("core/diagnose_usb", diagnoseusbfiles), "-Icore/include -Icore/base/include -Icore/diagnose_usb/include")
libcryptofiles = %w(
android_pubkey.c
)
-libcrypto = compile(expand('core/libcrypto_utils', libcryptofiles), '-Icore/libcrypto_utils/include -Iboringssl/include')
+libcrypto = compile(expand("core/libcrypto_utils", libcryptofiles), "-Icore/libcrypto_utils/include -Iboringssl/include")
# TODO: make subninja working
#boringssl = subninja('boringssl/build/', ['crypto/libcrypto.a'])
-boringssl = ['boringssl/build/crypto/libcrypto.a']
-
-link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl, '-lpthread -lusb-1.0')
-
+boringssl = ["boringssl/build/crypto/libcrypto.a"]
fastbootfiles = %w(
- protocol.cpp
- engine.cpp
bootimg_utils.cpp
fastboot.cpp
- util.cpp
+ fastboot_driver.cpp
fs.cpp
- usb_linux.cpp
+ main.cpp
socket.cpp
tcp.cpp
udp.cpp
+ usb_linux.cpp
+ util.cpp
+)
+libfastboot = compile(expand("core/fastboot", fastbootfiles), '-DPLATFORM_TOOLS_VERSION="\"$PLATFORM_TOOLS_VERSION\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Imkbootimg/include/bootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/fs_mgr/liblp/include -Icore/diagnose_usb/include -Iavb')
+
+fsmgrfiles = %w(
+ liblp/images.cpp
+ liblp/partition_opener.cpp
+ liblp/reader.cpp
+ liblp/utility.cpp
+ liblp/writer.cpp
)
-libfastboot = compile(expand('core/fastboot', fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils')
+libfsmgr = compile(expand("core/fs_mgr", fsmgrfiles), "-Icore/fs_mgr/liblp/include -Icore/base/include -Iextras/ext4_utils/include -Icore/libsparse/include")
sparsefiles = %w(
- backed_block.c
- output_file.c
- sparse.c
- sparse_crc32.c
- sparse_err.c
+ backed_block.cpp
+ output_file.cpp
+ sparse.cpp
+ sparse_crc32.cpp
+ sparse_err.cpp
sparse_read.cpp
)
-libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include -Icore/base/include')
+libsparse = compile(expand("core/libsparse", sparsefiles), "-Icore/libsparse/include -Icore/base/include")
f2fsfiles = %w(
- f2fs_utils.c
- f2fs_ioutils.c
- f2fs_dlutils.c
)
-f2fs = compile(expand('extras/f2fs_utils', f2fsfiles), '-Iextras/f2fs_utils -If2fs-tools/include -If2fs-tools/mkfs -Icore/libsparse/include -Iselinux/libselinux/include')
+f2fs = compile(expand("extras/f2fs_utils", f2fsfiles), "-DHAVE_LINUX_TYPES_H -If2fs-tools/include -Icore/liblog/include")
zipfiles = %w(
zip_archive.cc
)
-libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include')
+libzip = compile(expand("core/libziparchive", zipfiles), "-Icore/base/include -Icore/include -Icore/libziparchive/include")
utilfiles = %w(
FileMap.cpp
+ SharedBuffer.cpp
+ String16.cpp
+ String8.cpp
+ VectorImpl.cpp
+ Unicode.cpp
)
-libutil = compile(expand('core/libutils', utilfiles), '-Icore/include')
+libutil = compile(expand("core/libutils", utilfiles), "-Icore/include -Icore/base/include")
ext4files = %w(
- make_ext4fs.c
- ext4fixup.c
- ext4_utils.c
- allocate.c
- contents.c
- extent.c
- indirect.c
- sha1.c
- wipe.c
- crc16.c
- ext4_sb.c
-)
-libext4 = compile(expand('extras/ext4_utils', ext4files), '-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include -DANDROID -DHOST=1')
-
-make_ext4files = %w(
- make_ext4fs_main.c
+ ext4_utils.cpp
+ wipe.cpp
+ ext4_sb.cpp
)
-libmake_ext4 = compile(expand('extras/ext4_utils', make_ext4files), '-DANDROID -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include -DHOST=1')
+libext4 = compile(expand("extras/ext4_utils", ext4files), "-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include -Icore/base/include")
selinuxfiles = %w(
+ booleans.c
callbacks.c
+ canonicalize_context.c
check_context.c
+ disable.c
+ enabled.c
freecon.c
+ getenforce.c
init.c
+ label_backends_android.c
label.c
label_file.c
label_support.c
- setrans_client.c
- regex.c
- matchpathcon.c
- selinux_config.c
- label_backends_android.c
- canonicalize_context.c
- lsetfilecon.c
- policyvers.c
lgetfilecon.c
load_policy.c
+ lsetfilecon.c
+ matchpathcon.c
+ policyvers.c
+ regex.c
+ selinux_config.c
+ setenforce.c
+ setrans_client.c
seusers.c
sha1.c
- booleans.c
- disable.c
- enabled.c
- getenforce.c
- setenforce.c
)
-libselinux = compile(expand('selinux/libselinux/src', selinuxfiles), '-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -DUSE_PCRE2 -DNO_PERSISTENTLY_STORED_PATTERNS -DDISABLE_SETRANS -DDISABLE_BOOL -DNO_MEDIA_BACKEND -DNO_X_BACKEND -DNO_DB_BACKEND -DPCRE2_CODE_UNIT_WIDTH=8 -Iselinux/libselinux/include -Iselinux/libsepol/include')
+libselinux = compile(expand("selinux/libselinux/src", selinuxfiles), "-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -DUSE_PCRE2 -DNO_PERSISTENTLY_STORED_PATTERNS -DDISABLE_SETRANS -DDISABLE_BOOL -DNO_MEDIA_BACKEND -DNO_X_BACKEND -DNO_DB_BACKEND -DPCRE2_CODE_UNIT_WIDTH=8 -Iselinux/libselinux/include -Iselinux/libsepol/include")
libsepolfiles = %w(
- policydb_public.c
- genbools.c
- debug.c
- policydb.c
- conditional.c
- services.c
- ebitmap.c
- util.c
assertion.c
+ avrule_block.c
avtab.c
- hashtab.c
- sidtab.c
+ conditional.c
+ constraint.c
context.c
- genusers.c
context_record.c
+ debug.c
+ ebitmap.c
+ expand.c
+ genbools.c
+ genusers.c
+ hashtab.c
+ hierarchy.c
+ kernel_to_common.c
mls.c
- avrule_block.c
- symtab.c
+ policydb.c
policydb_convert.c
+ policydb_public.c
+ services.c
+ sidtab.c
+ symtab.c
+ util.c
write.c
- constraint.c
- expand.c
- hierarchy.c
)
-libsepol = compile(expand('selinux/libsepol/src', libsepolfiles), '-Iselinux/libsepol/include')
+libsepol = compile(expand("selinux/libsepol/src", libsepolfiles), "-Iselinux/libsepol/include -Iselinux/libsepol/src")
+
+link("fastboot", libfsmgr + libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + f2fs + libselinux + libsepol + libfastboot + libdiagnoseusb + boringssl, "-lz -lpcre2-8 -lpthread -ldl")
+
+# mke2fs.android - a ustom version of mke2fs that supports --android_sparse (FS#56955)
+libext2fsfiles = %w(
+ lib/blkid/cache.c
+ lib/blkid/dev.c
+ lib/blkid/devname.c
+ lib/blkid/devno.c
+ lib/blkid/getsize.c
+ lib/blkid/llseek.c
+ lib/blkid/probe.c
+ lib/blkid/read.c
+ lib/blkid/resolve.c
+ lib/blkid/save.c
+ lib/blkid/tag.c
+ lib/e2p/encoding.c
+ lib/e2p/feature.c
+ lib/e2p/hashstr.c
+ lib/e2p/mntopts.c
+ lib/e2p/ostype.c
+ lib/e2p/parse_num.c
+ lib/e2p/uuid.c
+ lib/et/com_err.c
+ lib/et/error_message.c
+ lib/et/et_name.c
+ lib/ext2fs/alloc.c
+ lib/ext2fs/alloc_sb.c
+ lib/ext2fs/alloc_stats.c
+ lib/ext2fs/alloc_tables.c
+ lib/ext2fs/atexit.c
+ lib/ext2fs/badblocks.c
+ lib/ext2fs/bb_inode.c
+ lib/ext2fs/bitmaps.c
+ lib/ext2fs/bitops.c
+ lib/ext2fs/blkmap64_ba.c
+ lib/ext2fs/blkmap64_rb.c
+ lib/ext2fs/blknum.c
+ lib/ext2fs/block.c
+ lib/ext2fs/bmap.c
+ lib/ext2fs/closefs.c
+ lib/ext2fs/crc16.c
+ lib/ext2fs/crc32c.c
+ lib/ext2fs/csum.c
+ lib/ext2fs/dirblock.c
+ lib/ext2fs/dir_iterate.c
+ lib/ext2fs/expanddir.c
+ lib/ext2fs/ext2_err.c
+ lib/ext2fs/ext_attr.c
+ lib/ext2fs/extent.c
+ lib/ext2fs/fallocate.c
+ lib/ext2fs/fileio.c
+ lib/ext2fs/freefs.c
+ lib/ext2fs/gen_bitmap64.c
+ lib/ext2fs/gen_bitmap.c
+ lib/ext2fs/get_num_dirs.c
+ lib/ext2fs/getsectsize.c
+ lib/ext2fs/getsize.c
+ lib/ext2fs/hashmap.c
+ lib/ext2fs/i_block.c
+ lib/ext2fs/ind_block.c
+ lib/ext2fs/initialize.c
+ lib/ext2fs/inline.c
+ lib/ext2fs/inline_data.c
+ lib/ext2fs/inode.c
+ lib/ext2fs/io_manager.c
+ lib/ext2fs/ismounted.c
+ lib/ext2fs/link.c
+ lib/ext2fs/llseek.c
+ lib/ext2fs/lookup.c
+ lib/ext2fs/mkdir.c
+ lib/ext2fs/mkjournal.c
+ lib/ext2fs/mmp.c
+ lib/ext2fs/namei.c
+ lib/ext2fs/newdir.c
+ lib/ext2fs/nls_utf8.c
+ lib/ext2fs/openfs.c
+ lib/ext2fs/progress.c
+ lib/ext2fs/punch.c
+ lib/ext2fs/rbtree.c
+ lib/ext2fs/read_bb.c
+ lib/ext2fs/read_bb_file.c
+ lib/ext2fs/res_gdt.c
+ lib/ext2fs/rw_bitmaps.c
+ lib/ext2fs/sha512.c
+ lib/ext2fs/sparse_io.c
+ lib/ext2fs/symlink.c
+ lib/ext2fs/undo_io.c
+ lib/ext2fs/unix_io.c
+ lib/ext2fs/valid_blk.c
+ lib/support/dict.c
+ lib/support/mkquota.c
+ lib/support/parse_qtype.c
+ lib/support/plausible.c
+ lib/support/prof_err.c
+ lib/support/profile.c
+ lib/support/quotaio.c
+ lib/support/quotaio_tree.c
+ lib/support/quotaio_v2.c
+ lib/uuid/clear.c
+ lib/uuid/gen_uuid.c
+ lib/uuid/isnull.c
+ lib/uuid/pack.c
+ lib/uuid/parse.c
+ lib/uuid/unpack.c
+ lib/uuid/unparse.c
+ misc/create_inode.c
+)
+libext2fs = compile(expand("e2fsprogs", libext2fsfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include")
+
+mke2fsfiles = %w(
+ misc/default_profile.c
+ misc/mke2fs.c
+ misc/mk_hugefiles.c
+ misc/util.c
+)
+mke2fs = compile(expand("e2fsprogs", mke2fsfiles), "-Ie2fsprogs/lib")
+
+link("mke2fs.android", mke2fs + libext2fs + libsparse + libbase + libzip + liblog + libutil, "-lpthread -lz")
+
+e2fsdroidfiles = %w(
+ contrib/android/basefs_allocator.c
+ contrib/android/base_fs.c
+ contrib/android/block_list.c
+ contrib/android/block_range.c
+ contrib/android/e2fsdroid.c
+ contrib/android/fsmap.c
+ contrib/android/perms.c
+)
+e2fsdroid = compile(expand("e2fsprogs", e2fsdroidfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc")
+
+link("e2fsdroid", e2fsdroid + libext2fs + libsparse + libbase + libzip + liblog + libutil + libselinux + libsepol + libcutils, "-lz -lpthread -lpcre2-8")
+
+ext2simgfiles = %w(
+ contrib/android/ext2simg.c
+)
+ext2simg = compile(expand("e2fsprogs", ext2simgfiles), "-Ie2fsprogs/lib -Icore/libsparse/include")
+
+link("ext2simg", ext2simg + libext2fs + libsparse + libbase + libzip + liblog + libutil, "-lz -lpthread")
-link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + f2fs + libselinux + libsepol + libfastboot + libdiagnoseusb, '-lz -lpcre2-8 -lpthread -ldl')
-link('make_ext4fs', libmake_ext4 + libzip + libcutils + liblog + libutil + libbase + libext4 + libselinux + libsepol + libsparse, '-lz -lpcre2-8 -lpthread')
+link("adb", libbase + liblog + libcutils + libutil + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl + libandroidfw + libzip + [apkent_o], "-lpthread -lusb-1.0 -lprotobuf-lite -lz")
diff --git a/development/anjuta/anjuta.SlackBuild b/development/anjuta/anjuta.SlackBuild
index f9944de6a4..6ad50aec7b 100644
--- a/development/anjuta/anjuta.SlackBuild
+++ b/development/anjuta/anjuta.SlackBuild
@@ -69,7 +69,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=format-nonliteral -Wno-error=format-y2k" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/development/apache-log4cxx/apache-log4cxx.SlackBuild b/development/apache-log4cxx/apache-log4cxx.SlackBuild
index 8e1adafefb..a0971e9701 100644
--- a/development/apache-log4cxx/apache-log4cxx.SlackBuild
+++ b/development/apache-log4cxx/apache-log4cxx.SlackBuild
@@ -70,6 +70,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
zcat $CWD/fixincludes.patch.gz | patch -p1 || exit
+zcat $CWD/narrowing-fixes.patch.gz | patch -p1 || exit
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/development/apache-log4cxx/narrowing-fixes.patch.gz b/development/apache-log4cxx/narrowing-fixes.patch.gz
new file mode 100644
index 0000000000..cd79cc6971
--- /dev/null
+++ b/development/apache-log4cxx/narrowing-fixes.patch.gz
Binary files differ
diff --git a/development/autogen/autogen.SlackBuild b/development/autogen/autogen.SlackBuild
index 8318ecd660..3fdb23b320 100644
--- a/development/autogen/autogen.SlackBuild
+++ b/development/autogen/autogen.SlackBuild
@@ -70,7 +70,11 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+# Patched for guile 2.2.x
+patch -p1 < $CWD/guile-2.2.patch
+
+autoreconf
+CFLAGS="$SLKCFLAGS -Wno-error=implicit-fallthrough -Wno-error=format-overflow" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
@@ -81,6 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \
--infodir=/usr/info \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--enable-static=no \
+ --disable-dependency-tracking \
--build=$ARCH-slackware-linux
make
diff --git a/development/autogen/guile-2.2.patch b/development/autogen/guile-2.2.patch
new file mode 100644
index 0000000000..b3d50f4b79
--- /dev/null
+++ b/development/autogen/guile-2.2.patch
@@ -0,0 +1,78 @@
+diff --git a/agen5/guile-iface.h b/agen5/guile-iface.h
+index 0aeabb0..6ce3520 100644
+--- a/agen5/guile-iface.h
++++ b/agen5/guile-iface.h
+@@ -9,7 +9,7 @@
+ # error AutoGen does not work with this version of Guile
+ choke me.
+
+-#elif GUILE_VERSION < 201000
++#else
+ # define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p))
+ # define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l))
+ # define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p))
+@@ -24,9 +24,6 @@
+ # define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v))
+ # define AG_SCM_VEC_P(_v) scm_is_vector(_v)
+
+-#else
+-# error unknown GUILE_VERSION
+- choke me.
+ #endif
+
+ #endif /* MUTATING_GUILE_IFACE_H_GUARD */
+diff --git a/configure b/configure
+index befe20b..c4254eb 100755
+--- a/configure
++++ b/configure
+@@ -14191,7 +14191,7 @@ $as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+ fi
+- _guile_versions_to_search="2.0 1.8"
++ _guile_versions_to_search="2.2 2.0 1.8"
+ if test -n "$GUILE_EFFECTIVE_VERSION"; then
+ _guile_tmp=""
+ for v in $_guile_versions_to_search; do
+
+diff --git a/agen5/guile-iface.h b/agen5/guile-iface.h
+index 0aeabb0..6ce3520 100644
+--- autogen-5.18.12/config/guile-orig.m4 2017-11-21 15:23:45.047606700 -0500
++++ autogen-5.18.12/config/guile.m4 2017-11-21 15:24:20.414686700 -0500
+@@ -47,7 +47,7 @@
+ # for an available version of Guile.
+ #
+ # By default, this macro will search for the latest stable version of
+-# Guile (e.g. 2.0), falling back to the previous stable version
++# Guile (e.g. 2.2), falling back to the previous stable version
+ # (e.g. 1.8) if it is available. If no guile-@var{VERSION}.pc file is
+ # found, an error is signalled. The found version is stored in
+ # @var{GUILE_EFFECTIVE_VERSION}.
+@@ -61,7 +61,7 @@
+ #
+ AC_DEFUN([GUILE_PKG],
+ [PKG_PROG_PKG_CONFIG
+- _guile_versions_to_search="m4_default([$1], [2.0 1.8])"
++ _guile_versions_to_search="m4_default([$1], [2.2 1.8])"
+ if test -n "$GUILE_EFFECTIVE_VERSION"; then
+ _guile_tmp=""
+ for v in $_guile_versions_to_search; do
+@@ -184,7 +184,7 @@
+ # If @code{guile} is not found, signal an error.
+ #
+ # By default, this macro will search for the latest stable version of
+-# Guile (e.g. 2.0). x.y or x.y.z versions can be specified. If an older
++# Guile (e.g. 2.2). x.y or x.y.z versions can be specified. If an older
+ # version is found, the macro will signal an error.
+ #
+ # The effective version of the found @code{guile} is set to
+@@ -201,7 +201,7 @@
+ [AC_PATH_PROG(GUILE,guile)
+ _guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])"
+ if test -z "$_guile_required_version"; then
+- _guile_required_version=2.0
++ _guile_required_version=2.2
+ fi
+ if test "$GUILE" = "" ; then
+ AC_MSG_ERROR([guile required but not found])
+
diff --git a/development/avr-binutils/avr-binutils.SlackBuild b/development/avr-binutils/avr-binutils.SlackBuild
index 3b31a96b3f..a3b68d60ec 100644
--- a/development/avr-binutils/avr-binutils.SlackBuild
+++ b/development/avr-binutils/avr-binutils.SlackBuild
@@ -9,13 +9,13 @@
# This file is placed in the public domain.
PRGNAM=avr-binutils
-VERSION=${VERSION:-2.25}
+VERSION=${VERSION:-2.31}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -26,8 +26,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -50,10 +50,10 @@ tar xvf $CWD/binutils-$VERSION.tar.bz2
cd binutils-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Apply patch for AVR specific output of 'size' (avr-size)
patch -p0 < $CWD/avr-size.patch
@@ -95,7 +95,7 @@ rm -f $PKG/usr/man/man1/avr-dlltool.1
rm -f $PKG/usr/man/man1/avr-nlmconv.1
rm -f $PKG/usr/man/man1/avr-windres.1
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/development/avr-binutils/avr-binutils.info b/development/avr-binutils/avr-binutils.info
index a5ea0988d2..c58398e7eb 100644
--- a/development/avr-binutils/avr-binutils.info
+++ b/development/avr-binutils/avr-binutils.info
@@ -1,8 +1,8 @@
PRGNAM="avr-binutils"
-VERSION="2.25"
+VERSION="2.31"
HOMEPAGE="http://www.gnu.org/software/binutils"
-DOWNLOAD="http://ftp.gnu.org/gnu/binutils/binutils-2.25.tar.bz2"
-MD5SUM="d9f3303f802a5b6b0bb73a335ab89d66"
+DOWNLOAD="http://ftp.gnu.org/gnu/binutils/binutils-2.31.tar.bz2"
+MD5SUM="50a489aa6d4b8630b7b89b2de6b185be"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/avr-binutils/avr-size.patch b/development/avr-binutils/avr-size.patch
index 2e01c3d31f..b36f3d6d08 100644
--- a/development/avr-binutils/avr-size.patch
+++ b/development/avr-binutils/avr-size.patch
@@ -1,8 +1,10 @@
-AVR specific only
---------------------------------------------------------------------------------
+AVR only; support -C for AVR memory usage
+
+Source: http://git.makehackvoid.com/cgi-bin/gitweb.cgi?p=mhvavrtools.git;a=blob_plain;f=mhvavrtools/patches/binutils-001-avr-size.patch;h=e80d28eae46217551d996a2253256c97d10aa4b5;hb=refs/heads/master
+===========================================================
--- binutils/size.c 2007-08-06 13:56:14.000000000 -0600
+++ binutils/size.c 2007-09-13 09:13:10.281250000 -0600
-@@ -35,10 +35,31 @@
+@@ -36,10 +36,31 @@
#include "getopt.h"
#include "bucomm.h"
@@ -36,7 +38,7 @@ AVR specific only
/* Program options. */
static enum
-@@ -47,9 +68,8 @@ static enum
+@@ -48,9 +69,8 @@ static enum
}
radix = decimal;
@@ -47,7 +49,7 @@ AVR specific only
static int show_version = 0;
static int show_help = 0;
static int show_totals = 0;
-@@ -63,6 +83,157 @@ static bfd_size_type total_textsize;
+@@ -64,6 +84,246 @@ static bfd_size_type total_textsize;
/* Program exit status. */
static int return_code = 0;
@@ -63,12 +65,18 @@ AVR specific only
+#define AVR4K 4096UL
+#define AVR8K 8192UL
+#define AVR16K 16384UL
++#define AVR20K 20480UL
+#define AVR24K 24576UL
+#define AVR32K 32768UL
++#define AVR36K 36864UL
+#define AVR40K 40960UL
+#define AVR64K 65536UL
++#define AVR68K 69632UL
+#define AVR128K 131072UL
++#define AVR136K 139264UL
++#define AVR200K 204800UL
+#define AVR256K 262144UL
++#define AVR264K 270336UL
+
+typedef struct
+{
@@ -80,123 +88,206 @@ AVR specific only
+
+avr_device_t avr[] =
+{
-+ {"atmega2560", AVR256K, AVR8K, AVR4K},
-+ {"atmega2561", AVR256K, AVR8K, AVR4K},
-+
-+ {"at43usb320", AVR128K, 608UL, 0},
-+ {"at90can128", AVR128K, AVR4K, AVR4K},
-+ {"at90usb1286", AVR128K, AVR8K, AVR4K},
-+ {"at90usb1287", AVR128K, AVR8K, AVR4K},
-+ {"atmega128", AVR128K, AVR4K, AVR4K},
-+ {"atmega1280", AVR128K, AVR8K, AVR4K},
-+ {"atmega1281", AVR128K, AVR8K, AVR4K},
-+ {"atmega1284P", AVR128K, AVR16K, AVR4K},
-+ {"atmega103", AVR128K, 4000UL, AVR4K},
-+ {"atxmega128a1",AVR128K, AVR8K, AVR2K},
-+
-+ {"at90can64", AVR64K, AVR4K, AVR2K},
-+ {"at90usb646", AVR64K, AVR4K, AVR2K},
-+ {"at90usb647", AVR64K, AVR4K, AVR2K},
-+ {"atmega64", AVR64K, AVR4K, AVR2K},
-+ {"atmega640", AVR64K, AVR8K, AVR4K},
-+ {"atmega644", AVR64K, AVR4K, AVR2K},
-+ {"atmega644p", AVR64K, AVR4K, AVR2K},
-+ {"atmega645", AVR64K, AVR4K, AVR2K},
-+ {"atmega6450", AVR64K, AVR4K, AVR2K},
-+ {"atmega649", AVR64K, AVR4K, AVR2K},
-+ {"atmega6490", AVR64K, AVR4K, AVR2K},
-+ {"atxmega64a1", AVR64K, AVR4K, AVR2K},
-+
-+ {"atmega406", AVR40K, AVR512, AVR2K},
-+
-+ {"at90can32", AVR32K, AVR2K, AVR1K},
-+ {"at94k", AVR32K, AVR4K, 0},
-+ {"atmega32", AVR32K, AVR2K, AVR1K},
-+ {"atmega323", AVR32K, AVR2K, AVR1K},
-+ {"atmega324p", AVR32K, AVR2K, AVR1K},
-+ {"atmega325", AVR32K, AVR2K, AVR1K},
-+ {"atmega325p", AVR32K, AVR2K, AVR1K},
-+ {"atmega3250", AVR32K, AVR2K, AVR1K},
-+ {"atmega3250p", AVR32K, AVR2K, AVR1K},
-+ {"atmega328p", AVR32K, AVR2K, AVR1K},
-+ {"atmega329", AVR32K, AVR2K, AVR1K},
-+ {"atmega329p", AVR32K, AVR2K, AVR1K},
-+ {"atmega3290", AVR32K, AVR2K, AVR1K},
-+ {"atmega3290p", AVR32K, AVR2K, AVR1K},
-+ {"atmega32hvb", AVR32K, AVR2K, AVR1K},
-+ {"atmega32c1", AVR32K, AVR2K, AVR1K},
-+ {"atmega32m1", AVR32K, AVR2K, AVR1K},
-+ {"atmega32u4", AVR32K, 2560UL, AVR1K},
-+
-+ {"at43usb355", AVR24K, 1120, 0},
-+
-+ {"at76c711", AVR16K, AVR2K, 0},
-+ {"at90pwm216", AVR16K, AVR1K, AVR512},
-+ {"at90pwm316", AVR16K, AVR1K, AVR512},
-+ {"at90usb162", AVR16K, AVR512, AVR512},
-+ {"atmega16", AVR16K, AVR1K, AVR512},
-+ {"atmega161", AVR16K, AVR1K, AVR512},
-+ {"atmega162", AVR16K, AVR1K, AVR512},
-+ {"atmega163", AVR16K, AVR1K, AVR512},
-+ {"atmega164", AVR16K, AVR1K, AVR512},
-+ {"atmega164p", AVR16K, AVR1K, AVR512},
-+ {"atmega165", AVR16K, AVR1K, AVR512},
-+ {"atmega165p", AVR16K, AVR1K, AVR512},
-+ {"atmega168", AVR16K, AVR1K, AVR512},
-+ {"atmega168p", AVR16K, AVR1K, AVR512},
-+ {"atmega169", AVR16K, AVR1K, AVR512},
-+ {"atmega169p", AVR16K, AVR1K, AVR512},
-+ {"attiny167", AVR16K, AVR512, AVR512},
-+ {"atxmega16d4", AVR16K, AVR2K, AVR1K},
-+
-+ {"at90c8534", AVR8K, 352, AVR512},
-+ {"at90pwm1", AVR8K, AVR512, AVR512},
-+ {"at90pwm2", AVR8K, AVR512, AVR512},
-+ {"at90pwm2b", AVR8K, AVR512, AVR512},
-+ {"at90pwm3", AVR8K, AVR512, AVR512},
-+ {"at90pwm3b", AVR8K, AVR512, AVR512},
-+ {"at90s8515", AVR8K, AVR512, AVR512},
-+ {"at90s8535", AVR8K, AVR512, AVR512},
-+ {"at90usb82", AVR8K, AVR512, AVR512},
-+ {"atmega8", AVR8K, AVR1K, AVR512},
-+ {"atmega8515", AVR8K, AVR512, AVR512},
-+ {"atmega8535", AVR8K, AVR512, AVR512},
-+ {"atmega88", AVR8K, AVR1K, AVR512},
-+ {"atmega88p", AVR8K, AVR1K, AVR512},
-+ {"attiny84", AVR8K, AVR512, AVR512},
-+ {"attiny85", AVR8K, AVR512, AVR512},
-+ {"attiny861", AVR8K, AVR512, AVR512},
-+ {"attiny88", AVR8K, AVR256, AVR64},
-+
-+ {"at90s4414", AVR4K, 352, AVR256},
-+ {"at90s4433", AVR4K, AVR128, AVR256},
-+ {"at90s4434", AVR4K, 352, AVR256},
-+ {"atmega48", AVR4K, AVR512, AVR256},
-+ {"atmega48p", AVR4K, AVR512, AVR256},
-+ {"attiny43u", AVR4K, AVR256, AVR64},
-+ {"attiny44", AVR4K, AVR256, AVR256},
-+ {"attiny45", AVR4K, AVR256, AVR256},
-+ {"attiny461", AVR4K, AVR256, AVR256},
-+ {"attiny48", AVR4K, AVR256, AVR64},
-+
-+ {"at86rf401", AVR2K, 224, AVR128},
-+ {"at90s2313", AVR2K, AVR128, AVR128},
-+ {"at90s2323", AVR2K, AVR128, AVR128},
-+ {"at90s2333", AVR2K, 224, AVR128},
-+ {"at90s2343", AVR2K, AVR128, AVR128},
-+ {"attiny22", AVR2K, 224, AVR128},
-+ {"attiny2313", AVR2K, AVR128, AVR128},
-+ {"attiny24", AVR2K, AVR128, AVR128},
-+ {"attiny25", AVR2K, AVR128, AVR128},
-+ {"attiny26", AVR2K, AVR128, AVR128},
-+ {"attiny261", AVR2K, AVR128, AVR128},
-+ {"attiny28", AVR2K, 0, 0},
-+
-+ {"at90s1200", AVR1K, 0, AVR64},
-+ {"attiny11", AVR1K, 0, AVR64},
-+ {"attiny12", AVR1K, 0, AVR64},
-+ {"attiny13", AVR1K, AVR64, AVR64},
-+ {"attiny15", AVR1K, 0, AVR64},
++ {"atxmega256a3", AVR264K, AVR16K, AVR4K},
++ {"atxmega256a3b", AVR264K, AVR16K, AVR4K},
++ {"atxmega256d3", AVR264K, AVR16K, AVR4K},
++
++ {"atmega2560", AVR256K, AVR8K, AVR4K},
++ {"atmega2561", AVR256K, AVR8K, AVR4K},
++
++ {"atxmega192a3", AVR200K, AVR16K, AVR2K},
++ {"atxmega192d3", AVR200K, AVR16K, AVR2K},
++
++ {"atxmega128a1", AVR136K, AVR8K, AVR2K},
++ {"atxmega128a1u", AVR136K, AVR8K, AVR2K},
++ {"atxmega128a3", AVR136K, AVR8K, AVR2K},
++ {"atxmega128d3", AVR136K, AVR8K, AVR2K},
++
++ {"at43usb320", AVR128K, 608UL, 0UL},
++ {"at90can128", AVR128K, AVR4K, AVR4K},
++ {"at90usb1286", AVR128K, AVR8K, AVR4K},
++ {"at90usb1287", AVR128K, AVR8K, AVR4K},
++ {"atmega128", AVR128K, AVR4K, AVR4K},
++ {"atmega1280", AVR128K, AVR8K, AVR4K},
++ {"atmega1281", AVR128K, AVR8K, AVR4K},
++ {"atmega1284p", AVR128K, AVR16K, AVR4K},
++ {"atmega128rfa1", AVR128K, AVR16K, AVR4K},
++ {"atmega103", AVR128K, 4000UL, AVR4K},
++
++ {"atxmega64a1", AVR68K, AVR4K, AVR2K},
++ {"atxmega64a1u", AVR68K, AVR4K, AVR2K},
++ {"atxmega64a3", AVR68K, AVR4K, AVR2K},
++ {"atxmega64d3", AVR68K, AVR4K, AVR2K},
++
++ {"at90can64", AVR64K, AVR4K, AVR2K},
++ {"at90scr100", AVR64K, AVR4K, AVR2K},
++ {"at90usb646", AVR64K, AVR4K, AVR2K},
++ {"at90usb647", AVR64K, AVR4K, AVR2K},
++ {"atmega64", AVR64K, AVR4K, AVR2K},
++ {"atmega640", AVR64K, AVR8K, AVR4K},
++ {"atmega644", AVR64K, AVR4K, AVR2K},
++ {"atmega644a", AVR64K, AVR4K, AVR2K},
++ {"atmega644p", AVR64K, AVR4K, AVR2K},
++ {"atmega644pa", AVR64K, AVR4K, AVR2K},
++ {"atmega645", AVR64K, AVR4K, AVR2K},
++ {"atmega645a", AVR64K, AVR4K, AVR2K},
++ {"atmega645p", AVR64K, AVR4K, AVR2K},
++ {"atmega6450", AVR64K, AVR4K, AVR2K},
++ {"atmega6450a", AVR64K, AVR4K, AVR2K},
++ {"atmega6450p", AVR64K, AVR4K, AVR2K},
++ {"atmega649", AVR64K, AVR4K, AVR2K},
++ {"atmega649a", AVR64K, AVR4K, AVR2K},
++ {"atmega649p", AVR64K, AVR4K, AVR2K},
++ {"atmega6490", AVR64K, AVR4K, AVR2K},
++ {"atmega6490a", AVR64K, AVR4K, AVR2K},
++ {"atmega6490p", AVR64K, AVR4K, AVR2K},
++ {"atmega64c1", AVR64K, AVR4K, AVR2K},
++ {"atmega64hve", AVR64K, AVR4K, AVR1K},
++ {"atmega64m1", AVR64K, AVR4K, AVR2K},
++ {"m3000", AVR64K, AVR4K, 0UL},
++
++ {"atmega406", AVR40K, AVR2K, AVR512},
++
++ {"atxmega32a4", AVR36K, AVR4K, AVR1K},
++ {"atxmega32d4", AVR36K, AVR4K, AVR1K},
++
++ {"at90can32", AVR32K, AVR2K, AVR1K},
++ {"at94k", AVR32K, AVR4K, 0UL},
++ {"atmega32", AVR32K, AVR2K, AVR1K},
++ {"atmega323", AVR32K, AVR2K, AVR1K},
++ {"atmega324a", AVR32K, AVR2K, AVR1K},
++ {"atmega324p", AVR32K, AVR2K, AVR1K},
++ {"atmega324pa", AVR32K, AVR2K, AVR1K},
++ {"atmega325", AVR32K, AVR2K, AVR1K},
++ {"atmega325a", AVR32K, AVR2K, AVR1K},
++ {"atmega325p", AVR32K, AVR2K, AVR1K},
++ {"atmega3250", AVR32K, AVR2K, AVR1K},
++ {"atmega3250a", AVR32K, AVR2K, AVR1K},
++ {"atmega3250p", AVR32K, AVR2K, AVR1K},
++ {"atmega328", AVR32K, AVR2K, AVR1K},
++ {"atmega328p", AVR32K, AVR2K, AVR1K},
++ {"atmega329", AVR32K, AVR2K, AVR1K},
++ {"atmega329a", AVR32K, AVR2K, AVR1K},
++ {"atmega329p", AVR32K, AVR2K, AVR1K},
++ {"atmega329pa", AVR32K, AVR2K, AVR1K},
++ {"atmega3290", AVR32K, AVR2K, AVR1K},
++ {"atmega3290a", AVR32K, AVR2K, AVR1K},
++ {"atmega3290p", AVR32K, AVR2K, AVR1K},
++ {"atmega32hvb", AVR32K, AVR2K, AVR1K},
++ {"atmega32c1", AVR32K, AVR2K, AVR1K},
++ {"atmega32hvb", AVR32K, AVR2K, AVR1K},
++ {"atmega32m1", AVR32K, AVR2K, AVR1K},
++ {"atmega32u2", AVR32K, AVR1K, AVR1K},
++ {"atmega32u4", AVR32K, 2560UL, AVR1K},
++ {"atmega32u6", AVR32K, 2560UL, AVR1K},
++
++ {"at43usb355", AVR24K, 1120UL, 0UL},
++
++ {"atxmega16a4", AVR20K, AVR2K, AVR1K},
++ {"atxmega16d4", AVR20K, AVR2K, AVR1K},
++
++ {"at76c711", AVR16K, AVR2K, 0UL},
++ {"at90pwm216", AVR16K, AVR1K, AVR512},
++ {"at90pwm316", AVR16K, AVR1K, AVR512},
++ {"at90usb162", AVR16K, AVR512, AVR512},
++ {"atmega16", AVR16K, AVR1K, AVR512},
++ {"atmega16a", AVR16K, AVR1K, AVR512},
++ {"atmega161", AVR16K, AVR1K, AVR512},
++ {"atmega162", AVR16K, AVR1K, AVR512},
++ {"atmega163", AVR16K, AVR1K, AVR512},
++ {"atmega164", AVR16K, AVR1K, AVR512},
++ {"atmega164a", AVR16K, AVR1K, AVR512},
++ {"atmega164p", AVR16K, AVR1K, AVR512},
++ {"atmega165a", AVR16K, AVR1K, AVR512},
++ {"atmega165", AVR16K, AVR1K, AVR512},
++ {"atmega165p", AVR16K, AVR1K, AVR512},
++ {"atmega168", AVR16K, AVR1K, AVR512},
++ {"atmega168a", AVR16K, AVR1K, AVR512},
++ {"atmega168p", AVR16K, AVR1K, AVR512},
++ {"atmega169", AVR16K, AVR1K, AVR512},
++ {"atmega169a", AVR16K, AVR1K, AVR512},
++ {"atmega169p", AVR16K, AVR1K, AVR512},
++ {"atmega169pa", AVR16K, AVR1K, AVR512},
++ {"atmega16hva", AVR16K, 768UL, AVR256},
++ {"atmega16hva2", AVR16K, AVR1K, AVR256},
++ {"atmega16hvb", AVR16K, AVR1K, AVR512},
++ {"atmega16m1", AVR16K, AVR1K, AVR512},
++ {"atmega16u2", AVR16K, AVR512, AVR512},
++ {"atmega16u4", AVR16K, 1280UL, AVR512},
++ {"attiny167", AVR16K, AVR512, AVR512},
++
++ {"at90c8534", AVR8K, 352UL, AVR512},
++ {"at90pwm1", AVR8K, AVR512, AVR512},
++ {"at90pwm2", AVR8K, AVR512, AVR512},
++ {"at90pwm2b", AVR8K, AVR512, AVR512},
++ {"at90pwm3", AVR8K, AVR512, AVR512},
++ {"at90pwm3b", AVR8K, AVR512, AVR512},
++ {"at90pwm81", AVR8K, AVR256, AVR512},
++ {"at90s8515", AVR8K, AVR512, AVR512},
++ {"at90s8535", AVR8K, AVR512, AVR512},
++ {"at90usb82", AVR8K, AVR512, AVR512},
++ {"ata6289", AVR8K, AVR512, 320UL},
++ {"atmega8", AVR8K, AVR1K, AVR512},
++ {"atmega8515", AVR8K, AVR512, AVR512},
++ {"atmega8535", AVR8K, AVR512, AVR512},
++ {"atmega88", AVR8K, AVR1K, AVR512},
++ {"atmega88a", AVR8K, AVR1K, AVR512},
++ {"atmega88p", AVR8K, AVR1K, AVR512},
++ {"atmega88pa", AVR8K, AVR1K, AVR512},
++ {"atmega8hva", AVR8K, 768UL, AVR256},
++ {"atmega8u2", AVR8K, AVR512, AVR512},
++ {"attiny84", AVR8K, AVR512, AVR512},
++ {"attiny84a", AVR8K, AVR512, AVR512},
++ {"attiny85", AVR8K, AVR512, AVR512},
++ {"attiny861", AVR8K, AVR512, AVR512},
++ {"attiny861a", AVR8K, AVR512, AVR512},
++ {"attiny87", AVR8K, AVR512, AVR512},
++ {"attiny88", AVR8K, AVR512, AVR64},
++
++ {"at90s4414", AVR4K, 352UL, AVR256},
++ {"at90s4433", AVR4K, AVR128, AVR256},
++ {"at90s4434", AVR4K, 352UL, AVR256},
++ {"atmega48", AVR4K, AVR512, AVR256},
++ {"atmega48a", AVR4K, AVR512, AVR256},
++ {"atmega48p", AVR4K, AVR512, AVR256},
++ {"attiny4313", AVR4K, AVR256, AVR256},
++ {"attiny43u", AVR4K, AVR256, AVR64},
++ {"attiny44", AVR4K, AVR256, AVR256},
++ {"attiny44a", AVR4K, AVR256, AVR256},
++ {"attiny45", AVR4K, AVR256, AVR256},
++ {"attiny461", AVR4K, AVR256, AVR256},
++ {"attiny461a", AVR4K, AVR256, AVR256},
++ {"attiny48", AVR4K, AVR256, AVR64},
++
++ {"at86rf401", AVR2K, 224UL, AVR128},
++ {"at90s2313", AVR2K, AVR128, AVR128},
++ {"at90s2323", AVR2K, AVR128, AVR128},
++ {"at90s2333", AVR2K, 224UL, AVR128},
++ {"at90s2343", AVR2K, AVR128, AVR128},
++ {"attiny20", AVR2K, AVR128, 0UL},
++ {"attiny22", AVR2K, 224UL, AVR128},
++ {"attiny2313", AVR2K, AVR128, AVR128},
++ {"attiny2313a", AVR2K, AVR128, AVR128},
++ {"attiny24", AVR2K, AVR128, AVR128},
++ {"attiny24a", AVR2K, AVR128, AVR128},
++ {"attiny25", AVR2K, AVR128, AVR128},
++ {"attiny26", AVR2K, AVR128, AVR128},
++ {"attiny261", AVR2K, AVR128, AVR128},
++ {"attiny261a", AVR2K, AVR128, AVR128},
++ {"attiny28", AVR2K, 0UL, 0UL},
++ {"attiny40", AVR2K, AVR256, 0UL},
++
++ {"at90s1200", AVR1K, 0UL, AVR64},
++ {"attiny9", AVR1K, 32UL, 0UL},
++ {"attiny10", AVR1K, 32UL, 0UL},
++ {"attiny11", AVR1K, 0UL, AVR64},
++ {"attiny12", AVR1K, 0UL, AVR64},
++ {"attiny13", AVR1K, AVR64, AVR64},
++ {"attiny13a", AVR1K, AVR64, AVR64},
++ {"attiny15", AVR1K, 0UL, AVR64},
++
++ {"attiny4", AVR512, 32UL, 0UL},
++ {"attiny5", AVR512, 32UL, 0UL},
+};
+
+static char *avrmcu = NULL;
@@ -205,7 +296,7 @@ AVR specific only
static char *target = NULL;
/* Forward declarations. */
-@@ -78,7 +240,8 @@ usage (FILE *stream, int status)
+@@ -79,7 +337,8 @@ usage (FILE *stream, int status)
fprintf (stream, _(" Displays the sizes of sections inside binary files\n"));
fprintf (stream, _(" If no input file(s) are specified, a.out is assumed\n"));
fprintf (stream, _(" The options are:\n\
@@ -215,7 +306,7 @@ AVR specific only
-o|-d|-x --radix={8|10|16} Display numbers in octal, decimal or hex\n\
-t --totals Display the total sizes (Berkeley only)\n\
--common Display total size for *COM* syms\n\
-@@ -87,11 +250,7 @@ usage (FILE *stream, int status)
+@@ -88,11 +337,7 @@ usage (FILE *stream, int status)
-h --help Display this information\n\
-v --version Display the program's version\n\
\n"),
@@ -228,7 +319,7 @@ AVR specific only
);
list_supported_targets (program_name, stream);
if (REPORT_BUGS_TO[0] && status == 0)
-@@ -102,6 +261,7 @@ usage (FILE *stream, int status)
+@@ -103,6 +359,7 @@ usage (FILE *stream, int status)
#define OPTION_FORMAT (200)
#define OPTION_RADIX (OPTION_FORMAT + 1)
#define OPTION_TARGET (OPTION_RADIX + 1)
@@ -236,7 +327,7 @@ AVR specific only
static struct option long_options[] =
{
-@@ -109,6 +269,7 @@ static struct option long_options[] =
+@@ -110,6 +368,7 @@ static struct option long_options[] =
{"format", required_argument, 0, OPTION_FORMAT},
{"radix", required_argument, 0, OPTION_RADIX},
{"target", required_argument, 0, OPTION_TARGET},
@@ -244,7 +335,7 @@ AVR specific only
{"totals", no_argument, &show_totals, 1},
{"version", no_argument, &show_version, 1},
{"help", no_argument, &show_help, 1},
-@@ -140,7 +301,7 @@ main (int argc, char **argv)
+@@ -141,7 +399,7 @@ main (int argc, char **argv)
bfd_init ();
set_default_bfd_target ();
@@ -253,7 +344,7 @@ AVR specific only
(int *) 0)) != EOF)
switch (c)
{
-@@ -149,11 +310,15 @@ main (int argc, char **argv)
+@@ -150,11 +409,15 @@ main (int argc, char **argv)
{
case 'B':
case 'b':
@@ -271,7 +362,7 @@ AVR specific only
break;
default:
non_fatal (_("invalid argument to --format: %s"), optarg);
-@@ -161,6 +326,10 @@ main (int argc, char **argv)
+@@ -162,6 +424,10 @@ main (int argc, char **argv)
}
break;
@@ -282,7 +373,7 @@ AVR specific only
case OPTION_TARGET:
target = optarg;
break;
-@@ -189,11 +358,14 @@ main (int argc, char **argv)
+@@ -190,11 +457,14 @@ main (int argc, char **argv)
break;
case 'A':
@@ -299,7 +390,7 @@ AVR specific only
case 'v':
case 'V':
show_version = 1;
-@@ -239,7 +411,7 @@ main (int argc, char **argv)
+@@ -240,7 +509,7 @@ main (int argc, char **argv)
for (; optind < argc;)
display_file (argv[optind++]);
@@ -308,7 +399,7 @@ AVR specific only
{
bfd_size_type total = total_textsize + total_datasize + total_bsssize;
-@@ -600,13 +772,117 @@ print_sysv_format (bfd *file)
+@@ -599,13 +869,117 @@ print_sysv_format (bfd *file)
printf ("\n\n");
}
@@ -341,12 +432,12 @@ AVR specific only
+ int rammax = 0;
+ int eeprommax = 0;
+ asection *section;
-+ bfd_size_type data_size = 0;
-+ bfd_size_type text_size = 0;
-+ bfd_size_type bss_size = 0;
-+ bfd_size_type bootloader_size = 0;
-+ bfd_size_type noinit_size = 0;
-+ bfd_size_type eeprom_size = 0;
++ bfd_size_type my_datasize = 0;
++ bfd_size_type my_textsize = 0;
++ bfd_size_type my_bsssize = 0;
++ bfd_size_type bootloadersize = 0;
++ bfd_size_type noinitsize = 0;
++ bfd_size_type eepromsize = 0;
+
+ avr_device_t *avrdevice = avr_find_device();
+ if (avrdevice != NULL)
@@ -358,21 +449,21 @@ AVR specific only
+ }
+
+ if ((section = bfd_get_section_by_name (file, ".data")) != NULL)
-+ data_size = bfd_section_size (file, section);
++ my_datasize = bfd_section_size (file, section);
+ if ((section = bfd_get_section_by_name (file, ".text")) != NULL)
-+ text_size = bfd_section_size (file, section);
++ my_textsize = bfd_section_size (file, section);
+ if ((section = bfd_get_section_by_name (file, ".bss")) != NULL)
-+ bss_size = bfd_section_size (file, section);
++ my_bsssize = bfd_section_size (file, section);
+ if ((section = bfd_get_section_by_name (file, ".bootloader")) != NULL)
-+ bootloader_size = bfd_section_size (file, section);
++ bootloadersize = bfd_section_size (file, section);
+ if ((section = bfd_get_section_by_name (file, ".noinit")) != NULL)
-+ noinit_size = bfd_section_size (file, section);
++ noinitsize = bfd_section_size (file, section);
+ if ((section = bfd_get_section_by_name (file, ".eeprom")) != NULL)
-+ eeprom_size = bfd_section_size (file, section);
++ eepromsize = bfd_section_size (file, section);
+
-+ bfd_size_type text = text_size + data_size + bootloader_size;
-+ bfd_size_type data = data_size + bss_size + noinit_size;
-+ bfd_size_type eeprom = eeprom_size;
++ bfd_size_type text = my_textsize + my_datasize + bootloadersize;
++ bfd_size_type data = my_datasize + my_bsssize + noinitsize;
++ bfd_size_type eeprom = eepromsize;
+
+ printf ("AVR Memory Usage\n"
+ "----------------\n"
diff --git a/development/avr-gcc/avr-gcc.SlackBuild b/development/avr-gcc/avr-gcc.SlackBuild
index a91986fe8c..ba8b2d314f 100644
--- a/development/avr-gcc/avr-gcc.SlackBuild
+++ b/development/avr-gcc/avr-gcc.SlackBuild
@@ -8,13 +8,14 @@
# This file is placed in the public domain.
PRGNAM=avr-gcc
-VERSION=${VERSION:-4.9.2}
+VERSION=${VERSION:-8.2.0}
+ISLVERSION=${ISLVERSION:-0.19}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -25,8 +26,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -42,21 +43,25 @@ fi
set -e
rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf gcc-$VERSION avr-gcc-build-$VERSION
-tar xvf $CWD/gcc-$VERSION.tar.bz2 || exit 1
-mkdir avr-gcc-build-$VERSION
-cd avr-gcc-build-$VERSION || exit 1
-chown -R root:root .
+mkdir -p $TMP/$PRGNAM $PKG $OUTPUT
+cd $TMP/$PRGNAM
+rm -rf $TMP/$PRGNAM/*
+tar xvf $CWD/gcc-$VERSION.tar.xz
+tar xvf $CWD/isl-$ISLVERSION.tar.bz2
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+cd gcc-$VERSION
+ln -s ../isl-$ISLVERSION isl
+
+mkdir ../avr-gcc-build-$VERSION
+cd ../avr-gcc-build-$VERSION
+
+export CFLAGS_FOR_TARGET="$SLKCFLAGS"
+export CXXFLAGS_FOR_TARGET="$SLKCFLAGS"
-CFLAGS_FOR_BUILD="$SLKCFLAGS" \
-CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \
../gcc-$VERSION/configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -71,11 +76,12 @@ CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \
--disable-linker-build-id \
--disable-nls \
--disable-werror \
- --enable-__cxa_atexit \
+ --disable-__cxa_atexit \
--enable-checking=release \
--enable-clocale=gnu \
--enable-cloog-backend=isl \
--enable-gnu-unique-object \
+ --enable-gnu-indirect-function \
--enable-gold \
--enable-languages=c,c++ \
--enable-ld=default \
@@ -90,22 +96,24 @@ CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \
--with-plugin-ld=ld.gold \
--with-system-zlib \
--with-dwarf2 \
+ --with-isl \
--program-prefix="avr-" \
--program-suffix="" \
--build=$ARCH-slackware-linux
make || exit 1
-make install DESTDIR=$PKG || exit 1
+make -j1 install DESTDIR=$PKG || exit 1
# Remove useless stuff
rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/libiberty.a
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/libcc1.*
rm -rf $PKG/usr/info
rm -rf $PKG/usr/include
rm -rf $PKG/usr/share
rm -rf $PKG/usr/man/man7
rm -rf $PKG/usr/libexec/gcc/avr/$VERSION/install-tools
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/development/avr-gcc/avr-gcc.info b/development/avr-gcc/avr-gcc.info
index 6bd3a9b64d..a57c77698b 100644
--- a/development/avr-gcc/avr-gcc.info
+++ b/development/avr-gcc/avr-gcc.info
@@ -1,8 +1,10 @@
PRGNAM="avr-gcc"
-VERSION="4.9.2"
+VERSION="8.2.0"
HOMEPAGE="http://www.gnu.org/software/gcc/"
-DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.bz2"
-MD5SUM="4df8ee253b7f3863ad0b86359cd39c43"
+DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz \
+ http://isl.gforge.inria.fr/isl-0.19.tar.bz2"
+MD5SUM="4ab282f414676496483b3e1793d07862 \
+ 7850d46a96e5ea31e34913190895e154"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="avr-binutils"
diff --git a/development/bashdb/bashdb.SlackBuild b/development/bashdb/bashdb.SlackBuild
index 2c053d3a53..27d2a6a01d 100644
--- a/development/bashdb/bashdb.SlackBuild
+++ b/development/bashdb/bashdb.SlackBuild
@@ -27,7 +27,7 @@
# readarray speeds up initial loading of large scripts.
PRGNAM=bashdb
-VERSION=${VERSION:-4.4_0.92}
+VERSION=${VERSION:-5.0_1.1.2}
ARCH=noarch
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -71,7 +71,7 @@ gzip -9 $PKG/usr/info/*.info
rm -rf $PKG/usr/info/dir
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog ChangeLog.0 INSTALL NEWS README THANKS TODO \
+cp -a AUTHORS COPYING ChangeLog ChangeLog.0 INSTALL NEWS.md README.md THANKS TODO \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/bashdb/bashdb.info b/development/bashdb/bashdb.info
index 8d06d80116..44d97f0c7f 100644
--- a/development/bashdb/bashdb.info
+++ b/development/bashdb/bashdb.info
@@ -1,8 +1,8 @@
PRGNAM="bashdb"
-VERSION="4.4_0.92"
+VERSION="5.0_1.1.2"
HOMEPAGE="http://bashdb.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/bashdb/bashdb-4.4-0.92.tar.bz2"
-MD5SUM="b5e7ac9daf6f9d21f9928f45bf46ded9"
+DOWNLOAD="http://downloads.sourceforge.net/bashdb/bashdb-5.0-1.1.2.tar.bz2"
+MD5SUM="33eceddaffd52f42c74795178e7744ee"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/brotli/README b/development/brotli/README
deleted file mode 100644
index f99e98ef93..0000000000
--- a/development/brotli/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Brotli is a generic-purpose lossless compression algorithm that compresses data
-using a combination of a modern variant of the LZ77 algorithm, Huffman coding
-and 2nd order context modeling, with a compression ratio comparable to the best
-currently available general-purpose compression methods.
-
-This SlackBuild will also install the Python modules.
diff --git a/development/brotli/brotli.SlackBuild b/development/brotli/brotli.SlackBuild
deleted file mode 100644
index fdcd22418d..0000000000
--- a/development/brotli/brotli.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for brotli
-
-# Copyright 2018-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=brotli
-VERSION=${VERSION:-1.0.9}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_TESTING=NO \
- -DCMAKE_BUILD_TYPE=Release ..
- make
- make install DESTDIR=$PKG
-cd ..
-
-python setup.py install --root=$PKG
-
-if $(python3 -c 'import sys' 2>/dev/null); then
- python3 setup.py install --root=$PKG
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a BUILD *.txt *.md LICENSE README WORKSPACE $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/brotli/brotli.info b/development/brotli/brotli.info
deleted file mode 100644
index 72f57150b8..0000000000
--- a/development/brotli/brotli.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="brotli"
-VERSION="1.0.9"
-HOMEPAGE="https://github.com/google/brotli/"
-DOWNLOAD="https://github.com/google/brotli/archive/v1.0.9/brotli-1.0.9.tar.gz"
-MD5SUM="c2274f0c7af8470ad514637c35bcee7d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/development/brotli/slack-desc b/development/brotli/slack-desc
deleted file mode 100644
index 1a6e42e258..0000000000
--- a/development/brotli/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-brotli: brotli (compression algorithm)
-brotli:
-brotli: Brotli is a generic-purpose lossless compression algorithm that
-brotli: compresses data using a combination of a modern variant of the LZ77
-brotli: algorithm, Huffman coding and 2nd order context modeling, with
-brotli: a compression ratio comparable to the best currently available
-brotli: general-purpose compression methods.
-brotli:
-brotli: Project URL: https://github.com/google/brotli
-brotli:
-brotli:
diff --git a/development/camlp4/camlp4.SlackBuild b/development/camlp4/camlp4.SlackBuild
index 932c6d73fc..cfd34f6caa 100644
--- a/development/camlp4/camlp4.SlackBuild
+++ b/development/camlp4/camlp4.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for camlp4
-# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=camlp4
-VERSION=${VERSION:-4.03_1}
+VERSION=${VERSION:-4.08_1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -55,17 +55,15 @@ else
fi
DOCS="CHANGES* LICENSE"
-TVERSION=$(echo $VERSION | tr _ +)
-CVERSION=$(echo $VERSION | tr _ -)
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$CVERSION
-tar xvf $CWD/$PRGNAM-$CVERSION.tar.?z* || tar xvf $CWD/$TVERSION.tar.?z*
-cd $PRGNAM-$CVERSION
+rm -rf $PRGNAM-$(echo $VERSION | tr _ -)
+tar xvf $CWD/$PRGNAM-$(echo $VERSION | tr _ -).tar.?z*
+cd $PRGNAM-$(echo $VERSION | tr _ -)
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/development/camlp4/camlp4.info b/development/camlp4/camlp4.info
index f7192e0340..1fa1c27557 100644
--- a/development/camlp4/camlp4.info
+++ b/development/camlp4/camlp4.info
@@ -1,8 +1,8 @@
PRGNAM="camlp4"
-VERSION="4.03_1"
+VERSION="4.08_1"
HOMEPAGE="http://caml.inria.fr"
-DOWNLOAD="https://github.com/ocaml/camlp4/archive/4.03+1.tar.gz"
-MD5SUM="65ece8d2c8f4b1e06d62323e78759a7c"
+DOWNLOAD="https://github.com/ocaml/camlp4/archive/4.08+1/camlp4-4.08-1.tar.gz"
+MD5SUM="7e09e32fdfb185050f69cb2f1e77bf8a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ocamlbuild"
diff --git a/development/check/README b/development/check/README
deleted file mode 100644
index 747690696b..0000000000
--- a/development/check/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Check is a unit test framework for C. It features a simple interface
-for defining unit tests, putting little in the way of the developer.
-Tests are run in a separate address space, so Check can catch both
-assertion failures and code errors that cause segmentation faults or
-other signals. The output from unit tests can be used within source
-code editors and IDEs.
-
-See the project's home page for more information, including a tutorial.
diff --git a/development/check/check.SlackBuild b/development/check/check.SlackBuild
deleted file mode 100644
index ea8d7b0495..0000000000
--- a/development/check/check.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Check
-
-# Copyright 2006-2020 Jules Villard <theblatte@loulous.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Eugene M., <damagedone at gmx dot com>
-
-PRGNAM=check
-VERSION=${VERSION:-0.15.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-check
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-rm -rf $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
-rm -rf $PKG/usr/share/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL NEWS README THANKS TODO \
-$PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/check/check.info b/development/check/check.info
deleted file mode 100644
index 71e1e8222b..0000000000
--- a/development/check/check.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="check"
-VERSION="0.15.2"
-HOMEPAGE="https://libcheck.github.io/check/"
-DOWNLOAD="https://github.com/libcheck/check/releases/download/0.15.2/check-0.15.2.tar.gz"
-MD5SUM="50fcafcecde5a380415b12e9c574e0b2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Eugene M"
-EMAIL="damagedone@gmx.com"
diff --git a/development/check/slack-desc b/development/check/slack-desc
deleted file mode 100644
index 5bdc8e191c..0000000000
--- a/development/check/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-check: check (unit test framework)
-check:
-check: Check is a unit test framework for C. It features a simple interface
-check: for defining unit tests, putting little in the way of the developer.
-check: Tests are run in a separate address space, so Check can catch both
-check: assertion failures and code errors that cause segmentation faults or
-check: other signals. The output from unit tests can be used within source
-check: code editors and IDEs.
-check:
-check: See http://check.sf.net for information and tutorial.
-check:
diff --git a/development/coccinelle/coccinelle.SlackBuild b/development/coccinelle/coccinelle.SlackBuild
index 9046fc3cc6..60583d10db 100644
--- a/development/coccinelle/coccinelle.SlackBuild
+++ b/development/coccinelle/coccinelle.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=coccinelle
-VERSION=${VERSION:-1.0.6}
+VERSION=${VERSION:-1.0.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -69,6 +69,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+./autogen
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/development/coccinelle/coccinelle.info b/development/coccinelle/coccinelle.info
index 02eee74e4c..6673d37227 100644
--- a/development/coccinelle/coccinelle.info
+++ b/development/coccinelle/coccinelle.info
@@ -1,8 +1,8 @@
PRGNAM="coccinelle"
-VERSION="1.0.6"
+VERSION="1.0.8"
HOMEPAGE="http://coccinelle.lip6.fr/"
-DOWNLOAD="http://coccinelle.lip6.fr/distrib/coccinelle-1.0.6.tgz"
-MD5SUM="01b6e7e471055c9af7f9ceadbd452108"
+DOWNLOAD="https://github.com/coccinelle/coccinelle/archive/1.0.8/coccinelle-1.0.8.tar.gz"
+MD5SUM="d58871107c28a970fc53e4f8124d14e1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="camlp4 menhir"
diff --git a/development/device-tree-compiler/device-tree-compiler.SlackBuild b/development/device-tree-compiler/device-tree-compiler.SlackBuild
index 58b655f1fa..26766281f5 100644
--- a/development/device-tree-compiler/device-tree-compiler.SlackBuild
+++ b/development/device-tree-compiler/device-tree-compiler.SlackBuild
@@ -25,7 +25,7 @@
# With tweaks from rworkman to use in SlackBuilds.org tree
PRGNAM=device-tree-compiler
-VERSION=${VERSION:-1.4.4}
+VERSION=${VERSION:-1.5.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.lz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/development/device-tree-compiler/device-tree-compiler.info b/development/device-tree-compiler/device-tree-compiler.info
index 38575f14af..93be5bab57 100644
--- a/development/device-tree-compiler/device-tree-compiler.info
+++ b/development/device-tree-compiler/device-tree-compiler.info
@@ -1,8 +1,8 @@
PRGNAM="device-tree-compiler"
-VERSION="1.4.4"
+VERSION="1.5.0"
HOMEPAGE="https://git.kernel.org/cgit/utils/dtc/dtc.git"
-DOWNLOAD="http://harrier.slackbuilds.org/misc/device-tree-compiler-1.4.4.tar.xz"
-MD5SUM="ccc3b88d50823b19791f42bc2e5c9309"
+DOWNLOAD="http://harrier.slackbuilds.org/misc/device-tree-compiler-1.5.0.tar.lz"
+MD5SUM="a609b2995f94de58fc7544a429ac0b28"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/docutils/README b/development/docutils/README
deleted file mode 100644
index 1160a389f0..0000000000
--- a/development/docutils/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Docutils (Python Documentation Utilities)
-
-Docutils is a modular system for processing documentation into useful
-formats, such as HTML, XML, and LaTeX. For input Docutils supports
-reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext
-markup syntax.
diff --git a/development/docutils/docutils.SlackBuild b/development/docutils/docutils.SlackBuild
deleted file mode 100644
index b953ca5071..0000000000
--- a/development/docutils/docutils.SlackBuild
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for docutils
-
-# Copyright 2006-2019 Robby Workman Tuscaloosa, AL, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=docutils
-VERSION=${VERSION:-0.14}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-2to3 --write --no-diffs docutils
-python3 setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
- grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.txt PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/docutils/docutils.info b/development/docutils/docutils.info
deleted file mode 100644
index 5e22f0645a..0000000000
--- a/development/docutils/docutils.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="docutils"
-VERSION="0.14"
-HOMEPAGE="http://docutils.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/docutils/docutils-0.14.tar.gz"
-MD5SUM="c53768d63db3873b7d452833553469de"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
diff --git a/development/docutils/slack-desc b/development/docutils/slack-desc
deleted file mode 100644
index 06dc8a4d0d..0000000000
--- a/development/docutils/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-docutils: docutils (Python Document Utilities module)
-docutils:
-docutils: Docutils is an open-source text processing system for processing
-docutils: plaintext documentation into useful formats, such as HTML or LaTeX.
-docutils: It includes reStructuredText, the easy to read, easy to use,
-docutils: what-you-see-is-what-you-get plaintext markup language.
-docutils:
-docutils: Homepage: http://docutils.sourceforge.net/
-docutils:
-docutils:
-docutils:
diff --git a/development/dune/README b/development/dune/README
new file mode 100644
index 0000000000..4bee426ba6
--- /dev/null
+++ b/development/dune/README
@@ -0,0 +1,5 @@
+Dune is a build system designed for OCaml/Reason projects only.
+It focuses on providing the user with a consistent experience and
+takes care of most of the low-level details of OCaml compilation.
+All you have to do is provide a description of your project and
+dune will do the rest.
diff --git a/development/dune/dune.SlackBuild b/development/dune/dune.SlackBuild
new file mode 100644
index 0000000000..753b06d084
--- /dev/null
+++ b/development/dune/dune.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for dune
+
+# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=dune
+VERSION=${VERSION:-1.11.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make release
+make DESTDIR=$PKG INSTALL_ARGS="--prefix=/usr --libdir='$(ocamlfind printconf destdir)'" install
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+rm -fR $PKG/usr/doc
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/dune/dune.info b/development/dune/dune.info
new file mode 100644
index 0000000000..87e20a4d06
--- /dev/null
+++ b/development/dune/dune.info
@@ -0,0 +1,10 @@
+PRGNAM="dune"
+VERSION="1.11.3"
+HOMEPAGE="http://caml.inria.fr"
+DOWNLOAD="https://github.com/ocaml/dune/archive/1.11.3/dune-1.11.3.tar.gz"
+MD5SUM="483164bdca4d0f568f4c95987737899b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="ocaml-findlib"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/development/dune/slack-desc b/development/dune/slack-desc
new file mode 100644
index 0000000000..4e035d51d4
--- /dev/null
+++ b/development/dune/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+dune: dune (ocaml build system - formerly jbuilder)
+dune:
+dune: Dune is a build system designed for OCaml/Reason projects only.
+dune: It focuses on providing the user with a consistent experience and
+dune: takes care of most of the low-level details of OCaml compilation.
+dune: All you have to do is provide a description of your project and
+dune: dune will do the rest.
+dune:
+dune: homepage: https://github.com/ocaml/dune
+dune:
+dune:
diff --git a/development/freetds/freetds.SlackBuild b/development/freetds/freetds.SlackBuild
index 826125272e..64317e53d1 100644
--- a/development/freetds/freetds.SlackBuild
+++ b/development/freetds/freetds.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=freetds
-VERSION=${VERSION:-1.00.9}
+VERSION=${VERSION:-1.00.99}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/development/freetds/freetds.info b/development/freetds/freetds.info
index 530fdb3b51..81e2313fd5 100644
--- a/development/freetds/freetds.info
+++ b/development/freetds/freetds.info
@@ -1,8 +1,8 @@
PRGNAM="freetds"
-VERSION="1.00.9"
+VERSION="1.00.99"
HOMEPAGE="http://www.freetds.org/"
-DOWNLOAD="ftp://ftp.freetds.org/pub/freetds/stable/freetds-1.00.9.tar.gz"
-MD5SUM="9f3518c9763f195eca119e4ee504be8d"
+DOWNLOAD="ftp://ftp.freetds.org/pub/freetds/stable/freetds-1.00.99.tar.gz"
+MD5SUM="32777effeb8e45daa5890ef5ad636230"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/gcc5/README b/development/gcc5/README
new file mode 100644
index 0000000000..043d62efcf
--- /dev/null
+++ b/development/gcc5/README
@@ -0,0 +1,46 @@
+This gcc5 package can be installed alongside Slackware's gcc-7 packages.
+These version 7 compilers can sometimes be quite a bit more strict about
+what they accept as valid code. As a consequence, you will regularly run
+into compilation issues with software. Not just the software made with
+the scripts on slackbuilds.org, but also some of the software in
+the Slackware core distribution requires patches in order to get them
+to compile.
+
+Still having the gcc version 5 compilers can sometimes be a lifesaver.
+Particulars of the gcc5 package:
+- The gcc5 binaries were given a suffix '-5' to make them stand apart
+ from Slackware's default compilers.
+- The gcc5 package only contains the C, C++ and Java language compilers.
+- One all-encompassing package is built by the SlackBuild script.
+- Profile scripts are added to /etc/profile.d/. You can 'source'
+ the profile script to prefer the gcc-5 compilers over gcc-7.
+- On 64bit Slackware, the gcc5.SlackBuild will detect an existing gcc
+ multilib compiler and will then build a multilib capable gcc5.
+ If you run pure 64bit Slackware, then a pure 64bit gcc5 package is built.
+
+How to use these gcc5 compilers instead of Slackware's default C and C++?
+Simple:
+In your console or terminal, you 'source' the provided profile script,
+like this (a c-shell compatible script is available as well):
+
+ source /etc/profile.d/gcc5.sh
+
+The command 'source' is equivalent to the dot command ' . '.
+The profile script will (re-)define the common variables that are used
+by make and other programs to determine which binary to run as the compiler:
+
+export CC=gcc-5
+export CPP=cpp-5
+export CXX=g++-5
+export AR=gcc-ar-5
+export NM=gcc-nm-5
+export RANLIB=gcc-ranlib-5
+
+Nothing else needs to be done after sourcing the profile script.
+All you do next is run your compile job as usual in that same console.
+Your program will be compiled with the binaries provided by the gcc5 package.
+
+** WARNING:
+** The temporary build location used by the script (defaulting here to /tmp/SBo)
+** should *NOT* be a directory path a non-root user could create later...
+
diff --git a/development/gcc5/c89.sh b/development/gcc5/c89.sh
new file mode 100644
index 0000000000..424b1e1669
--- /dev/null
+++ b/development/gcc5/c89.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+fl="-std=c89"
+CC=${CC:-"gcc"}
+for opt; do
+ case "$opt" in
+ -ansi|-std=c89|-std=iso9899:1990) fl="";;
+ -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
+ exit 1;;
+ esac
+done
+exec $CC $fl ${1+"$@"}
diff --git a/development/gcc5/c99.sh b/development/gcc5/c99.sh
new file mode 100644
index 0000000000..c33636937c
--- /dev/null
+++ b/development/gcc5/c99.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+fl="-std=c99"
+CC=${CC:-"gcc"}
+for opt; do
+ case "$opt" in
+ -std=c99|-std=iso9899:1999) fl="";;
+ -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+ exit 1;;
+ esac
+done
+exec $CC $fl ${1+"$@"}
diff --git a/development/gcc5/ecj.sh b/development/gcc5/ecj.sh
new file mode 100644
index 0000000000..1d8b797931
--- /dev/null
+++ b/development/gcc5/ecj.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+CLASSPATH=@JAVADIR@/ecj.jar${CLASSPATH:+:}$CLASSPATH \
+ java org.eclipse.jdt.internal.compiler.batch.Main "$@"
+
diff --git a/development/gcc5/fastjar-patches/1000-fastjar-0.97-segfault.patch b/development/gcc5/fastjar-patches/1000-fastjar-0.97-segfault.patch
new file mode 100644
index 0000000000..ab6262407a
--- /dev/null
+++ b/development/gcc5/fastjar-patches/1000-fastjar-0.97-segfault.patch
@@ -0,0 +1,29 @@
+2009-01-14 Jakub Jelinek <jakub@redhat.com>
+
+ * jartool.c (make_manifest): Initialize current_time before
+ calling unix2dostime on it.
+
+--- fastjar-0.97/jartool.c.jj 2008-10-15 18:35:37.000000000 +0200
++++ fastjar-0.97/jartool.c 2009-01-14 15:40:50.000000000 +0100
+@@ -820,6 +820,10 @@ int make_manifest(int jfd, const char *m
+ int mod_time; /* file modification time */
+ struct zipentry *ze;
+
++ current_time = time(NULL);
++ if(current_time == (time_t)-1)
++ exit_on_error("time");
++
+ mod_time = unix2dostime(&current_time);
+
+ /* If we are creating a new manifest, create a META-INF directory entry */
+@@ -828,10 +832,6 @@ int make_manifest(int jfd, const char *m
+
+ memset((file_header + 12), '\0', 16); /*clear mod time, crc, size fields*/
+
+- current_time = time(NULL);
+- if(current_time == (time_t)-1)
+- exit_on_error("time");
+-
+ PACK_UB2(file_header, LOC_EXTRA, 0);
+ PACK_UB2(file_header, LOC_COMP, 0);
+ PACK_UB2(file_header, LOC_FNLEN, nlen);
diff --git a/development/gcc5/fastjar-patches/1001-fastjar-0.97-len1.patch b/development/gcc5/fastjar-patches/1001-fastjar-0.97-len1.patch
new file mode 100644
index 0000000000..722351d334
--- /dev/null
+++ b/development/gcc5/fastjar-patches/1001-fastjar-0.97-len1.patch
@@ -0,0 +1,16 @@
+2009-12-21 Chris Ball <cjb@laptop.org>
+
+ * jartool.c (add_file_to_jar): Test write return value against -1
+ instead of 1.
+
+--- fastjar-0.97/jartool.c.jj 2008-10-15 12:35:37.000000000 -0400
++++ fastjar-0.97/jartool.c 2009-12-22 06:48:09.309530000 -0500
+@@ -1257,7 +1257,7 @@ int add_file_to_jar(int jfd, int ffd, co
+ exit_on_error("write");
+
+ /* write the file name to the zip file */
+- if (1 == write(jfd, fname, file_name_length))
++ if (-1 == write(jfd, fname, file_name_length))
+ exit_on_error("write");
+
+ if(verbose){
diff --git a/development/gcc5/fastjar-patches/1002-fastjar-0.97-filename0.patch b/development/gcc5/fastjar-patches/1002-fastjar-0.97-filename0.patch
new file mode 100644
index 0000000000..34a02a74f3
--- /dev/null
+++ b/development/gcc5/fastjar-patches/1002-fastjar-0.97-filename0.patch
@@ -0,0 +1,14 @@
+2010-03-01 Richard Guenther <rguenther@suse.de>
+
+ * jartool.c (read_entries): Properly zero-terminate filename.
+
+--- fastjar-0.97/jartool.c 6 Sep 2009 22:16:00 -0000 1.59
++++ fastjar-0.97/jartool.c 1 Mar 2010 15:38:43 -0000 1.60
+@@ -790,6 +790,7 @@ int read_entries (int fd)
+ progname, jarfile);
+ return 1;
+ }
++ ze->filename[len] = '\0';
+ len = UNPACK_UB4(header, CEN_EFLEN);
+ len += UNPACK_UB4(header, CEN_COMLEN);
+ if (lseek (fd, len, SEEK_CUR) == -1)
diff --git a/development/gcc5/fastjar-patches/1003-fastjar-CVE-2010-0831.patch b/development/gcc5/fastjar-patches/1003-fastjar-CVE-2010-0831.patch
new file mode 100644
index 0000000000..2c6e23c76c
--- /dev/null
+++ b/development/gcc5/fastjar-patches/1003-fastjar-CVE-2010-0831.patch
@@ -0,0 +1,102 @@
+2010-06-10 Jakub Jelinek <jakub@redhat.com>
+ Dan Rosenberg <dan.j.rosenberg@gmail.com>
+
+ * jartool.c (extract_jar): Fix up checks for traversal to parent
+ directories, disallow absolute paths, make the code slightly more
+ efficient.
+
+--- fastjar-0.97/jartool.c.jj 2009-09-07 00:10:47.000000000 +0200
++++ fastjar-0.97/jartool.c 2010-06-08 20:00:29.000000000 +0200
+@@ -1730,7 +1730,17 @@ int extract_jar(int fd, const char **fil
+ struct stat sbuf;
+ int depth = 0;
+
+- tmp_buff = malloc(sizeof(char) * strlen((const char *)filename));
++ if(*filename == '/'){
++ fprintf(stderr, "Absolute path names are not allowed.\n");
++ exit(EXIT_FAILURE);
++ }
++
++ tmp_buff = malloc(strlen((const char *)filename));
++
++ if(tmp_buff == NULL) {
++ fprintf(stderr, "Out of memory.\n");
++ exit(EXIT_FAILURE);
++ }
+
+ for(;;){
+ const ub1 *idx = (const unsigned char *)strchr((const char *)start, '/');
+@@ -1738,25 +1748,28 @@ int extract_jar(int fd, const char **fil
+ if(idx == NULL)
+ break;
+ else if(idx == start){
++ tmp_buff[idx - filename] = '/';
+ start++;
+ continue;
+ }
+- start = idx + 1;
+
+- strncpy(tmp_buff, (const char *)filename, (idx - filename));
+- tmp_buff[(idx - filename)] = '\0';
++ memcpy(tmp_buff + (start - filename), (const char *)start, (idx - start));
++ tmp_buff[idx - filename] = '\0';
+
+ #ifdef DEBUG
+ printf("checking the existance of %s\n", tmp_buff);
+ #endif
+- if(strcmp(tmp_buff, "..") == 0){
++ if(idx - start == 2 && memcmp(start, "..", 2) == 0){
+ --depth;
+ if (depth < 0){
+ fprintf(stderr, "Traversal to parent directories during unpacking!\n");
+ exit(EXIT_FAILURE);
+ }
+- } else if (strcmp(tmp_buff, ".") != 0)
++ } else if (idx - start != 1 || *start != '.')
+ ++depth;
++
++ start = idx + 1;
++
+ if(stat(tmp_buff, &sbuf) < 0){
+ if(errno != ENOENT)
+ exit_on_error("stat");
+@@ -1765,6 +1778,7 @@ int extract_jar(int fd, const char **fil
+ #ifdef DEBUG
+ printf("Directory exists\n");
+ #endif
++ tmp_buff[idx - filename] = '/';
+ continue;
+ }else {
+ fprintf(stderr, "Hmmm.. %s exists but isn't a directory!\n",
+@@ -1781,10 +1795,11 @@ int extract_jar(int fd, const char **fil
+ if(verbose && handle)
+ printf("%10s: %s/\n", "created", tmp_buff);
+
++ tmp_buff[idx - filename] = '/';
+ }
+
+ /* only a directory */
+- if(strlen((const char *)start) == 0)
++ if(*start == '\0')
+ dir = TRUE;
+
+ #ifdef DEBUG
+@@ -1792,7 +1807,7 @@ int extract_jar(int fd, const char **fil
+ #endif
+
+ /* If the entry was just a directory, don't write to file, etc */
+- if(strlen((const char *)start) == 0)
++ if(*start == '\0')
+ f_fd = -1;
+
+ free(tmp_buff);
+@@ -1876,7 +1891,8 @@ int extract_jar(int fd, const char **fil
+ exit(EXIT_FAILURE);
+ }
+
+- close(f_fd);
++ if (f_fd != -1)
++ close(f_fd);
+
+ if(verbose && dir == FALSE && handle)
+ printf("%10s: %s\n",
diff --git a/development/gcc5/fastjar-patches/1004-fastjar-man.patch b/development/gcc5/fastjar-patches/1004-fastjar-man.patch
new file mode 100644
index 0000000000..34bf704dbb
--- /dev/null
+++ b/development/gcc5/fastjar-patches/1004-fastjar-man.patch
@@ -0,0 +1,27 @@
+2010-03-24 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * Makefile.am (POD2MAN): Provide --date from ChangeLog.
+ * Makefile.in: Regenerate.
+
+--- fastjar-0.97/Makefile.am.jj 2008-10-16 04:24:55.000000000 -0400
++++ fastjar-0.97/Makefile.am 2010-06-21 09:29:41.021398000 -0400
+@@ -39,7 +39,7 @@ EXTRA_DIST = \
+ texi2pod.pl
+
+ TEXI2POD = perl $(srcdir)/texi2pod.pl
+-POD2MAN = pod2man --center="GNU" --release=@VERSION@
++POD2MAN = pod2man --center="GNU" --release=@VERSION@ --date=$(shell sed -n '1s/ .*//p' <$(srcdir)/ChangeLog)
+
+ .pod.1:
+ -($(POD2MAN) --section=1 $< > $(@).T$$$$ && \
+--- fastjar-0.97/Makefile.in.jj 2008-10-16 04:15:16.000000000 -0400
++++ fastjar-0.97/Makefile.in 2010-06-21 09:30:15.882810000 -0400
+@@ -515,7 +515,7 @@ EXTRA_DIST = \
+ texi2pod.pl
+
+ TEXI2POD = perl $(srcdir)/texi2pod.pl
+-POD2MAN = pod2man --center="GNU" --release=@VERSION@
++POD2MAN = pod2man --center="GNU" --release=@VERSION@ --date=$(shell sed -n '1s/ .*//p' <$(srcdir)/ChangeLog)
+
+ #SPLINT_FLAGS=-I . -I $(srcdir)/lib -I $(srcdir) -DHAVE_CONFIG_H +posixlib +weak
+ SPLINT_FLAGS = -I . -I $(srcdir)/lib -I $(srcdir) -DHAVE_CONFIG_H -DPRIx32= -warnposix +weak
diff --git a/development/gcc5/gcc5.SlackBuild b/development/gcc5/gcc5.SlackBuild
new file mode 100644
index 0000000000..a96e4541cd
--- /dev/null
+++ b/development/gcc5/gcc5.SlackBuild
@@ -0,0 +1,569 @@
+#!/bin/sh
+# GCC package build script (written by volkerdi@slackware.com)
+#
+# Copyright 2003, 2004 Slackware Linux, Inc., Concord, California, USA
+# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# Modified 2011 by Eric Hameleers <alien at slackware.com> for OpenJDK.
+# Modified 2017, 2018 by Eric Hameleers <alien at slackware.com> for gcc5.
+
+# Some notes, Fri May 16 12:31:32 PDT 2003:
+#
+# Why i486 and not i386? Because the shared C++ libraries in gcc-3.2.x will
+# require 486 opcodes even when a 386 target is used (so we already weren't
+# compatible with the i386 for Slackware 9.0, didn't notice, and nobody
+# complained :-). gcc-3.3 fixes this issue and allows you to build a 386
+# compiler, but the fix is done in a way that produces binaries that are not
+# compatible with gcc-3.2.x compiled binaries. To retain compatibility with
+# Slackware 9.0, we'll have to use i486 (or better) as the compiler target
+# for gcc-3.3.
+#
+# It's time to say goodbye to i386 support in Slackware. I've surveyed 386
+# usage online, and the most common thing I see people say when someone asks
+# about running Linux on a 386 is to "run Slackware", but then they also
+# usually go on to say "be sure to get an OLD version, like 4.0, before glibc,
+# because it'll be more efficient." Now, if that's the general advice, then
+# I see no reason to continue 386 support in the latest Slackware (and indeed
+# it's no longer easily possible).
+
+# Some more notes, Mon Aug 3 19:49:51 UTC 2015:
+#
+# Changing to -march=i586 for 32-bit x86 as several things (Mesa being one of
+# them) no longer work if constrained to -march=i486. We're not going to use
+# -march=i686 since the only additional opcode is CMOV, which is actually less
+# efficient on modern CPUs running in 32-bit mode than the alternate i586
+# instructions. No need to throw i586 CPUs under the bus (yet).
+
+PRGNAM=gcc5
+VERSION=${VERSION:-5.5.0}
+MAJVER=$(echo ${VERSION} |cut -d. -f1)
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i586 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m) ;;
+ esac
+ export ARCH
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i386" ]; then
+ SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+ LIB_ARCH=i386
+elif [ "$ARCH" = "i486" ]; then
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+ LIB_ARCH=i386
+elif [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+ LIB_ARCH=i386
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+ LIB_ARCH=i386
+elif [ "$ARCH" = "s390" ]; then
+ SLKCFLAGS="-O2"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+ LIB_ARCH=s390
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ SLKLDFLAGS="-L/usr/lib64"
+ LIBDIRSUFFIX="64"
+ LIB_ARCH=amd64
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+ LIB_ARCH=armv7hl
+else
+ SLKCFLAGS="-O2"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+ LIB_ARCH=$ARCH
+fi
+
+# What do we want to build
+LANGS=${LANGS:-'c,c++,java'}
+
+echo "Building these compilers: $LANGS"
+
+case "$ARCH" in
+ arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+ *) TARGET=$ARCH-slackware-linux ;;
+esac
+
+if [ "$ARCH" = "x86_64" ]; then
+ if [ -f /usr/lib/libc.a ]; then
+ # If we find a 32bit C library on 64bit Slackware, assume multilib:
+ GCC_ARCHOPTS="--enable-multilib"
+ MULTILIB="YES"
+ else
+ GCC_ARCHOPTS="--disable-multilib"
+ MULTILIB="NO"
+ fi
+else
+ GCC_ARCHOPTS="--with-arch=$ARCH"
+ MULTILIB="NO"
+fi
+
+# Clear the build locations:
+rm -fr $TMP/fastjar-* $TMP/gcc-$VERSION $TMP/gcc.build.lnx $TMP/gcc.build.log $TMP/package-$PRGNAM
+
+mkdir -p $PKG/usr/doc/gcc-$VERSION
+
+# Insert package description:
+mkdir -p $PKG/install
+if [ ${MULTILIB} = "YES" ]; then
+ SLDESC=" The compilers support multilib."
+else
+ SLDESC=""
+fi
+cat $CWD/slack-desc.gcc5 | sed -e "s/@MULTILIB@/${SLDESC}/" \
+ > $PKG/install/slack-desc
+
+# Unpack the gcc sources:
+cd $TMP
+tar xvf $CWD/gcc-$VERSION.tar.?z || exit 1
+
+# Patches based inside the gcc directory go here:
+#( cd gcc-$VERSION/gcc
+# #cat $CWD/patches/gcc.66782.diff | patch -p0 --verbose || exit 1
+#) || exit 1
+
+# Copy ecj.jar into the TLD of the source. Needed for java compiler.
+# This can be retrieved from ftp://sourceware.org/pub/java
+cp $CWD/ecj-4.9.jar gcc-$VERSION/ecj.jar
+
+# Use an antlr runtime to compile javadoc.
+# The runtime can be obtained from:
+#https://oss.sonatype.org/content/repositories/releases/org/antlr/antlr-runtime/
+ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1)
+
+# install docs
+( cd gcc-$VERSION
+ # Smite the fixincludes:
+ cat $CWD/patches/gcc-no_fixincludes.diff | patch -p1 --verbose --backup --suffix=.orig || exit 1
+
+ # Add retpoline support:
+ cat $CWD/patches/0001-i386-Move-struct-ix86_frame-to-machine_function.diff | patch -p2 --verbose || exit 1
+ cat $CWD/patches/0002-i386-Use-reference-of-struct-ix86_frame-to-avoid-cop.diff | patch -p2 --verbose || exit 1
+ cat $CWD/patches/0003-i386-More-use-reference-of-struct-ix86_frame-to-avoi.diff | patch -p2 --verbose || exit 1
+ cat $CWD/patches/0004-i386-Don-t-use-reference-of-struct-ix86_frame.diff | patch -p2 --verbose || exit 1
+ cat $CWD/patches/0005-x86-Add-mindirect-branch-doc.diff | patch -p2 --verbose || exit 1
+ cat $CWD/patches/0005-x86-Add-mindirect-branch.diff | patch -p2 --verbose || exit 1
+ cat $CWD/patches/0006-x86-Add-mfunction-return-doc.diff | patch -p2 --verbose || exit 1
+ cat $CWD/patches/0006-x86-Add-mfunction-return.diff | patch -p2 --verbose || exit 1
+ cat $CWD/patches/0007-x86-Add-mindirect-branch-register-doc.diff | patch -p2 --verbose || exit 1
+ cat $CWD/patches/0007-x86-Add-mindirect-branch-register.diff | patch -p2 --verbose || exit 1
+ cat $CWD/patches/0008-x86-Add-V-register-operand-modifier-doc.diff | patch -p2 --verbose || exit 1
+ cat $CWD/patches/0008-x86-Add-V-register-operand-modifier.diff | patch -p2 --verbose || exit 1
+ cat $CWD/patches/0009-x86-Disallow-mindirect-branch-mfunction-return-with-.diff | patch -p2 --verbose || exit 1
+ cat $CWD/patches/0009-x86-Disallow-mindirect-branch-mfunction-return-with-doc.diff | patch -p2 --verbose || exit 1
+
+ # Fix build with glibc 2.28, which no longer makes available header file <sys/ustat.h>
+ cat $CWD/patches/glibc2.28-ustat.diff | patch -p0 --verbose || exit 1
+
+ # Fix perms/owners
+ chown -R root:root .
+ find . -perm 777 -exec chmod 755 {} \;
+ find . -perm 775 -exec chmod 755 {} \;
+ find . -perm 754 -exec chmod 755 {} \;
+ find . -perm 664 -exec chmod 644 {} \;
+ mkdir -p $PKG/usr/doc/gcc-$VERSION
+ cp -a \
+ COPYING* ChangeLog* FAQ INSTALL \
+ LAST_UPDATED MAINTAINERS NEWS \
+ README* *.html \
+ $PKG/usr/doc/gcc-$VERSION
+
+ # We will keep part of these, but they are really big...
+ if [ -r ChangeLog ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/gcc-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+ fi
+ if [ -r NEWS ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/gcc-$VERSION)
+ cat NEWS | head -n 1000 > $DOCSDIR/NEWS
+ touch -r NEWS $DOCSDIR/NEWS
+ fi
+
+ mkdir -p $PKG/usr/doc/gcc-${VERSION}/gcc
+ ( cd gcc
+ cp -a \
+ ABOUT* COPYING* DATESTAMP DEV-PHASE LANG* ONEWS README* SERVICE \
+ $PKG/usr/doc/gcc-$VERSION/gcc
+
+ mkdir -p $PKG/usr/doc/gcc-${VERSION}/gcc/java
+ ( cd java
+ cp -a \
+ ChangeLog.tree-ssa \
+ $PKG/usr/doc/gcc-${VERSION}/gcc/java
+ if [ -r ChangeLog ]; then
+ cat ChangeLog | head -n 1000 > $PKG/usr/doc/gcc-${VERSION}/gcc/java/ChangeLog
+ touch -r ChangeLog $PKG/usr/doc/gcc-${VERSION}/gcc/java/ChangeLog
+ fi
+ )
+
+ ) || exit 1
+
+ mkdir -p $PKG/usr/doc/gcc-${VERSION}/libffi
+ ( cd libffi
+ cp -a \
+ ChangeLog.libgcj ChangeLog.v1 \
+ LICENSE* README* \
+ $PKG/usr/doc/gcc-${VERSION}/libffi
+ if [ -r ChangeLog ]; then
+ cat ChangeLog | head -n 1000 > $PKG/usr/doc/gcc-${VERSION}/libffi/ChangeLog
+ touch -r ChangeLog $PKG/usr/doc/gcc-${VERSION}/libffi/ChangeLog
+ fi
+ )
+
+ mkdir -p $PKG/usr/doc/gcc-${VERSION}/libjava
+ ( cd libjava
+ cp -a \
+ COPYING* HACKING LIBGCJ_LICENSE \
+ NEWS README* THANKS \
+ $PKG/usr/doc/gcc-${VERSION}/libjava
+ if [ -r ChangeLog ]; then
+ cat ChangeLog | head -n 1000 > $PKG/usr/doc/gcc-${VERSION}/libjava/ChangeLog
+ touch -r ChangeLog $PKG/usr/doc/gcc-${VERSION}/libjava/ChangeLog
+ fi
+ )
+
+ if [ -d libmudflap ]; then
+ mkdir -p $PKG/usr/doc/gcc-${VERSION}/libmudflap
+ ( cd libmudflap
+ if [ -r ChangeLog ]; then
+ cat ChangeLog | head -n 1000 > $PKG/usr/doc/gcc-${VERSION}/libmudflap/ChangeLog
+ touch -r ChangeLog $PKG/usr/doc/gcc-${VERSION}/libmudflap/ChangeLog
+ fi
+ )
+ fi
+
+ mkdir -p $PKG/usr/doc/gcc-${VERSION}/libgomp
+ ( cd libgomp
+ if [ -r ChangeLog ]; then
+ cat ChangeLog | head -n 1000 > $PKG/usr/doc/gcc-${VERSION}/libgomp/ChangeLog
+ touch -r ChangeLog $PKG/usr/doc/gcc-${VERSION}/libgomp/ChangeLog
+ fi
+ )
+
+ mkdir -p $PKG/usr/doc/gcc-${VERSION}/libstdc++-v3
+ ( cd libstdc++-v3
+ cp -a \
+ README* \
+ doc/html/faq.html \
+ $PKG/usr/doc/gcc-${VERSION}/libstdc++-v3
+ if [ -r ChangeLog ]; then
+ cat ChangeLog | head -n 1000 > $PKG/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog
+ touch -r ChangeLog $PKG/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog
+ fi
+ )
+)
+
+# Add fastjar to the gcc5 package:
+( cd $TMP
+ FASTJARVER=$(echo $CWD/fastjar-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+ echo
+ echo "Building fastjar-$FASTJARVER first"
+ echo
+ rm -rf fastjar-$FASTJARVER
+ tar xvf $CWD/fastjar-$FASTJARVER.tar.?z* || exit 1
+ cd fastjar-$FASTJARVER || exit 1
+ chown -R root:root .
+ find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+ for patch in $CWD/fastjar-patches/* ; do
+ cat $patch | patch -p1 --verbose || exit 1
+ done
+ LDFLAGS="$SLKLDFLAGS" \
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ ./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib$LIBDIRSUFFIX \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ --build=$TARGET
+ make || exit 1
+ make install DESTDIR=$PKG || exit 1
+ mkdir -p $PKG/usr/doc/fastjar-$FASTJARVER
+ cp -a \
+ AUTHORS CHANGES COPYING* INSTALL NEWS README* TODO \
+ $PKG/usr/doc/fastjar-$FASTJARVER
+ # If there's a ChangeLog, installing at least part of the recent history
+ # is useful, but don't let it get totally out of control:
+ if [ -r ChangeLog ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/fastjar-$FASTJARVER)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+ fi
+ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ # Compress and if needed symlink the man pages:
+ if [ -d $PKG/usr/man ]; then
+ ( cd $PKG/usr/man
+ for manpagedir in $(find . -type d -name "man*") ; do
+ ( cd $manpagedir
+ for eachpage in $( find . -type l -maxdepth 1) ; do
+ ln -s $( readlink $eachpage ).gz $eachpage.gz
+ rm $eachpage
+ done
+ gzip -9 *.?
+ )
+ done
+ )
+ fi
+ # Compress info files, if any:
+ if [ -d $PKG/usr/info ]; then
+ ( cd $PKG/usr/info
+ rm -f dir
+ gzip -9 *
+ )
+ fi
+ echo
+) || exit 1
+
+# build gcc
+( mkdir gcc.build.lnx;
+ cd gcc.build.lnx;
+
+ # I think it's incorrect to include this option (as it'll end up set
+ # to i586 on x86 platforms), and we want to tune the binary structure
+ # for i686, as that's where almost all of the optimization speedups
+ # are to be found.
+ # Correct me if my take on this is wrong.
+ # --with-cpu=$ARCH
+
+ # NOTE: For Slackware 15.0, look into removing --with-default-libstdcxx-abi=gcc4-compatible,
+ # which will then require rebuilding all C++ libraries. That is, if there's any benefit.
+
+ LDFLAGS="$SLKLDFLAGS" \
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ ../gcc-$VERSION/configure \
+ --prefix=/usr \
+ --libdir=/usr/lib$LIBDIRSUFFIX \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ --enable-shared \
+ --enable-bootstrap \
+ --enable-languages=${LANGS} \
+ --enable-threads=posix \
+ --enable-checking=release \
+ --enable-objc-gc \
+ --with-system-zlib \
+ --with-python-dir=/lib$LIBDIRSUFFIX/python2.7/site-packages \
+ --enable-libstdcxx-dual-abi \
+ --with-default-libstdcxx-abi=gcc4-compatible \
+ --disable-libunwind-exceptions \
+ --enable-__cxa_atexit \
+ --enable-libssp \
+ --enable-lto \
+ --disable-install-libiberty \
+ --with-gnu-ld \
+ --without-isl \
+ --verbose \
+ --enable-java-home \
+ --with-java-home=/usr/lib$LIBDIRSUFFIX/jvm/jre \
+ --with-jvm-root-dir=/usr/lib$LIBDIRSUFFIX/jvm \
+ --with-jvm-jar-dir=/usr/lib$LIBDIRSUFFIX/jvm/jvm-exports \
+ --with-arch-directory=$LIB_ARCH \
+ --with-antlr-jar=$ANTLJAR \
+ --program-suffix=-${MAJVER} \
+ --enable-version-specific-runtime-libs \
+ $GCC_ARCHOPTS \
+ --target=${TARGET} \
+ --build=${TARGET} \
+ --host=${TARGET} || exit 1
+ #--enable-java-awt=gtk \
+ #--disable-gtktest \
+
+ # Start the build:
+
+ # Include all debugging info (for now):
+ make bootstrap
+ make info
+ make install DESTDIR=$PKG
+
+# KLUDGE ALERT
+# These *gdb.py files are causing ldconfig to complain, so they are going
+# to be REMOVED for now... at some point, they might be moved somewhere
+# else, in which case things should Just Work(tm). Keep an eye on it.
+rm -f $PKG/usr/lib*/*gdb.py
+
+# Be sure the "specs" file is installed.
+if [ ! -r $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs ]; then
+ cat stage1-gcc/specs > $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs
+fi
+
+if [ ${MULTILIB} = "NO" ]; then
+ # Make our 64bit gcc look for 32bit gcc binaries in ./32 subdirectory:
+ # (only needed if gcc was compiled with disable-multilib)
+ if [ "$ARCH" = "x86_64" ]; then
+ sed -i 's#;.\(:../lib !m64 m32;\)$#;32\1#' \
+ $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs
+ fi
+fi
+
+make -i install-info DESTDIR=$PKG
+
+# Move potentially conflicting stuff to version specific subdirectory:
+if [ -d $PKG/usr/lib${LIBDIRSUFFIX} ]; then
+ mv $PKG/usr/lib${LIBDIRSUFFIX}/lib* $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/
+fi
+if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/lib${LIBDIRSUFFIX}/ ]; then
+ mv $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/lib${LIBDIRSUFFIX}/lib* $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/
+fi
+chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/libgcc_s.so.1
+if [ ${MULTILIB} = "YES" ]; then
+ if [ -d $PKG/usr/lib ]; then
+ mv $PKG/usr/lib/lib* $PKG/usr/lib/gcc/${TARGET}/${VERSION}/
+ fi
+ if [ -d $PKG/usr/lib/gcc/${TARGET}/lib/ ]; then
+ mv $PKG/usr/lib/gcc/${TARGET}/lib/lib* $PKG/usr/lib/gcc/${TARGET}/${VERSION}/
+ fi
+ chmod 755 $PKG/usr/lib/gcc/${TARGET}/${VERSION}/libgcc_s.so.1
+fi
+
+# The (huge) static GNU java libraries are not packaged. In nearly all
+# cases one or more dependencies will not be available as static anyway.
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libgcj.a
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libgcj-tools.a
+rm -f $PKG/usr/lib/libgcj.a
+rm -f $PKG/usr/lib/libgcj-tools.a
+
+# Fix stuff up:
+( cd $PKG/usr/info
+ rm dir
+ for eachinfo in *.info ; do
+ mv $eachinfo $(basename $eachinfo .info)-${MAJVER}.info
+ done
+ gzip -9 *
+)
+
+( cd $PKG/usr/bin
+ ln -sf g++-${MAJVER} c++-${MAJVER}
+ ln -sf gcc-${MAJVER} cc-${MAJVER}
+ # Improved versions of the Slackware c?9 scripts,
+ # it is safe to overwrite the originals:
+ cat $CWD/c89.sh > c89
+ cat $CWD/c99.sh > c99
+ chmod 755 c89 c99
+)
+
+( cd $PKG/usr/man
+ rm -r man7 # Part of the system gcc package
+ gzip -9 */*
+ cd man1
+ ln -sf g++-${MAJVER}.1.gz c++-${MAJVER}.1.gz
+ ln -sf gcc-${MAJVER}.1.gz cc-${MAJVER}.1.gz
+)
+
+# keep a log
+) 2>&1 | tee $TMP/gcc.build.log
+
+# Add profile scripts (non-executable by default) to make it easier
+# to set the environment for compiling with gcc5:
+mkdir -p $PKG/etc/profile.d
+cat $CWD/profile.d/gcc5.sh > $PKG/etc/profile.d/gcc5.sh
+cat $CWD/profile.d/gcc5.csh > $PKG/etc/profile.d/gcc5.csh
+chmod 644 $PKG/etc/profile.d/*
+
+# The ecj wrapper script:
+cat $CWD/ecj.sh | sed -e "s,@JAVADIR@,/usr/share/java," > $PKG/usr/bin/ecj
+chmod 755 $PKG/usr/bin/ecj
+# Some compatibility links.
+for JAVAPROG in gcj gcjh gcj-dbtool gjar gjarsigner gjavah ; do
+ ln -s ${JAVAPROG}-${MAJVER} $PKG/usr/bin/${JAVAPROG}
+done
+( cd $PKG
+ for JAVALIB in usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/libgcj* ; do
+ ln -s /${JAVALIB} $PKG/usr/lib${LIBDIRSUFFIX}/
+ done
+)
+# And add the missing javac symlink:
+ln -s ../../../bin/ecj $PKG/usr/lib$LIBDIRSUFFIX/jvm/bin/javac
+# Don't package libffi stuff anymore. GCC will link the internal version
+# statically, and we'll need a newer one elsewhere.
+find . -name "ffi*.h" | xargs rm -f
+find . -name "libffi*" | xargs rm -f
+rm -f usr/man/man3/ffi*
+rm -f usr/info/libffi*
+# Install a proper pkgconfig file for libgcj:
+rm $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/pkgconfig/libgcj*pc
+rm $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/32/pkgconfig/libgcj*pc
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
+cat $CWD/libgcj-5.pc \
+ | sed -e "s,@LIBDIRSUFFIX@,${LIBDIRSUFFIX}," \
+ | sed -e "s,@TARGET@,${TARGET}," \
+ | sed -e "s,@VERSION@,${VERSION}," \
+ > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/libgcj-5.pc
+
+# Filter all .la files (thanks much to Mark Post for the sed script):
+( cd $PKG
+ for file in $(find . -type f -name "*.la") ; do
+ cat $file | sed -e 's%-L'${TMP}'[[:graph:]]* % %g' > $TMP/tmp-la-file
+ cat $TMP/tmp-la-file > $file
+ done
+ rm $TMP/tmp-la-file
+)
+
+## Strip bloated binaries and libraries:
+( cd $PKG
+ find . -name "lib*so*" -exec strip --strip-unneeded "{}" \;
+ find . -name "lib*a" -exec strip -g "{}" \;
+ strip --strip-unneeded usr/bin/* 2> /dev/null
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Remove localizations overlapping with Slackware's gcc
+rm -rf $PKG/usr/share/locale
+
+( cd $PKG
+ if [ ${MULTILIB} = "YES" ]; then
+ /sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}-${VERSION}_multilib-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+ else
+ /sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}-${VERSION}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+ fi
+)
diff --git a/development/gcc5/gcc5.info b/development/gcc5/gcc5.info
new file mode 100644
index 0000000000..cb7d761a98
--- /dev/null
+++ b/development/gcc5/gcc5.info
@@ -0,0 +1,17 @@
+PRGNAM="gcc5"
+VERSION="5.5.0"
+HOMEPAGE="https://gcc.gnu.org/"
+DOWNLOAD="https://ftp.gnu.org/gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.xz \
+ http://www.antlr3.org/download/antlr-runtime-3.4.jar \
+ https://sourceware.org/pub/java/ecj-4.9.jar \
+ https://download.savannah.gnu.org/releases/fastjar/fastjar-0.97.tar.gz"
+MD5SUM="0f70424213b4a1113c04ba66ddda0c1f \
+ 0e0318be407e51fdf7ba6777eabfdf73 \
+ 7339f199ba11c941890031fd9981d7be \
+ 2659f09c2e43ef8b7d4406321753f1b2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Eric Hameleers"
+EMAIL="alien@slackware.com"
+
diff --git a/development/gcc5/libgcj-5.pc b/development/gcc5/libgcj-5.pc
new file mode 100644
index 0000000000..e2eb293209
--- /dev/null
+++ b/development/gcc5/libgcj-5.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib@LIBDIRSUFFIX@/gcc/@TARGET@/@VERSION@
+includedir=$(libdir)/include/
+
+Name: libgcj
+Description: libgcj
+Version: @VERSION@
+Libs: -L${libdir} -lgcj
+Cflags: -I${includedir}
diff --git a/development/gcc5/patches/0001-i386-Move-struct-ix86_frame-to-machine_function.diff b/development/gcc5/patches/0001-i386-Move-struct-ix86_frame-to-machine_function.diff
new file mode 100644
index 0000000000..413d75697f
--- /dev/null
+++ b/development/gcc5/patches/0001-i386-Move-struct-ix86_frame-to-machine_function.diff
@@ -0,0 +1,239 @@
+From 11a3b9034935080b9996caf07fca6353309006f1 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Mon, 15 Jan 2018 11:27:24 +0000
+Subject: [PATCH 1/9] i386: Move struct ix86_frame to machine_function
+
+Make ix86_frame available to i386 code generation. This is needed to
+backport the patch set of -mindirect-branch= to mitigate variant #2 of
+the speculative execution vulnerabilities on x86 processors identified
+by CVE-2017-5715, aka Spectre.
+
+ Backport from mainline
+ * config/i386/i386.c (ix86_frame): Moved to ...
+ * config/i386/i386.h (ix86_frame): Here.
+ (machine_function): Add frame.
+ * config/i386/i386.c (ix86_compute_frame_layout): Repace the
+ frame argument with &cfun->machine->frame.
+ (ix86_can_use_return_insn_p): Don't pass &frame to
+ ix86_compute_frame_layout. Copy frame from cfun->machine->frame.
+ (ix86_can_eliminate): Likewise.
+ (ix86_expand_prologue): Likewise.
+ (ix86_expand_epilogue): Likewise.
+ (ix86_expand_split_stack_prologue): Likewise.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256691 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ src/gcc/config/i386/i386.c | 68 ++++++++-------------------------------------
+ src/gcc/config/i386/i386.h | 53 ++++++++++++++++++++++++++++++++++-
+ 2 files changed, 65 insertions(+), 56 deletions(-)
+
+Index: b/src/gcc/config/i386/i386.c
+===================================================================
+--- a/src/gcc/config/i386/i386.c
++++ b/src/gcc/config/i386/i386.c
+@@ -2306,53 +2306,6 @@ struct GTY(()) stack_local_entry {
+ struct stack_local_entry *next;
+ };
+
+-/* Structure describing stack frame layout.
+- Stack grows downward:
+-
+- [arguments]
+- <- ARG_POINTER
+- saved pc
+-
+- saved static chain if ix86_static_chain_on_stack
+-
+- saved frame pointer if frame_pointer_needed
+- <- HARD_FRAME_POINTER
+- [saved regs]
+- <- regs_save_offset
+- [padding0]
+-
+- [saved SSE regs]
+- <- sse_regs_save_offset
+- [padding1] |
+- | <- FRAME_POINTER
+- [va_arg registers] |
+- |
+- [frame] |
+- |
+- [padding2] | = to_allocate
+- <- STACK_POINTER
+- */
+-struct ix86_frame
+-{
+- int nsseregs;
+- int nregs;
+- int va_arg_size;
+- int red_zone_size;
+- int outgoing_arguments_size;
+-
+- /* The offsets relative to ARG_POINTER. */
+- HOST_WIDE_INT frame_pointer_offset;
+- HOST_WIDE_INT hard_frame_pointer_offset;
+- HOST_WIDE_INT stack_pointer_offset;
+- HOST_WIDE_INT hfp_save_offset;
+- HOST_WIDE_INT reg_save_offset;
+- HOST_WIDE_INT sse_reg_save_offset;
+-
+- /* When save_regs_using_mov is set, emit prologue using
+- move instead of push instructions. */
+- bool save_regs_using_mov;
+-};
+-
+ /* Which cpu are we scheduling for. */
+ enum attr_cpu ix86_schedule;
+
+@@ -2443,7 +2396,7 @@ static unsigned int ix86_function_arg_bo
+ const_tree);
+ static rtx ix86_static_chain (const_tree, bool);
+ static int ix86_function_regparm (const_tree, const_tree);
+-static void ix86_compute_frame_layout (struct ix86_frame *);
++static void ix86_compute_frame_layout (void);
+ static bool ix86_expand_vector_init_one_nonzero (bool, machine_mode,
+ rtx, rtx, int);
+ static void ix86_add_new_builtins (HOST_WIDE_INT);
+@@ -9664,7 +9617,8 @@ ix86_can_use_return_insn_p (void)
+ if (crtl->args.pops_args && crtl->args.size >= 32768)
+ return 0;
+
+- ix86_compute_frame_layout (&frame);
++ ix86_compute_frame_layout ();
++ frame = cfun->machine->frame;
+ return (frame.stack_pointer_offset == UNITS_PER_WORD
+ && (frame.nregs + frame.nsseregs) == 0);
+ }
+@@ -10073,8 +10027,8 @@ ix86_can_eliminate (const int from, cons
+ HOST_WIDE_INT
+ ix86_initial_elimination_offset (int from, int to)
+ {
+- struct ix86_frame frame;
+- ix86_compute_frame_layout (&frame);
++ ix86_compute_frame_layout ();
++ struct ix86_frame frame = cfun->machine->frame;
+
+ if (from == ARG_POINTER_REGNUM && to == HARD_FRAME_POINTER_REGNUM)
+ return frame.hard_frame_pointer_offset;
+@@ -10113,8 +10067,9 @@ ix86_builtin_setjmp_frame_value (void)
+ /* Fill structure ix86_frame about frame of currently computed function. */
+
+ static void
+-ix86_compute_frame_layout (struct ix86_frame *frame)
++ix86_compute_frame_layout (void)
+ {
++ struct ix86_frame *frame = &cfun->machine->frame;
+ unsigned HOST_WIDE_INT stack_alignment_needed;
+ HOST_WIDE_INT offset;
+ unsigned HOST_WIDE_INT preferred_alignment;
+@@ -11417,7 +11372,8 @@ ix86_expand_prologue (void)
+ m->fs.sp_offset = INCOMING_FRAME_SP_OFFSET;
+ m->fs.sp_valid = true;
+
+- ix86_compute_frame_layout (&frame);
++ ix86_compute_frame_layout ();
++ frame = m->frame;
+
+ if (!TARGET_64BIT && ix86_function_ms_hook_prologue (current_function_decl))
+ {
+@@ -12083,7 +12039,8 @@ ix86_expand_epilogue (int style)
+ bool using_drap;
+
+ ix86_finalize_stack_realign_flags ();
+- ix86_compute_frame_layout (&frame);
++ ix86_compute_frame_layout ();
++ frame = m->frame;
+
+ m->fs.sp_valid = (!frame_pointer_needed
+ || (crtl->sp_is_unchanging
+@@ -12546,7 +12503,8 @@ ix86_expand_split_stack_prologue (void)
+ gcc_assert (flag_split_stack && reload_completed);
+
+ ix86_finalize_stack_realign_flags ();
+- ix86_compute_frame_layout (&frame);
++ ix86_compute_frame_layout ();
++ frame = cfun->machine->frame;
+ allocate = frame.stack_pointer_offset - INCOMING_FRAME_SP_OFFSET;
+
+ /* This is the label we will branch to if we have enough stack
+Index: b/src/gcc/config/i386/i386.h
+===================================================================
+--- a/src/gcc/config/i386/i386.h
++++ b/src/gcc/config/i386/i386.h
+@@ -2409,9 +2409,56 @@ enum avx_u128_state
+
+ #define FASTCALL_PREFIX '@'
+
++#ifndef USED_FOR_TARGET
++/* Structure describing stack frame layout.
++ Stack grows downward:
++
++ [arguments]
++ <- ARG_POINTER
++ saved pc
++
++ saved static chain if ix86_static_chain_on_stack
++
++ saved frame pointer if frame_pointer_needed
++ <- HARD_FRAME_POINTER
++ [saved regs]
++ <- regs_save_offset
++ [padding0]
++
++ [saved SSE regs]
++ <- sse_regs_save_offset
++ [padding1] |
++ | <- FRAME_POINTER
++ [va_arg registers] |
++ |
++ [frame] |
++ |
++ [padding2] | = to_allocate
++ <- STACK_POINTER
++ */
++struct GTY(()) ix86_frame
++{
++ int nsseregs;
++ int nregs;
++ int va_arg_size;
++ int red_zone_size;
++ int outgoing_arguments_size;
++
++ /* The offsets relative to ARG_POINTER. */
++ HOST_WIDE_INT frame_pointer_offset;
++ HOST_WIDE_INT hard_frame_pointer_offset;
++ HOST_WIDE_INT stack_pointer_offset;
++ HOST_WIDE_INT hfp_save_offset;
++ HOST_WIDE_INT reg_save_offset;
++ HOST_WIDE_INT sse_reg_save_offset;
++
++ /* When save_regs_using_mov is set, emit prologue using
++ move instead of push instructions. */
++ bool save_regs_using_mov;
++};
++
+ /* Machine specific frame tracking during prologue/epilogue generation. */
+
+-#ifndef USED_FOR_TARGET
+ struct GTY(()) machine_frame_state
+ {
+ /* This pair tracks the currently active CFA as reg+offset. When reg
+@@ -2457,6 +2504,9 @@ struct GTY(()) machine_function {
+ int varargs_fpr_size;
+ int optimize_mode_switching[MAX_386_ENTITIES];
+
++ /* Cached initial frame layout for the current function. */
++ struct ix86_frame frame;
++
+ /* Number of saved registers USE_FAST_PROLOGUE_EPILOGUE
+ has been computed for. */
+ int use_fast_prologue_epilogue_nregs;
+@@ -2524,6 +2574,7 @@ struct GTY(()) machine_function {
+ #define ix86_current_function_calls_tls_descriptor \
+ (ix86_tls_descriptor_calls_expanded_in_cfun && df_regs_ever_live_p (SP_REG))
+ #define ix86_static_chain_on_stack (cfun->machine->static_chain_on_stack)
++#define ix86_red_zone_size (cfun->machine->frame.red_zone_size)
+
+ /* Control behavior of x86_file_start. */
+ #define X86_FILE_START_VERSION_DIRECTIVE false
diff --git a/development/gcc5/patches/0002-i386-Use-reference-of-struct-ix86_frame-to-avoid-cop.diff b/development/gcc5/patches/0002-i386-Use-reference-of-struct-ix86_frame-to-avoid-cop.diff
new file mode 100644
index 0000000000..7b928df765
--- /dev/null
+++ b/development/gcc5/patches/0002-i386-Use-reference-of-struct-ix86_frame-to-avoid-cop.diff
@@ -0,0 +1,72 @@
+From 18202ba32cb8de22fc43a5839235a751d0f5c4d9 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Mon, 15 Jan 2018 11:28:44 +0000
+Subject: [PATCH 2/9] i386: Use reference of struct ix86_frame to avoid copy
+
+When there is no need to make a copy of ix86_frame, we can use reference
+of struct ix86_frame to avoid copy.
+
+ Backport from mainline
+ * config/i386/i386.c (ix86_can_use_return_insn_p): Use reference
+ of struct ix86_frame.
+ (ix86_initial_elimination_offset): Likewise.
+ (ix86_expand_split_stack_prologue): Likewise.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256692 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/config/i386/i386.c | 9 +++------
+ gcc/testsuite/ChangeLog | 8 ++++++++
+ 2 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index 8133372..397ef7c 100644
+--- a/src/gcc/config/i386/i386.c
++++ b/src/gcc/config/i386/i386.c
+@@ -11843,8 +11843,6 @@ symbolic_reference_mentioned_p (rtx op)
+ bool
+ ix86_can_use_return_insn_p (void)
+ {
+- struct ix86_frame frame;
+-
+ if (! reload_completed || frame_pointer_needed)
+ return 0;
+
+@@ -11857,7 +11855,7 @@ ix86_can_use_return_insn_p (void)
+ return 0;
+
+ ix86_compute_frame_layout ();
+- frame = cfun->machine->frame;
++ struct ix86_frame &frame = cfun->machine->frame;
+ return (frame.stack_pointer_offset == UNITS_PER_WORD
+ && (frame.nregs + frame.nsseregs) == 0);
+ }
+@@ -12344,7 +12342,7 @@ HOST_WIDE_INT
+ ix86_initial_elimination_offset (int from, int to)
+ {
+ ix86_compute_frame_layout ();
+- struct ix86_frame frame = cfun->machine->frame;
++ struct ix86_frame &frame = cfun->machine->frame;
+
+ if (from == ARG_POINTER_REGNUM && to == HARD_FRAME_POINTER_REGNUM)
+ return frame.hard_frame_pointer_offset;
+@@ -14860,7 +14858,6 @@ static GTY(()) rtx split_stack_fn_large;
+ void
+ ix86_expand_split_stack_prologue (void)
+ {
+- struct ix86_frame frame;
+ HOST_WIDE_INT allocate;
+ unsigned HOST_WIDE_INT args_size;
+ rtx_code_label *label;
+@@ -14873,7 +14870,7 @@ ix86_expand_split_stack_prologue (void)
+
+ ix86_finalize_stack_realign_flags ();
+ ix86_compute_frame_layout ();
+- frame = cfun->machine->frame;
++ struct ix86_frame &frame = cfun->machine->frame;
+ allocate = frame.stack_pointer_offset - INCOMING_FRAME_SP_OFFSET;
+
+ /* This is the label we will branch to if we have enough stack
+--
+2.7.4
+
diff --git a/development/gcc5/patches/0003-i386-More-use-reference-of-struct-ix86_frame-to-avoi.diff b/development/gcc5/patches/0003-i386-More-use-reference-of-struct-ix86_frame-to-avoi.diff
new file mode 100644
index 0000000000..f6f30d1d22
--- /dev/null
+++ b/development/gcc5/patches/0003-i386-More-use-reference-of-struct-ix86_frame-to-avoi.diff
@@ -0,0 +1,59 @@
+From 839ca2d69157ef03c8df0ab912dacdb991738694 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Mon, 15 Jan 2018 11:33:42 +0000
+Subject: [PATCH 3/9] i386: More use reference of struct ix86_frame to avoid copy
+
+When there is no need to make a copy of ix86_frame, we can use reference
+of struct ix86_frame to avoid copy.
+
+ Backport from mainline
+ * config/i386/i386.c (ix86_expand_prologue): Use reference of
+ struct ix86_frame.
+ (ix86_expand_epilogue): Likewise.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256695 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog | 7 +++++++
+ gcc/config/i386/i386.c | 6 ++----
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index 397ef7c..986e6d7 100644
+--- a/src/gcc/config/i386/i386.c
++++ b/src/gcc/config/i386/i386.c
+@@ -13667,7 +13667,6 @@ ix86_expand_prologue (void)
+ {
+ struct machine_function *m = cfun->machine;
+ rtx insn, t;
+- struct ix86_frame frame;
+ HOST_WIDE_INT allocate;
+ bool int_registers_saved;
+ bool sse_registers_saved;
+@@ -13691,7 +13690,7 @@ ix86_expand_prologue (void)
+ m->fs.sp_valid = true;
+
+ ix86_compute_frame_layout ();
+- frame = m->frame;
++ struct ix86_frame &frame = cfun->machine->frame;
+
+ if (!TARGET_64BIT && ix86_function_ms_hook_prologue (current_function_decl))
+ {
+@@ -14354,13 +14353,12 @@ ix86_expand_epilogue (int style)
+ {
+ struct machine_function *m = cfun->machine;
+ struct machine_frame_state frame_state_save = m->fs;
+- struct ix86_frame frame;
+ bool restore_regs_via_mov;
+ bool using_drap;
+
+ ix86_finalize_stack_realign_flags ();
+ ix86_compute_frame_layout ();
+- frame = m->frame;
++ struct ix86_frame &frame = cfun->machine->frame;
+
+ m->fs.sp_valid = (!frame_pointer_needed
+ || (crtl->sp_is_unchanging
+--
+2.7.4
+
diff --git a/development/gcc5/patches/0004-i386-Don-t-use-reference-of-struct-ix86_frame.diff b/development/gcc5/patches/0004-i386-Don-t-use-reference-of-struct-ix86_frame.diff
new file mode 100644
index 0000000000..7678444cd7
--- /dev/null
+++ b/development/gcc5/patches/0004-i386-Don-t-use-reference-of-struct-ix86_frame.diff
@@ -0,0 +1,63 @@
+From c25b81ba01fa9ac0c1baa3aabd64190c47928f03 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 16 Jan 2018 12:49:29 +0000
+Subject: [PATCH 4/9] i386: Don't use reference of struct ix86_frame
+
+Use reference of struct ix86_frame in ix86_expand_prologue and
+ix86_expand_epilogue caused:
+
+raised STORAGE_ERROR : stack overflow or erroneous memory access
+make[5]: *** [/export/gnu/import/git/sources/gcc/gcc/ada/Make-generated.in:45: ada/sinfo.h] Error 1
+
+on trunk when bootstrapping GCC with ada on x86-64.
+
+ * config/i386/i386.c (ix86_expand_prologue): Don't use reference
+ of struct ix86_frame.
+ (ix86_expand_epilogue): Likewise.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256742 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog | 10 ++++++++++
+ gcc/config/i386/i386.c | 6 ++++--
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index e758387..ba2abc5 100644
+--- a/src/gcc/config/i386/i386.c
++++ b/src/gcc/config/i386/i386.c
+@@ -14061,6 +14061,7 @@ ix86_expand_prologue (void)
+ {
+ struct machine_function *m = cfun->machine;
+ rtx insn, t;
++ struct ix86_frame frame;
+ HOST_WIDE_INT allocate;
+ bool int_registers_saved;
+ bool sse_registers_saved;
+@@ -14084,7 +14085,7 @@ ix86_expand_prologue (void)
+ m->fs.sp_valid = true;
+
+ ix86_compute_frame_layout ();
+- struct ix86_frame &frame = cfun->machine->frame;
++ frame = m->frame;
+
+ if (!TARGET_64BIT && ix86_function_ms_hook_prologue (current_function_decl))
+ {
+@@ -14747,12 +14748,13 @@ ix86_expand_epilogue (int style)
+ {
+ struct machine_function *m = cfun->machine;
+ struct machine_frame_state frame_state_save = m->fs;
++ struct ix86_frame frame;
+ bool restore_regs_via_mov;
+ bool using_drap;
+
+ ix86_finalize_stack_realign_flags ();
+ ix86_compute_frame_layout ();
+- struct ix86_frame &frame = cfun->machine->frame;
++ frame = m->frame;
+
+ m->fs.sp_valid = (!frame_pointer_needed
+ || (crtl->sp_is_unchanging
+--
+2.7.4
+
diff --git a/development/gcc5/patches/0005-x86-Add-mindirect-branch-doc.diff b/development/gcc5/patches/0005-x86-Add-mindirect-branch-doc.diff
new file mode 100644
index 0000000000..bcaf572b1e
--- /dev/null
+++ b/development/gcc5/patches/0005-x86-Add-mindirect-branch-doc.diff
@@ -0,0 +1,279 @@
+From c6b72be421ded17e0c156070ba6e90aa6c335ed6 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 16 Jan 2018 10:59:42 +0000
+Subject: [PATCH 5/9] x86: Add -mindirect-branch= (documentation)
+
+Add -mindirect-branch= option to convert indirect call and jump to call
+and return thunks. The default is 'keep', which keeps indirect call and
+jump unmodified. 'thunk' converts indirect call and jump to call and
+return thunk. 'thunk-inline' converts indirect call and jump to inlined
+call and return thunk. 'thunk-extern' converts indirect call and jump to
+external call and return thunk provided in a separate object file. You
+can control this behavior for a specific function by using the function
+attribute indirect_branch.
+
+2 kinds of thunks are geneated. Memory thunk where the function address
+is at the top of the stack:
+
+__x86_indirect_thunk:
+ call L2
+L1:
+ pause
+ lfence
+ jmp L1
+L2:
+ lea 8(%rsp), %rsp|lea 4(%esp), %esp
+ ret
+
+Indirect jmp via memory, "jmp mem", is converted to
+
+ push memory
+ jmp __x86_indirect_thunk
+
+Indirect call via memory, "call mem", is converted to
+
+ jmp L2
+L1:
+ push [mem]
+ jmp __x86_indirect_thunk
+L2:
+ call L1
+
+Register thunk where the function address is in a register, reg:
+
+__x86_indirect_thunk_reg:
+ call L2
+L1:
+ pause
+ lfence
+ jmp L1
+L2:
+ movq %reg, (%rsp)|movl %reg, (%esp)
+ ret
+
+where reg is one of (r|e)ax, (r|e)dx, (r|e)cx, (r|e)bx, (r|e)si, (r|e)di,
+(r|e)bp, r8, r9, r10, r11, r12, r13, r14 and r15.
+
+Indirect jmp via register, "jmp reg", is converted to
+
+ jmp __x86_indirect_thunk_reg
+
+Indirect call via register, "call reg", is converted to
+
+ call __x86_indirect_thunk_reg
+
+gcc/
+
+ Backport from mainline
+ * config/i386/i386-opts.h (indirect_branch): New.
+ * config/i386/i386-protos.h (ix86_output_indirect_jmp): Likewise.
+ * config/i386/i386.c (ix86_using_red_zone): Disallow red-zone
+ with local indirect jump when converting indirect call and jump.
+ (ix86_set_indirect_branch_type): New.
+ (ix86_set_current_function): Call ix86_set_indirect_branch_type.
+ (indirectlabelno): New.
+ (indirect_thunk_needed): Likewise.
+ (indirect_thunk_bnd_needed): Likewise.
+ (indirect_thunks_used): Likewise.
+ (indirect_thunks_bnd_used): Likewise.
+ (INDIRECT_LABEL): Likewise.
+ (indirect_thunk_name): Likewise.
+ (output_indirect_thunk): Likewise.
+ (output_indirect_thunk_function): Likewise.
+ (ix86_output_indirect_branch_via_reg): Likewise.
+ (ix86_output_indirect_branch_via_push): Likewise.
+ (ix86_output_indirect_branch): Likewise.
+ (ix86_output_indirect_jmp): Likewise.
+ (ix86_code_end): Call output_indirect_thunk_function if needed.
+ (ix86_output_call_insn): Call ix86_output_indirect_branch if
+ needed.
+ (ix86_handle_fndecl_attribute): Handle indirect_branch.
+ (ix86_attribute_table): Add indirect_branch.
+ * config/i386/i386.h (machine_function): Add indirect_branch_type
+ and has_local_indirect_jump.
+ * config/i386/i386.md (indirect_jump): Set has_local_indirect_jump
+ to true.
+ (tablejump): Likewise.
+ (*indirect_jump): Use ix86_output_indirect_jmp.
+ (*tablejump_1): Likewise.
+ (simple_return_indirect_internal): Likewise.
+ * config/i386/i386.opt (mindirect-branch=): New option.
+ (indirect_branch): New.
+ (keep): Likewise.
+ (thunk): Likewise.
+ (thunk-inline): Likewise.
+ (thunk-extern): Likewise.
+ * doc/extend.texi: Document indirect_branch function attribute.
+ * doc/invoke.texi: Document -mindirect-branch= option.
+
+gcc/testsuite/
+
+ Backport from mainline
+ * gcc.target/i386/indirect-thunk-1.c: New test.
+ * gcc.target/i386/indirect-thunk-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-8.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-7.c: Likewise.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256732 138bc75d-0d04-0410-961f-82ee72b054a4
+
+[UBUNTU NOTES: Updated for gcc-5.4 to include defines for
+ FIRST_INT_REG, LAST_INT_REG, and LEGACY_INT_REGNO_P as defined in
+ https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=222269.
+ Dropped indirect-thunk-5.c, indirect-thunk-6.c,
+ indirect-thunk-bnd-3.c, indirect-thunk-bnd-4.c,
+ indirect-thunk-extern-5.c, indirect-thunk-extern-6.c,
+ indirect-thunk-inline-5.c, and indirect-thunk-inline-6.c tests due
+ to gcc 5.4 and earlier not supporting the -fno-plt option.
+ --sbeattie, tyhicks]
+---
+ src/gcc/config/i386/i386-opts.h | 13
+ src/gcc/config/i386/i386-protos.h | 1
+ src/gcc/config/i386/i386.c | 621 +++++++++++-
+ src/gcc/config/i386/i386.h | 12
+ src/gcc/config/i386/i386.md | 26
+ src/gcc/config/i386/i386.opt | 20
+ src/gcc/doc/extend.texi | 10
+ src/gcc/doc/invoke.texi | 14
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c | 44
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c | 23
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c | 23
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c | 22
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c | 22
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c | 44
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c | 42
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c | 19
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c | 19
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c | 43
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c | 44
+ 33 files changed, 1334 insertions(+), 15 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-5.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-6.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-7.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-3.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-4.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-5.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-6.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-5.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-6.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c
+
+Index: b/src/gcc/doc/extend.texi
+===================================================================
+--- a/src/gcc/doc/extend.texi
++++ b/src/gcc/doc/extend.texi
+@@ -4119,6 +4119,16 @@ Specify which floating-point unit to use
+ @code{target("fpmath=sse,387")} option must be specified as
+ @code{target("fpmath=sse+387")} because the comma would separate
+ different options.
++
++@item indirect_branch("@var{choice}")
++@cindex @code{indirect_branch} function attribute, x86
++On x86 targets, the @code{indirect_branch} attribute causes the compiler
++to convert indirect call and jump with @var{choice}. @samp{keep}
++keeps indirect call and jump unmodified. @samp{thunk} converts indirect
++call and jump to call and return thunk. @samp{thunk-inline} converts
++indirect call and jump to inlined call and return thunk.
++@samp{thunk-extern} converts indirect call and jump to external call
++and return thunk provided in a separate object file.
+ @end table
+
+ On the PowerPC, the following options are allowed:
+Index: b/src/gcc/doc/invoke.texi
+===================================================================
+--- a/src/gcc/doc/invoke.texi
++++ b/src/gcc/doc/invoke.texi
+@@ -1090,7 +1090,8 @@ See RS/6000 and PowerPC Options.
+ -m32 -m64 -mx32 -m16 -mlarge-data-threshold=@var{num} @gol
+ -msse2avx -mfentry -mrecord-mcount -mnop-mcount -m8bit-idiv @gol
+ -mavx256-split-unaligned-load -mavx256-split-unaligned-store @gol
+--malign-data=@var{type} -mstack-protector-guard=@var{guard}}
++-malign-data=@var{type} -mstack-protector-guard=@var{guard} @gol
++-mindirect-branch=@var{choice}}
+
+ @emph{x86 Windows Options}
+ @gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll @gol
+@@ -24017,6 +24018,17 @@ The default value of this option is enab
+ of the option is @option{-fno-sync-libcalls}. This option is used in
+ the implementation of the @file{libatomic} runtime library.
+
++@item -mindirect-branch=@var{choice}
++@opindex -mindirect-branch
++Convert indirect call and jump with @var{choice}. The default is
++@samp{keep}, which keeps indirect call and jump unmodified.
++@samp{thunk} converts indirect call and jump to call and return thunk.
++@samp{thunk-inline} converts indirect call and jump to inlined call
++and return thunk. @samp{thunk-extern} converts indirect call and jump
++to external call and return thunk provided in a separate object file.
++You can control this behavior for a specific function by using the
++function attribute @code{indirect_branch}. @xref{Function Attributes}.
++
+ @end table
+
+ @c man end
diff --git a/development/gcc5/patches/0005-x86-Add-mindirect-branch.diff b/development/gcc5/patches/0005-x86-Add-mindirect-branch.diff
new file mode 100644
index 0000000000..db9690ccc1
--- /dev/null
+++ b/development/gcc5/patches/0005-x86-Add-mindirect-branch.diff
@@ -0,0 +1,1870 @@
+From c6b72be421ded17e0c156070ba6e90aa6c335ed6 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 16 Jan 2018 10:59:42 +0000
+Subject: [PATCH 5/9] x86: Add -mindirect-branch=
+
+Add -mindirect-branch= option to convert indirect call and jump to call
+and return thunks. The default is 'keep', which keeps indirect call and
+jump unmodified. 'thunk' converts indirect call and jump to call and
+return thunk. 'thunk-inline' converts indirect call and jump to inlined
+call and return thunk. 'thunk-extern' converts indirect call and jump to
+external call and return thunk provided in a separate object file. You
+can control this behavior for a specific function by using the function
+attribute indirect_branch.
+
+2 kinds of thunks are geneated. Memory thunk where the function address
+is at the top of the stack:
+
+__x86_indirect_thunk:
+ call L2
+L1:
+ pause
+ lfence
+ jmp L1
+L2:
+ lea 8(%rsp), %rsp|lea 4(%esp), %esp
+ ret
+
+Indirect jmp via memory, "jmp mem", is converted to
+
+ push memory
+ jmp __x86_indirect_thunk
+
+Indirect call via memory, "call mem", is converted to
+
+ jmp L2
+L1:
+ push [mem]
+ jmp __x86_indirect_thunk
+L2:
+ call L1
+
+Register thunk where the function address is in a register, reg:
+
+__x86_indirect_thunk_reg:
+ call L2
+L1:
+ pause
+ lfence
+ jmp L1
+L2:
+ movq %reg, (%rsp)|movl %reg, (%esp)
+ ret
+
+where reg is one of (r|e)ax, (r|e)dx, (r|e)cx, (r|e)bx, (r|e)si, (r|e)di,
+(r|e)bp, r8, r9, r10, r11, r12, r13, r14 and r15.
+
+Indirect jmp via register, "jmp reg", is converted to
+
+ jmp __x86_indirect_thunk_reg
+
+Indirect call via register, "call reg", is converted to
+
+ call __x86_indirect_thunk_reg
+
+gcc/
+
+ Backport from mainline
+ * config/i386/i386-opts.h (indirect_branch): New.
+ * config/i386/i386-protos.h (ix86_output_indirect_jmp): Likewise.
+ * config/i386/i386.c (ix86_using_red_zone): Disallow red-zone
+ with local indirect jump when converting indirect call and jump.
+ (ix86_set_indirect_branch_type): New.
+ (ix86_set_current_function): Call ix86_set_indirect_branch_type.
+ (indirectlabelno): New.
+ (indirect_thunk_needed): Likewise.
+ (indirect_thunk_bnd_needed): Likewise.
+ (indirect_thunks_used): Likewise.
+ (indirect_thunks_bnd_used): Likewise.
+ (INDIRECT_LABEL): Likewise.
+ (indirect_thunk_name): Likewise.
+ (output_indirect_thunk): Likewise.
+ (output_indirect_thunk_function): Likewise.
+ (ix86_output_indirect_branch_via_reg): Likewise.
+ (ix86_output_indirect_branch_via_push): Likewise.
+ (ix86_output_indirect_branch): Likewise.
+ (ix86_output_indirect_jmp): Likewise.
+ (ix86_code_end): Call output_indirect_thunk_function if needed.
+ (ix86_output_call_insn): Call ix86_output_indirect_branch if
+ needed.
+ (ix86_handle_fndecl_attribute): Handle indirect_branch.
+ (ix86_attribute_table): Add indirect_branch.
+ * config/i386/i386.h (machine_function): Add indirect_branch_type
+ and has_local_indirect_jump.
+ * config/i386/i386.md (indirect_jump): Set has_local_indirect_jump
+ to true.
+ (tablejump): Likewise.
+ (*indirect_jump): Use ix86_output_indirect_jmp.
+ (*tablejump_1): Likewise.
+ (simple_return_indirect_internal): Likewise.
+ * config/i386/i386.opt (mindirect-branch=): New option.
+ (indirect_branch): New.
+ (keep): Likewise.
+ (thunk): Likewise.
+ (thunk-inline): Likewise.
+ (thunk-extern): Likewise.
+ * doc/extend.texi: Document indirect_branch function attribute.
+ * doc/invoke.texi: Document -mindirect-branch= option.
+
+gcc/testsuite/
+
+ Backport from mainline
+ * gcc.target/i386/indirect-thunk-1.c: New test.
+ * gcc.target/i386/indirect-thunk-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-8.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-7.c: Likewise.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256732 138bc75d-0d04-0410-961f-82ee72b054a4
+
+[UBUNTU NOTES: Updated for gcc-5.4 to include defines for
+ FIRST_INT_REG, LAST_INT_REG, and LEGACY_INT_REGNO_P as defined in
+ https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=222269.
+ Dropped indirect-thunk-5.c, indirect-thunk-6.c,
+ indirect-thunk-bnd-3.c, indirect-thunk-bnd-4.c,
+ indirect-thunk-extern-5.c, indirect-thunk-extern-6.c,
+ indirect-thunk-inline-5.c, and indirect-thunk-inline-6.c tests due
+ to gcc 5.4 and earlier not supporting the -fno-plt option.
+ --sbeattie, tyhicks]
+---
+ src/gcc/config/i386/i386-opts.h | 13
+ src/gcc/config/i386/i386-protos.h | 1
+ src/gcc/config/i386/i386.c | 621 +++++++++++-
+ src/gcc/config/i386/i386.h | 12
+ src/gcc/config/i386/i386.md | 26
+ src/gcc/config/i386/i386.opt | 20
+ src/gcc/doc/extend.texi | 10
+ src/gcc/doc/invoke.texi | 14
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c | 44
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c | 23
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c | 23
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c | 22
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c | 22
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c | 44
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c | 42
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c | 19
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c | 19
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c | 43
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c | 20
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c | 21
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c | 44
+ 33 files changed, 1334 insertions(+), 15 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-5.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-6.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-7.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-3.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-4.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-5.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-6.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-5.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-6.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c
+
+Index: b/src/gcc/config/i386/i386-opts.h
+===================================================================
+--- a/src/gcc/config/i386/i386-opts.h
++++ b/src/gcc/config/i386/i386-opts.h
+@@ -99,4 +99,17 @@ enum stack_protector_guard {
+ SSP_GLOBAL /* global canary */
+ };
+
++/* This is used to mitigate variant #2 of the speculative execution
++ vulnerabilities on x86 processors identified by CVE-2017-5715, aka
++ Spectre. They convert indirect branches and function returns to
++ call and return thunks to avoid speculative execution via indirect
++ call, jmp and ret. */
++enum indirect_branch {
++ indirect_branch_unset = 0,
++ indirect_branch_keep,
++ indirect_branch_thunk,
++ indirect_branch_thunk_inline,
++ indirect_branch_thunk_extern
++};
++
+ #endif
+Index: b/src/gcc/config/i386/i386-protos.h
+===================================================================
+--- a/src/gcc/config/i386/i386-protos.h
++++ b/src/gcc/config/i386/i386-protos.h
+@@ -306,6 +306,7 @@ extern enum attr_cpu ix86_schedule;
+ #endif
+
+ extern const char * ix86_output_call_insn (rtx_insn *insn, rtx call_op);
++extern const char * ix86_output_indirect_jmp (rtx call_op, bool ret_p);
+
+ #ifdef RTX_CODE
+ /* Target data for multipass lookahead scheduling.
+Index: b/src/gcc/config/i386/i386.c
+===================================================================
+--- a/src/gcc/config/i386/i386.c
++++ b/src/gcc/config/i386/i386.c
+@@ -2554,12 +2554,23 @@ make_pass_insert_vzeroupper (gcc::contex
+ return new pass_insert_vzeroupper (ctxt);
+ }
+
+-/* Return true if a red-zone is in use. */
++/* Return true if a red-zone is in use. We can't use red-zone when
++ there are local indirect jumps, like "indirect_jump" or "tablejump",
++ which jumps to another place in the function, since "call" in the
++ indirect thunk pushes the return address onto stack, destroying
++ red-zone.
++
++ TODO: If we can reserve the first 2 WORDs, for PUSH and, another
++ for CALL, in red-zone, we can allow local indirect jumps with
++ indirect thunk. */
+
+ static inline bool
+ ix86_using_red_zone (void)
+ {
+- return TARGET_RED_ZONE && !TARGET_64BIT_MS_ABI;
++ return (TARGET_RED_ZONE
++ && !TARGET_64BIT_MS_ABI
++ && (!cfun->machine->has_local_indirect_jump
++ || cfun->machine->indirect_branch_type == indirect_branch_keep));
+ }
+
+ /* Return a string that documents the current -m options. The caller is
+@@ -5126,6 +5137,37 @@ ix86_reset_previous_fndecl (void)
+ ix86_previous_fndecl = NULL_TREE;
+ }
+
++/* Set the indirect_branch_type field from the function FNDECL. */
++
++static void
++ix86_set_indirect_branch_type (tree fndecl)
++{
++ if (cfun->machine->indirect_branch_type == indirect_branch_unset)
++ {
++ tree attr = lookup_attribute ("indirect_branch",
++ DECL_ATTRIBUTES (fndecl));
++ if (attr != NULL)
++ {
++ tree args = TREE_VALUE (attr);
++ if (args == NULL)
++ gcc_unreachable ();
++ tree cst = TREE_VALUE (args);
++ if (strcmp (TREE_STRING_POINTER (cst), "keep") == 0)
++ cfun->machine->indirect_branch_type = indirect_branch_keep;
++ else if (strcmp (TREE_STRING_POINTER (cst), "thunk") == 0)
++ cfun->machine->indirect_branch_type = indirect_branch_thunk;
++ else if (strcmp (TREE_STRING_POINTER (cst), "thunk-inline") == 0)
++ cfun->machine->indirect_branch_type = indirect_branch_thunk_inline;
++ else if (strcmp (TREE_STRING_POINTER (cst), "thunk-extern") == 0)
++ cfun->machine->indirect_branch_type = indirect_branch_thunk_extern;
++ else
++ gcc_unreachable ();
++ }
++ else
++ cfun->machine->indirect_branch_type = ix86_indirect_branch;
++ }
++}
++
+ /* Establish appropriate back-end context for processing the function
+ FNDECL. The argument might be NULL to indicate processing at top
+ level, outside of any function scope. */
+@@ -5136,7 +5178,11 @@ ix86_set_current_function (tree fndecl)
+ several times in the course of compiling a function, and we don't want to
+ slow things down too much or call target_reinit when it isn't safe. */
+ if (fndecl == ix86_previous_fndecl)
+- return;
++ {
++ if (fndecl != NULL_TREE)
++ ix86_set_indirect_branch_type (fndecl);
++ return;
++ }
+
+ tree old_tree;
+ if (ix86_previous_fndecl == NULL_TREE)
+@@ -5153,6 +5199,8 @@ ix86_set_current_function (tree fndecl)
+ return;
+ }
+
++ ix86_set_indirect_branch_type (fndecl);
++
+ tree new_tree = DECL_FUNCTION_SPECIFIC_TARGET (fndecl);
+ if (new_tree == NULL_TREE)
+ new_tree = target_option_default_node;
+@@ -9681,6 +9729,220 @@ ix86_setup_frame_addresses (void)
+ # endif
+ #endif
+
++/* Label count for call and return thunks. It is used to make unique
++ labels in call and return thunks. */
++static int indirectlabelno;
++
++/* True if call and return thunk functions are needed. */
++static bool indirect_thunk_needed = false;
++/* True if call and return thunk functions with the BND prefix are
++ needed. */
++static bool indirect_thunk_bnd_needed = false;
++
++/* Bit masks of integer registers, which contain branch target, used
++ by call and return thunks functions. */
++static int indirect_thunks_used;
++/* Bit masks of integer registers, which contain branch target, used
++ by call and return thunks functions with the BND prefix. */
++static int indirect_thunks_bnd_used;
++
++#ifndef INDIRECT_LABEL
++# define INDIRECT_LABEL "LIND"
++#endif
++
++/* Fills in the label name that should be used for the indirect thunk. */
++
++static void
++indirect_thunk_name (char name[32], int regno, bool need_bnd_p)
++{
++ if (USE_HIDDEN_LINKONCE)
++ {
++ const char *bnd = need_bnd_p ? "_bnd" : "";
++ if (regno >= 0)
++ {
++ const char *reg_prefix;
++ if (LEGACY_INT_REGNO_P (regno))
++ reg_prefix = TARGET_64BIT ? "r" : "e";
++ else
++ reg_prefix = "";
++ sprintf (name, "__x86_indirect_thunk%s_%s%s",
++ bnd, reg_prefix, reg_names[regno]);
++ }
++ else
++ sprintf (name, "__x86_indirect_thunk%s", bnd);
++ }
++ else
++ {
++ if (regno >= 0)
++ {
++ if (need_bnd_p)
++ ASM_GENERATE_INTERNAL_LABEL (name, "LITBR", regno);
++ else
++ ASM_GENERATE_INTERNAL_LABEL (name, "LITR", regno);
++ }
++ else
++ {
++ if (need_bnd_p)
++ ASM_GENERATE_INTERNAL_LABEL (name, "LITB", 0);
++ else
++ ASM_GENERATE_INTERNAL_LABEL (name, "LIT", 0);
++ }
++ }
++}
++
++/* Output a call and return thunk for indirect branch. If BND_P is
++ true, the BND prefix is needed. If REGNO != -1, the function
++ address is in REGNO and the call and return thunk looks like:
++
++ call L2
++ L1:
++ pause
++ jmp L1
++ L2:
++ mov %REG, (%sp)
++ ret
++
++ Otherwise, the function address is on the top of stack and the
++ call and return thunk looks like:
++
++ call L2
++ L1:
++ pause
++ jmp L1
++ L2:
++ lea WORD_SIZE(%sp), %sp
++ ret
++ */
++
++static void
++output_indirect_thunk (bool need_bnd_p, int regno)
++{
++ char indirectlabel1[32];
++ char indirectlabel2[32];
++
++ ASM_GENERATE_INTERNAL_LABEL (indirectlabel1, INDIRECT_LABEL,
++ indirectlabelno++);
++ ASM_GENERATE_INTERNAL_LABEL (indirectlabel2, INDIRECT_LABEL,
++ indirectlabelno++);
++
++ /* Call */
++ if (need_bnd_p)
++ fputs ("\tbnd call\t", asm_out_file);
++ else
++ fputs ("\tcall\t", asm_out_file);
++ assemble_name_raw (asm_out_file, indirectlabel2);
++ fputc ('\n', asm_out_file);
++
++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel1);
++
++ /* Pause + lfence. */
++ fprintf (asm_out_file, "\tpause\n\tlfence\n");
++
++ /* Jump. */
++ fputs ("\tjmp\t", asm_out_file);
++ assemble_name_raw (asm_out_file, indirectlabel1);
++ fputc ('\n', asm_out_file);
++
++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel2);
++
++ if (regno >= 0)
++ {
++ /* MOV. */
++ rtx xops[2];
++ xops[0] = gen_rtx_MEM (word_mode, stack_pointer_rtx);
++ xops[1] = gen_rtx_REG (word_mode, regno);
++ output_asm_insn ("mov\t{%1, %0|%0, %1}", xops);
++ }
++ else
++ {
++ /* LEA. */
++ rtx xops[2];
++ xops[0] = stack_pointer_rtx;
++ xops[1] = plus_constant (Pmode, stack_pointer_rtx, UNITS_PER_WORD);
++ output_asm_insn ("lea\t{%E1, %0|%0, %E1}", xops);
++ }
++
++ if (need_bnd_p)
++ fputs ("\tbnd ret\n", asm_out_file);
++ else
++ fputs ("\tret\n", asm_out_file);
++}
++
++/* Output a funtion with a call and return thunk for indirect branch.
++ If BND_P is true, the BND prefix is needed. If REGNO != -1, the
++ function address is in REGNO. Otherwise, the function address is
++ on the top of stack. */
++
++static void
++output_indirect_thunk_function (bool need_bnd_p, int regno)
++{
++ char name[32];
++ tree decl;
++
++ /* Create __x86_indirect_thunk/__x86_indirect_thunk_bnd. */
++ indirect_thunk_name (name, regno, need_bnd_p);
++ decl = build_decl (BUILTINS_LOCATION, FUNCTION_DECL,
++ get_identifier (name),
++ build_function_type_list (void_type_node, NULL_TREE));
++ DECL_RESULT (decl) = build_decl (BUILTINS_LOCATION, RESULT_DECL,
++ NULL_TREE, void_type_node);
++ TREE_PUBLIC (decl) = 1;
++ TREE_STATIC (decl) = 1;
++ DECL_IGNORED_P (decl) = 1;
++
++#if TARGET_MACHO
++ if (TARGET_MACHO)
++ {
++ switch_to_section (darwin_sections[picbase_thunk_section]);
++ fputs ("\t.weak_definition\t", asm_out_file);
++ assemble_name (asm_out_file, name);
++ fputs ("\n\t.private_extern\t", asm_out_file);
++ assemble_name (asm_out_file, name);
++ putc ('\n', asm_out_file);
++ ASM_OUTPUT_LABEL (asm_out_file, name);
++ DECL_WEAK (decl) = 1;
++ }
++ else
++#endif
++ if (USE_HIDDEN_LINKONCE)
++ {
++ cgraph_node::create (decl)->set_comdat_group (DECL_ASSEMBLER_NAME (decl));
++
++ targetm.asm_out.unique_section (decl, 0);
++ switch_to_section (get_named_section (decl, NULL, 0));
++
++ targetm.asm_out.globalize_label (asm_out_file, name);
++ fputs ("\t.hidden\t", asm_out_file);
++ assemble_name (asm_out_file, name);
++ putc ('\n', asm_out_file);
++ ASM_DECLARE_FUNCTION_NAME (asm_out_file, name, decl);
++ }
++ else
++ {
++ switch_to_section (text_section);
++ ASM_OUTPUT_LABEL (asm_out_file, name);
++ }
++
++ DECL_INITIAL (decl) = make_node (BLOCK);
++ current_function_decl = decl;
++ allocate_struct_function (decl, false);
++ init_function_start (decl);
++ /* We're about to hide the function body from callees of final_* by
++ emitting it directly; tell them we're a thunk, if they care. */
++ cfun->is_thunk = true;
++ first_function_block_is_cold = false;
++ /* Make sure unwind info is emitted for the thunk if needed. */
++ final_start_function (emit_barrier (), asm_out_file, 1);
++
++ output_indirect_thunk (need_bnd_p, regno);
++
++ final_end_function ();
++ init_insn_lengths ();
++ free_after_compilation (cfun);
++ set_cfun (NULL);
++ current_function_decl = NULL;
++}
++
+ static int pic_labels_used;
+
+ /* Fills in the label name that should be used for a pc thunk for
+@@ -9707,11 +9969,32 @@ ix86_code_end (void)
+ rtx xops[2];
+ int regno;
+
++ if (indirect_thunk_needed)
++ output_indirect_thunk_function (false, -1);
++ if (indirect_thunk_bnd_needed)
++ output_indirect_thunk_function (true, -1);
++
++ for (regno = FIRST_REX_INT_REG; regno <= LAST_REX_INT_REG; regno++)
++ {
++ int i = regno - FIRST_REX_INT_REG + LAST_INT_REG + 1;
++ if ((indirect_thunks_used & (1 << i)))
++ output_indirect_thunk_function (false, regno);
++
++ if ((indirect_thunks_bnd_used & (1 << i)))
++ output_indirect_thunk_function (true, regno);
++ }
++
+ for (regno = AX_REG; regno <= SP_REG; regno++)
+ {
+ char name[32];
+ tree decl;
+
++ if ((indirect_thunks_used & (1 << regno)))
++ output_indirect_thunk_function (false, regno);
++
++ if ((indirect_thunks_bnd_used & (1 << regno)))
++ output_indirect_thunk_function (true, regno);
++
+ if (!(pic_labels_used & (1 << regno)))
+ continue;
+
+@@ -25805,12 +26088,292 @@ ix86_expand_call (rtx retval, rtx fnaddr
+ return call;
+ }
+
++/* Output indirect branch via a call and return thunk. CALL_OP is a
++ register which contains the branch target. XASM is the assembly
++ template for CALL_OP. Branch is a tail call if SIBCALL_P is true.
++ A normal call is converted to:
++
++ call __x86_indirect_thunk_reg
++
++ and a tail call is converted to:
++
++ jmp __x86_indirect_thunk_reg
++ */
++
++static void
++ix86_output_indirect_branch_via_reg (rtx call_op, bool sibcall_p)
++{
++ char thunk_name_buf[32];
++ char *thunk_name;
++ bool need_bnd_p = ix86_bnd_prefixed_insn_p (current_output_insn);
++ int regno = REGNO (call_op);
++
++ if (cfun->machine->indirect_branch_type
++ != indirect_branch_thunk_inline)
++ {
++ if (cfun->machine->indirect_branch_type == indirect_branch_thunk)
++ {
++ int i = regno;
++ if (i >= FIRST_REX_INT_REG)
++ i -= (FIRST_REX_INT_REG - LAST_INT_REG - 1);
++ if (need_bnd_p)
++ indirect_thunks_bnd_used |= 1 << i;
++ else
++ indirect_thunks_used |= 1 << i;
++ }
++ indirect_thunk_name (thunk_name_buf, regno, need_bnd_p);
++ thunk_name = thunk_name_buf;
++ }
++ else
++ thunk_name = NULL;
++
++ if (sibcall_p)
++ {
++ if (thunk_name != NULL)
++ {
++ if (need_bnd_p)
++ fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name);
++ else
++ fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name);
++ }
++ else
++ output_indirect_thunk (need_bnd_p, regno);
++ }
++ else
++ {
++ if (thunk_name != NULL)
++ {
++ if (need_bnd_p)
++ fprintf (asm_out_file, "\tbnd call\t%s\n", thunk_name);
++ else
++ fprintf (asm_out_file, "\tcall\t%s\n", thunk_name);
++ return;
++ }
++
++ char indirectlabel1[32];
++ char indirectlabel2[32];
++
++ ASM_GENERATE_INTERNAL_LABEL (indirectlabel1,
++ INDIRECT_LABEL,
++ indirectlabelno++);
++ ASM_GENERATE_INTERNAL_LABEL (indirectlabel2,
++ INDIRECT_LABEL,
++ indirectlabelno++);
++
++ /* Jump. */
++ if (need_bnd_p)
++ fputs ("\tbnd jmp\t", asm_out_file);
++ else
++ fputs ("\tjmp\t", asm_out_file);
++ assemble_name_raw (asm_out_file, indirectlabel2);
++ fputc ('\n', asm_out_file);
++
++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel1);
++
++ if (thunk_name != NULL)
++ {
++ if (need_bnd_p)
++ fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name);
++ else
++ fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name);
++ }
++ else
++ output_indirect_thunk (need_bnd_p, regno);
++
++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel2);
++
++ /* Call. */
++ if (need_bnd_p)
++ fputs ("\tbnd call\t", asm_out_file);
++ else
++ fputs ("\tcall\t", asm_out_file);
++ assemble_name_raw (asm_out_file, indirectlabel1);
++ fputc ('\n', asm_out_file);
++ }
++}
++
++/* Output indirect branch via a call and return thunk. CALL_OP is
++ the branch target. XASM is the assembly template for CALL_OP.
++ Branch is a tail call if SIBCALL_P is true. A normal call is
++ converted to:
++
++ jmp L2
++ L1:
++ push CALL_OP
++ jmp __x86_indirect_thunk
++ L2:
++ call L1
++
++ and a tail call is converted to:
++
++ push CALL_OP
++ jmp __x86_indirect_thunk
++ */
++
++static void
++ix86_output_indirect_branch_via_push (rtx call_op, const char *xasm,
++ bool sibcall_p)
++{
++ char thunk_name_buf[32];
++ char *thunk_name;
++ char push_buf[64];
++ bool need_bnd_p = ix86_bnd_prefixed_insn_p (current_output_insn);
++ int regno = -1;
++
++ if (cfun->machine->indirect_branch_type
++ != indirect_branch_thunk_inline)
++ {
++ if (cfun->machine->indirect_branch_type == indirect_branch_thunk)
++ {
++ if (need_bnd_p)
++ indirect_thunk_bnd_needed = true;
++ else
++ indirect_thunk_needed = true;
++ }
++ indirect_thunk_name (thunk_name_buf, regno, need_bnd_p);
++ thunk_name = thunk_name_buf;
++ }
++ else
++ thunk_name = NULL;
++
++ snprintf (push_buf, sizeof (push_buf), "push{%c}\t%s",
++ TARGET_64BIT ? 'q' : 'l', xasm);
++
++ if (sibcall_p)
++ {
++ output_asm_insn (push_buf, &call_op);
++ if (thunk_name != NULL)
++ {
++ if (need_bnd_p)
++ fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name);
++ else
++ fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name);
++ }
++ else
++ output_indirect_thunk (need_bnd_p, regno);
++ }
++ else
++ {
++ char indirectlabel1[32];
++ char indirectlabel2[32];
++
++ ASM_GENERATE_INTERNAL_LABEL (indirectlabel1,
++ INDIRECT_LABEL,
++ indirectlabelno++);
++ ASM_GENERATE_INTERNAL_LABEL (indirectlabel2,
++ INDIRECT_LABEL,
++ indirectlabelno++);
++
++ /* Jump. */
++ if (need_bnd_p)
++ fputs ("\tbnd jmp\t", asm_out_file);
++ else
++ fputs ("\tjmp\t", asm_out_file);
++ assemble_name_raw (asm_out_file, indirectlabel2);
++ fputc ('\n', asm_out_file);
++
++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel1);
++
++ /* An external function may be called via GOT, instead of PLT. */
++ if (MEM_P (call_op))
++ {
++ struct ix86_address parts;
++ rtx addr = XEXP (call_op, 0);
++ if (ix86_decompose_address (addr, &parts)
++ && parts.base == stack_pointer_rtx)
++ {
++ /* Since call will adjust stack by -UNITS_PER_WORD,
++ we must convert "disp(stack, index, scale)" to
++ "disp+UNITS_PER_WORD(stack, index, scale)". */
++ if (parts.index)
++ {
++ addr = gen_rtx_MULT (Pmode, parts.index,
++ GEN_INT (parts.scale));
++ addr = gen_rtx_PLUS (Pmode, stack_pointer_rtx,
++ addr);
++ }
++ else
++ addr = stack_pointer_rtx;
++
++ rtx disp;
++ if (parts.disp != NULL_RTX)
++ disp = plus_constant (Pmode, parts.disp,
++ UNITS_PER_WORD);
++ else
++ disp = GEN_INT (UNITS_PER_WORD);
++
++ addr = gen_rtx_PLUS (Pmode, addr, disp);
++ call_op = gen_rtx_MEM (GET_MODE (call_op), addr);
++ }
++ }
++
++ output_asm_insn (push_buf, &call_op);
++
++ if (thunk_name != NULL)
++ {
++ if (need_bnd_p)
++ fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name);
++ else
++ fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name);
++ }
++ else
++ output_indirect_thunk (need_bnd_p, regno);
++
++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel2);
++
++ /* Call. */
++ if (need_bnd_p)
++ fputs ("\tbnd call\t", asm_out_file);
++ else
++ fputs ("\tcall\t", asm_out_file);
++ assemble_name_raw (asm_out_file, indirectlabel1);
++ fputc ('\n', asm_out_file);
++ }
++}
++
++/* Output indirect branch via a call and return thunk. CALL_OP is
++ the branch target. XASM is the assembly template for CALL_OP.
++ Branch is a tail call if SIBCALL_P is true. */
++
++static void
++ix86_output_indirect_branch (rtx call_op, const char *xasm,
++ bool sibcall_p)
++{
++ if (REG_P (call_op))
++ ix86_output_indirect_branch_via_reg (call_op, sibcall_p);
++ else
++ ix86_output_indirect_branch_via_push (call_op, xasm, sibcall_p);
++}
++/* Output indirect jump. CALL_OP is the jump target. Jump is a
++ function return if RET_P is true. */
++
++const char *
++ix86_output_indirect_jmp (rtx call_op, bool ret_p)
++{
++ if (cfun->machine->indirect_branch_type != indirect_branch_keep)
++ {
++ /* We can't have red-zone if this isn't a function return since
++ "call" in the indirect thunk pushes the return address onto
++ stack, destroying red-zone. */
++ if (!ret_p && ix86_red_zone_size != 0)
++ gcc_unreachable ();
++
++ ix86_output_indirect_branch (call_op, "%0", true);
++ return "";
++ }
++ else
++ return "%!jmp\t%A0";
++}
++
+ /* Output the assembly for a call instruction. */
+
+ const char *
+ ix86_output_call_insn (rtx_insn *insn, rtx call_op)
+ {
+ bool direct_p = constant_call_address_operand (call_op, VOIDmode);
++ bool output_indirect_p
++ = (!TARGET_SEH
++ && cfun->machine->indirect_branch_type != indirect_branch_keep);
+ bool seh_nop_p = false;
+ const char *xasm;
+
+@@ -25823,9 +26386,17 @@ ix86_output_call_insn (rtx_insn *insn, r
+ else if (TARGET_SEH)
+ xasm = "%!rex.W jmp %A0";
+ else
+- xasm = "%!jmp\t%A0";
++ {
++ if (output_indirect_p)
++ xasm = "%0";
++ else
++ xasm = "%!jmp\t%A0";
++ }
+
+- output_asm_insn (xasm, &call_op);
++ if (output_indirect_p && !direct_p)
++ ix86_output_indirect_branch (call_op, xasm, true);
++ else
++ output_asm_insn (xasm, &call_op);
+ return "";
+ }
+
+@@ -25862,9 +26433,17 @@ ix86_output_call_insn (rtx_insn *insn, r
+ if (direct_p)
+ xasm = "%!call\t%P0";
+ else
+- xasm = "%!call\t%A0";
++ {
++ if (output_indirect_p)
++ xasm = "%0";
++ else
++ xasm = "%!call\t%A0";
++ }
+
+- output_asm_insn (xasm, &call_op);
++ if (output_indirect_p && !direct_p)
++ ix86_output_indirect_branch (call_op, xasm, false);
++ else
++ output_asm_insn (xasm, &call_op);
+
+ if (seh_nop_p)
+ return "nop";
+@@ -43014,7 +43593,7 @@ ix86_handle_struct_attribute (tree *node
+ }
+
+ static tree
+-ix86_handle_fndecl_attribute (tree *node, tree name, tree, int,
++ix86_handle_fndecl_attribute (tree *node, tree name, tree args, int,
+ bool *no_add_attrs)
+ {
+ if (TREE_CODE (*node) != FUNCTION_DECL)
+@@ -43023,6 +43602,29 @@ ix86_handle_fndecl_attribute (tree *node
+ name);
+ *no_add_attrs = true;
+ }
++
++ if (is_attribute_p ("indirect_branch", name))
++ {
++ tree cst = TREE_VALUE (args);
++ if (TREE_CODE (cst) != STRING_CST)
++ {
++ warning (OPT_Wattributes,
++ "%qE attribute requires a string constant argument",
++ name);
++ *no_add_attrs = true;
++ }
++ else if (strcmp (TREE_STRING_POINTER (cst), "keep") != 0
++ && strcmp (TREE_STRING_POINTER (cst), "thunk") != 0
++ && strcmp (TREE_STRING_POINTER (cst), "thunk-inline") != 0
++ && strcmp (TREE_STRING_POINTER (cst), "thunk-extern") != 0)
++ {
++ warning (OPT_Wattributes,
++ "argument to %qE attribute is not "
++ "(keep|thunk|thunk-inline|thunk-extern)", name);
++ *no_add_attrs = true;
++ }
++ }
++
+ return NULL_TREE;
+ }
+
+@@ -46915,6 +47517,9 @@ static const struct attribute_spec ix86_
+ false },
+ { "callee_pop_aggregate_return", 1, 1, false, true, true,
+ ix86_handle_callee_pop_aggregate_return, true },
++ { "indirect_branch", 1, 1, true, false, false,
++ ix86_handle_fndecl_attribute, false },
++
+ /* End element. */
+ { NULL, 0, 0, false, false, false, NULL, false }
+ };
+Index: b/src/gcc/config/i386/i386.h
+===================================================================
+--- a/src/gcc/config/i386/i386.h
++++ b/src/gcc/config/i386/i386.h
+@@ -1229,6 +1229,9 @@ extern const char *host_detect_local_cpu
+ /* Base register for access to local variables of the function. */
+ #define FRAME_POINTER_REGNUM 20
+
++#define FIRST_INT_REG AX_REG
++#define LAST_INT_REG SP_REG
++
+ /* First floating point reg */
+ #define FIRST_FLOAT_REG 8
+
+@@ -1465,6 +1468,8 @@ enum reg_class
+ registers. */
+ #define TARGET_SMALL_REGISTER_CLASSES_FOR_MODE_P hook_bool_mode_true
+
++#define LEGACY_INT_REGNO_P(N) (IN_RANGE ((N), FIRST_INT_REG, LAST_INT_REG))
++
+ #define QI_REG_P(X) (REG_P (X) && QI_REGNO_P (REGNO (X)))
+ #define QI_REGNO_P(N) IN_RANGE ((N), AX_REG, BX_REG)
+
+@@ -2550,6 +2555,13 @@ struct GTY(()) machine_function {
+ /* If true, it is safe to not save/restore DRAP register. */
+ BOOL_BITFIELD no_drap_save_restore : 1;
+
++ /* How to generate indirec branch. */
++ ENUM_BITFIELD(indirect_branch) indirect_branch_type : 3;
++
++ /* If true, the current function has local indirect jumps, like
++ "indirect_jump" or "tablejump". */
++ BOOL_BITFIELD has_local_indirect_jump : 1;
++
+ /* During prologue/epilogue generation, the current frame state.
+ Otherwise, the frame state at the end of the prologue. */
+ struct machine_frame_state fs;
+Index: b/src/gcc/config/i386/i386.md
+===================================================================
+--- a/src/gcc/config/i386/i386.md
++++ b/src/gcc/config/i386/i386.md
+@@ -11556,13 +11556,18 @@
+ {
+ if (TARGET_X32)
+ operands[0] = convert_memory_address (word_mode, operands[0]);
++ cfun->machine->has_local_indirect_jump = true;
+ })
+
+ (define_insn "*indirect_jump"
+ [(set (pc) (match_operand:W 0 "indirect_branch_operand" "rBw"))]
+ ""
+- "%!jmp\t%A0"
+- [(set_attr "type" "ibr")
++ "* return ix86_output_indirect_jmp (operands[0], false);"
++ [(set (attr "type")
++ (if_then_else (match_test "(cfun->machine->indirect_branch_type
++ != indirect_branch_keep)")
++ (const_string "multi")
++ (const_string "ibr")))
+ (set_attr "length_immediate" "0")])
+
+ (define_expand "tablejump"
+@@ -11604,14 +11609,19 @@
+
+ if (TARGET_X32)
+ operands[0] = convert_memory_address (word_mode, operands[0]);
++ cfun->machine->has_local_indirect_jump = true;
+ })
+
+ (define_insn "*tablejump_1"
+ [(set (pc) (match_operand:W 0 "indirect_branch_operand" "rBw"))
+ (use (label_ref (match_operand 1)))]
+ ""
+- "%!jmp\t%A0"
+- [(set_attr "type" "ibr")
++ "* return ix86_output_indirect_jmp (operands[0], false);"
++ [(set (attr "type")
++ (if_then_else (match_test "(cfun->machine->indirect_branch_type
++ != indirect_branch_keep)")
++ (const_string "multi")
++ (const_string "ibr")))
+ (set_attr "length_immediate" "0")])
+
+ ;; Convert setcc + movzbl to xor + setcc if operands don't overlap.
+@@ -12198,8 +12208,12 @@
+ [(simple_return)
+ (use (match_operand:SI 0 "register_operand" "r"))]
+ "reload_completed"
+- "%!jmp\t%A0"
+- [(set_attr "type" "ibr")
++ "* return ix86_output_indirect_jmp (operands[0], true);"
++ [(set (attr "type")
++ (if_then_else (match_test "(cfun->machine->indirect_branch_type
++ != indirect_branch_keep)")
++ (const_string "multi")
++ (const_string "ibr")))
+ (set_attr "length_immediate" "0")])
+
+ (define_insn "nop"
+Index: b/src/gcc/config/i386/i386.opt
+===================================================================
+--- a/src/gcc/config/i386/i386.opt
++++ b/src/gcc/config/i386/i386.opt
+@@ -876,3 +876,23 @@ Enum(stack_protector_guard) String(tls)
+
+ EnumValue
+ Enum(stack_protector_guard) String(global) Value(SSP_GLOBAL)
++
++mindirect-branch=
++Target Report RejectNegative Joined Enum(indirect_branch) Var(ix86_indirect_branch) Init(indirect_branch_keep)
++Convert indirect call and jump to call and return thunks.
++
++Enum
++Name(indirect_branch) Type(enum indirect_branch)
++Known indirect branch choices (for use with the -mindirect-branch= option):
++
++EnumValue
++Enum(indirect_branch) String(keep) Value(indirect_branch_keep)
++
++EnumValue
++Enum(indirect_branch) String(thunk) Value(indirect_branch_thunk)
++
++EnumValue
++Enum(indirect_branch) String(thunk-inline) Value(indirect_branch_thunk_inline)
++
++EnumValue
++Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern)
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch;
++
++void
++male_indirect_jump (long offset)
++{
++ dispatch(offset);
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch[256];
++
++void
++male_indirect_jump (long offset)
++{
++ dispatch[offset](offset);
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
+@@ -0,0 +1,21 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch;
++
++int
++male_indirect_jump (long offset)
++{
++ dispatch(offset);
++ return 0;
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
+@@ -0,0 +1,21 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch[256];
++
++int
++male_indirect_jump (long offset)
++{
++ dispatch[offset](offset);
++ return 0;
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c
+@@ -0,0 +1,44 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */
++
++void func0 (void);
++void func1 (void);
++void func2 (void);
++void func3 (void);
++void func4 (void);
++void func4 (void);
++void func5 (void);
++
++void
++bar (int i)
++{
++ switch (i)
++ {
++ default:
++ func0 ();
++ break;
++ case 1:
++ func1 ();
++ break;
++ case 2:
++ func2 ();
++ break;
++ case 3:
++ func3 ();
++ break;
++ case 4:
++ func4 ();
++ break;
++ case 5:
++ func5 ();
++ break;
++ }
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
+@@ -0,0 +1,23 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch;
++
++extern void male_indirect_jump (long)
++ __attribute__ ((indirect_branch("thunk")));
++
++void
++male_indirect_jump (long offset)
++{
++ dispatch(offset);
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
+@@ -0,0 +1,21 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch[256];
++
++__attribute__ ((indirect_branch("thunk")))
++void
++male_indirect_jump (long offset)
++{
++ dispatch[offset](offset);
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
+@@ -0,0 +1,23 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch;
++extern int male_indirect_jump (long)
++ __attribute__ ((indirect_branch("thunk-inline")));
++
++int
++male_indirect_jump (long offset)
++{
++ dispatch(offset);
++ return 0;
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */
++/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
++/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
+@@ -0,0 +1,22 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch[256];
++
++__attribute__ ((indirect_branch("thunk-inline")))
++int
++male_indirect_jump (long offset)
++{
++ dispatch[offset](offset);
++ return 0;
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */
++/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
++/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
+@@ -0,0 +1,22 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch;
++extern int male_indirect_jump (long)
++ __attribute__ ((indirect_branch("thunk-extern")));
++
++int
++male_indirect_jump (long offset)
++{
++ dispatch(offset);
++ return 0;
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
+@@ -0,0 +1,21 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch[256];
++
++__attribute__ ((indirect_branch("thunk-extern")))
++int
++male_indirect_jump (long offset)
++{
++ dispatch[offset](offset);
++ return 0;
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c
+@@ -0,0 +1,44 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fno-pic" } */
++
++void func0 (void);
++void func1 (void);
++void func2 (void);
++void func3 (void);
++void func4 (void);
++void func4 (void);
++void func5 (void);
++
++__attribute__ ((indirect_branch("thunk-extern")))
++void
++bar (int i)
++{
++ switch (i)
++ {
++ default:
++ func0 ();
++ break;
++ case 1:
++ func1 ();
++ break;
++ case 2:
++ func2 ();
++ break;
++ case 3:
++ func3 ();
++ break;
++ case 4:
++ func4 ();
++ break;
++ case 5:
++ func5 ();
++ break;
++ }
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c
+@@ -0,0 +1,42 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */
++
++void func0 (void);
++void func1 (void);
++void func2 (void);
++void func3 (void);
++void func4 (void);
++void func4 (void);
++void func5 (void);
++
++__attribute__ ((indirect_branch("keep")))
++void
++bar (int i)
++{
++ switch (i)
++ {
++ default:
++ func0 ();
++ break;
++ case 1:
++ func1 ();
++ break;
++ case 2:
++ func2 ();
++ break;
++ case 3:
++ func3 ();
++ break;
++ case 4:
++ func4 ();
++ break;
++ case 5:
++ func5 ();
++ break;
++ }
++}
++
++/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile { target { ! x32 } } } */
++/* { dg-options "-O2 -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fno-pic" } */
++
++void (*dispatch) (char *);
++char buf[10];
++
++void
++foo (void)
++{
++ dispatch (buf);
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "pushq\[ \t\]%rax" { target x32 } } } */
++/* { dg-final { scan-assembler "bnd jmp\[ \t\]*__x86_indirect_thunk_bnd" } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "bnd call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "bnd ret" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c
+@@ -0,0 +1,21 @@
++/* { dg-do compile { target { ! x32 } } } */
++/* { dg-options "-O2 -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fno-pic" } */
++
++void (*dispatch) (char *);
++char buf[10];
++
++int
++foo (void)
++{
++ dispatch (buf);
++ return 0;
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "pushq\[ \t\]%rax" { target x32 } } } */
++/* { dg-final { scan-assembler "bnd jmp\[ \t\]*__x86_indirect_thunk_bnd" } } */
++/* { dg-final { scan-assembler "bnd jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "bnd call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "bnd ret" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
+@@ -0,0 +1,19 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch;
++
++void
++male_indirect_jump (long offset)
++{
++ dispatch(offset);
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
+@@ -0,0 +1,19 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch[256];
++
++void
++male_indirect_jump (long offset)
++{
++ dispatch[offset](offset);
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch;
++
++int
++male_indirect_jump (long offset)
++{
++ dispatch(offset);
++ return 0;
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch[256];
++
++int
++male_indirect_jump (long offset)
++{
++ dispatch[offset](offset);
++ return 0;
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c
+@@ -0,0 +1,43 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */
++
++void func0 (void);
++void func1 (void);
++void func2 (void);
++void func3 (void);
++void func4 (void);
++void func4 (void);
++void func5 (void);
++
++void
++bar (int i)
++{
++ switch (i)
++ {
++ default:
++ func0 ();
++ break;
++ case 1:
++ func1 ();
++ break;
++ case 2:
++ func2 ();
++ break;
++ case 3:
++ func3 ();
++ break;
++ case 4:
++ func4 ();
++ break;
++ case 5:
++ func5 ();
++ break;
++ }
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch;
++
++void
++male_indirect_jump (long offset)
++{
++ dispatch(offset);
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
++/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch[256];
++
++void
++male_indirect_jump (long offset)
++{
++ dispatch[offset](offset);
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
++/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
+@@ -0,0 +1,21 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch;
++
++int
++male_indirect_jump (long offset)
++{
++ dispatch(offset);
++ return 0;
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */
++/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */
++/* { dg-final { scan-assembler-times {\tpause} 1 } } */
++/* { dg-final { scan-assembler-times {\tlfence} 1 } } */
++/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
+@@ -0,0 +1,21 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch[256];
++
++int
++male_indirect_jump (long offset)
++{
++ dispatch[offset](offset);
++ return 0;
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */
++/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */
++/* { dg-final { scan-assembler-times {\tpause} 1 } } */
++/* { dg-final { scan-assembler-times {\tlfence} 1 } } */
++/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c
+@@ -0,0 +1,44 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */
++
++void func0 (void);
++void func1 (void);
++void func2 (void);
++void func3 (void);
++void func4 (void);
++void func4 (void);
++void func5 (void);
++
++void
++bar (int i)
++{
++ switch (i)
++ {
++ default:
++ func0 ();
++ break;
++ case 1:
++ func1 ();
++ break;
++ case 2:
++ func2 ();
++ break;
++ case 3:
++ func3 ();
++ break;
++ case 4:
++ func4 ();
++ break;
++ case 5:
++ func5 ();
++ break;
++ }
++}
++
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
++/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */
diff --git a/development/gcc5/patches/0006-x86-Add-mfunction-return-doc.diff b/development/gcc5/patches/0006-x86-Add-mfunction-return-doc.diff
new file mode 100644
index 0000000000..b40d524892
--- /dev/null
+++ b/development/gcc5/patches/0006-x86-Add-mfunction-return-doc.diff
@@ -0,0 +1,300 @@
+From 357311dd400f7f72d2132f2f94161ece39bf08c6 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 16 Jan 2018 11:10:44 +0000
+Subject: [PATCH 6/9] x86: Add -mfunction-return=
+
+Add -mfunction-return= option to convert function return to call and
+return thunks. The default is 'keep', which keeps function return
+unmodified. 'thunk' converts function return to call and return thunk.
+'thunk-inline' converts function return to inlined call and return thunk.
+'thunk-extern' converts function return to external call and return
+thunk provided in a separate object file. You can control this behavior
+for a specific function by using the function attribute function_return.
+
+Function return thunk is the same as memory thunk for -mindirect-branch=
+where the return address is at the top of the stack:
+
+__x86_return_thunk:
+ call L2
+L1:
+ pause
+ lfence
+ jmp L1
+L2:
+ lea 8(%rsp), %rsp|lea 4(%esp), %esp
+ ret
+
+and function return becomes
+
+ jmp __x86_return_thunk
+
+-mindirect-branch= tests are updated with -mfunction-return=keep to
+avoid false test failures when -mfunction-return=thunk is added to
+RUNTESTFLAGS for "make check".
+
+gcc/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/i386-protos.h (ix86_output_function_return): New.
+ * config/i386/i386.c (ix86_set_indirect_branch_type): Also
+ set function_return_type.
+ (indirect_thunk_name): Add ret_p to indicate thunk for function
+ return.
+ (output_indirect_thunk_function): Pass false to
+ indirect_thunk_name.
+ (ix86_output_indirect_branch_via_reg): Likewise.
+ (ix86_output_indirect_branch_via_push): Likewise.
+ (output_indirect_thunk_function): Create alias for function
+ return thunk if regno < 0.
+ (ix86_output_function_return): New function.
+ (ix86_handle_fndecl_attribute): Handle function_return.
+ (ix86_attribute_table): Add function_return.
+ * config/i386/i386.h (machine_function): Add
+ function_return_type.
+ * config/i386/i386.md (simple_return_internal): Use
+ ix86_output_function_return.
+ (simple_return_internal_long): Likewise.
+ * config/i386/i386.opt (mfunction-return=): New option.
+ (indirect_branch): Mention -mfunction-return=.
+ * doc/extend.texi: Document function_return function attribute.
+ * doc/invoke.texi: Document -mfunction-return= option.
+
+gcc/testsuite/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * gcc.target/i386/indirect-thunk-1.c (dg-options): Add
+ -mfunction-return=keep.
+ * gcc.target/i386/indirect-thunk-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-8.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-7.c: Likewise.
+ * gcc.target/i386/ret-thunk-1.c: New test.
+ * gcc.target/i386/ret-thunk-10.c: Likewise.
+ * gcc.target/i386/ret-thunk-11.c: Likewise.
+ * gcc.target/i386/ret-thunk-12.c: Likewise.
+ * gcc.target/i386/ret-thunk-13.c: Likewise.
+ * gcc.target/i386/ret-thunk-14.c: Likewise.
+ * gcc.target/i386/ret-thunk-15.c: Likewise.
+ * gcc.target/i386/ret-thunk-16.c: Likewise.
+ * gcc.target/i386/ret-thunk-2.c: Likewise.
+ * gcc.target/i386/ret-thunk-3.c: Likewise.
+ * gcc.target/i386/ret-thunk-4.c: Likewise.
+ * gcc.target/i386/ret-thunk-5.c: Likewise.
+ * gcc.target/i386/ret-thunk-6.c: Likewise.
+ * gcc.target/i386/ret-thunk-7.c: Likewise.
+ * gcc.target/i386/ret-thunk-8.c: Likewise.
+ * gcc.target/i386/ret-thunk-9.c: Likewise.
+
+i386: Don't use ASM_OUTPUT_DEF for TARGET_MACHO
+
+ASM_OUTPUT_DEF isn't defined for TARGET_MACHO. Use ASM_OUTPUT_LABEL to
+generate the __x86_return_thunk label, instead of the set directive.
+Update testcase to remove the __x86_return_thunk label check. Since
+-fno-pic is ignored on Darwin, update testcases to sscan or "push"
+only on Linux.
+
+gcc/
+
+ Backport from mainline
+ 2018-01-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR target/83839
+ * config/i386/i386.c (output_indirect_thunk_function): Use
+ ASM_OUTPUT_LABEL, instead of ASM_OUTPUT_DEF, for TARGET_MACHO
+ for __x86.return_thunk.
+
+gcc/testsuite/
+
+ Backport from mainline
+ 2018-01-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR target/83839
+ * gcc.target/i386/indirect-thunk-1.c: Scan for "push" only on
+ Linux.
+ * gcc.target/i386/indirect-thunk-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-register-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-register-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-register-4.c: Likewise.
+ * gcc.target/i386/ret-thunk-10.c: Likewise.
+ * gcc.target/i386/ret-thunk-11.c: Likewise.
+ * gcc.target/i386/ret-thunk-12.c: Likewise.
+ * gcc.target/i386/ret-thunk-13.c: Likewise.
+ * gcc.target/i386/ret-thunk-14.c: Likewise.
+ * gcc.target/i386/ret-thunk-15.c: Likewise.
+ * gcc.target/i386/ret-thunk-9.c: Don't check the
+ __x86_return_thunk label.
+ Scan for "push" only for Linux.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256734 138bc75d-0d04-0410-961f-82ee72b054a4
+
+[Ubuntu note: Dropped indirect-thunk-5.c, indirect-thunk-6.c,
+ indirect-thunk-bnd-3.c, indirect-thunk-bnd-4.c,
+ indirect-thunk-extern-5.c, indirect-thunk-extern-6.c,
+ indirect-thunk-inline-5.c, and indirect-thunk-inline-6.c tests due
+ to gcc 5.4 and earlier not supporting the -fno-plt option.
+ --sbeattie,]
+
+---
+ src/gcc/config/i386/i386-protos.h | 1
+ src/gcc/config/i386/i386.c | 152 +++++++++++-
+ src/gcc/config/i386/i386.h | 3
+ src/gcc/config/i386/i386.md | 9
+ src/gcc/config/i386/i386.opt | 6
+ src/gcc/doc/extend.texi | 9
+ src/gcc/doc/invoke.texi | 13 -
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c | 4
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-1.c | 13 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-10.c | 23 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-11.c | 23 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-12.c | 22 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-13.c | 22 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-14.c | 22 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-15.c | 22 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-16.c | 18 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-2.c | 13 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-3.c | 12
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-4.c | 12
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-5.c | 15 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-6.c | 14 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-7.c | 13 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-8.c | 14 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-9.c | 24 +
+ 48 files changed, 507 insertions(+), 66 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-10.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-11.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-12.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-13.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-14.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-15.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-16.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-3.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-4.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-5.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-6.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-7.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-8.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-9.c
+
+Index: b/src/gcc/doc/extend.texi
+===================================================================
+--- a/src/gcc/doc/extend.texi
++++ b/src/gcc/doc/extend.texi
+@@ -4129,6 +4129,15 @@ call and jump to call and return thunk.
+ indirect call and jump to inlined call and return thunk.
+ @samp{thunk-extern} converts indirect call and jump to external call
+ and return thunk provided in a separate object file.
++
++@item function_return("@var{choice}")
++@cindex @code{function_return} function attribute, x86
++On x86 targets, the @code{function_return} attribute causes the compiler
++to convert function return with @var{choice}. @samp{keep} keeps function
++return unmodified. @samp{thunk} converts function return to call and
++return thunk. @samp{thunk-inline} converts function return to inlined
++call and return thunk. @samp{thunk-extern} converts function return to
++external call and return thunk provided in a separate object file.
+ @end table
+
+ On the PowerPC, the following options are allowed:
+Index: b/src/gcc/doc/invoke.texi
+===================================================================
+--- a/src/gcc/doc/invoke.texi
++++ b/src/gcc/doc/invoke.texi
+@@ -1091,7 +1091,7 @@ See RS/6000 and PowerPC Options.
+ -msse2avx -mfentry -mrecord-mcount -mnop-mcount -m8bit-idiv @gol
+ -mavx256-split-unaligned-load -mavx256-split-unaligned-store @gol
+ -malign-data=@var{type} -mstack-protector-guard=@var{guard} @gol
+--mindirect-branch=@var{choice}}
++-mindirect-branch=@var{choice} -mfunction-return=@var{choice}}
+
+ @emph{x86 Windows Options}
+ @gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll @gol
+@@ -24029,6 +24029,17 @@ to external call and return thunk provid
+ You can control this behavior for a specific function by using the
+ function attribute @code{indirect_branch}. @xref{Function Attributes}.
+
++@item -mfunction-return=@var{choice}
++@opindex -mfunction-return
++Convert function return with @var{choice}. The default is @samp{keep},
++which keeps function return unmodified. @samp{thunk} converts function
++return to call and return thunk. @samp{thunk-inline} converts function
++return to inlined call and return thunk. @samp{thunk-extern} converts
++function return to external call and return thunk provided in a separate
++object file. You can control this behavior for a specific function by
++using the function attribute @code{function_return}.
++@xref{Function Attributes}.
++
+ @end table
+
+ @c man end
diff --git a/development/gcc5/patches/0006-x86-Add-mfunction-return.diff b/development/gcc5/patches/0006-x86-Add-mfunction-return.diff
new file mode 100644
index 0000000000..1883cc6a51
--- /dev/null
+++ b/development/gcc5/patches/0006-x86-Add-mfunction-return.diff
@@ -0,0 +1,1409 @@
+From 357311dd400f7f72d2132f2f94161ece39bf08c6 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 16 Jan 2018 11:10:44 +0000
+Subject: [PATCH 6/9] x86: Add -mfunction-return=
+
+Add -mfunction-return= option to convert function return to call and
+return thunks. The default is 'keep', which keeps function return
+unmodified. 'thunk' converts function return to call and return thunk.
+'thunk-inline' converts function return to inlined call and return thunk.
+'thunk-extern' converts function return to external call and return
+thunk provided in a separate object file. You can control this behavior
+for a specific function by using the function attribute function_return.
+
+Function return thunk is the same as memory thunk for -mindirect-branch=
+where the return address is at the top of the stack:
+
+__x86_return_thunk:
+ call L2
+L1:
+ pause
+ lfence
+ jmp L1
+L2:
+ lea 8(%rsp), %rsp|lea 4(%esp), %esp
+ ret
+
+and function return becomes
+
+ jmp __x86_return_thunk
+
+-mindirect-branch= tests are updated with -mfunction-return=keep to
+avoid false test failures when -mfunction-return=thunk is added to
+RUNTESTFLAGS for "make check".
+
+gcc/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/i386-protos.h (ix86_output_function_return): New.
+ * config/i386/i386.c (ix86_set_indirect_branch_type): Also
+ set function_return_type.
+ (indirect_thunk_name): Add ret_p to indicate thunk for function
+ return.
+ (output_indirect_thunk_function): Pass false to
+ indirect_thunk_name.
+ (ix86_output_indirect_branch_via_reg): Likewise.
+ (ix86_output_indirect_branch_via_push): Likewise.
+ (output_indirect_thunk_function): Create alias for function
+ return thunk if regno < 0.
+ (ix86_output_function_return): New function.
+ (ix86_handle_fndecl_attribute): Handle function_return.
+ (ix86_attribute_table): Add function_return.
+ * config/i386/i386.h (machine_function): Add
+ function_return_type.
+ * config/i386/i386.md (simple_return_internal): Use
+ ix86_output_function_return.
+ (simple_return_internal_long): Likewise.
+ * config/i386/i386.opt (mfunction-return=): New option.
+ (indirect_branch): Mention -mfunction-return=.
+ * doc/extend.texi: Document function_return function attribute.
+ * doc/invoke.texi: Document -mfunction-return= option.
+
+gcc/testsuite/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * gcc.target/i386/indirect-thunk-1.c (dg-options): Add
+ -mfunction-return=keep.
+ * gcc.target/i386/indirect-thunk-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-8.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-7.c: Likewise.
+ * gcc.target/i386/ret-thunk-1.c: New test.
+ * gcc.target/i386/ret-thunk-10.c: Likewise.
+ * gcc.target/i386/ret-thunk-11.c: Likewise.
+ * gcc.target/i386/ret-thunk-12.c: Likewise.
+ * gcc.target/i386/ret-thunk-13.c: Likewise.
+ * gcc.target/i386/ret-thunk-14.c: Likewise.
+ * gcc.target/i386/ret-thunk-15.c: Likewise.
+ * gcc.target/i386/ret-thunk-16.c: Likewise.
+ * gcc.target/i386/ret-thunk-2.c: Likewise.
+ * gcc.target/i386/ret-thunk-3.c: Likewise.
+ * gcc.target/i386/ret-thunk-4.c: Likewise.
+ * gcc.target/i386/ret-thunk-5.c: Likewise.
+ * gcc.target/i386/ret-thunk-6.c: Likewise.
+ * gcc.target/i386/ret-thunk-7.c: Likewise.
+ * gcc.target/i386/ret-thunk-8.c: Likewise.
+ * gcc.target/i386/ret-thunk-9.c: Likewise.
+
+i386: Don't use ASM_OUTPUT_DEF for TARGET_MACHO
+
+ASM_OUTPUT_DEF isn't defined for TARGET_MACHO. Use ASM_OUTPUT_LABEL to
+generate the __x86_return_thunk label, instead of the set directive.
+Update testcase to remove the __x86_return_thunk label check. Since
+-fno-pic is ignored on Darwin, update testcases to sscan or "push"
+only on Linux.
+
+gcc/
+
+ Backport from mainline
+ 2018-01-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR target/83839
+ * config/i386/i386.c (output_indirect_thunk_function): Use
+ ASM_OUTPUT_LABEL, instead of ASM_OUTPUT_DEF, for TARGET_MACHO
+ for __x86.return_thunk.
+
+gcc/testsuite/
+
+ Backport from mainline
+ 2018-01-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR target/83839
+ * gcc.target/i386/indirect-thunk-1.c: Scan for "push" only on
+ Linux.
+ * gcc.target/i386/indirect-thunk-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-register-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-register-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-register-4.c: Likewise.
+ * gcc.target/i386/ret-thunk-10.c: Likewise.
+ * gcc.target/i386/ret-thunk-11.c: Likewise.
+ * gcc.target/i386/ret-thunk-12.c: Likewise.
+ * gcc.target/i386/ret-thunk-13.c: Likewise.
+ * gcc.target/i386/ret-thunk-14.c: Likewise.
+ * gcc.target/i386/ret-thunk-15.c: Likewise.
+ * gcc.target/i386/ret-thunk-9.c: Don't check the
+ __x86_return_thunk label.
+ Scan for "push" only for Linux.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256734 138bc75d-0d04-0410-961f-82ee72b054a4
+
+[Ubuntu note: Dropped indirect-thunk-5.c, indirect-thunk-6.c,
+ indirect-thunk-bnd-3.c, indirect-thunk-bnd-4.c,
+ indirect-thunk-extern-5.c, indirect-thunk-extern-6.c,
+ indirect-thunk-inline-5.c, and indirect-thunk-inline-6.c tests due
+ to gcc 5.4 and earlier not supporting the -fno-plt option.
+ --sbeattie,]
+
+---
+ src/gcc/config/i386/i386-protos.h | 1
+ src/gcc/config/i386/i386.c | 152 +++++++++++-
+ src/gcc/config/i386/i386.h | 3
+ src/gcc/config/i386/i386.md | 9
+ src/gcc/config/i386/i386.opt | 6
+ src/gcc/doc/extend.texi | 9
+ src/gcc/doc/invoke.texi | 13 -
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c | 4
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c | 4
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-1.c | 13 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-10.c | 23 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-11.c | 23 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-12.c | 22 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-13.c | 22 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-14.c | 22 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-15.c | 22 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-16.c | 18 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-2.c | 13 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-3.c | 12
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-4.c | 12
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-5.c | 15 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-6.c | 14 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-7.c | 13 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-8.c | 14 +
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-9.c | 24 +
+ 48 files changed, 507 insertions(+), 66 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-10.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-11.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-12.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-13.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-14.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-15.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-16.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-3.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-4.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-5.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-6.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-7.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-8.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-9.c
+
+Index: b/src/gcc/config/i386/i386-protos.h
+===================================================================
+--- a/src/gcc/config/i386/i386-protos.h
++++ b/src/gcc/config/i386/i386-protos.h
+@@ -307,6 +307,7 @@ extern enum attr_cpu ix86_schedule;
+
+ extern const char * ix86_output_call_insn (rtx_insn *insn, rtx call_op);
+ extern const char * ix86_output_indirect_jmp (rtx call_op, bool ret_p);
++extern const char * ix86_output_function_return (bool long_p);
+
+ #ifdef RTX_CODE
+ /* Target data for multipass lookahead scheduling.
+Index: b/src/gcc/config/i386/i386.c
+===================================================================
+--- a/src/gcc/config/i386/i386.c
++++ b/src/gcc/config/i386/i386.c
+@@ -5166,6 +5166,31 @@ ix86_set_indirect_branch_type (tree fnde
+ else
+ cfun->machine->indirect_branch_type = ix86_indirect_branch;
+ }
++
++ if (cfun->machine->function_return_type == indirect_branch_unset)
++ {
++ tree attr = lookup_attribute ("function_return",
++ DECL_ATTRIBUTES (fndecl));
++ if (attr != NULL)
++ {
++ tree args = TREE_VALUE (attr);
++ if (args == NULL)
++ gcc_unreachable ();
++ tree cst = TREE_VALUE (args);
++ if (strcmp (TREE_STRING_POINTER (cst), "keep") == 0)
++ cfun->machine->function_return_type = indirect_branch_keep;
++ else if (strcmp (TREE_STRING_POINTER (cst), "thunk") == 0)
++ cfun->machine->function_return_type = indirect_branch_thunk;
++ else if (strcmp (TREE_STRING_POINTER (cst), "thunk-inline") == 0)
++ cfun->machine->function_return_type = indirect_branch_thunk_inline;
++ else if (strcmp (TREE_STRING_POINTER (cst), "thunk-extern") == 0)
++ cfun->machine->function_return_type = indirect_branch_thunk_extern;
++ else
++ gcc_unreachable ();
++ }
++ else
++ cfun->machine->function_return_type = ix86_function_return;
++ }
+ }
+
+ /* Establish appropriate back-end context for processing the function
+@@ -9753,8 +9778,12 @@ static int indirect_thunks_bnd_used;
+ /* Fills in the label name that should be used for the indirect thunk. */
+
+ static void
+-indirect_thunk_name (char name[32], int regno, bool need_bnd_p)
++indirect_thunk_name (char name[32], int regno, bool need_bnd_p,
++ bool ret_p)
+ {
++ if (regno >= 0 && ret_p)
++ gcc_unreachable ();
++
+ if (USE_HIDDEN_LINKONCE)
+ {
+ const char *bnd = need_bnd_p ? "_bnd" : "";
+@@ -9769,7 +9798,10 @@ indirect_thunk_name (char name[32], int
+ bnd, reg_prefix, reg_names[regno]);
+ }
+ else
+- sprintf (name, "__x86_indirect_thunk%s", bnd);
++ {
++ const char *ret = ret_p ? "return" : "indirect";
++ sprintf (name, "__x86_%s_thunk%s", ret, bnd);
++ }
+ }
+ else
+ {
+@@ -9782,10 +9814,20 @@ indirect_thunk_name (char name[32], int
+ }
+ else
+ {
+- if (need_bnd_p)
+- ASM_GENERATE_INTERNAL_LABEL (name, "LITB", 0);
++ if (ret_p)
++ {
++ if (need_bnd_p)
++ ASM_GENERATE_INTERNAL_LABEL (name, "LRTB", 0);
++ else
++ ASM_GENERATE_INTERNAL_LABEL (name, "LRT", 0);
++ }
+ else
+- ASM_GENERATE_INTERNAL_LABEL (name, "LIT", 0);
++ {
++ if (need_bnd_p)
++ ASM_GENERATE_INTERNAL_LABEL (name, "LITB", 0);
++ else
++ ASM_GENERATE_INTERNAL_LABEL (name, "LIT", 0);
++ }
+ }
+ }
+ }
+@@ -9880,7 +9922,7 @@ output_indirect_thunk_function (bool nee
+ tree decl;
+
+ /* Create __x86_indirect_thunk/__x86_indirect_thunk_bnd. */
+- indirect_thunk_name (name, regno, need_bnd_p);
++ indirect_thunk_name (name, regno, need_bnd_p, false);
+ decl = build_decl (BUILTINS_LOCATION, FUNCTION_DECL,
+ get_identifier (name),
+ build_function_type_list (void_type_node, NULL_TREE));
+@@ -9923,6 +9965,36 @@ output_indirect_thunk_function (bool nee
+ ASM_OUTPUT_LABEL (asm_out_file, name);
+ }
+
++ if (regno < 0)
++ {
++ /* Create alias for __x86.return_thunk/__x86.return_thunk_bnd. */
++ char alias[32];
++
++ indirect_thunk_name (alias, regno, need_bnd_p, true);
++#if TARGET_MACHO
++ if (TARGET_MACHO)
++ {
++ fputs ("\t.weak_definition\t", asm_out_file);
++ assemble_name (asm_out_file, alias);
++ fputs ("\n\t.private_extern\t", asm_out_file);
++ assemble_name (asm_out_file, alias);
++ putc ('\n', asm_out_file);
++ ASM_OUTPUT_LABEL (asm_out_file, alias);
++ }
++#else
++ ASM_OUTPUT_DEF (asm_out_file, alias, name);
++ if (USE_HIDDEN_LINKONCE)
++ {
++ fputs ("\t.globl\t", asm_out_file);
++ assemble_name (asm_out_file, alias);
++ putc ('\n', asm_out_file);
++ fputs ("\t.hidden\t", asm_out_file);
++ assemble_name (asm_out_file, alias);
++ putc ('\n', asm_out_file);
++ }
++#endif
++ }
++
+ DECL_INITIAL (decl) = make_node (BLOCK);
+ current_function_decl = decl;
+ allocate_struct_function (decl, false);
+@@ -26121,7 +26193,7 @@ ix86_output_indirect_branch_via_reg (rtx
+ else
+ indirect_thunks_used |= 1 << i;
+ }
+- indirect_thunk_name (thunk_name_buf, regno, need_bnd_p);
++ indirect_thunk_name (thunk_name_buf, regno, need_bnd_p, false);
+ thunk_name = thunk_name_buf;
+ }
+ else
+@@ -26230,7 +26302,7 @@ ix86_output_indirect_branch_via_push (rt
+ else
+ indirect_thunk_needed = true;
+ }
+- indirect_thunk_name (thunk_name_buf, regno, need_bnd_p);
++ indirect_thunk_name (thunk_name_buf, regno, need_bnd_p, false);
+ thunk_name = thunk_name_buf;
+ }
+ else
+@@ -26365,6 +26437,46 @@ ix86_output_indirect_jmp (rtx call_op, b
+ return "%!jmp\t%A0";
+ }
+
++/* Output function return. CALL_OP is the jump target. Add a REP
++ prefix to RET if LONG_P is true and function return is kept. */
++
++const char *
++ix86_output_function_return (bool long_p)
++{
++ if (cfun->machine->function_return_type != indirect_branch_keep)
++ {
++ char thunk_name[32];
++ bool need_bnd_p = ix86_bnd_prefixed_insn_p (current_output_insn);
++
++ if (cfun->machine->function_return_type
++ != indirect_branch_thunk_inline)
++ {
++ bool need_thunk = (cfun->machine->function_return_type
++ == indirect_branch_thunk);
++ indirect_thunk_name (thunk_name, -1, need_bnd_p, true);
++ if (need_bnd_p)
++ {
++ indirect_thunk_bnd_needed |= need_thunk;
++ fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name);
++ }
++ else
++ {
++ indirect_thunk_needed |= need_thunk;
++ fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name);
++ }
++ }
++ else
++ output_indirect_thunk (need_bnd_p, -1);
++
++ return "";
++ }
++
++ if (!long_p || ix86_bnd_prefixed_insn_p (current_output_insn))
++ return "%!ret";
++
++ return "rep%; ret";
++}
++
+ /* Output the assembly for a call instruction. */
+
+ const char *
+@@ -43625,6 +43737,28 @@ ix86_handle_fndecl_attribute (tree *node
+ }
+ }
+
++ if (is_attribute_p ("function_return", name))
++ {
++ tree cst = TREE_VALUE (args);
++ if (TREE_CODE (cst) != STRING_CST)
++ {
++ warning (OPT_Wattributes,
++ "%qE attribute requires a string constant argument",
++ name);
++ *no_add_attrs = true;
++ }
++ else if (strcmp (TREE_STRING_POINTER (cst), "keep") != 0
++ && strcmp (TREE_STRING_POINTER (cst), "thunk") != 0
++ && strcmp (TREE_STRING_POINTER (cst), "thunk-inline") != 0
++ && strcmp (TREE_STRING_POINTER (cst), "thunk-extern") != 0)
++ {
++ warning (OPT_Wattributes,
++ "argument to %qE attribute is not "
++ "(keep|thunk|thunk-inline|thunk-extern)", name);
++ *no_add_attrs = true;
++ }
++ }
++
+ return NULL_TREE;
+ }
+
+@@ -47519,6 +47653,8 @@ static const struct attribute_spec ix86_
+ ix86_handle_callee_pop_aggregate_return, true },
+ { "indirect_branch", 1, 1, true, false, false,
+ ix86_handle_fndecl_attribute, false },
++ { "function_return", 1, 1, true, false, false,
++ ix86_handle_fndecl_attribute, false },
+
+ /* End element. */
+ { NULL, 0, 0, false, false, false, NULL, false }
+Index: b/src/gcc/config/i386/i386.h
+===================================================================
+--- a/src/gcc/config/i386/i386.h
++++ b/src/gcc/config/i386/i386.h
+@@ -2562,6 +2562,9 @@ struct GTY(()) machine_function {
+ "indirect_jump" or "tablejump". */
+ BOOL_BITFIELD has_local_indirect_jump : 1;
+
++ /* How to generate function return. */
++ ENUM_BITFIELD(indirect_branch) function_return_type : 3;
++
+ /* During prologue/epilogue generation, the current frame state.
+ Otherwise, the frame state at the end of the prologue. */
+ struct machine_frame_state fs;
+Index: b/src/gcc/config/i386/i386.md
+===================================================================
+--- a/src/gcc/config/i386/i386.md
++++ b/src/gcc/config/i386/i386.md
+@@ -12169,7 +12169,7 @@
+ (define_insn "simple_return_internal"
+ [(simple_return)]
+ "reload_completed"
+- "%!ret"
++ "* return ix86_output_function_return (false);"
+ [(set_attr "length_nobnd" "1")
+ (set_attr "atom_unit" "jeu")
+ (set_attr "length_immediate" "0")
+@@ -12182,12 +12182,7 @@
+ [(simple_return)
+ (unspec [(const_int 0)] UNSPEC_REP)]
+ "reload_completed"
+-{
+- if (ix86_bnd_prefixed_insn_p (insn))
+- return "%!ret";
+-
+- return "rep%; ret";
+-}
++ "* return ix86_output_function_return (true);"
+ [(set_attr "length" "2")
+ (set_attr "atom_unit" "jeu")
+ (set_attr "length_immediate" "0")
+Index: b/src/gcc/config/i386/i386.opt
+===================================================================
+--- a/src/gcc/config/i386/i386.opt
++++ b/src/gcc/config/i386/i386.opt
+@@ -881,9 +881,13 @@ mindirect-branch=
+ Target Report RejectNegative Joined Enum(indirect_branch) Var(ix86_indirect_branch) Init(indirect_branch_keep)
+ Convert indirect call and jump to call and return thunks.
+
++mfunction-return=
++Target Report RejectNegative Joined Enum(indirect_branch) Var(ix86_function_return) Init(indirect_branch_keep)
++Convert function return to call and return thunk.
++
+ Enum
+ Name(indirect_branch) Type(enum indirect_branch)
+-Known indirect branch choices (for use with the -mindirect-branch= option):
++Known indirect branch choices (for use with the -mindirect-branch=/-mfunction-return= options):
+
+ EnumValue
+ Enum(indirect_branch) String(keep) Value(indirect_branch_keep)
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -11,7 +11,7 @@ male_indirect_jump (long offset)
+ dispatch(offset);
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -11,7 +11,7 @@ male_indirect_jump (long offset)
+ dispatch[offset](offset);
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -12,7 +12,7 @@ male_indirect_jump (long offset)
+ return 0;
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -12,7 +12,7 @@ male_indirect_jump (long offset)
+ return 0;
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
+
+ void func0 (void);
+ void func1 (void);
+@@ -35,7 +35,7 @@ bar (int i)
+ }
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -14,7 +14,7 @@ male_indirect_jump (long offset)
+ dispatch(offset);
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -12,7 +12,7 @@ male_indirect_jump (long offset)
+ dispatch[offset](offset);
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -14,7 +14,7 @@ male_indirect_jump (long offset)
+ return 0;
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */
+ /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */
+ /* { dg-final { scan-assembler {\tpause} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -13,7 +13,7 @@ male_indirect_jump (long offset)
+ return 0;
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */
+ /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */
+ /* { dg-final { scan-assembler {\tpause} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -14,7 +14,7 @@ male_indirect_jump (long offset)
+ return 0;
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -13,7 +13,7 @@ male_indirect_jump (long offset)
+ return 0;
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
+
+ void func0 (void);
+ void func1 (void);
+@@ -36,7 +36,7 @@ bar (int i)
+ }
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" } } */
+ /* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
+
+ void func0 (void);
+ void func1 (void);
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile { target { ! x32 } } } */
+-/* { dg-options "-O2 -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fno-pic" } */
+
+ void (*dispatch) (char *);
+ char buf[10];
+@@ -10,7 +10,7 @@ foo (void)
+ dispatch (buf);
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "pushq\[ \t\]%rax" { target x32 } } } */
+ /* { dg-final { scan-assembler "bnd jmp\[ \t\]*__x86_indirect_thunk_bnd" } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile { target { ! x32 } } } */
+-/* { dg-options "-O2 -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fno-pic" } */
+
+ void (*dispatch) (char *);
+ char buf[10];
+@@ -11,7 +11,7 @@ foo (void)
+ return 0;
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "pushq\[ \t\]%rax" { target x32 } } } */
+ /* { dg-final { scan-assembler "bnd jmp\[ \t\]*__x86_indirect_thunk_bnd" } } */
+ /* { dg-final { scan-assembler "bnd jmp\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -11,7 +11,7 @@ male_indirect_jump (long offset)
+ dispatch(offset);
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
+ /* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -11,7 +11,7 @@ male_indirect_jump (long offset)
+ dispatch[offset](offset);
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
+ /* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -12,7 +12,7 @@ male_indirect_jump (long offset)
+ return 0;
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -12,7 +12,7 @@ male_indirect_jump (long offset)
+ return 0;
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
+
+ void func0 (void);
+ void func1 (void);
+@@ -35,7 +35,7 @@ bar (int i)
+ }
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
+ /* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -11,7 +11,7 @@ male_indirect_jump (long offset)
+ dispatch(offset);
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
+ /* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
+ /* { dg-final { scan-assembler {\tpause} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -11,7 +11,7 @@ male_indirect_jump (long offset)
+ dispatch[offset](offset);
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
+ /* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
+ /* { dg-final { scan-assembler {\tpause} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -12,7 +12,7 @@ male_indirect_jump (long offset)
+ return 0;
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */
+ /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */
+ /* { dg-final { scan-assembler-times {\tpause} 1 } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+@@ -12,7 +12,7 @@ male_indirect_jump (long offset)
+ return 0;
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */
+ /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */
+ /* { dg-final { scan-assembler-times {\tpause} 1 } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
+
+ void func0 (void);
+ void func1 (void);
+@@ -35,7 +35,7 @@ bar (int i)
+ }
+ }
+
+-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { { ! x32 } && *-*-linux* } } } } */
+ /* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
+ /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
+ /* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-1.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-1.c
+@@ -0,0 +1,13 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=thunk" } */
++
++void
++foo (void)
++{
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_return_thunk" } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-10.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-10.c
+@@ -0,0 +1,23 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=thunk-inline -mindirect-branch=thunk -fno-pic" } */
++
++extern void (*bar) (void);
++
++int
++foo (void)
++{
++ bar ();
++ return 0;
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*__x86_return_thunk" } } */
++/* { dg-final { scan-assembler-times {\tpause} 2 } } */
++/* { dg-final { scan-assembler-times {\tlfence} 2 } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?bar" { target { { ! x32 } && *-*-linux* } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "__x86_indirect_thunk:" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target { x32 } } } } */
++/* { dg-final { scan-assembler "__x86_indirect_thunk_(r|e)ax:" { target { x32 } } } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-11.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-11.c
+@@ -0,0 +1,23 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=thunk-extern -mindirect-branch=thunk -fno-pic" } */
++
++extern void (*bar) (void);
++
++int
++foo (void)
++{
++ bar ();
++ return 0;
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_return_thunk" } } */
++/* { dg-final { scan-assembler-times {\tpause} 1 } } */
++/* { dg-final { scan-assembler-times {\tlfence} 1 } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?bar" { target { { ! x32 } && *-*-linux* } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "__x86_indirect_thunk:" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target { x32 } } } } */
++/* { dg-final { scan-assembler "__x86_indirect_thunk_(r|e)ax:" { target { x32 } } } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-12.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-12.c
+@@ -0,0 +1,22 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
++
++extern void (*bar) (void);
++
++int
++foo (void)
++{
++ bar ();
++ return 0;
++}
++
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*__x86_return_thunk" } } */
++/* { dg-final { scan-assembler-times {\tpause} 1 } } */
++/* { dg-final { scan-assembler-times {\tlfence} 1 } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "__x86_indirect_thunk:" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target { x32 } } } } */
++/* { dg-final { scan-assembler "__x86_indirect_thunk_(r|e)ax:" { target { x32 } } } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-13.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-13.c
+@@ -0,0 +1,22 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
++
++extern void (*bar) (void);
++extern int foo (void) __attribute__ ((function_return("thunk")));
++
++int
++foo (void)
++{
++ bar ();
++ return 0;
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_return_thunk" } } */
++/* { dg-final { scan-assembler-times {\tpause} 2 } } */
++/* { dg-final { scan-assembler-times {\tlfence} 2 } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?bar" { target { { ! x32 } && *-*-linux* } } } } */
++/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 3 } } */
++/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 3 } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*__x86_indirect_thunk" } } */
++/* { dg-final { scan-assembler-not "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target { x32 } } } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-14.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-14.c
+@@ -0,0 +1,22 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
++
++extern void (*bar) (void);
++
++__attribute__ ((function_return("thunk-inline")))
++int
++foo (void)
++{
++ bar ();
++ return 0;
++}
++
++/* { dg-final { scan-assembler-times {\tpause} 1 } } */
++/* { dg-final { scan-assembler-times {\tlfence} 1 } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*__x86_return_thunk" } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?bar" { target { { ! x32 } && *-*-linux* } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target { x32 } } } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-15.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-15.c
+@@ -0,0 +1,22 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=keep -fno-pic" } */
++
++extern void (*bar) (void);
++
++__attribute__ ((function_return("thunk-extern"), indirect_branch("thunk")))
++int
++foo (void)
++{
++ bar ();
++ return 0;
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_return_thunk" } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler-times {\tpause} 1 } } */
++/* { dg-final { scan-assembler-times {\tlfence} 1 } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?bar" { target { { ! x32 } && *-*-linux* } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-16.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-16.c
+@@ -0,0 +1,18 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=thunk-inline -mindirect-branch=thunk-extern -fno-pic" } */
++
++extern void (*bar) (void);
++
++__attribute__ ((function_return("keep"), indirect_branch("keep")))
++int
++foo (void)
++{
++ bar ();
++ return 0;
++}
++
++/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */
++/* { dg-final { scan-assembler-not "__x86_return_thunk" } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-2.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-2.c
+@@ -0,0 +1,13 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=thunk-inline" } */
++
++void
++foo (void)
++{
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*__x86_return_thunk" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-3.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-3.c
+@@ -0,0 +1,12 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=thunk-extern" } */
++
++void
++foo (void)
++{
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_return_thunk" } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-4.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-4.c
+@@ -0,0 +1,12 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=keep" } */
++
++void
++foo (void)
++{
++}
++
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*__x86_return_thunk" } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-5.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-5.c
+@@ -0,0 +1,15 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=keep" } */
++
++extern void foo (void) __attribute__ ((function_return("thunk")));
++
++void
++foo (void)
++{
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_return_thunk" } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-6.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-6.c
+@@ -0,0 +1,14 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=keep" } */
++
++__attribute__ ((function_return("thunk-inline")))
++void
++foo (void)
++{
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler {\tlfence} } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*__x86_return_thunk" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-7.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-7.c
+@@ -0,0 +1,13 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=keep" } */
++
++__attribute__ ((function_return("thunk-extern")))
++void
++foo (void)
++{
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_return_thunk" } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-8.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-8.c
+@@ -0,0 +1,14 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=thunk-inline" } */
++
++extern void foo (void) __attribute__ ((function_return("keep")));
++
++void
++foo (void)
++{
++}
++
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*__x86_return_thunk" } } */
++/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-9.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-9.c
+@@ -0,0 +1,24 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mfunction-return=thunk -mindirect-branch=thunk -fno-pic" } */
++
++extern void (*bar) (void);
++
++int
++foo (void)
++{
++ bar ();
++ return 0;
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_return_thunk" } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "__x86_indirect_thunk:" } } */
++/* { dg-final { scan-assembler-times {\tpause} 1 { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times {\tlfence} 1 { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?bar" { target { { ! x32 } && *-*-linux* } } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler-times {\tpause} 2 { target { x32 } } } } */
++/* { dg-final { scan-assembler-times {\tlfence} 2 { target { x32 } } } } */
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target { x32 } } } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */
diff --git a/development/gcc5/patches/0007-x86-Add-mindirect-branch-register-doc.diff b/development/gcc5/patches/0007-x86-Add-mindirect-branch-register-doc.diff
new file mode 100644
index 0000000000..9780bfc918
--- /dev/null
+++ b/development/gcc5/patches/0007-x86-Add-mindirect-branch-register-doc.diff
@@ -0,0 +1,231 @@
+From 86118fbdbafe6af54b2da467e1073c49e1742116 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 16 Jan 2018 11:17:49 +0000
+Subject: [PATCH 7/9] x86: Add -mindirect-branch-register (documentation)
+
+Add -mindirect-branch-register to force indirect branch via register.
+This is implemented by disabling patterns of indirect branch via memory,
+similar to TARGET_X32.
+
+-mindirect-branch= and -mfunction-return= tests are updated with
+-mno-indirect-branch-register to avoid false test failures when
+-mindirect-branch-register is added to RUNTESTFLAGS for "make check".
+
+gcc/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/constraints.md (Bs): Disallow memory operand for
+ -mindirect-branch-register.
+ (Bw): Likewise.
+ * config/i386/predicates.md (indirect_branch_operand): Likewise.
+ (GOT_memory_operand): Likewise.
+ (call_insn_operand): Likewise.
+ (sibcall_insn_operand): Likewise.
+ (GOT32_symbol_operand): Likewise.
+ * config/i386/i386.md (indirect_jump): Call convert_memory_address
+ for -mindirect-branch-register.
+ (tablejump): Likewise.
+ (*sibcall_memory): Likewise.
+ (*sibcall_value_memory): Likewise.
+ Disallow peepholes of indirect call and jump via memory for
+ -mindirect-branch-register.
+ (*call_pop): Replace m with Bw.
+ (*call_value_pop): Likewise.
+ (*sibcall_pop_memory): Replace m with Bs.
+ * config/i386/i386.opt (mindirect-branch-register): New option.
+ * doc/invoke.texi: Document -mindirect-branch-register option.
+
+gcc/testsuite/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * gcc.target/i386/indirect-thunk-1.c (dg-options): Add
+ -mno-indirect-branch-register.
+ * gcc.target/i386/indirect-thunk-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-7.c: Likewise.
+ * gcc.target/i386/ret-thunk-10.c: Likewise.
+ * gcc.target/i386/ret-thunk-11.c: Likewise.
+ * gcc.target/i386/ret-thunk-12.c: Likewise.
+ * gcc.target/i386/ret-thunk-13.c: Likewise.
+ * gcc.target/i386/ret-thunk-14.c: Likewise.
+ * gcc.target/i386/ret-thunk-15.c: Likewise.
+ * gcc.target/i386/ret-thunk-9.c: Likewise.
+ * gcc.target/i386/indirect-thunk-register-1.c: New test.
+ * gcc.target/i386/indirect-thunk-register-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-register-3.c: Likewise.
+
+i386: Rename to ix86_indirect_branch_register
+
+Rename the variable for -mindirect-branch-register to
+ix86_indirect_branch_register to match the command-line option name.
+
+ Backport from mainline
+ 2018-01-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/constraints.md (Bs): Replace
+ ix86_indirect_branch_thunk_register with
+ ix86_indirect_branch_register.
+ (Bw): Likewise.
+ * config/i386/i386.md (indirect_jump): Likewise.
+ (tablejump): Likewise.
+ (*sibcall_memory): Likewise.
+ (*sibcall_value_memory): Likewise.
+ Peepholes of indirect call and jump via memory: Likewise.
+ * config/i386/i386.opt: Likewise.
+ * config/i386/predicates.md (indirect_branch_operand): Likewise.
+ (GOT_memory_operand): Likewise.
+ (call_insn_operand): Likewise.
+ (sibcall_insn_operand): Likewise.
+ (GOT32_symbol_operand): Likewise.
+
+x86: Rewrite ix86_indirect_branch_register logic
+
+Rewrite ix86_indirect_branch_register logic with
+
+(and (not (match_test "ix86_indirect_branch_register"))
+ (original condition before r256662))
+
+ Backport from mainline
+ 2018-01-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/predicates.md (constant_call_address_operand):
+ Rewrite ix86_indirect_branch_register logic.
+ (sibcall_insn_operand): Likewise.
+
+Don't check ix86_indirect_branch_register for GOT operand
+
+Since GOT_memory_operand and GOT32_symbol_operand are simple pattern
+matches, don't check ix86_indirect_branch_register here. If needed,
+-mindirect-branch= will convert indirect branch via GOT slot to a call
+and return thunk.
+
+ Backport from mainline
+ 2018-01-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/constraints.md (Bs): Update
+ ix86_indirect_branch_register check. Don't check
+ ix86_indirect_branch_register with GOT_memory_operand.
+ (Bw): Likewise.
+ * config/i386/predicates.md (GOT_memory_operand): Don't check
+ ix86_indirect_branch_register here.
+ (GOT32_symbol_operand): Likewise.
+
+i386: Rewrite indirect_branch_operand logic
+
+ Backport from mainline
+ 2018-01-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/predicates.md (indirect_branch_operand): Rewrite
+ ix86_indirect_branch_register logic.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256735 138bc75d-0d04-0410-961f-82ee72b054a4
+
+[Ubuntu note: Dropped indirect-thunk-5.c, indirect-thunk-6.c,
+ indirect-thunk-bnd-3.c, indirect-thunk-bnd-4.c,
+ indirect-thunk-extern-5.c, indirect-thunk-extern-6.c,
+ indirect-thunk-inline-5.c, and indirect-thunk-inline-6.c tests due
+ to gcc 5.4 and earlier not supporting the -fno-plt option.
+ --sbeattie,]
+---
+ src/gcc/config/i386/constraints.md | 6 +
+ src/gcc/config/i386/i386.md | 34 ++++++----
+ src/gcc/config/i386/i386.opt | 4 +
+ src/gcc/config/i386/predicates.md | 9 +-
+ src/gcc/doc/invoke.texi | 7 +-
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-register-1.c | 22 ++++++
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-register-2.c | 20 +++++
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-register-3.c | 19 +++++
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-10.c | 2
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-11.c | 2
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-12.c | 2
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-13.c | 2
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-14.c | 2
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-15.c | 2
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-9.c | 2
+ 39 files changed, 134 insertions(+), 49 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-register-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-register-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-register-3.c
+
+Index: b/src/gcc/doc/invoke.texi
+===================================================================
+--- a/src/gcc/doc/invoke.texi
++++ b/src/gcc/doc/invoke.texi
+@@ -1091,7 +1091,8 @@ See RS/6000 and PowerPC Options.
+ -msse2avx -mfentry -mrecord-mcount -mnop-mcount -m8bit-idiv @gol
+ -mavx256-split-unaligned-load -mavx256-split-unaligned-store @gol
+ -malign-data=@var{type} -mstack-protector-guard=@var{guard} @gol
+--mindirect-branch=@var{choice} -mfunction-return=@var{choice}}
++-mindirect-branch=@var{choice} -mfunction-return=@var{choice} @gol
++-mindirect-branch-register}
+
+ @emph{x86 Windows Options}
+ @gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll @gol
+@@ -24040,6 +24041,10 @@ object file. You can control this behav
+ using the function attribute @code{function_return}.
+ @xref{Function Attributes}.
+
++@item -mindirect-branch-register
++@opindex -mindirect-branch-register
++Force indirect call and jump via register.
++
+ @end table
+
+ @c man end
diff --git a/development/gcc5/patches/0007-x86-Add-mindirect-branch-register.diff b/development/gcc5/patches/0007-x86-Add-mindirect-branch-register.diff
new file mode 100644
index 0000000000..211368991f
--- /dev/null
+++ b/development/gcc5/patches/0007-x86-Add-mindirect-branch-register.diff
@@ -0,0 +1,812 @@
+From 86118fbdbafe6af54b2da467e1073c49e1742116 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 16 Jan 2018 11:17:49 +0000
+Subject: [PATCH 7/9] x86: Add -mindirect-branch-register
+
+Add -mindirect-branch-register to force indirect branch via register.
+This is implemented by disabling patterns of indirect branch via memory,
+similar to TARGET_X32.
+
+-mindirect-branch= and -mfunction-return= tests are updated with
+-mno-indirect-branch-register to avoid false test failures when
+-mindirect-branch-register is added to RUNTESTFLAGS for "make check".
+
+gcc/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/constraints.md (Bs): Disallow memory operand for
+ -mindirect-branch-register.
+ (Bw): Likewise.
+ * config/i386/predicates.md (indirect_branch_operand): Likewise.
+ (GOT_memory_operand): Likewise.
+ (call_insn_operand): Likewise.
+ (sibcall_insn_operand): Likewise.
+ (GOT32_symbol_operand): Likewise.
+ * config/i386/i386.md (indirect_jump): Call convert_memory_address
+ for -mindirect-branch-register.
+ (tablejump): Likewise.
+ (*sibcall_memory): Likewise.
+ (*sibcall_value_memory): Likewise.
+ Disallow peepholes of indirect call and jump via memory for
+ -mindirect-branch-register.
+ (*call_pop): Replace m with Bw.
+ (*call_value_pop): Likewise.
+ (*sibcall_pop_memory): Replace m with Bs.
+ * config/i386/i386.opt (mindirect-branch-register): New option.
+ * doc/invoke.texi: Document -mindirect-branch-register option.
+
+gcc/testsuite/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * gcc.target/i386/indirect-thunk-1.c (dg-options): Add
+ -mno-indirect-branch-register.
+ * gcc.target/i386/indirect-thunk-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-bnd-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-7.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-1.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-3.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-4.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-5.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-6.c: Likewise.
+ * gcc.target/i386/indirect-thunk-inline-7.c: Likewise.
+ * gcc.target/i386/ret-thunk-10.c: Likewise.
+ * gcc.target/i386/ret-thunk-11.c: Likewise.
+ * gcc.target/i386/ret-thunk-12.c: Likewise.
+ * gcc.target/i386/ret-thunk-13.c: Likewise.
+ * gcc.target/i386/ret-thunk-14.c: Likewise.
+ * gcc.target/i386/ret-thunk-15.c: Likewise.
+ * gcc.target/i386/ret-thunk-9.c: Likewise.
+ * gcc.target/i386/indirect-thunk-register-1.c: New test.
+ * gcc.target/i386/indirect-thunk-register-2.c: Likewise.
+ * gcc.target/i386/indirect-thunk-register-3.c: Likewise.
+
+i386: Rename to ix86_indirect_branch_register
+
+Rename the variable for -mindirect-branch-register to
+ix86_indirect_branch_register to match the command-line option name.
+
+ Backport from mainline
+ 2018-01-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/constraints.md (Bs): Replace
+ ix86_indirect_branch_thunk_register with
+ ix86_indirect_branch_register.
+ (Bw): Likewise.
+ * config/i386/i386.md (indirect_jump): Likewise.
+ (tablejump): Likewise.
+ (*sibcall_memory): Likewise.
+ (*sibcall_value_memory): Likewise.
+ Peepholes of indirect call and jump via memory: Likewise.
+ * config/i386/i386.opt: Likewise.
+ * config/i386/predicates.md (indirect_branch_operand): Likewise.
+ (GOT_memory_operand): Likewise.
+ (call_insn_operand): Likewise.
+ (sibcall_insn_operand): Likewise.
+ (GOT32_symbol_operand): Likewise.
+
+x86: Rewrite ix86_indirect_branch_register logic
+
+Rewrite ix86_indirect_branch_register logic with
+
+(and (not (match_test "ix86_indirect_branch_register"))
+ (original condition before r256662))
+
+ Backport from mainline
+ 2018-01-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/predicates.md (constant_call_address_operand):
+ Rewrite ix86_indirect_branch_register logic.
+ (sibcall_insn_operand): Likewise.
+
+Don't check ix86_indirect_branch_register for GOT operand
+
+Since GOT_memory_operand and GOT32_symbol_operand are simple pattern
+matches, don't check ix86_indirect_branch_register here. If needed,
+-mindirect-branch= will convert indirect branch via GOT slot to a call
+and return thunk.
+
+ Backport from mainline
+ 2018-01-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/constraints.md (Bs): Update
+ ix86_indirect_branch_register check. Don't check
+ ix86_indirect_branch_register with GOT_memory_operand.
+ (Bw): Likewise.
+ * config/i386/predicates.md (GOT_memory_operand): Don't check
+ ix86_indirect_branch_register here.
+ (GOT32_symbol_operand): Likewise.
+
+i386: Rewrite indirect_branch_operand logic
+
+ Backport from mainline
+ 2018-01-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/predicates.md (indirect_branch_operand): Rewrite
+ ix86_indirect_branch_register logic.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256735 138bc75d-0d04-0410-961f-82ee72b054a4
+
+[Ubuntu note: Dropped indirect-thunk-5.c, indirect-thunk-6.c,
+ indirect-thunk-bnd-3.c, indirect-thunk-bnd-4.c,
+ indirect-thunk-extern-5.c, indirect-thunk-extern-6.c,
+ indirect-thunk-inline-5.c, and indirect-thunk-inline-6.c tests due
+ to gcc 5.4 and earlier not supporting the -fno-plt option.
+ --sbeattie,]
+---
+ src/gcc/config/i386/constraints.md | 6 +
+ src/gcc/config/i386/i386.md | 34 ++++++----
+ src/gcc/config/i386/i386.opt | 4 +
+ src/gcc/config/i386/predicates.md | 9 +-
+ src/gcc/doc/invoke.texi | 7 +-
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c | 2
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-register-1.c | 22 ++++++
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-register-2.c | 20 +++++
+ src/gcc/testsuite/gcc.target/i386/indirect-thunk-register-3.c | 19 +++++
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-10.c | 2
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-11.c | 2
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-12.c | 2
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-13.c | 2
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-14.c | 2
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-15.c | 2
+ src/gcc/testsuite/gcc.target/i386/ret-thunk-9.c | 2
+ 39 files changed, 134 insertions(+), 49 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-register-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-register-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-register-3.c
+
+Index: b/src/gcc/config/i386/constraints.md
+===================================================================
+--- a/src/gcc/config/i386/constraints.md
++++ b/src/gcc/config/i386/constraints.md
+@@ -157,12 +157,14 @@
+
+ (define_constraint "Bs"
+ "@internal Sibcall memory operand."
+- (and (not (match_test "TARGET_X32"))
++ (and (not (match_test "ix86_indirect_branch_register"))
++ (not (match_test "TARGET_X32"))
+ (match_operand 0 "sibcall_memory_operand")))
+
+ (define_constraint "Bw"
+ "@internal Call memory operand."
+- (and (not (match_test "TARGET_X32"))
++ (and (not (match_test "ix86_indirect_branch_register"))
++ (not (match_test "TARGET_X32"))
+ (match_operand 0 "memory_operand")))
+
+ (define_constraint "Bz"
+Index: b/src/gcc/config/i386/i386.md
+===================================================================
+--- a/src/gcc/config/i386/i386.md
++++ b/src/gcc/config/i386/i386.md
+@@ -11554,7 +11554,7 @@
+ [(set (pc) (match_operand 0 "indirect_branch_operand"))]
+ ""
+ {
+- if (TARGET_X32)
++ if (TARGET_X32 || ix86_indirect_branch_register)
+ operands[0] = convert_memory_address (word_mode, operands[0]);
+ cfun->machine->has_local_indirect_jump = true;
+ })
+@@ -11607,7 +11607,7 @@
+ OPTAB_DIRECT);
+ }
+
+- if (TARGET_X32)
++ if (TARGET_X32 || ix86_indirect_branch_register)
+ operands[0] = convert_memory_address (word_mode, operands[0]);
+ cfun->machine->has_local_indirect_jump = true;
+ })
+@@ -11764,7 +11764,7 @@
+ [(call (mem:QI (match_operand:W 0 "memory_operand" "m"))
+ (match_operand 1))
+ (unspec [(const_int 0)] UNSPEC_PEEPSIB)]
+- "!TARGET_X32"
++ "!TARGET_X32 && !ix86_indirect_branch_register"
+ "* return ix86_output_call_insn (insn, operands[0]);"
+ [(set_attr "type" "call")])
+
+@@ -11773,7 +11773,9 @@
+ (match_operand:W 1 "memory_operand"))
+ (call (mem:QI (match_dup 0))
+ (match_operand 3))]
+- "!TARGET_X32 && SIBLING_CALL_P (peep2_next_insn (1))
++ "!TARGET_X32
++ && !ix86_indirect_branch_register
++ && SIBLING_CALL_P (peep2_next_insn (1))
+ && peep2_reg_dead_p (2, operands[0])"
+ [(parallel [(call (mem:QI (match_dup 1))
+ (match_dup 3))
+@@ -11785,7 +11787,9 @@
+ (unspec_volatile [(const_int 0)] UNSPECV_BLOCKAGE)
+ (call (mem:QI (match_dup 0))
+ (match_operand 3))]
+- "!TARGET_X32 && SIBLING_CALL_P (peep2_next_insn (2))
++ "!TARGET_X32
++ && !ix86_indirect_branch_register
++ && SIBLING_CALL_P (peep2_next_insn (2))
+ && peep2_reg_dead_p (3, operands[0])"
+ [(unspec_volatile [(const_int 0)] UNSPECV_BLOCKAGE)
+ (parallel [(call (mem:QI (match_dup 1))
+@@ -11806,7 +11810,7 @@
+ })
+
+ (define_insn "*call_pop"
+- [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lmBz"))
++ [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lBwBz"))
+ (match_operand 1))
+ (set (reg:SI SP_REG)
+ (plus:SI (reg:SI SP_REG)
+@@ -11826,7 +11830,7 @@
+ [(set_attr "type" "call")])
+
+ (define_insn "*sibcall_pop_memory"
+- [(call (mem:QI (match_operand:SI 0 "memory_operand" "m"))
++ [(call (mem:QI (match_operand:SI 0 "memory_operand" "Bs"))
+ (match_operand 1))
+ (set (reg:SI SP_REG)
+ (plus:SI (reg:SI SP_REG)
+@@ -11878,7 +11882,9 @@
+ [(set (match_operand:W 0 "register_operand")
+ (match_operand:W 1 "memory_operand"))
+ (set (pc) (match_dup 0))]
+- "!TARGET_X32 && peep2_reg_dead_p (2, operands[0])"
++ "!TARGET_X32
++ && !ix86_indirect_branch_register
++ && peep2_reg_dead_p (2, operands[0])"
+ [(set (pc) (match_dup 1))])
+
+ ;; Call subroutine, returning value in operand 0
+@@ -11928,7 +11934,7 @@
+ (call (mem:QI (match_operand:W 1 "memory_operand" "m"))
+ (match_operand 2)))
+ (unspec [(const_int 0)] UNSPEC_PEEPSIB)]
+- "!TARGET_X32"
++ "!TARGET_X32 && !ix86_indirect_branch_register"
+ "* return ix86_output_call_insn (insn, operands[1]);"
+ [(set_attr "type" "callv")])
+
+@@ -11938,7 +11944,9 @@
+ (set (match_operand 2)
+ (call (mem:QI (match_dup 0))
+ (match_operand 3)))]
+- "!TARGET_X32 && SIBLING_CALL_P (peep2_next_insn (1))
++ "!TARGET_X32
++ && !ix86_indirect_branch_register
++ && SIBLING_CALL_P (peep2_next_insn (1))
+ && peep2_reg_dead_p (2, operands[0])"
+ [(parallel [(set (match_dup 2)
+ (call (mem:QI (match_dup 1))
+@@ -11952,7 +11960,9 @@
+ (set (match_operand 2)
+ (call (mem:QI (match_dup 0))
+ (match_operand 3)))]
+- "!TARGET_X32 && SIBLING_CALL_P (peep2_next_insn (2))
++ "!TARGET_X32
++ && !ix86_indirect_branch_register
++ && SIBLING_CALL_P (peep2_next_insn (2))
+ && peep2_reg_dead_p (3, operands[0])"
+ [(unspec_volatile [(const_int 0)] UNSPECV_BLOCKAGE)
+ (parallel [(set (match_dup 2)
+@@ -11976,7 +11986,7 @@
+
+ (define_insn "*call_value_pop"
+ [(set (match_operand 0)
+- (call (mem:QI (match_operand:SI 1 "call_insn_operand" "lmBz"))
++ (call (mem:QI (match_operand:SI 1 "call_insn_operand" "lBwBz"))
+ (match_operand 2)))
+ (set (reg:SI SP_REG)
+ (plus:SI (reg:SI SP_REG)
+Index: b/src/gcc/config/i386/i386.opt
+===================================================================
+--- a/src/gcc/config/i386/i386.opt
++++ b/src/gcc/config/i386/i386.opt
+@@ -900,3 +900,7 @@ Enum(indirect_branch) String(thunk-inlin
+
+ EnumValue
+ Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern)
++
++mindirect-branch-register
++Target Report Var(ix86_indirect_branch_register) Init(0)
++Force indirect call and jump via register.
+Index: b/src/gcc/config/i386/predicates.md
+===================================================================
+--- a/src/gcc/config/i386/predicates.md
++++ b/src/gcc/config/i386/predicates.md
+@@ -607,7 +607,8 @@
+ ;; Test for a valid operand for indirect branch.
+ (define_predicate "indirect_branch_operand"
+ (ior (match_operand 0 "register_operand")
+- (and (not (match_test "TARGET_X32"))
++ (and (not (match_test "ix86_indirect_branch_register"))
++ (not (match_test "TARGET_X32"))
+ (match_operand 0 "memory_operand"))))
+
+ ;; Test for a valid operand for a call instruction.
+@@ -616,7 +617,8 @@
+ (ior (match_test "constant_call_address_operand
+ (op, mode == VOIDmode ? mode : Pmode)")
+ (match_operand 0 "call_register_no_elim_operand")
+- (and (not (match_test "TARGET_X32"))
++ (and (not (match_test "ix86_indirect_branch_register"))
++ (not (match_test "TARGET_X32"))
+ (match_operand 0 "memory_operand"))))
+
+ ;; Similarly, but for tail calls, in which we cannot allow memory references.
+@@ -624,7 +626,8 @@
+ (ior (match_test "constant_call_address_operand
+ (op, mode == VOIDmode ? mode : Pmode)")
+ (match_operand 0 "register_no_elim_operand")
+- (and (not (match_test "TARGET_X32"))
++ (and (not (match_test "ix86_indirect_branch_register"))
++ (not (match_test "TARGET_X32"))
+ (match_operand 0 "sibcall_memory_operand"))))
+
+ ;; Match exactly zero.
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
+
+ void func0 (void);
+ void func1 (void);
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */
+
+ void func0 (void);
+ void func1 (void);
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile { target { ! x32 } } } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fno-pic" } */
+
+ void (*dispatch) (char *);
+ char buf[10];
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile { target { ! x32 } } } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fno-pic" } */
+
+ void (*dispatch) (char *);
+ char buf[10];
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
+
+ void func0 (void);
+ void func1 (void);
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
+
+ typedef void (*dispatch_t)(long offset);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
+
+ void func0 (void);
+ void func1 (void);
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-register-1.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-register-1.c
+@@ -0,0 +1,22 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk -mindirect-branch-register -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch;
++
++void
++male_indirect_jump (long offset)
++{
++ dispatch(offset);
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "mov\[ \t\](%eax|%rax), \\((%esp|%rsp)\\)" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler-not "push(?:l|q)\[ \t\]*_?dispatch" } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" } } */
++/* { dg-final { scan-assembler-not "__x86_indirect_thunk\n" } } */
++/* { dg-final { scan-assembler-not "__x86_indirect_thunk_bnd\n" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-register-2.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-register-2.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-inline -mindirect-branch-register -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch;
++
++void
++male_indirect_jump (long offset)
++{
++ dispatch(offset);
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler "mov\[ \t\](%eax|%rax), \\((%esp|%rsp)\\)" } } */
++/* { dg-final { scan-assembler {\tpause} } } */
++/* { dg-final { scan-assembler-not "push(?:l|q)\[ \t\]*_?dispatch" } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" } } */
++/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-register-3.c
+===================================================================
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-register-3.c
+@@ -0,0 +1,19 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-extern -mindirect-branch-register -fno-pic" } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch;
++
++void
++male_indirect_jump (long offset)
++{
++ dispatch(offset);
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" } } */
++/* { dg-final { scan-assembler-not "push(?:l|q)\[ \t\]*_?dispatch" } } */
++/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" } } */
++/* { dg-final { scan-assembler-not {\t(pause|pause|nop)} } } */
++/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */
++/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-10.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/ret-thunk-10.c
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-10.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=thunk-inline -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=thunk-inline -mindirect-branch=thunk -fno-pic" } */
+
+ extern void (*bar) (void);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-11.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/ret-thunk-11.c
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-11.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=thunk-extern -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=thunk-extern -mindirect-branch=thunk -fno-pic" } */
+
+ extern void (*bar) (void);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-12.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/ret-thunk-12.c
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-12.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */
+
+ extern void (*bar) (void);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-13.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/ret-thunk-13.c
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-13.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */
+
+ extern void (*bar) (void);
+ extern int foo (void) __attribute__ ((function_return("thunk")));
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-14.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/ret-thunk-14.c
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-14.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */
+
+ extern void (*bar) (void);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-15.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/ret-thunk-15.c
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-15.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=keep -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=keep -fno-pic" } */
+
+ extern void (*bar) (void);
+
+Index: b/src/gcc/testsuite/gcc.target/i386/ret-thunk-9.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/ret-thunk-9.c
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-9.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mfunction-return=thunk -mindirect-branch=thunk -fno-pic" } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=thunk -mindirect-branch=thunk -fno-pic" } */
+
+ extern void (*bar) (void);
+
diff --git a/development/gcc5/patches/0008-x86-Add-V-register-operand-modifier-doc.diff b/development/gcc5/patches/0008-x86-Add-V-register-operand-modifier-doc.diff
new file mode 100644
index 0000000000..b3bd93a218
--- /dev/null
+++ b/development/gcc5/patches/0008-x86-Add-V-register-operand-modifier-doc.diff
@@ -0,0 +1,65 @@
+From 8a47615dd04a02fdae9691f5ad73fd5a5530c156 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 16 Jan 2018 11:19:51 +0000
+Subject: [PATCH 8/9] x86: Add 'V' register operand modifier (documentation)
+
+Add 'V', a special modifier which prints the name of the full integer
+register without '%'. For
+
+extern void (*func_p) (void);
+
+void
+foo (void)
+{
+ asm ("call __x86_indirect_thunk_%V0" : : "a" (func_p));
+}
+
+it generates:
+
+foo:
+ movq func_p(%rip), %rax
+ call __x86_indirect_thunk_rax
+ ret
+
+gcc/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/i386.c (print_reg): Print the name of the full
+ integer register without '%'.
+ (ix86_print_operand): Handle 'V'.
+ * doc/extend.texi: Document 'V' modifier.
+
+gcc/testsuite/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * gcc.target/i386/indirect-thunk-register-4.c: New test.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256736 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog | 10 ++++++++++
+ gcc/config/i386/i386.c | 13 ++++++++++++-
+ gcc/doc/extend.texi | 3 +++
+ gcc/testsuite/ChangeLog | 7 +++++++
+ gcc/testsuite/gcc.target/i386/indirect-thunk-register-4.c | 13 +++++++++++++
+ 5 files changed, 45 insertions(+), 1 deletion(-)
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-register-4.c
+
+diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
+index 46e0a36..9db9e0e 100644
+--- a/src/gcc/doc/extend.texi
++++ b/src/gcc/doc/extend.texi
+@@ -8778,6 +8778,9 @@ The table below shows the list of supported modifiers and their effects.
+ @tab @code{2}
+ @end multitable
+
++@code{V} is a special modifier which prints the name of the full integer
++register without @code{%}.
++
+ @anchor{x86floatingpointasmoperands}
+ @subsubsection x86 Floating-Point @code{asm} Operands
+
diff --git a/development/gcc5/patches/0008-x86-Add-V-register-operand-modifier.diff b/development/gcc5/patches/0008-x86-Add-V-register-operand-modifier.diff
new file mode 100644
index 0000000000..fb1ccd9883
--- /dev/null
+++ b/development/gcc5/patches/0008-x86-Add-V-register-operand-modifier.diff
@@ -0,0 +1,125 @@
+From 8a47615dd04a02fdae9691f5ad73fd5a5530c156 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 16 Jan 2018 11:19:51 +0000
+Subject: [PATCH 8/9] x86: Add 'V' register operand modifier
+
+Add 'V', a special modifier which prints the name of the full integer
+register without '%'. For
+
+extern void (*func_p) (void);
+
+void
+foo (void)
+{
+ asm ("call __x86_indirect_thunk_%V0" : : "a" (func_p));
+}
+
+it generates:
+
+foo:
+ movq func_p(%rip), %rax
+ call __x86_indirect_thunk_rax
+ ret
+
+gcc/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/i386.c (print_reg): Print the name of the full
+ integer register without '%'.
+ (ix86_print_operand): Handle 'V'.
+ * doc/extend.texi: Document 'V' modifier.
+
+gcc/testsuite/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * gcc.target/i386/indirect-thunk-register-4.c: New test.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256736 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog | 10 ++++++++++
+ gcc/config/i386/i386.c | 13 ++++++++++++-
+ gcc/doc/extend.texi | 3 +++
+ gcc/testsuite/ChangeLog | 7 +++++++
+ gcc/testsuite/gcc.target/i386/indirect-thunk-register-4.c | 13 +++++++++++++
+ 5 files changed, 45 insertions(+), 1 deletion(-)
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-register-4.c
+
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index 8fb8902..1bbdd0c 100644
+--- a/src/gcc/config/i386/i386.c
++++ b/src/gcc/config/i386/i386.c
+@@ -17941,6 +17941,7 @@ put_condition_code (enum rtx_code code, machine_mode mode, bool reverse,
+ If CODE is 'h', pretend the reg is the 'high' byte register.
+ If CODE is 'y', print "st(0)" instead of "st", if the reg is stack op.
+ If CODE is 'd', duplicate the operand for AVX instruction.
++ If CODE is 'V', print naked full integer register name without %.
+ */
+
+ void
+@@ -17951,7 +17952,7 @@ print_reg (rtx x, int code, FILE *file)
+ unsigned int regno;
+ bool duplicated = code == 'd' && TARGET_AVX;
+
+- if (ASSEMBLER_DIALECT == ASM_ATT)
++ if (ASSEMBLER_DIALECT == ASM_ATT && code != 'V')
+ putc ('%', file);
+
+ if (x == pc_rtx)
+@@ -17999,6 +18000,14 @@ print_reg (rtx x, int code, FILE *file)
+ else
+ code = GET_MODE_SIZE (GET_MODE (x));
+
++ if (code == 'V')
++ {
++ if (GENERAL_REGNO_P (regno))
++ code = GET_MODE_SIZE (word_mode);
++ else
++ error ("'V' modifier on non-integer register");
++ }
++
+ /* Irritatingly, AMD extended registers use different naming convention
+ from the normal registers: "r%d[bwd]" */
+ if (REX_INT_REGNO_P (regno))
+@@ -18118,6 +18127,7 @@ print_reg (rtx x, int code, FILE *file)
+ & -- print some in-use local-dynamic symbol name.
+ H -- print a memory address offset by 8; used for sse high-parts
+ Y -- print condition for XOP pcom* instruction.
++ V -- print naked full integer register name without %.
+ + -- print a branch hint as 'cs' or 'ds' prefix
+ ; -- print a semicolon (after prefixes due to bug in older gas).
+ ~ -- print "i" if TARGET_AVX2, "f" otherwise.
+@@ -18342,6 +18352,7 @@ ix86_print_operand (FILE *file, rtx x, int code)
+ case 'X':
+ case 'P':
+ case 'p':
++ case 'V':
+ break;
+
+ case 's':
+diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-register-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-register-4.c
+new file mode 100644
+index 0000000..f0cd9b7
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-register-4.c
+@@ -0,0 +1,13 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=keep -fno-pic" } */
++
++extern void (*func_p) (void);
++
++void
++foo (void)
++{
++ asm("call __x86_indirect_thunk_%V0" : : "a" (func_p));
++}
++
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_eax" { target ia32 } } } */
++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_rax" { target { ! ia32 } } } } */
+--
+2.7.4
+
diff --git a/development/gcc5/patches/0009-x86-Disallow-mindirect-branch-mfunction-return-with-.diff b/development/gcc5/patches/0009-x86-Disallow-mindirect-branch-mfunction-return-with-.diff
new file mode 100644
index 0000000000..fdaab625ab
--- /dev/null
+++ b/development/gcc5/patches/0009-x86-Disallow-mindirect-branch-mfunction-return-with-.diff
@@ -0,0 +1,275 @@
+From 5d1c53c6fd593de2360c1a2ae44ebf5fa3c5263b Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 16 Jan 2018 11:22:01 +0000
+Subject: [PATCH 9/9] x86: Disallow -mindirect-branch=/-mfunction-return= with
+ -mcmodel=large
+
+Since the thunk function may not be reachable in large code model,
+-mcmodel=large is incompatible with -mindirect-branch=thunk,
+-mindirect-branch=thunk-extern, -mfunction-return=thunk and
+-mfunction-return=thunk-extern. Issue an error when they are used with
+-mcmodel=large.
+
+gcc/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/i386.c (ix86_set_indirect_branch_type): Disallow
+ -mcmodel=large with -mindirect-branch=thunk,
+ -mindirect-branch=thunk-extern, -mfunction-return=thunk and
+ -mfunction-return=thunk-extern.
+ * doc/invoke.texi: Document -mcmodel=large is incompatible with
+ -mindirect-branch=thunk, -mindirect-branch=thunk-extern,
+ -mfunction-return=thunk and -mfunction-return=thunk-extern.
+
+gcc/testsuite/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * gcc.target/i386/indirect-thunk-10.c: New test.
+ * gcc.target/i386/indirect-thunk-8.c: Likewise.
+ * gcc.target/i386/indirect-thunk-9.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-10.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-11.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-9.c: Likewise.
+ * gcc.target/i386/ret-thunk-17.c: Likewise.
+ * gcc.target/i386/ret-thunk-18.c: Likewise.
+ * gcc.target/i386/ret-thunk-19.c: Likewise.
+ * gcc.target/i386/ret-thunk-20.c: Likewise.
+ * gcc.target/i386/ret-thunk-21.c: Likewise.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256737 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog | 13 +++++++++++
+ gcc/config/i386/i386.c | 26 ++++++++++++++++++++++
+ gcc/doc/invoke.texi | 11 +++++++++
+ gcc/testsuite/ChangeLog | 17 ++++++++++++++
+ gcc/testsuite/gcc.target/i386/indirect-thunk-10.c | 7 ++++++
+ gcc/testsuite/gcc.target/i386/indirect-thunk-8.c | 7 ++++++
+ gcc/testsuite/gcc.target/i386/indirect-thunk-9.c | 7 ++++++
+ .../gcc.target/i386/indirect-thunk-attr-10.c | 9 ++++++++
+ .../gcc.target/i386/indirect-thunk-attr-11.c | 9 ++++++++
+ .../gcc.target/i386/indirect-thunk-attr-9.c | 9 ++++++++
+ gcc/testsuite/gcc.target/i386/ret-thunk-17.c | 7 ++++++
+ gcc/testsuite/gcc.target/i386/ret-thunk-18.c | 8 +++++++
+ gcc/testsuite/gcc.target/i386/ret-thunk-19.c | 8 +++++++
+ gcc/testsuite/gcc.target/i386/ret-thunk-20.c | 9 ++++++++
+ gcc/testsuite/gcc.target/i386/ret-thunk-21.c | 9 ++++++++
+ 15 files changed, 156 insertions(+)
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-10.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-8.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-9.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-10.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-11.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-9.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-17.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-18.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-19.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-20.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-21.c
+
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index 1bbdd0c..e758387 100644
+--- a/src/gcc/config/i386/i386.c
++++ b/src/gcc/config/i386/i386.c
+@@ -7187,6 +7187,19 @@ ix86_set_indirect_branch_type (tree fndecl)
+ }
+ else
+ cfun->machine->indirect_branch_type = ix86_indirect_branch;
++
++ /* -mcmodel=large is not compatible with -mindirect-branch=thunk
++ nor -mindirect-branch=thunk-extern. */
++ if ((ix86_cmodel == CM_LARGE || ix86_cmodel == CM_LARGE_PIC)
++ && ((cfun->machine->indirect_branch_type
++ == indirect_branch_thunk_extern)
++ || (cfun->machine->indirect_branch_type
++ == indirect_branch_thunk)))
++ error ("%<-mindirect-branch=%s%> and %<-mcmodel=large%> are not "
++ "compatible",
++ ((cfun->machine->indirect_branch_type
++ == indirect_branch_thunk_extern)
++ ? "thunk-extern" : "thunk"));
+ }
+
+ if (cfun->machine->function_return_type == indirect_branch_unset)
+@@ -7212,6 +7225,19 @@ ix86_set_indirect_branch_type (tree fndecl)
+ }
+ else
+ cfun->machine->function_return_type = ix86_function_return;
++
++ /* -mcmodel=large is not compatible with -mfunction-return=thunk
++ nor -mfunction-return=thunk-extern. */
++ if ((ix86_cmodel == CM_LARGE || ix86_cmodel == CM_LARGE_PIC)
++ && ((cfun->machine->function_return_type
++ == indirect_branch_thunk_extern)
++ || (cfun->machine->function_return_type
++ == indirect_branch_thunk)))
++ error ("%<-mfunction-return=%s%> and %<-mcmodel=large%> are not "
++ "compatible",
++ ((cfun->machine->function_return_type
++ == indirect_branch_thunk_extern)
++ ? "thunk-extern" : "thunk"));
+ }
+ }
+
+diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-10.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-10.c
+new file mode 100644
+index 0000000..a0674bd
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-10.c
+@@ -0,0 +1,7 @@
++/* { dg-do compile { target { lp64 } } } */
++/* { dg-options "-O2 -mindirect-branch=thunk-inline -mfunction-return=keep -mcmodel=large" } */
++
++void
++bar (void)
++{
++}
+diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-8.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-8.c
+new file mode 100644
+index 0000000..7a80a89
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-8.c
+@@ -0,0 +1,7 @@
++/* { dg-do compile { target { lp64 } } } */
++/* { dg-options "-O2 -mindirect-branch=thunk -mfunction-return=keep -mcmodel=large" } */
++
++void
++bar (void)
++{ /* { dg-error "'-mindirect-branch=thunk' and '-mcmodel=large' are not compatible" } */
++}
+diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-9.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-9.c
+new file mode 100644
+index 0000000..d4d45c5
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-9.c
+@@ -0,0 +1,7 @@
++/* { dg-do compile { target { lp64 } } } */
++/* { dg-options "-O2 -mindirect-branch=thunk-extern -mfunction-return=keep -mcmodel=large" } */
++
++void
++bar (void)
++{ /* { dg-error "'-mindirect-branch=thunk-extern' and '-mcmodel=large' are not compatible" } */
++}
+diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-10.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-10.c
+new file mode 100644
+index 0000000..3a2aead
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-10.c
+@@ -0,0 +1,9 @@
++/* { dg-do compile { target { lp64 } } } */
++/* { dg-options "-O2 -mindirect-branch=keep -mfunction-return=keep -mcmodel=large" } */
++/* { dg-additional-options "-fPIC" { target fpic } } */
++
++__attribute__ ((indirect_branch("thunk-extern")))
++void
++bar (void)
++{ /* { dg-error "'-mindirect-branch=thunk-extern' and '-mcmodel=large' are not compatible" } */
++}
+diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-11.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-11.c
+new file mode 100644
+index 0000000..8e52f03
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-11.c
+@@ -0,0 +1,9 @@
++/* { dg-do compile { target { lp64 } } } */
++/* { dg-options "-O2 -mindirect-branch=keep -mfunction-return=keep -mcmodel=large" } */
++/* { dg-additional-options "-fPIC" { target fpic } } */
++
++__attribute__ ((indirect_branch("thunk-inline")))
++void
++bar (void)
++{
++}
+diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-9.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-9.c
+new file mode 100644
+index 0000000..bdaa4f6
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-9.c
+@@ -0,0 +1,9 @@
++/* { dg-do compile { target { lp64 } } } */
++/* { dg-options "-O2 -mindirect-branch=keep -mfunction-return=keep -mcmodel=large" } */
++/* { dg-additional-options "-fPIC" { target fpic } } */
++
++__attribute__ ((indirect_branch("thunk")))
++void
++bar (void)
++{ /* { dg-error "'-mindirect-branch=thunk' and '-mcmodel=large' are not compatible" } */
++}
+diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-17.c b/gcc/testsuite/gcc.target/i386/ret-thunk-17.c
+new file mode 100644
+index 0000000..0605e2c
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-17.c
+@@ -0,0 +1,7 @@
++/* { dg-do compile { target { lp64 } } } */
++/* { dg-options "-O2 -mfunction-return=thunk -mindirect-branch=keep -mcmodel=large" } */
++
++void
++bar (void)
++{ /* { dg-error "'-mfunction-return=thunk' and '-mcmodel=large' are not compatible" } */
++}
+diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-18.c b/gcc/testsuite/gcc.target/i386/ret-thunk-18.c
+new file mode 100644
+index 0000000..307019d
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-18.c
+@@ -0,0 +1,8 @@
++/* { dg-do compile { target { lp64 } } } */
++/* { dg-options "-O2 -mfunction-return=thunk-extern -mindirect-branch=keep -mcmodel=large" } */
++/* { dg-additional-options "-fPIC" { target fpic } } */
++
++void
++bar (void)
++{ /* { dg-error "'-mfunction-return=thunk-extern' and '-mcmodel=large' are not compatible" } */
++}
+diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-19.c b/gcc/testsuite/gcc.target/i386/ret-thunk-19.c
+new file mode 100644
+index 0000000..772617f
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-19.c
+@@ -0,0 +1,8 @@
++/* { dg-do compile { target { lp64 } } } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=keep -mcmodel=large" } */
++
++__attribute__ ((function_return("thunk")))
++void
++bar (void)
++{ /* { dg-error "'-mfunction-return=thunk' and '-mcmodel=large' are not compatible" } */
++}
+diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-20.c b/gcc/testsuite/gcc.target/i386/ret-thunk-20.c
+new file mode 100644
+index 0000000..1e9f9bd
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-20.c
+@@ -0,0 +1,9 @@
++/* { dg-do compile { target { lp64 } } } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=keep -mcmodel=large" } */
++/* { dg-additional-options "-fPIC" { target fpic } } */
++
++__attribute__ ((function_return("thunk-extern")))
++void
++bar (void)
++{ /* { dg-error "'-mfunction-return=thunk-extern' and '-mcmodel=large' are not compatible" } */
++}
+diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-21.c b/gcc/testsuite/gcc.target/i386/ret-thunk-21.c
+new file mode 100644
+index 0000000..eea07f7
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/ret-thunk-21.c
+@@ -0,0 +1,9 @@
++/* { dg-do compile { target { lp64 } } } */
++/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=keep -mcmodel=large" } */
++/* { dg-additional-options "-fPIC" { target fpic } } */
++
++__attribute__ ((function_return("thunk-inline")))
++void
++bar (void)
++{
++}
+--
+2.7.4
+
diff --git a/development/gcc5/patches/0009-x86-Disallow-mindirect-branch-mfunction-return-with-doc.diff b/development/gcc5/patches/0009-x86-Disallow-mindirect-branch-mfunction-return-with-doc.diff
new file mode 100644
index 0000000000..c107900552
--- /dev/null
+++ b/development/gcc5/patches/0009-x86-Disallow-mindirect-branch-mfunction-return-with-doc.diff
@@ -0,0 +1,102 @@
+From 5d1c53c6fd593de2360c1a2ae44ebf5fa3c5263b Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 16 Jan 2018 11:22:01 +0000
+Subject: [PATCH 9/9] x86: Disallow -mindirect-branch=/-mfunction-return= with
+ -mcmodel=large
+
+Since the thunk function may not be reachable in large code model,
+-mcmodel=large is incompatible with -mindirect-branch=thunk,
+-mindirect-branch=thunk-extern, -mfunction-return=thunk and
+-mfunction-return=thunk-extern. Issue an error when they are used with
+-mcmodel=large.
+
+gcc/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/i386/i386.c (ix86_set_indirect_branch_type): Disallow
+ -mcmodel=large with -mindirect-branch=thunk,
+ -mindirect-branch=thunk-extern, -mfunction-return=thunk and
+ -mfunction-return=thunk-extern.
+ * doc/invoke.texi: Document -mcmodel=large is incompatible with
+ -mindirect-branch=thunk, -mindirect-branch=thunk-extern,
+ -mfunction-return=thunk and -mfunction-return=thunk-extern.
+
+gcc/testsuite/
+
+ Backport from mainline
+ 2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * gcc.target/i386/indirect-thunk-10.c: New test.
+ * gcc.target/i386/indirect-thunk-8.c: Likewise.
+ * gcc.target/i386/indirect-thunk-9.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-10.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-11.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-9.c: Likewise.
+ * gcc.target/i386/ret-thunk-17.c: Likewise.
+ * gcc.target/i386/ret-thunk-18.c: Likewise.
+ * gcc.target/i386/ret-thunk-19.c: Likewise.
+ * gcc.target/i386/ret-thunk-20.c: Likewise.
+ * gcc.target/i386/ret-thunk-21.c: Likewise.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256737 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog | 13 +++++++++++
+ gcc/config/i386/i386.c | 26 ++++++++++++++++++++++
+ gcc/doc/invoke.texi | 11 +++++++++
+ gcc/testsuite/ChangeLog | 17 ++++++++++++++
+ gcc/testsuite/gcc.target/i386/indirect-thunk-10.c | 7 ++++++
+ gcc/testsuite/gcc.target/i386/indirect-thunk-8.c | 7 ++++++
+ gcc/testsuite/gcc.target/i386/indirect-thunk-9.c | 7 ++++++
+ .../gcc.target/i386/indirect-thunk-attr-10.c | 9 ++++++++
+ .../gcc.target/i386/indirect-thunk-attr-11.c | 9 ++++++++
+ .../gcc.target/i386/indirect-thunk-attr-9.c | 9 ++++++++
+ gcc/testsuite/gcc.target/i386/ret-thunk-17.c | 7 ++++++
+ gcc/testsuite/gcc.target/i386/ret-thunk-18.c | 8 +++++++
+ gcc/testsuite/gcc.target/i386/ret-thunk-19.c | 8 +++++++
+ gcc/testsuite/gcc.target/i386/ret-thunk-20.c | 9 ++++++++
+ gcc/testsuite/gcc.target/i386/ret-thunk-21.c | 9 ++++++++
+ 15 files changed, 156 insertions(+)
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-10.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-8.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-9.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-10.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-11.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-9.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-17.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-18.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-19.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-20.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/ret-thunk-21.c
+
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index 1e572b1..6f3c344 100644
+--- a/src/gcc/doc/invoke.texi
++++ b/src/gcc/doc/invoke.texi
+@@ -25699,6 +25699,11 @@ to external call and return thunk provided in a separate object file.
+ You can control this behavior for a specific function by using the
+ function attribute @code{indirect_branch}. @xref{Function Attributes}.
+
++Note that @option{-mcmodel=large} is incompatible with
++@option{-mindirect-branch=thunk} nor
++@option{-mindirect-branch=thunk-extern} since the thunk function may
++not be reachable in large code model.
++
+ @item -mfunction-return=@var{choice}
+ @opindex -mfunction-return
+ Convert function return with @var{choice}. The default is @samp{keep},
+@@ -25710,6 +25715,12 @@ object file. You can control this behavior for a specific function by
+ using the function attribute @code{function_return}.
+ @xref{Function Attributes}.
+
++Note that @option{-mcmodel=large} is incompatible with
++@option{-mfunction-return=thunk} nor
++@option{-mfunction-return=thunk-extern} since the thunk function may
++not be reachable in large code model.
++
++
+ @item -mindirect-branch-register
+ @opindex -mindirect-branch-register
+ Force indirect call and jump via register.
diff --git a/development/gcc5/patches/gcc-no_fixincludes.diff b/development/gcc5/patches/gcc-no_fixincludes.diff
new file mode 100644
index 0000000000..52b661613d
--- /dev/null
+++ b/development/gcc5/patches/gcc-no_fixincludes.diff
@@ -0,0 +1,27 @@
+--- ./gcc/Makefile.in.orig 2010-04-02 02:49:06.000000000 -0500
++++ ./gcc/Makefile.in 2010-08-01 16:55:30.088318841 -0500
+@@ -3864,9 +3864,9 @@
+ chmod a+r $${fix_dir}/limits.h; \
+ done
+ # Install the README
+- rm -f include-fixed/README
+- cp $(srcdir)/../fixincludes/README-fixinc include-fixed/README
+- chmod a+r include-fixed/README
++# rm -f include-fixed/README
++# cp $(srcdir)/../fixincludes/README-fixinc include-fixed/README
++# chmod a+r include-fixed/README
+ $(STAMP) $@
+
+ .PHONY: install-gcc-tooldir
+@@ -3947,10 +3947,7 @@
+ (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
+ SHELL='$(SHELL)'; MACRO_LIST=`${PWD_COMMAND}`/macro_list ; \
+ gcc_dir=`${PWD_COMMAND}` ; \
+- export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
+- cd $(build_objdir)/fixincludes && \
+- $(SHELL) ./fixinc.sh "$${gcc_dir}/$${fix_dir}" \
+- $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \
++ export TARGET_MACHINE srcdir SHELL MACRO_LIST ); \
+ rm -f $${fix_dir}/syslimits.h; \
+ if [ -f $${fix_dir}/limits.h ]; then \
+ mv $${fix_dir}/limits.h $${fix_dir}/syslimits.h; \
diff --git a/development/gcc5/patches/gcc.66782.diff b/development/gcc5/patches/gcc.66782.diff
new file mode 100644
index 0000000000..0743f8853b
--- /dev/null
+++ b/development/gcc5/patches/gcc.66782.diff
@@ -0,0 +1,124 @@
+Index: config/i386/i386.md
+===================================================================
+--- config/i386/i386.md (revision 225539)
++++ config/i386/i386.md (working copy)
+@@ -108,6 +108,7 @@
+ UNSPEC_LD_MPIC ; load_macho_picbase
+ UNSPEC_TRUNC_NOOP
+ UNSPEC_DIV_ALREADY_SPLIT
++ UNSPEC_MS_TO_SYSV_CALL
+ UNSPEC_PAUSE
+ UNSPEC_LEA_ADDR
+ UNSPEC_XBEGIN_ABORT
+@@ -11584,6 +11585,15 @@
+ "* return ix86_output_call_insn (insn, operands[0]);"
+ [(set_attr "type" "call")])
+
++(define_insn "*call_rex64_ms_sysv"
++ [(match_parallel 2 "call_rex64_ms_sysv_operation"
++ [(call (mem:QI (match_operand:DI 0 "call_insn_operand" "rBwBz"))
++ (match_operand 1))
++ (unspec [(const_int 0)] UNSPEC_MS_TO_SYSV_CALL)])]
++ "TARGET_64BIT && !SIBLING_CALL_P (insn)"
++ "* return ix86_output_call_insn (insn, operands[0]);"
++ [(set_attr "type" "call")])
++
+ (define_insn "*sibcall"
+ [(call (mem:QI (match_operand:W 0 "sibcall_insn_operand" "UBsBz"))
+ (match_operand 1))]
+@@ -11808,6 +11818,16 @@
+ (match_dup 3)))
+ (unspec [(const_int 0)] UNSPEC_PEEPSIB)])])
+
++(define_insn "*call_value_rex64_ms_sysv"
++ [(match_parallel 3 "call_rex64_ms_sysv_operation"
++ [(set (match_operand 0)
++ (call (mem:QI (match_operand:DI 1 "call_insn_operand" "rBwBz"))
++ (match_operand 2)))
++ (unspec [(const_int 0)] UNSPEC_MS_TO_SYSV_CALL)])]
++ "TARGET_64BIT && !SIBLING_CALL_P (insn)"
++ "* return ix86_output_call_insn (insn, operands[1]);"
++ [(set_attr "type" "callv")])
++
+ (define_expand "call_value_pop"
+ [(parallel [(set (match_operand 0)
+ (call (match_operand:QI 1)
+Index: config/i386/predicates.md
+===================================================================
+--- config/i386/predicates.md (revision 225533)
++++ config/i386/predicates.md (working copy)
+@@ -616,6 +616,36 @@
+ && XINT (XEXP (op, 0), 1) == UNSPEC_GOTPCREL);
+ })
+
++;; Return true if OP is a call from MS ABI to SYSV ABI function.
++(define_predicate "call_rex64_ms_sysv_operation"
++ (match_code "parallel")
++{
++ unsigned creg_size = ARRAY_SIZE (x86_64_ms_sysv_extra_clobbered_registers);
++ unsigned i;
++
++ if ((unsigned) XVECLEN (op, 0) != creg_size + 2)
++ return false;
++
++ for (i = 0; i < creg_size; i++)
++ {
++ rtx elt = XVECEXP (op, 0, i+2);
++ enum machine_mode mode;
++ unsigned regno;
++
++ if (GET_CODE (elt) != CLOBBER
++ || GET_CODE (SET_DEST (elt)) != REG)
++ return false;
++
++ regno = x86_64_ms_sysv_extra_clobbered_registers[i];
++ mode = SSE_REGNO_P (regno) ? TImode : DImode;
++
++ if (GET_MODE (SET_DEST (elt)) != mode
++ || REGNO (SET_DEST (elt)) != regno)
++ return false;
++ }
++ return true;
++})
++
+ ;; Match exactly zero.
+ (define_predicate "const0_operand"
+ (match_code "const_int,const_wide_int,const_double,const_vector")
+Index: config/i386/i386.c
+===================================================================
+--- config/i386/i386.c (revision 225533)
++++ config/i386/i386.c (working copy)
+@@ -25639,7 +25639,9 @@
+ rtx callarg2,
+ rtx pop, bool sibcall)
+ {
+- rtx vec[3];
++ unsigned int const cregs_size
++ = ARRAY_SIZE (x86_64_ms_sysv_extra_clobbered_registers);
++ rtx vec[3 + cregs_size];
+ rtx use = NULL, call;
+ unsigned int vec_len = 0;
+
+@@ -25742,16 +25744,18 @@
+ if (TARGET_64BIT_MS_ABI
+ && (!callarg2 || INTVAL (callarg2) != -2))
+ {
+- int const cregs_size
+- = ARRAY_SIZE (x86_64_ms_sysv_extra_clobbered_registers);
+- int i;
++ unsigned i;
+
++ vec[vec_len++] = gen_rtx_UNSPEC (VOIDmode, gen_rtvec (1, const0_rtx),
++ UNSPEC_MS_TO_SYSV_CALL);
++
+ for (i = 0; i < cregs_size; i++)
+ {
+ int regno = x86_64_ms_sysv_extra_clobbered_registers[i];
+ machine_mode mode = SSE_REGNO_P (regno) ? TImode : DImode;
+
+- clobber_reg (&use, gen_rtx_REG (mode, regno));
++ vec[vec_len++]
++ = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (mode, regno));
+ }
+ }
+
diff --git a/development/gcc5/patches/gcc.69140.diff b/development/gcc5/patches/gcc.69140.diff
new file mode 100644
index 0000000000..ace60ebdd0
--- /dev/null
+++ b/development/gcc5/patches/gcc.69140.diff
@@ -0,0 +1,13 @@
+--- ./gcc/config/i386/i386.c.orig 2015-11-18 09:45:26.000000000 -0600
++++ ./gcc/config/i386/i386.c 2016-02-05 13:50:07.202981920 -0600
+@@ -9677,6 +9677,10 @@
+ if (TARGET_64BIT_MS_ABI && get_frame_size () > SEH_MAX_FRAME_SIZE)
+ return true;
+
++ /* SSE saves require frame-pointer when stack is misaligned. */
++ if (TARGET_64BIT_MS_ABI && ix86_incoming_stack_boundary < 128)
++ return true;
++
+ /* In ix86_option_override_internal, TARGET_OMIT_LEAF_FRAME_POINTER
+ turns off the frame pointer by default. Turn it back on now if
+ we've not got a leaf function. */
diff --git a/development/gcc5/patches/glibc2.28-ustat.diff b/development/gcc5/patches/glibc2.28-ustat.diff
new file mode 100644
index 0000000000..c7d71d0677
--- /dev/null
+++ b/development/gcc5/patches/glibc2.28-ustat.diff
@@ -0,0 +1,31 @@
+--- libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2018/04/25 07:39:32 259630
++++ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2018/05/24 20:07:25 260687
+@@ -138,7 +138,6 @@
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -231,7 +230,19 @@
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+- unsigned struct_ustat_sz = sizeof(struct ustat);
++ // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
++ // has been removed from glibc 2.28.
++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
++ || defined(__x86_64__)
++#define SIZEOF_STRUCT_USTAT 32
++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
++ || defined(__powerpc__) || defined(__s390__)
++#define SIZEOF_STRUCT_USTAT 20
++#else
++#error Unknown size of struct ustat
++#endif
++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+ unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+ unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
diff --git a/development/gcc5/profile.d/gcc5.csh b/development/gcc5/profile.d/gcc5.csh
new file mode 100644
index 0000000000..25f9dc1342
--- /dev/null
+++ b/development/gcc5/profile.d/gcc5.csh
@@ -0,0 +1,7 @@
+setenv CC gcc-5
+setenv CPP cpp-5
+setenv CXX g++-5
+setenv AR gcc-ar-5
+setenv NM gcc-nm-5
+setenv RANLIB gcc-ranlib-5
+
diff --git a/development/gcc5/profile.d/gcc5.sh b/development/gcc5/profile.d/gcc5.sh
new file mode 100644
index 0000000000..7143b5d0e9
--- /dev/null
+++ b/development/gcc5/profile.d/gcc5.sh
@@ -0,0 +1,7 @@
+export CC=gcc-5
+export CPP=cpp-5
+export CXX=g++-5
+export AR=gcc-ar-5
+export NM=gcc-nm-5
+export RANLIB=gcc-ranlib-5
+
diff --git a/development/gcc5/slack-desc.gcc5 b/development/gcc5/slack-desc.gcc5
new file mode 100644
index 0000000000..d9d965846b
--- /dev/null
+++ b/development/gcc5/slack-desc.gcc5
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
+# leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+gcc5: gcc5 (Co-installable GCC-5 package with C, C++ and Java support)
+gcc5:
+gcc5: GCC is the GNU Compiler Collection.
+gcc5:
+gcc5: This package contains those parts of the compiler collection needed to
+gcc5: compile C and C++ code and programs written in the Java programming
+gcc5: language.@MULTILIB@
+gcc5:
+gcc5: This gcc5 package must be co-installed with Slackware's gcc7 compiler.
+gcc5:
+gcc5:
diff --git a/development/geany-plugins/geany-plugins.SlackBuild b/development/geany-plugins/geany-plugins.SlackBuild
index f83d24874f..ead50f0428 100644
--- a/development/geany-plugins/geany-plugins.SlackBuild
+++ b/development/geany-plugins/geany-plugins.SlackBuild
@@ -26,7 +26,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=geany-plugins
-VERSION=${VERSION:-1.34.0}
+VERSION=${VERSION:-1.36.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -72,10 +72,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-./autogen.sh
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
diff --git a/development/geany-plugins/geany-plugins.info b/development/geany-plugins/geany-plugins.info
index 06c67e8dd8..a1b4ae4ed5 100644
--- a/development/geany-plugins/geany-plugins.info
+++ b/development/geany-plugins/geany-plugins.info
@@ -1,8 +1,8 @@
PRGNAM="geany-plugins"
-VERSION="1.34.0"
+VERSION="1.36.0"
HOMEPAGE="https://plugins.geany.org/"
-DOWNLOAD="https://github.com/geany/geany-plugins/archive/1.34.0/geany-plugins-1.34.0.tar.gz"
-MD5SUM="64a0bfa6d44b4996cf9d33b01e13c6e4"
+DOWNLOAD="https://github.com/geany/geany-plugins/archive/1.36.0/geany-plugins-1.36.0.tar.gz"
+MD5SUM="ef26e47c73a2502a636fccf323ae990a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="geany"
diff --git a/development/geany/geany.SlackBuild b/development/geany/geany.SlackBuild
index a2e1deee07..245e63388b 100644
--- a/development/geany/geany.SlackBuild
+++ b/development/geany/geany.SlackBuild
@@ -31,7 +31,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=geany
-VERSION=${VERSION:-1.34.1}
+VERSION=${VERSION:-1.36.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -90,7 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--disable-static \
- --disable-html-docs \
+ --enable-gtk3 \
--build=$ARCH-slackware-linux
make
diff --git a/development/geany/geany.info b/development/geany/geany.info
index ec46e04d62..cc772da644 100644
--- a/development/geany/geany.info
+++ b/development/geany/geany.info
@@ -1,8 +1,8 @@
PRGNAM="geany"
-VERSION="1.34.1"
+VERSION="1.36.0"
HOMEPAGE="https://www.geany.org/"
-DOWNLOAD="https://github.com/geany/geany/archive/1.34.1/geany-1.34.1.tar.gz"
-MD5SUM="d36ad44844c8721f2ef9b5398260de3b"
+DOWNLOAD="https://github.com/geany/geany/archive/1.36.0/geany-1.36.0.tar.gz"
+MD5SUM="dece8f7b7e8c42c8a6724b10809c6d5c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/gedit/gedit.SlackBuild b/development/gedit/gedit.SlackBuild
index 9ed2ab95c6..264611aaa0 100644
--- a/development/gedit/gedit.SlackBuild
+++ b/development/gedit/gedit.SlackBuild
@@ -70,6 +70,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+export LDFLAGS="-lgmodule-2.0 -lICE"
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/development/glade/glade.SlackBuild b/development/glade/glade.SlackBuild
index 1741b2a9cb..63ee055fab 100644
--- a/development/glade/glade.SlackBuild
+++ b/development/glade/glade.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=glade
-VERSION=${VERSION:-3.18.3}
+VERSION=${VERSION:-3.36.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -91,7 +91,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* INSTALL NEWS README* TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* INSTALL NEWS TODO $PKG/usr/doc/$PRGNAM-$VERSION
# If there's a ChangeLog, installing at least part of the recent history
# is useful, but don't let it get totally out of control:
diff --git a/development/glade/glade.info b/development/glade/glade.info
index fff72106e7..354f6d2ed8 100644
--- a/development/glade/glade.info
+++ b/development/glade/glade.info
@@ -1,8 +1,8 @@
PRGNAM="glade"
-VERSION="3.18.3"
+VERSION="3.36.0"
HOMEPAGE="https://glade.gnome.org"
-DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/glade/3.18/glade-3.18.3.tar.xz"
-MD5SUM="6852d6286683728e0ea40ca9b5d2416f"
+DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/glade/3.36/glade-3.36.0.tar.xz"
+MD5SUM="e5928b38dc628d5d8844f471576743c8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/gnats/gnats.SlackBuild b/development/gnats/gnats.SlackBuild
index da9575aaa1..18ca2b30d7 100644
--- a/development/gnats/gnats.SlackBuild
+++ b/development/gnats/gnats.SlackBuild
@@ -69,7 +69,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=pointer-compare -Wno-error=implicit-fallthrough=" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/development/gnuradio/boost-1.70.0.patch b/development/gnuradio/boost-1.70.0.patch
new file mode 100644
index 0000000000..6d46598525
--- /dev/null
+++ b/development/gnuradio/boost-1.70.0.patch
@@ -0,0 +1,36 @@
+From c01473bf00b73ba1dd72813fbc4c4c5d0f66d339 Mon Sep 17 00:00:00 2001
+From: Michael Dickens <michael.dickens@ettus.com>
+Date: Thu, 23 May 2019 10:26:00 -0400
+Subject: [PATCH] blocks: simple fix for Boost 1.70.0 in socket_pdu
+
+NOTE: There have been multiple fixes proposed, such as
+https://github.com/gnuradio/gnuradio/pull/2451 .
+This one is the simplest and most compatible.
+---
+ gr-blocks/lib/socket_pdu_impl.cc | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc
+index e20f1478f0..168d74ebb2 100644
+--- a/gr-blocks/lib/socket_pdu_impl.cc
++++ b/gr-blocks/lib/socket_pdu_impl.cc
+@@ -1,6 +1,6 @@
+ /* -*- c++ -*- */
+ /*
+- * Copyright 2013 Free Software Foundation, Inc.
++ * Copyright 2013,2019 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+@@ -165,7 +165,11 @@ namespace gr {
+ void
+ socket_pdu_impl::start_tcp_accept()
+ {
++#if (BOOST_VERSION >= 107000)
++ tcp_connection::sptr new_connection = tcp_connection::make(d_io_service, d_rxbuf.size(), d_tcp_no_delay);
++#else
+ tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay);
++#endif
+
+ d_acceptor_tcp->async_accept(new_connection->socket(),
+ boost::bind(&socket_pdu_impl::handle_tcp_accept, this,
diff --git a/development/gnuradio/boost-1.73.0.patch b/development/gnuradio/boost-1.73.0.patch
new file mode 100644
index 0000000000..9dd1e3a821
--- /dev/null
+++ b/development/gnuradio/boost-1.73.0.patch
@@ -0,0 +1,720 @@
+ponce <matteo.bernardini@gmail.com>
+
+Qualify placeholders with their full namespace.
+
+This is needed with boost >= 1.73.0
+
+diff -Naur gnuradio-3.7.13.2.orig/docs/doxygen/other/msg_passing.dox gnuradio-3.7.13.2/docs/doxygen/other/msg_passing.dox
+--- gnuradio-3.7.13.2.orig/docs/doxygen/other/msg_passing.dox 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/docs/doxygen/other/msg_passing.dox 2020-05-17 10:25:08.170538000 +0200
+@@ -101,7 +101,7 @@
+
+ \code
+ set_msg_handler(pmt::pmt_t port_id,
+- boost::bind(&block_class::message_handler_function, this, _1));
++ boost::bind(&block_class::message_handler_function, this, boost::placeholders::_1));
+ \endcode
+
+ In Python:
+@@ -276,15 +276,15 @@
+ {
+ message_port_register_in(pmt::mp("print"));
+ set_msg_handler(pmt::mp("print"),
+- boost::bind(&message_debug_impl::print, this, _1));
++ boost::bind(&message_debug_impl::print, this, boost::placeholders::_1));
+
+ message_port_register_in(pmt::mp("store"));
+ set_msg_handler(pmt::mp("store"),
+- boost::bind(&message_debug_impl::store, this, _1));
++ boost::bind(&message_debug_impl::store, this, boost::placeholders::_1));
+
+ message_port_register_in(pmt::mp("print_pdu"));
+ set_msg_handler(pmt::mp("print_pdu"),
+- boost::bind(&message_debug_impl::print_pdu, this, _1));
++ boost::bind(&message_debug_impl::print_pdu, this, boost::placeholders::_1));
+ }
+ \endcode
+
+diff -Naur gnuradio-3.7.13.2.orig/gnuradio-runtime/lib/block.cc gnuradio-3.7.13.2/gnuradio-runtime/lib/block.cc
+--- gnuradio-3.7.13.2.orig/gnuradio-runtime/lib/block.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gnuradio-runtime/lib/block.cc 2020-05-17 10:25:08.164538000 +0200
+@@ -60,7 +60,7 @@
+ {
+ global_block_registry.register_primitive(alias(), this);
+ message_port_register_in(d_system_port);
+- set_msg_handler(d_system_port, boost::bind(&block::system_handler, this, _1));
++ set_msg_handler(d_system_port, boost::bind(&block::system_handler, this, boost::placeholders::_1));
+
+ configure_default_loggers(d_logger, d_debug_logger, symbol_name());
+ }
+diff -Naur gnuradio-3.7.13.2.orig/gr-analog/lib/sig_source_X_impl.cc.t gnuradio-3.7.13.2/gr-analog/lib/sig_source_X_impl.cc.t
+--- gnuradio-3.7.13.2.orig/gr-analog/lib/sig_source_X_impl.cc.t 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-analog/lib/sig_source_X_impl.cc.t 2020-05-17 10:25:08.169538000 +0200
+@@ -55,7 +55,7 @@
+ set_frequency(frequency);
+
+ message_port_register_in(pmt::mp("freq"));
+- set_msg_handler(pmt::mp("freq"), boost::bind(&@IMPL_NAME@::set_frequency_msg, this, _1));
++ set_msg_handler(pmt::mp("freq"), boost::bind(&@IMPL_NAME@::set_frequency_msg, this, boost::placeholders::_1));
+ }
+
+ @IMPL_NAME@::~@IMPL_NAME@()
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/copy_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/copy_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/copy_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/copy_impl.cc 2020-05-17 10:25:08.162538000 +0200
+@@ -47,7 +47,7 @@
+ {
+ message_port_register_in(pmt::mp("en"));
+ set_msg_handler(pmt::mp("en"),
+- boost::bind(&copy_impl::handle_enable, this, _1));
++ boost::bind(&copy_impl::handle_enable, this, boost::placeholders::_1));
+ }
+
+ copy_impl::~copy_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/message_debug_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/message_debug_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/message_debug_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/message_debug_impl.cc 2020-05-17 10:25:08.160538000 +0200
+@@ -102,13 +102,13 @@
+ io_signature::make(0, 0, 0))
+ {
+ message_port_register_in(pmt::mp("print"));
+- set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, _1));
++ set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, boost::placeholders::_1));
+
+ message_port_register_in(pmt::mp("store"));
+- set_msg_handler(pmt::mp("store"), boost::bind(&message_debug_impl::store, this, _1));
++ set_msg_handler(pmt::mp("store"), boost::bind(&message_debug_impl::store, this, boost::placeholders::_1));
+
+ message_port_register_in(pmt::mp("print_pdu"));
+- set_msg_handler(pmt::mp("print_pdu"), boost::bind(&message_debug_impl::print_pdu, this, _1));
++ set_msg_handler(pmt::mp("print_pdu"), boost::bind(&message_debug_impl::print_pdu, this, boost::placeholders::_1));
+ }
+
+ message_debug_impl::~message_debug_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/message_strobe_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/message_strobe_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/message_strobe_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/message_strobe_impl.cc 2020-05-17 10:25:08.159538000 +0200
+@@ -58,7 +58,7 @@
+
+ message_port_register_in(pmt::mp("set_msg"));
+ set_msg_handler(pmt::mp("set_msg"),
+- boost::bind(&message_strobe_impl::set_msg, this, _1));
++ boost::bind(&message_strobe_impl::set_msg, this, boost::placeholders::_1));
+ }
+
+ message_strobe_impl::~message_strobe_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/message_strobe_random_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/message_strobe_random_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/message_strobe_random_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/message_strobe_random_impl.cc 2020-05-17 10:25:08.163538000 +0200
+@@ -68,7 +68,7 @@
+
+ message_port_register_in(pmt::mp("set_msg"));
+ set_msg_handler(pmt::mp("set_msg"),
+- boost::bind(&message_strobe_random_impl::set_msg, this, _1));
++ boost::bind(&message_strobe_random_impl::set_msg, this, boost::placeholders::_1));
+ }
+
+ float message_strobe_random_impl::next_delay(){
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/multiply_matrix_cc_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/multiply_matrix_cc_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/multiply_matrix_cc_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/multiply_matrix_cc_impl.cc 2020-05-17 10:25:08.161538000 +0200
+@@ -57,7 +57,7 @@
+ message_port_register_in(port_name);
+ set_msg_handler(
+ port_name,
+- boost::bind(&multiply_matrix_cc_impl::msg_handler_A, this, _1)
++ boost::bind(&multiply_matrix_cc_impl::msg_handler_A, this, boost::placeholders::_1)
+ );
+ }
+
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/multiply_matrix_ff_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/multiply_matrix_ff_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/multiply_matrix_ff_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/multiply_matrix_ff_impl.cc 2020-05-17 10:25:08.162538000 +0200
+@@ -57,7 +57,7 @@
+ message_port_register_in(port_name);
+ set_msg_handler(
+ port_name,
+- boost::bind(&multiply_matrix_ff_impl::msg_handler_A, this, _1)
++ boost::bind(&multiply_matrix_ff_impl::msg_handler_A, this, boost::placeholders::_1)
+ );
+ }
+
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/mute_XX_impl.cc.t gnuradio-3.7.13.2/gr-blocks/lib/mute_XX_impl.cc.t
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/mute_XX_impl.cc.t 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/mute_XX_impl.cc.t 2020-05-17 10:25:08.163538000 +0200
+@@ -48,7 +48,7 @@
+ {
+ message_port_register_in(pmt::intern("set_mute"));
+ set_msg_handler(pmt::intern("set_mute"),
+- boost::bind(&@NAME_IMPL@::set_mute_pmt, this, _1));
++ boost::bind(&@NAME_IMPL@::set_mute_pmt, this, boost::placeholders::_1));
+ }
+
+ @NAME_IMPL@::~@NAME_IMPL@()
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/nop_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/nop_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/nop_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/nop_impl.cc 2020-05-17 10:25:08.164538000 +0200
+@@ -46,7 +46,7 @@
+ {
+ // Arrange to have count_received_msgs called when messages are received.
+ message_port_register_in(pmt::mp("port"));
+- set_msg_handler(pmt::mp("port"), boost::bind(&nop_impl::count_received_msgs, this, _1));
++ set_msg_handler(pmt::mp("port"), boost::bind(&nop_impl::count_received_msgs, this, boost::placeholders::_1));
+ }
+
+ nop_impl::~nop_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/pdu_filter_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/pdu_filter_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/pdu_filter_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/pdu_filter_impl.cc 2020-05-17 10:25:08.158538000 +0200
+@@ -45,7 +45,7 @@
+ {
+ message_port_register_out(pdu::pdu_port_id());
+ message_port_register_in(pdu::pdu_port_id());
+- set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_filter_impl::handle_msg, this, _1));
++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_filter_impl::handle_msg, this, boost::placeholders::_1));
+ }
+
+ void
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/pdu_remove_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/pdu_remove_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/pdu_remove_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/pdu_remove_impl.cc 2020-05-17 10:25:08.163538000 +0200
+@@ -45,7 +45,7 @@
+ {
+ message_port_register_out(pdu::pdu_port_id());
+ message_port_register_in(pdu::pdu_port_id());
+- set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_remove_impl::handle_msg, this, _1));
++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_remove_impl::handle_msg, this, boost::placeholders::_1));
+ }
+
+ void
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/pdu_set_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/pdu_set_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/pdu_set_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/pdu_set_impl.cc 2020-05-17 10:25:08.159538000 +0200
+@@ -45,7 +45,7 @@
+ {
+ message_port_register_out(pdu::pdu_port_id());
+ message_port_register_in(pdu::pdu_port_id());
+- set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_set_impl::handle_msg, this, _1));
++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_set_impl::handle_msg, this, boost::placeholders::_1));
+ }
+
+ void
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/random_pdu_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/random_pdu_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/random_pdu_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/random_pdu_impl.cc 2020-05-17 10:25:08.162538000 +0200
+@@ -50,7 +50,7 @@
+ {
+ message_port_register_out(pdu::pdu_port_id());
+ message_port_register_in(pmt::mp("generate"));
+- set_msg_handler(pmt::mp("generate"), boost::bind(&random_pdu_impl::generate_pdu, this, _1));
++ set_msg_handler(pmt::mp("generate"), boost::bind(&random_pdu_impl::generate_pdu, this, boost::placeholders::_1));
+ if(length_modulo < 1)
+ throw std::runtime_error("length_module must be >= 1");
+ if(max_items < length_modulo)
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/repeat_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/repeat_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/repeat_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/repeat_impl.cc 2020-05-17 10:25:08.160538000 +0200
+@@ -45,7 +45,7 @@
+ {
+ message_port_register_in(pmt::mp("interpolation"));
+ set_msg_handler(pmt::mp("interpolation"),
+- boost::bind(&repeat_impl::msg_set_interpolation, this, _1));
++ boost::bind(&repeat_impl::msg_set_interpolation, this, boost::placeholders::_1));
+ }
+
+ void
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/socket_pdu_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/socket_pdu_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/socket_pdu_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/socket_pdu_impl.cc 2020-05-17 10:25:08.161538000 +0200
+@@ -86,7 +86,7 @@
+
+ start_tcp_accept();
+
+- set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::tcp_server_send, this, _1));
++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::tcp_server_send, this, boost::placeholders::_1));
+ }
+ else if (type =="TCP_CLIENT") {
+ boost::system::error_code error = boost::asio::error::host_not_found;
+@@ -96,7 +96,7 @@
+ throw boost::system::system_error(error);
+ d_tcp_socket->set_option(boost::asio::ip::tcp::no_delay(d_tcp_no_delay));
+
+- set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::tcp_client_send, this, _1));
++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::tcp_client_send, this, boost::placeholders::_1));
+
+ d_tcp_socket->async_read_some(boost::asio::buffer(d_rxbuf),
+ boost::bind(&socket_pdu_impl::handle_tcp_read, this,
+@@ -110,7 +110,7 @@
+ boost::asio::placeholders::error,
+ boost::asio::placeholders::bytes_transferred));
+
+- set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::udp_send, this, _1));
++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::udp_send, this, boost::placeholders::_1));
+ }
+ else if (type =="UDP_CLIENT") {
+ d_udp_socket.reset(new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint));
+@@ -119,7 +119,7 @@
+ boost::asio::placeholders::error,
+ boost::asio::placeholders::bytes_transferred));
+
+- set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::udp_send, this, _1));
++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::udp_send, this, boost::placeholders::_1));
+ }
+ else
+ throw std::runtime_error("gr::blocks:socket_pdu: unknown socket type");
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/tagged_stream_multiply_length_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/tagged_stream_multiply_length_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 2020-05-17 10:25:08.163538000 +0200
+@@ -48,7 +48,7 @@
+ set_relative_rate(1);
+ message_port_register_in(pmt::intern("set_scalar"));
+ set_msg_handler(pmt::intern("set_scalar"),
+- boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, this, _1));
++ boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, this, boost::placeholders::_1));
+ }
+
+ tagged_stream_multiply_length_impl::~tagged_stream_multiply_length_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/tuntap_pdu_impl.cc gnuradio-3.7.13.2/gr-blocks/lib/tuntap_pdu_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/tuntap_pdu_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/tuntap_pdu_impl.cc 2020-05-17 10:25:08.163538000 +0200
+@@ -97,7 +97,7 @@
+
+ // set up input message port
+ message_port_register_in(pdu::pdu_port_id());
+- set_msg_handler(pdu::pdu_port_id(), boost::bind(&tuntap_pdu_impl::send, this, _1));
++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&tuntap_pdu_impl::send, this, boost::placeholders::_1));
+ }
+
+ int
+diff -Naur gnuradio-3.7.13.2.orig/gr-digital/lib/chunks_to_symbols_XX_impl.cc.t gnuradio-3.7.13.2/gr-digital/lib/chunks_to_symbols_XX_impl.cc.t
+--- gnuradio-3.7.13.2.orig/gr-digital/lib/chunks_to_symbols_XX_impl.cc.t 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-digital/lib/chunks_to_symbols_XX_impl.cc.t 2020-05-17 10:31:33.972538000 +0200
+@@ -52,7 +52,7 @@
+ set_msg_handler(
+ pmt::mp("set_symbol_table"),
+ boost::bind(&@IMPL_NAME@::handle_set_symbol_table,
+- this, _1));
++ this, boost::placeholders::_1));
+ }
+
+ @IMPL_NAME@::~@IMPL_NAME@()
+diff -Naur gnuradio-3.7.13.2.orig/gr-digital/lib/constellation_receiver_cb_impl.cc gnuradio-3.7.13.2/gr-digital/lib/constellation_receiver_cb_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-digital/lib/constellation_receiver_cb_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-digital/lib/constellation_receiver_cb_impl.cc 2020-05-17 10:30:11.359538000 +0200
+@@ -65,12 +65,12 @@
+ set_msg_handler(
+ pmt::mp("set_constellation"),
+ boost::bind(&constellation_receiver_cb_impl::handle_set_constellation,
+- this, _1));
++ this, boost::placeholders::_1));
+
+ message_port_register_in(pmt::mp("rotate_phase"));
+ set_msg_handler(pmt::mp("rotate_phase"),
+ boost::bind(&constellation_receiver_cb_impl::handle_rotate_phase,
+- this, _1));
++ this, boost::placeholders::_1));
+ }
+
+ constellation_receiver_cb_impl::~constellation_receiver_cb_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-digital/lib/costas_loop_cc_impl.cc gnuradio-3.7.13.2/gr-digital/lib/costas_loop_cc_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-digital/lib/costas_loop_cc_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-digital/lib/costas_loop_cc_impl.cc 2020-05-17 10:30:55.808538000 +0200
+@@ -83,7 +83,7 @@
+ set_msg_handler(
+ pmt::mp("noise"),
+ boost::bind(&costas_loop_cc_impl::handle_set_noise,
+- this, _1));
++ this, boost::placeholders::_1));
+ }
+
+ costas_loop_cc_impl::~costas_loop_cc_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-digital/lib/crc32_async_bb_impl.cc gnuradio-3.7.13.2/gr-digital/lib/crc32_async_bb_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-digital/lib/crc32_async_bb_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-digital/lib/crc32_async_bb_impl.cc 2020-05-17 10:25:08.172538000 +0200
+@@ -51,9 +51,9 @@
+ message_port_register_out(d_out_port);
+
+ if(check)
+- set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::check, this ,_1) );
++ set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::check, this , boost::placeholders::_1) );
+ else
+- set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::calc, this ,_1) );
++ set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::calc, this , boost::placeholders::_1) );
+ }
+
+ crc32_async_bb_impl::~crc32_async_bb_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-digital/lib/header_payload_demux_impl.cc gnuradio-3.7.13.2/gr-digital/lib/header_payload_demux_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-digital/lib/header_payload_demux_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-digital/lib/header_payload_demux_impl.cc 2020-05-17 10:25:08.172538000 +0200
+@@ -154,7 +154,7 @@
+ }
+ set_tag_propagation_policy(TPP_DONT);
+ message_port_register_in(msg_port_id());
+- set_msg_handler(msg_port_id(), boost::bind(&header_payload_demux_impl::parse_header_data_msg, this, _1));
++ set_msg_handler(msg_port_id(), boost::bind(&header_payload_demux_impl::parse_header_data_msg, this, boost::placeholders::_1));
+ for (size_t i = 0; i < special_tags.size(); i++) {
+ d_special_tags.push_back(pmt::string_to_symbol(special_tags[i]));
+ d_special_tags_last_value.push_back(pmt::PMT_NIL);
+diff -Naur gnuradio-3.7.13.2.orig/gr-digital/lib/protocol_formatter_async_impl.cc gnuradio-3.7.13.2/gr-digital/lib/protocol_formatter_async_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-digital/lib/protocol_formatter_async_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-digital/lib/protocol_formatter_async_impl.cc 2020-05-17 10:25:08.172538000 +0200
+@@ -55,7 +55,7 @@
+ message_port_register_out(d_pld_port);
+
+ set_msg_handler(d_in_port,
+- boost::bind(&protocol_formatter_async_impl::append, this ,_1) );
++ boost::bind(&protocol_formatter_async_impl::append, this , boost::placeholders::_1) );
+ }
+
+ protocol_formatter_async_impl::~protocol_formatter_async_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-fec/lib/async_decoder_impl.cc gnuradio-3.7.13.2/gr-fec/lib/async_decoder_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-fec/lib/async_decoder_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-fec/lib/async_decoder_impl.cc 2020-05-17 10:25:08.170538000 +0200
+@@ -67,10 +67,10 @@
+
+ if(d_packed) {
+ d_pack = new blocks::kernel::pack_k_bits(8);
+- set_msg_handler(d_in_port, boost::bind(&async_decoder_impl::decode_packed, this ,_1));
++ set_msg_handler(d_in_port, boost::bind(&async_decoder_impl::decode_packed, this , boost::placeholders::_1));
+ }
+ else {
+- set_msg_handler(d_in_port, boost::bind(&async_decoder_impl::decode_unpacked, this ,_1));
++ set_msg_handler(d_in_port, boost::bind(&async_decoder_impl::decode_unpacked, this , boost::placeholders::_1));
+ }
+
+ // The maximum frame size is set by the initial frame size of the decoder.
+diff -Naur gnuradio-3.7.13.2.orig/gr-fec/lib/async_encoder_impl.cc gnuradio-3.7.13.2/gr-fec/lib/async_encoder_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-fec/lib/async_encoder_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-fec/lib/async_encoder_impl.cc 2020-05-17 10:25:08.169538000 +0200
+@@ -63,7 +63,7 @@
+ message_port_register_out(d_out_port);
+
+ if(d_packed) {
+- set_msg_handler(d_in_port, boost::bind(&async_encoder_impl::encode_packed, this ,_1) );
++ set_msg_handler(d_in_port, boost::bind(&async_encoder_impl::encode_packed, this , boost::placeholders::_1) );
+
+ d_unpack = new blocks::kernel::unpack_k_bits(8);
+
+@@ -73,7 +73,7 @@
+
+ }
+ else {
+- set_msg_handler(d_in_port, boost::bind(&async_encoder_impl::encode_unpacked, this ,_1) );
++ set_msg_handler(d_in_port, boost::bind(&async_encoder_impl::encode_unpacked, this , boost::placeholders::_1) );
+ }
+
+ if(d_packed || (strncmp(d_encoder->get_input_conversion(), "pack", 4) == 0)) {
+diff -Naur gnuradio-3.7.13.2.orig/gr-fec/lib/depuncture_bb_impl.cc gnuradio-3.7.13.2/gr-fec/lib/depuncture_bb_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-fec/lib/depuncture_bb_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-fec/lib/depuncture_bb_impl.cc 2020-05-17 10:25:08.170538000 +0200
+@@ -76,7 +76,7 @@
+ set_fixed_rate(true);
+ set_relative_rate((double)d_puncsize/(d_puncsize - d_puncholes));
+ set_output_multiple(d_puncsize);
+- //set_msg_handler(boost::bind(&depuncture_bb_impl::catch_msg, this, _1));
++ //set_msg_handler(boost::bind(&depuncture_bb_impl::catch_msg, this, boost::placeholders::_1));
+ }
+
+ depuncture_bb_impl::~depuncture_bb_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-fec/lib/puncture_bb_impl.cc gnuradio-3.7.13.2/gr-fec/lib/puncture_bb_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-fec/lib/puncture_bb_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-fec/lib/puncture_bb_impl.cc 2020-05-17 10:25:08.170538000 +0200
+@@ -73,7 +73,7 @@
+ set_fixed_rate(true);
+ set_relative_rate((double)(d_puncsize - d_puncholes)/d_puncsize);
+ set_output_multiple(d_puncsize - d_puncholes);
+- //set_msg_handler(boost::bind(&puncture_bb_impl::catch_msg, this, _1));
++ //set_msg_handler(boost::bind(&puncture_bb_impl::catch_msg, this, boost::placeholders::_1));
+ }
+
+ puncture_bb_impl::~puncture_bb_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-fec/lib/puncture_ff_impl.cc gnuradio-3.7.13.2/gr-fec/lib/puncture_ff_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-fec/lib/puncture_ff_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-fec/lib/puncture_ff_impl.cc 2020-05-17 10:25:08.170538000 +0200
+@@ -73,7 +73,7 @@
+ set_fixed_rate(true);
+ set_relative_rate((double)(d_puncsize - d_puncholes)/d_puncsize);
+ set_output_multiple(d_puncsize - d_puncholes);
+- //set_msg_handler(boost::bind(&puncture_ff_impl::catch_msg, this, _1));
++ //set_msg_handler(boost::bind(&puncture_ff_impl::catch_msg, this, boost::placeholders::_1));
+ }
+
+ puncture_ff_impl::~puncture_ff_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-filter/lib/fractional_resampler_cc_impl.cc gnuradio-3.7.13.2/gr-filter/lib/fractional_resampler_cc_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-filter/lib/fractional_resampler_cc_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-filter/lib/fractional_resampler_cc_impl.cc 2020-05-17 10:33:00.233538000 +0200
+@@ -54,7 +54,7 @@
+ set_relative_rate(1.0 / resamp_ratio);
+ message_port_register_in(pmt::intern("msg_in"));
+ set_msg_handler(pmt::intern("msg_in"), boost::bind(
+- &fractional_resampler_cc_impl::handle_msg, this, _1));
++ &fractional_resampler_cc_impl::handle_msg, this, boost::placeholders::_1));
+ }
+
+ fractional_resampler_cc_impl::~fractional_resampler_cc_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-filter/lib/fractional_resampler_ff_impl.cc gnuradio-3.7.13.2/gr-filter/lib/fractional_resampler_ff_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-filter/lib/fractional_resampler_ff_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-filter/lib/fractional_resampler_ff_impl.cc 2020-05-17 10:33:25.006538000 +0200
+@@ -55,7 +55,7 @@
+
+ message_port_register_in(pmt::intern("msg_in"));
+ set_msg_handler(pmt::intern("msg_in"), boost::bind(
+- &fractional_resampler_ff_impl::handle_msg, this, _1));
++ &fractional_resampler_ff_impl::handle_msg, this, boost::placeholders::_1));
+ }
+
+ fractional_resampler_ff_impl::~fractional_resampler_ff_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t gnuradio-3.7.13.2/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t
+--- gnuradio-3.7.13.2.orig/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t 2020-05-17 10:32:22.116538000 +0200
+@@ -69,7 +69,7 @@
+ message_port_register_in(pmt::mp("freq"));
+ set_msg_handler(pmt::mp("freq"),
+ boost::bind(&@IMPL_NAME@::handle_set_center_freq,
+- this, _1));
++ this, boost::placeholders::_1));
+ }
+
+ @IMPL_NAME@::~@IMPL_NAME@()
+diff -Naur gnuradio-3.7.13.2.orig/gr-qtgui/lib/const_sink_c_impl.cc gnuradio-3.7.13.2/gr-qtgui/lib/const_sink_c_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-qtgui/lib/const_sink_c_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-qtgui/lib/const_sink_c_impl.cc 2020-05-17 10:25:08.165538000 +0200
+@@ -69,7 +69,7 @@
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler(pmt::mp("in"),
+- boost::bind(&const_sink_c_impl::handle_pdus, this, _1));
++ boost::bind(&const_sink_c_impl::handle_pdus, this, boost::placeholders::_1));
+
+ for(int i = 0; i < d_nconnections; i++) {
+ d_residbufs_real.push_back((double*)volk_malloc(d_buffer_size*sizeof(double),
+diff -Naur gnuradio-3.7.13.2.orig/gr-qtgui/lib/edit_box_msg_impl.cc gnuradio-3.7.13.2/gr-qtgui/lib/edit_box_msg_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-qtgui/lib/edit_box_msg_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-qtgui/lib/edit_box_msg_impl.cc 2020-05-17 10:25:08.167538000 +0200
+@@ -161,7 +161,7 @@
+ message_port_register_in(pmt::mp("val"));
+
+ set_msg_handler(pmt::mp("val"),
+- boost::bind(&edit_box_msg_impl::set_value, this, _1));
++ boost::bind(&edit_box_msg_impl::set_value, this, boost::placeholders::_1));
+ }
+
+ edit_box_msg_impl::~edit_box_msg_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-qtgui/lib/freq_sink_c_impl.cc gnuradio-3.7.13.2/gr-qtgui/lib/freq_sink_c_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-qtgui/lib/freq_sink_c_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-qtgui/lib/freq_sink_c_impl.cc 2020-05-17 10:25:08.166538000 +0200
+@@ -76,12 +76,12 @@
+ message_port_register_out(d_port);
+ message_port_register_in(d_port);
+ set_msg_handler(d_port,
+- boost::bind(&freq_sink_c_impl::handle_set_freq, this, _1));
++ boost::bind(&freq_sink_c_impl::handle_set_freq, this, boost::placeholders::_1));
+
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler(pmt::mp("in"),
+- boost::bind(&freq_sink_c_impl::handle_pdus, this, _1));
++ boost::bind(&freq_sink_c_impl::handle_pdus, this, boost::placeholders::_1));
+
+ d_main_gui = NULL;
+
+diff -Naur gnuradio-3.7.13.2.orig/gr-qtgui/lib/freq_sink_f_impl.cc gnuradio-3.7.13.2/gr-qtgui/lib/freq_sink_f_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-qtgui/lib/freq_sink_f_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-qtgui/lib/freq_sink_f_impl.cc 2020-05-17 10:25:08.169538000 +0200
+@@ -75,12 +75,12 @@
+ message_port_register_out(d_port);
+ message_port_register_in(d_port);
+ set_msg_handler(d_port,
+- boost::bind(&freq_sink_f_impl::handle_set_freq, this, _1));
++ boost::bind(&freq_sink_f_impl::handle_set_freq, this, boost::placeholders::_1));
+
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler(pmt::mp("in"),
+- boost::bind(&freq_sink_f_impl::handle_pdus, this, _1));
++ boost::bind(&freq_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
+
+ d_main_gui = NULL;
+
+diff -Naur gnuradio-3.7.13.2.orig/gr-qtgui/lib/histogram_sink_f_impl.cc gnuradio-3.7.13.2/gr-qtgui/lib/histogram_sink_f_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-qtgui/lib/histogram_sink_f_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-qtgui/lib/histogram_sink_f_impl.cc 2020-05-17 10:25:08.168538000 +0200
+@@ -72,7 +72,7 @@
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler(pmt::mp("in"),
+- boost::bind(&histogram_sink_f_impl::handle_pdus, this, _1));
++ boost::bind(&histogram_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
+
+ // +1 for the PDU buffer
+ for(int i = 0; i < d_nconnections+1; i++) {
+diff -Naur gnuradio-3.7.13.2.orig/gr-qtgui/lib/sink_c_impl.cc gnuradio-3.7.13.2/gr-qtgui/lib/sink_c_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-qtgui/lib/sink_c_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-qtgui/lib/sink_c_impl.cc 2020-05-17 10:25:08.166538000 +0200
+@@ -79,7 +79,7 @@
+ message_port_register_out(d_port);
+ message_port_register_in(d_port);
+ set_msg_handler(d_port,
+- boost::bind(&sink_c_impl::handle_set_freq, this, _1));
++ boost::bind(&sink_c_impl::handle_set_freq, this, boost::placeholders::_1));
+
+ d_main_gui = NULL;
+
+diff -Naur gnuradio-3.7.13.2.orig/gr-qtgui/lib/sink_f_impl.cc gnuradio-3.7.13.2/gr-qtgui/lib/sink_f_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-qtgui/lib/sink_f_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-qtgui/lib/sink_f_impl.cc 2020-05-17 10:25:08.165538000 +0200
+@@ -79,7 +79,7 @@
+ message_port_register_out(d_port);
+ message_port_register_in(d_port);
+ set_msg_handler(d_port,
+- boost::bind(&sink_f_impl::handle_set_freq, this, _1));
++ boost::bind(&sink_f_impl::handle_set_freq, this, boost::placeholders::_1));
+
+ d_main_gui = NULL;
+
+diff -Naur gnuradio-3.7.13.2.orig/gr-qtgui/lib/time_raster_sink_b_impl.cc gnuradio-3.7.13.2/gr-qtgui/lib/time_raster_sink_b_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-qtgui/lib/time_raster_sink_b_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-qtgui/lib/time_raster_sink_b_impl.cc 2020-05-17 10:25:08.167538000 +0200
+@@ -82,7 +82,7 @@
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler(pmt::mp("in"),
+- boost::bind(&time_raster_sink_b_impl::handle_pdus, this, _1));
++ boost::bind(&time_raster_sink_b_impl::handle_pdus, this, boost::placeholders::_1));
+
+ d_scale = 1.0f;
+
+diff -Naur gnuradio-3.7.13.2.orig/gr-qtgui/lib/time_raster_sink_f_impl.cc gnuradio-3.7.13.2/gr-qtgui/lib/time_raster_sink_f_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-qtgui/lib/time_raster_sink_f_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-qtgui/lib/time_raster_sink_f_impl.cc 2020-05-17 10:25:08.168538000 +0200
+@@ -82,7 +82,7 @@
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler(pmt::mp("in"),
+- boost::bind(&time_raster_sink_f_impl::handle_pdus, this, _1));
++ boost::bind(&time_raster_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
+
+ d_icols = static_cast<int>(ceil(d_cols));
+ d_tmpflt = (float*)volk_malloc(d_icols*sizeof(float),
+diff -Naur gnuradio-3.7.13.2.orig/gr-qtgui/lib/time_sink_c_impl.cc gnuradio-3.7.13.2/gr-qtgui/lib/time_sink_c_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-qtgui/lib/time_sink_c_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-qtgui/lib/time_sink_c_impl.cc 2020-05-17 10:25:08.166538000 +0200
+@@ -73,7 +73,7 @@
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler(pmt::mp("in"),
+- boost::bind(&time_sink_c_impl::handle_pdus, this, _1));
++ boost::bind(&time_sink_c_impl::handle_pdus, this, boost::placeholders::_1));
+
+ // +2 for the PDU message buffers
+ for(int n = 0; n < d_nconnections+2; n++) {
+diff -Naur gnuradio-3.7.13.2.orig/gr-qtgui/lib/time_sink_f_impl.cc gnuradio-3.7.13.2/gr-qtgui/lib/time_sink_f_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-qtgui/lib/time_sink_f_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-qtgui/lib/time_sink_f_impl.cc 2020-05-17 10:25:08.168538000 +0200
+@@ -73,7 +73,7 @@
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler(pmt::mp("in"),
+- boost::bind(&time_sink_f_impl::handle_pdus, this, _1));
++ boost::bind(&time_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
+
+ // +1 for the PDU buffer
+ for(int n = 0; n < d_nconnections+1; n++) {
+diff -Naur gnuradio-3.7.13.2.orig/gr-qtgui/lib/waterfall_sink_c_impl.cc gnuradio-3.7.13.2/gr-qtgui/lib/waterfall_sink_c_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-qtgui/lib/waterfall_sink_c_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-qtgui/lib/waterfall_sink_c_impl.cc 2020-05-17 10:25:08.167538000 +0200
+@@ -114,12 +114,12 @@
+ message_port_register_out(d_port);
+ message_port_register_in(d_port);
+ set_msg_handler(d_port,
+- boost::bind(&waterfall_sink_c_impl::handle_set_freq, this, _1));
++ boost::bind(&waterfall_sink_c_impl::handle_set_freq, this, boost::placeholders::_1));
+
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler(pmt::mp("in"),
+- boost::bind(&waterfall_sink_c_impl::handle_pdus, this, _1));
++ boost::bind(&waterfall_sink_c_impl::handle_pdus, this, boost::placeholders::_1));
+ }
+
+ waterfall_sink_c_impl::~waterfall_sink_c_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-qtgui/lib/waterfall_sink_f_impl.cc gnuradio-3.7.13.2/gr-qtgui/lib/waterfall_sink_f_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-qtgui/lib/waterfall_sink_f_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-qtgui/lib/waterfall_sink_f_impl.cc 2020-05-17 10:25:08.165538000 +0200
+@@ -110,12 +110,12 @@
+ message_port_register_out(d_port);
+ message_port_register_in(d_port);
+ set_msg_handler(d_port,
+- boost::bind(&waterfall_sink_f_impl::handle_set_freq, this, _1));
++ boost::bind(&waterfall_sink_f_impl::handle_set_freq, this, boost::placeholders::_1));
+
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler(pmt::mp("in"),
+- boost::bind(&waterfall_sink_f_impl::handle_pdus, this, _1));
++ boost::bind(&waterfall_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
+ }
+
+ waterfall_sink_f_impl::~waterfall_sink_f_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-uhd/lib/usrp_block_impl.cc gnuradio-3.7.13.2/gr-uhd/lib/usrp_block_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-uhd/lib/usrp_block_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-uhd/lib/usrp_block_impl.cc 2020-05-17 10:25:08.171538000 +0200
+@@ -145,11 +145,11 @@
+ message_port_register_in(pmt::mp("command"));
+ set_msg_handler(
+ pmt::mp("command"),
+- boost::bind(&usrp_block_impl::msg_handler_command, this, _1)
++ boost::bind(&usrp_block_impl::msg_handler_command, this, boost::placeholders::_1)
+ );
+
+ // cuz we lazy:
+-#define REGISTER_CMD_HANDLER(key, _handler) register_msg_cmd_handler(key, boost::bind(&usrp_block_impl::_handler, this, _1, _2, _3))
++#define REGISTER_CMD_HANDLER(key, _handler) register_msg_cmd_handler(key, boost::bind(&usrp_block_impl::_handler, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3))
+ // Register default command handlers:
+ REGISTER_CMD_HANDLER(cmd_freq_key(), _cmd_handler_freq);
+ REGISTER_CMD_HANDLER(cmd_gain_key(), _cmd_handler_gain);
+@@ -266,7 +266,7 @@
+ if (not _wait_for_locked_sensor(
+ get_mboard_sensor_names(mboard_index),
+ sensor_name,
+- boost::bind(&usrp_block_impl::get_mboard_sensor, this, _1, mboard_index)
++ boost::bind(&usrp_block_impl::get_mboard_sensor, this, boost::placeholders::_1, mboard_index)
+ )) {
+ GR_LOG_WARN(d_logger, boost::format("Sensor '%s' failed to lock within timeout on motherboard %d.") % sensor_name % mboard_index);
+ clocks_locked = false;
+diff -Naur gnuradio-3.7.13.2.orig/gr-uhd/lib/usrp_source_impl.cc gnuradio-3.7.13.2/gr-uhd/lib/usrp_source_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-uhd/lib/usrp_source_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-uhd/lib/usrp_source_impl.cc 2020-05-17 10:25:08.171538000 +0200
+@@ -82,7 +82,7 @@
+ #ifdef GR_UHD_USE_STREAM_API
+ _samps_per_packet = 1;
+ #endif
+- register_msg_cmd_handler(cmd_tag_key(), boost::bind(&usrp_source_impl::_cmd_handler_tag, this, _1));
++ register_msg_cmd_handler(cmd_tag_key(), boost::bind(&usrp_source_impl::_cmd_handler_tag, this, boost::placeholders::_1));
+ }
+
+ usrp_source_impl::~usrp_source_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-zeromq/lib/pub_msg_sink_impl.cc gnuradio-3.7.13.2/gr-zeromq/lib/pub_msg_sink_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-zeromq/lib/pub_msg_sink_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-zeromq/lib/pub_msg_sink_impl.cc 2020-05-17 10:25:08.164538000 +0200
+@@ -58,7 +58,7 @@
+
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler( pmt::mp("in"),
+- boost::bind(&pub_msg_sink_impl::handler, this, _1));
++ boost::bind(&pub_msg_sink_impl::handler, this, boost::placeholders::_1));
+ }
+
+ pub_msg_sink_impl::~pub_msg_sink_impl()
+diff -Naur gnuradio-3.7.13.2.orig/gr-zeromq/lib/push_msg_sink_impl.cc gnuradio-3.7.13.2/gr-zeromq/lib/push_msg_sink_impl.cc
+--- gnuradio-3.7.13.2.orig/gr-zeromq/lib/push_msg_sink_impl.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-zeromq/lib/push_msg_sink_impl.cc 2020-05-17 10:25:08.164538000 +0200
+@@ -60,7 +60,7 @@
+
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler(pmt::mp("in"),
+- boost::bind(&push_msg_sink_impl::handler, this, _1));
++ boost::bind(&push_msg_sink_impl::handler, this, boost::placeholders::_1));
+ }
+
+ push_msg_sink_impl::~push_msg_sink_impl()
diff --git a/development/gnuradio/gnuradio.SlackBuild b/development/gnuradio/gnuradio.SlackBuild
index 0c395d8a07..94acf411ca 100644
--- a/development/gnuradio/gnuradio.SlackBuild
+++ b/development/gnuradio/gnuradio.SlackBuild
@@ -73,11 +73,15 @@ find -L . \
# install docs in the right place
sed -i "s|\${GR_DATA_DIR}/doc|doc|" CMakeLists.txt
+patch -p1 < $CWD/boost-1.70.0.patch
+patch -p1 < $CWD/boost-1.73.0.patch
+patch -p1 < $CWD/replace_boost_endian_check_with_cmake.patch
+
mkdir -p build
cd build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-deprecated-declarations" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONFDIR=/etc \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
diff --git a/development/gnuradio/replace_boost_endian_check_with_cmake.patch b/development/gnuradio/replace_boost_endian_check_with_cmake.patch
new file mode 100644
index 0000000000..ba4b1b7e20
--- /dev/null
+++ b/development/gnuradio/replace_boost_endian_check_with_cmake.patch
@@ -0,0 +1,45 @@
+diff -Naur gnuradio-3.7.13.2.orig/CMakeLists.txt gnuradio-3.7.13.2/CMakeLists.txt
+--- gnuradio-3.7.13.2.orig/CMakeLists.txt 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/CMakeLists.txt 2020-05-17 10:45:46.012538000 +0200
+@@ -186,6 +186,12 @@
+ ########################################################################
+ include(GrMiscUtils) #compiler flag check
+
++include(TestBigEndian)
++TEST_BIG_ENDIAN(GR_IS_BIG_ENDIAN)
++if(GR_IS_BIG_ENDIAN)
++ add_definitions(-DGR_IS_BIG_ENDIAN)
++endif(GR_IS_BIG_ENDIAN)
++
+ if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
+ #http://gcc.gnu.org/wiki/Visibility
+ GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-fvisibility=hidden HAVE_VISIBILITY_HIDDEN)
+diff -Naur gnuradio-3.7.13.2.orig/gr-blocks/lib/wavfile.cc gnuradio-3.7.13.2/gr-blocks/lib/wavfile.cc
+--- gnuradio-3.7.13.2.orig/gr-blocks/lib/wavfile.cc 2018-06-13 21:38:34.000000000 +0200
++++ gnuradio-3.7.13.2/gr-blocks/lib/wavfile.cc 2020-05-17 10:47:30.216538000 +0200
+@@ -27,7 +27,6 @@
+ #include <gnuradio/blocks/wavfile.h>
+ #include <cstring>
+ #include <stdint.h>
+-#include <boost/detail/endian.hpp> //BOOST_BIG_ENDIAN
+
+ namespace gr {
+ namespace blocks {
+@@ -35,7 +34,7 @@
+
+ // Basically, this is the opposite of htonx() and ntohx()
+ // Define host to/from worknet (little endian) short and long
+-#ifdef BOOST_BIG_ENDIAN
++#ifdef GR_IS_BIG_ENDIAN
+
+ static inline uint16_t __gri_wav_bs16(uint16_t x)
+ {
+@@ -59,7 +58,7 @@
+ #define htows(x) uint16_t(x)
+ #define wtohs(x) uint16_t(x)
+
+-#endif // BOOST_BIG_ENDIAN
++#endif // GR_IS_BIG_ENDIAN
+
+ // WAV files are always little-endian, so we need some byte switching macros
+ static inline uint32_t host_to_wav(uint32_t x) { return htowl(x); }
diff --git a/development/gpsim/gpsim.SlackBuild b/development/gpsim/gpsim.SlackBuild
index 787ddc0e29..25822ab265 100644
--- a/development/gpsim/gpsim.SlackBuild
+++ b/development/gpsim/gpsim.SlackBuild
@@ -70,7 +70,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/development/gr-osmosdr/boost-1.73.patch b/development/gr-osmosdr/boost-1.73.patch
new file mode 100644
index 0000000000..60d26518be
--- /dev/null
+++ b/development/gr-osmosdr/boost-1.73.patch
@@ -0,0 +1,20 @@
+diff -Naur gr-osmosdr-20170612.orig/lib/rfspace/rfspace_source_c.cc gr-osmosdr-20170612/lib/rfspace/rfspace_source_c.cc
+--- gr-osmosdr-20170612.orig/lib/rfspace/rfspace_source_c.cc 2018-06-14 21:01:32.000000000 +0200
++++ gr-osmosdr-20170612/lib/rfspace/rfspace_source_c.cc 2020-05-17 15:11:25.958538000 +0200
+@@ -1089,14 +1089,14 @@
+ // Start the asynchronous receive operation. The handle_receive function
+ // used as a callback will update the ec and rx_bytes variables.
+ socket.async_receive( boost::asio::buffer(data, sizeof(data)),
+- boost::bind(handle_receive, _1, _2, &ec, &rx_bytes) );
++ boost::bind(handle_receive, boost::placeholders::_1, boost::placeholders::_2, &ec, &rx_bytes) );
+
+ // Set a deadline for the asynchronous operation.
+ timer.expires_from_now( boost::posix_time::milliseconds(10) );
+
+ // Start an asynchronous wait on the timer. The handle_timer function
+ // used as a callback will update the ec variable.
+- timer.async_wait( boost::bind(handle_timer, _1, &ec) );
++ timer.async_wait( boost::bind(handle_timer, boost::placeholders::_1, &ec) );
+
+ // Reset the io_service in preparation for a subsequent run_one() invocation.
+ ios.reset();
diff --git a/development/gr-osmosdr/gr-osmosdr.SlackBuild b/development/gr-osmosdr/gr-osmosdr.SlackBuild
index 8ec9fc13df..7831a9de81 100644
--- a/development/gr-osmosdr/gr-osmosdr.SlackBuild
+++ b/development/gr-osmosdr/gr-osmosdr.SlackBuild
@@ -70,6 +70,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i "s|gr_osmosdr_libs}|gr_osmosdr_libs} -lboost_chrono|" lib/CMakeLists.txt
+patch -p1 < $CWD/boost-1.73.patch
+
mkdir -p build
cd build
cmake \
diff --git a/development/gsoap/gsoap-libtool.patch b/development/gsoap/gsoap-libtool.patch
index 87a9fcefdf..d87defacb8 100644
--- a/development/gsoap/gsoap-libtool.patch
+++ b/development/gsoap/gsoap-libtool.patch
@@ -1,6 +1,6 @@
diff -ur gsoap-2.8.orig/configure.ac gsoap-2.8/configure.ac
---- gsoap-2.8.orig/configure.ac 2015-11-10 18:52:20.000000000 +0100
-+++ gsoap-2.8/configure.ac 2015-11-22 09:28:38.711054796 +0100
+--- gsoap-2.8.orig/configure.ac 2017-10-26 14:01:08.000000000 +0200
++++ gsoap-2.8/configure.ac 2017-12-03 15:29:52.878661826 +0100
@@ -16,8 +16,7 @@
AM_PROG_LEX
AC_PROG_YACC
@@ -11,7 +11,7 @@ diff -ur gsoap-2.8.orig/configure.ac gsoap-2.8/configure.ac
AC_PROG_LN_S
AC_PROG_AWK
AC_PROG_INSTALL
-@@ -236,16 +235,16 @@
+@@ -259,15 +258,15 @@
WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
SAMPLE_INCLUDES=
SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
@@ -20,76 +20,75 @@ diff -ur gsoap-2.8.orig/configure.ac gsoap-2.8/configure.ac
else
AC_MSG_RESULT(no)
WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
- # an ugly hack to get httpda and smdevp plugins to conditionally
# compile with wsdl2h when OPENSSL is available
-- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lssl -lcrypto -lz"
-+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lcrypto"
+- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz"
++ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto"
SAMPLE_INCLUDES=
SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
+ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la"
fi
- if test -n "$OPENSSL"; then
- WSDL2H_EXTRA_FLAGS="-I${OPENSSL}/include ${WSDL2H_EXTRA_FLAGS}"
-@@ -258,7 +257,7 @@
+ if test -n "$ZLIB"; then
+ WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
+@@ -286,7 +285,7 @@
WSDL2H_EXTRA_FLAGS=
SAMPLE_SSL_LIBS=
SAMPLE_INCLUDES=
- WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
+ WSDL2H_SOAP_CPP_LIB="libgsoap++.la"
fi
- AC_SUBST(WSDL2H_EXTRA_FLAGS)
- AC_SUBST(WSDL2H_EXTRA_LIBS)
+ AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes")
+ AC_SUBST(WITH_OPENSSL)
diff -ur gsoap-2.8.orig/gsoap/Makefile.am gsoap-2.8/gsoap/Makefile.am
---- gsoap-2.8.orig/gsoap/Makefile.am 2015-11-10 18:52:22.000000000 +0100
-+++ gsoap-2.8/gsoap/Makefile.am 2015-11-22 09:24:43.198046409 +0100
+--- gsoap-2.8.orig/gsoap/Makefile.am 2017-10-26 14:01:08.000000000 +0200
++++ gsoap-2.8/gsoap/Makefile.am 2017-12-03 15:34:29.556641119 +0100
@@ -34,20 +34,30 @@
dom_cpp.cpp: dom.cpp
- $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp
+ $(LN_S) -f $(top_srcdir)/gsoap/dom.cpp dom_cpp.cpp
-lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a
+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
-libgsoap_a_SOURCES = stdsoap2.c dom.c
--libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
+-libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform)
-libgsoap___a_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
--libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
+-libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform)
-libgsoapck_a_SOURCES = stdsoap2_ck.c dom.c
--libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
+-libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
--libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
+-libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c
--libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+-libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
--libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+SOVERSION = 0
+
+libgsoap_la_SOURCES = stdsoap2.c dom.c
-+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
++libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform)
+libgsoap_la_LDFLAGS = -version-info $(SOVERSION)
+libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
-+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
++libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform)
+libgsoap___la_LDFLAGS = -version-info $(SOVERSION)
+libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c
-+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
++libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
+libgsoapck_la_LDFLAGS = -version-info $(SOVERSION)
+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
-+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
++libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
+libgsoapck___la_LDFLAGS = -version-info $(SOVERSION)
+libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
-+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
++libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION)
+libgsoapssl_la_LIBADD = -lssl -lcrypto -lz
+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
-+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
++libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION)
+libgsoapssl___la_LIBADD = -lssl -lcrypto -lz
- BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES)
+ BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
diff -ur gsoap-2.8.orig/gsoap/samples/Makefile.defines gsoap-2.8/gsoap/samples/Makefile.defines
---- gsoap-2.8.orig/gsoap/samples/Makefile.defines 2015-11-10 18:52:26.000000000 +0100
-+++ gsoap-2.8/gsoap/samples/Makefile.defines 2015-11-22 09:22:54.369042534 +0100
+--- gsoap-2.8.orig/gsoap/samples/Makefile.defines 2017-10-26 14:01:10.000000000 +0200
++++ gsoap-2.8/gsoap/samples/Makefile.defines 2017-12-03 15:35:07.477638281 +0100
@@ -13,13 +13,13 @@
SOAP_C_CORE=soapC.c
SOAP_C_CLIENT=soapClient.c $(SOAP_C_CORE)
@@ -111,11 +110,11 @@ diff -ur gsoap-2.8.orig/gsoap/samples/Makefile.defines gsoap-2.8/gsoap/samples/M
+SOAP_CPP_LIB_CK=$(top_builddir)/gsoap/libgsoapck++.la
+SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.la
diff -ur gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8/gsoap/samples/autotest/Makefile.am
---- gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am 2015-11-10 18:52:26.000000000 +0100
-+++ gsoap-2.8/gsoap/samples/autotest/Makefile.am 2015-11-22 09:22:54.368042534 +0100
+--- gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am 2017-10-26 14:01:10.000000000 +0200
++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am 2017-12-03 15:35:30.202636580 +0100
@@ -14,7 +14,7 @@
- WSDLINPUT=$(srcdir)/examples.wsdl
- SOAPHEADER=$(srcdir)/examples.h
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h
SOAP_CPP_SRC=soapC.cpp soapServer.cpp
-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la
@@ -123,11 +122,11 @@ diff -ur gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8/gsoap/sampl
$(SOAP_CPP_SRC) : $(WSDLINPUT)
$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
diff -ur gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am gsoap-2.8/gsoap/samples/databinding/Makefile.am
---- gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am 2015-11-10 18:52:26.000000000 +0100
-+++ gsoap-2.8/gsoap/samples/databinding/Makefile.am 2015-11-22 09:22:54.368042534 +0100
+--- gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am 2017-10-26 14:01:10.000000000 +0200
++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am 2017-12-03 15:35:50.071635093 +0100
@@ -14,7 +14,7 @@
- WSDLINPUT=$(srcdir)/address.xsd
- SOAPHEADER=$(srcdir)/address.h
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h
SOAP_CPP_SRC=addressC.cpp
-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la
diff --git a/development/gsoap/gsoap.SlackBuild b/development/gsoap/gsoap.SlackBuild
index a92cd16d6a..58e9a2532b 100644
--- a/development/gsoap/gsoap.SlackBuild
+++ b/development/gsoap/gsoap.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for gsoap
-# Copyright 2009-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2009-2018 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gsoap
-VERSION=${VERSION:-2.8.46}
+VERSION=${VERSION:-2.8.59}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/development/gsoap/gsoap.info b/development/gsoap/gsoap.info
index 1f3e52d4cd..8e3c8ca5d4 100644
--- a/development/gsoap/gsoap.info
+++ b/development/gsoap/gsoap.info
@@ -1,8 +1,8 @@
PRGNAM="gsoap"
-VERSION="2.8.46"
+VERSION="2.8.59"
HOMEPAGE="http://gsoap2.sourceforge.net/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/gsoap_2.8.46.zip"
-MD5SUM="e7ff6c940730371dcb90079ca56a8551"
+DOWNLOAD="http://downloads.sourceforge.net/gsoap2/gsoap_2.8.59.zip"
+MD5SUM="af00304f7c9345ce83b32d45e7e601b1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/guile2.2/README b/development/guile2.2/README
new file mode 100644
index 0000000000..51a9d3e5b0
--- /dev/null
+++ b/development/guile2.2/README
@@ -0,0 +1,10 @@
+Guile is the GNU Ubiquitous Intelligent Language for Extensions.
+
+Guile is an interpreter for Scheme, packaged as a library that you
+can link into your applications to give them their own scripting
+language. Guile will eventually support other languages as well,
+giving users of Guile-based applications a choice of languages.
+
+This is Guile 2.2 (legacy version) needed by some packages in SBo.
+
+This package can be installed alongside with Slackware's Guile
diff --git a/development/guile2.2/guile2.2.SlackBuild b/development/guile2.2/guile2.2.SlackBuild
new file mode 100644
index 0000000000..2774bd1d86
--- /dev/null
+++ b/development/guile2.2/guile2.2.SlackBuild
@@ -0,0 +1,138 @@
+#!/bin/sh
+
+# Slackware build script for guile2.2
+
+# Copyright 2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=guile2.2
+SRCNAM=guile
+VERSION=${VERSION:-2.2.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --program-suffix=2.2 \
+ --with-threads \
+ --disable-error-on-warning \
+ --disable-static \
+ --disable-rpath \
+ --build=$ARCH-slackware-linux
+
+make -j1
+make install DESTDIR=$PKG
+
+# Move libguile*-gdb.scm to GDB's autoload directory to avoid
+# getting "not an ELF file" errors from ldconfig:
+mkdir -p $PKG/usr/share/gdb/auto-load/usr/lib${LIBDIRSUFFIX}
+mv $PKG/usr/lib${LIBDIRSUFFIX}/libguile*-gdb.scm $PKG/usr/share/gdb/auto-load/usr/lib${LIBDIRSUFFIX} || exit 1
+
+# Change timestamps on *.go and *.scm files, otherwise on multilib systems
+# the compiled (go) files may be detected as older than the source (scm)
+# files, causing guile to attempt to recompile itself with every use:
+find $PKG/usr/lib${LIBDIRSUFFIX} -name "*.go" -exec touch -r $CWD/guile.SlackBuild "{}" \;
+find $PKG/usr/share -name "*.scm" -exec touch -r $CWD/guile.SlackBuild "{}" \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# Compress info files
+if [ -d $PKG/usr/info ]; then
+ ( cd $PKG/usr/info
+ rm -f dir
+ gzip -9 *
+ # rename it so that it will not overwrite Slackware's guile 3.0 package
+ for i in {1..10}
+ do
+ mv guile.info-$i.gz guile2.2.info-$i.gz
+ done
+ mv guile.info.gz guile2.2.info.gz
+ mv r5rs.info.gz r5rs2.2.info.gz
+ )
+fi
+
+# Avoid duplicate with Slackware's guile.m4
+# It can detect newer and older versions of guile installed on system
+mv $PKG/usr/share/aclocal/guile.m4 $PKG/usr/share/aclocal/guile22.m4
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* GUILE-VERSION HACKING INSTALL LICENSE NEWS README* THANKS \
+ $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Fix guile-config2.2 info
+sed -i '1s/guile/guile2.2/' -i $PKG/usr/bin/guile-config2.2
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
diff --git a/development/guile2.2/guile2.2.info b/development/guile2.2/guile2.2.info
new file mode 100644
index 0000000000..3f1c79c884
--- /dev/null
+++ b/development/guile2.2/guile2.2.info
@@ -0,0 +1,10 @@
+PRGNAM="guile2.2"
+VERSION="2.2.6"
+HOMEPAGE="https://www.gnu.org/software/guile"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/guile/guile-2.2.6.tar.xz"
+MD5SUM="e946a685e782685f6ebb97026131a315"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/development/guile2.2/slack-desc b/development/guile2.2/slack-desc
new file mode 100644
index 0000000000..5a799c15c1
--- /dev/null
+++ b/development/guile2.2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+guile2.2: guile2.2 (GNU's extension language library)
+guile2.2:
+guile2.2: Guile is the GNU Ubiquitous Intelligent Language for Extensions.
+guile2.2: Guile is an interpreter for Scheme, packaged as a library that you
+guile2.2: can link into your applications to give them their own scripting
+guile2.2: language. Guile will eventually support other languages as well,
+guile2.2: giving users of Guile-based applications a choice of languages.
+guile2.2:
+guile2.2: This is Guile 2.2 (legacy version) needed by some packages in SBo.
+guile2.2:
+guile2.2:
diff --git a/development/hte/hte.SlackBuild b/development/hte/hte.SlackBuild
index 97058415df..519c03db13 100644
--- a/development/hte/hte.SlackBuild
+++ b/development/hte/hte.SlackBuild
@@ -24,13 +24,13 @@
SRCNAM=ht
PRGNAM=hte
-VERSION=${VERSION:-2.0.18}
+VERSION=${VERSION:-2.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,14 +61,20 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.*z?
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
cd $SRCNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Thanks gentoo!
+patch -p1 < $CWD/hteditor-2.1.0-gcc-7.patch
+
+# Respect our CFLAGS
+sed -i "s|-O3 -fomit-frame-pointer -Wall -fsigned-char|$SLKCFLAGS|" configure
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/development/hte/hte.info b/development/hte/hte.info
index e12fb4f8eb..1a2a2cd461 100644
--- a/development/hte/hte.info
+++ b/development/hte/hte.info
@@ -1,8 +1,8 @@
PRGNAM="hte"
-VERSION="2.0.18"
+VERSION="2.1.0"
HOMEPAGE="http://hte.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/hte/ht-2.0.18.tar.bz2"
-MD5SUM="9cd5c52bb3fbae5c631875cd0de3318c"
+DOWNLOAD="https://downloads.sf.net/hte/ht-2.1.0.tar.bz2"
+MD5SUM="09b2a4461d75e9cd03af1cd67fadc1ec"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/hte/hteditor-2.1.0-gcc-7.patch b/development/hte/hteditor-2.1.0-gcc-7.patch
new file mode 100644
index 0000000000..ebcc3c0aa4
--- /dev/null
+++ b/development/hte/hteditor-2.1.0-gcc-7.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/show_bug.cgi?id=620732
+
+Fixes build failure on gcc-7:
+
+ htapp.cc: In function 'uint isqr(uint)':
+ htapp.cc:3026:18: error: call of overloaded 'abs(uint)' is ambiguous
+ while (abs(a - b) > 1) {
+ ^
+
+Picked upstream patch that fixes it:
+
+commit 3b62f2f7e49e024ec9d3c5ffc8ff9cd87a107af6
+Author: Sebastian Biallas <sb@biallas.net>
+Date: Sun Nov 13 15:25:26 2016 +0100
+
+ use unsigned variables
+
+diff --git a/htapp.cc b/htapp.cc
+index 53d8725..03236e2 100644
+--- a/htapp.cc
++++ b/htapp.cc
+@@ -3021,8 +3021,8 @@ void do_modal_resize()
+
+ static uint isqr(uint u)
+ {
+- uint a = 2;
+- uint b = u/a;
++ int a = 2;
++ int b = u/a;
+ while (abs(a - b) > 1) {
+ a = (a+b)/2;
+ b = u/a;
diff --git a/development/icecream/README b/development/icecream/README
deleted file mode 100644
index 50daacb2d4..0000000000
--- a/development/icecream/README
+++ /dev/null
@@ -1,12 +0,0 @@
-Icecream is a distributed compile system. It allows parallel compiling by
-distributing the compile jobs to several nodes of a compile network running the
-icecc daemon. The icecc scheduler routes the jobs and provides status and
-statistics information to the icecc monitor. Each compile node can accept one
-or more compile jobs depending on the number of processors and the settings of
-the daemon. Link jobs and other jobs which cannot be distributed are executed
-locally on the node where the compilation is started.
-Note that upon installation of the resulting package, all your software
-will be compiled by icecream by default.
-
-For information on how to use icecream in combination with ccache see
-https://github.com/icecc/icecream#how-to-combine-icecream-with-ccache
diff --git a/development/icecream/doinst.sh b/development/icecream/doinst.sh
deleted file mode 100644
index 9685b60dea..0000000000
--- a/development/icecream/doinst.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-# Keep same perms on rc.iceccd.new:
-if [ -e etc/rc.d/rc.iceccd ]; then
- cp -a etc/rc.d/rc.iceccd etc/rc.d/rc.iceccd.new.incoming
- cat etc/rc.d/rc.iceccd.new > etc/rc.d/rc.iceccd.new.incoming
- mv etc/rc.d/rc.iceccd.new.incoming etc/rc.d/rc.iceccd.new
-fi
-
-# Keep same perms on rc.icecc-scheduler.new:
-if [ -e etc/rc.d/rc.icecc-scheduler ]; then
- cp -a etc/rc.d/rc.icecc-scheduler etc/rc.d/rc.icecc-scheduler.new.incoming
- cat etc/rc.d/rc.icecc-scheduler.new > etc/rc.d/rc.icecc-scheduler.new.incoming
- mv etc/rc.d/rc.icecc-scheduler.new.incoming etc/rc.d/rc.icecc-scheduler.new
-fi
-
-config etc/rc.d/rc.iceccd.new
-config etc/rc.d/rc.icecream.conf.new
-config etc/rc.d/rc.icecc-scheduler.new
-
diff --git a/development/icecream/icecream.SlackBuild b/development/icecream/icecream.SlackBuild
deleted file mode 100644
index 4afe8dabd3..0000000000
--- a/development/icecream/icecream.SlackBuild
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for icecream
-
-# Copyright 2009-2018 Heinz Wiesinger, Amsterdam, The Netherlands
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=icecream
-VERSION=${VERSION:-1.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if ! grep ^icecream: /etc/group 2>&1 > /dev/null; then
- echo " Must have a icecream group to run this script."
- echo " # groupadd -g 283 icecream"
- echo " Or something similar."
- exit 1
-elif ! grep ^icecream: /etc/passwd 2>&1 > /dev/null; then
- echo " Must have a icecream user to run this script."
- echo " # useradd -u 283 -g icecream -d /var/cache/icecream icecream"
- echo " Or something similar."
- exit 1
-fi
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-./autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib$LIBDIRSUFFIX \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --enable-clang-rewrite-includes \
- --enable-clang-wrappers \
- --enable-shared \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/etc/profile.d/
-cp $CWD/profile.d/* $PKG/etc/profile.d/
-chmod 0755 $PKG/etc/profile.d/*
-
-# Install init script
-mkdir -p $PKG/etc/rc.d
-install -m 0755 $CWD/rc.iceccd $PKG/etc/rc.d/rc.iceccd.new
-install -m 0755 $CWD/rc.icecc-scheduler $PKG/etc/rc.d/rc.icecc-scheduler.new
-install -m 0644 $CWD/rc.icecream.conf $PKG/etc/rc.d/rc.icecream.conf.new
-
-for i in $ARCH-slackware-linux-c++ $ARCH-slackware-linux-g++ \
- $ARCH-slackware-linux-gcc $ARCH-slackware-linux-clang \
- $ARCH-slackware-linux-clang++; do
- ln -s /usr/bin/icecc $PKG/usr/libexec/icecc/bin/$i
-done
-
-mkdir -p $PKG/var/{cache,log}/icecream
-chown icecream:icecream $PKG/var/{cache,log}/icecream
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/icecream/icecream.info b/development/icecream/icecream.info
deleted file mode 100644
index 430743d46a..0000000000
--- a/development/icecream/icecream.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="icecream"
-VERSION="1.1"
-HOMEPAGE="https://github.com/icecc/icecream"
-DOWNLOAD="https://github.com/icecc/icecream/archive/1.1/icecream-1.1.tar.gz"
-MD5SUM="bd33e21fa25ccedeb5c94be9c6f034e1"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
diff --git a/development/icecream/profile.d/icecream.csh b/development/icecream/profile.d/icecream.csh
deleted file mode 100644
index 386d9242a8..0000000000
--- a/development/icecream/profile.d/icecream.csh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/csh
-setenv PATH /usr/libexec/icecc/bin:${PATH}
diff --git a/development/icecream/profile.d/icecream.sh b/development/icecream/profile.d/icecream.sh
deleted file mode 100644
index c0c3d179ee..0000000000
--- a/development/icecream/profile.d/icecream.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-export PATH=/usr/libexec/icecc/bin:$PATH
diff --git a/development/icecream/rc.icecc-scheduler b/development/icecream/rc.icecc-scheduler
deleted file mode 100644
index 633661bebe..0000000000
--- a/development/icecream/rc.icecc-scheduler
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-# Start/stop/restart scheduler.
-# $Id: rc.scheduler,v 1.0 2009/04/18
-# Author: Heinz Wiesinger <pprkut@liwjatan.at>
-# ---------------------------------------------------------------------------
-
-PID=$(/sbin/pidof -o %PPID icecc-scheduler)
-
-# Get the configuration information from /etc/rc.d/rc.icecream.conf:
-. /etc/rc.d/rc.icecream.conf
-
-# Start scheduler:
-scheduler_start() {
- if [ -n "$PID" ]; then
- echo "Distributed compiler scheduler already running"
- exit
- fi
- if [ -x /usr/sbin/icecc-scheduler ]; then
- echo "Starting distributed compiler scheduler: /usr/sbin/icecc-scheduler "
- /usr/sbin/icecc-scheduler -n $NETWORK -d -u icecream \
- -l /var/log/icecream/icecc-scheduler.log
- fi
-}
-
-# Stop scheduler:
-scheduler_stop() {
- echo "Stopping distributed compiler scheduler"
- killall icecc-scheduler 1> /dev/null 2> /dev/null
-}
-
-# Restart scheduler:
-scheduler_restart() {
- scheduler_stop
- sleep 1
- scheduler_start
-}
-
-case "$1" in
-'start')
- scheduler_start
- ;;
-'stop')
- scheduler_stop
- ;;
-'restart')
- scheduler_restart
- ;;
-*)
- echo "usage $0 start|stop|restart"
-esac
diff --git a/development/icecream/rc.iceccd b/development/icecream/rc.iceccd
deleted file mode 100644
index 776de18a15..0000000000
--- a/development/icecream/rc.iceccd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-# Start/stop/restart iceccd.
-# $Id: rc.iceccd,v 1.0 2009/04/18
-# Author: Heinz Wiesinger <pprkut@liwjatan.at>
-# ---------------------------------------------------------------------------
-
-PID=$(/sbin/pidof -o %PPID iceccd)
-
-# Get the configuration information from /etc/rc.d/rc.icecream.conf:
-. /etc/rc.d/rc.icecream.conf
-
-# Start iceccd:
-iceccd_start() {
- if [ -n "$PID" ]; then
- echo "Distributed compiler daemon already running"
- exit
- fi
- if [ -x /usr/sbin/iceccd ]; then
- echo "Starting distributed compiler daemon: /usr/sbin/iceccd "
- /usr/sbin/iceccd -n $NETWORK -d -u icecream \
- -l /var/log/icecream/iceccd.log
- fi
-}
-
-# Stop iceccd:
-iceccd_stop() {
- echo "Stopping distributed compiler daemon"
- killall iceccd 1> /dev/null 2> /dev/null
-}
-
-# Restart iceccd:
-iceccd_restart() {
- iceccd_stop
- sleep 1
- iceccd_start
-}
-
-case "$1" in
-'start')
- iceccd_start
- ;;
-'stop')
- iceccd_stop
- ;;
-'restart')
- iceccd_restart
- ;;
-*)
- echo "usage $0 start|stop|restart"
-esac
diff --git a/development/icecream/rc.icecream.conf b/development/icecream/rc.icecream.conf
deleted file mode 100644
index f422fde174..0000000000
--- a/development/icecream/rc.icecream.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/rc.d/rc.icecream.conf
-#
-# This file contains the configuration settings for both iceccd and scheduler
-
-# Defines the network name used to determine which nodes can be used for
-# the compile processes. That way you can have several icecream clusters
-# in the same network
-NETWORK=$(hostname -d)
diff --git a/development/icecream/slack-desc b/development/icecream/slack-desc
deleted file mode 100644
index a435b5c2cd..0000000000
--- a/development/icecream/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-icecream: icecream (network-distributed compilation)
-icecream:
-icecream: Icecream is a distributed compile system. It allows parallel
-icecream: compiling by distributing the compile jobs to several nodes of a
-icecream: compile network running the statistics information to the icecc
-icecream: monitor. Each compile node can accept one or more compile jobs
-icecream: depending on the number of processors and the settings of icecc
-icecream: daemon. The icecc scheduler routes the jobs and provides status
-icecream: and the daemon. Link jobs and other jobs which cannot be
-icecream: distributed are executed locally on the node where the compilation
-icecream: is started.
diff --git a/development/jdk/profile.d/jdk.csh b/development/jdk/profile.d/jdk.csh
index 3a1ec7be8b..24580311a3 100644
--- a/development/jdk/profile.d/jdk.csh
+++ b/development/jdk/profile.d/jdk.csh
@@ -1,4 +1,3 @@
#!/bin/csh
setenv JAVA_HOME /usr/lib/java
-setenv MANPATH ${MANPATH}:${JAVA_HOME}/man
setenv PATH ${PATH}:${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin
diff --git a/development/jdk/profile.d/jdk.sh b/development/jdk/profile.d/jdk.sh
index ed0bc73d4d..66815e299f 100644
--- a/development/jdk/profile.d/jdk.sh
+++ b/development/jdk/profile.d/jdk.sh
@@ -1,4 +1,3 @@
#!/bin/sh
export JAVA_HOME=/usr/lib/java
-export MANPATH="${MANPATH}:${JAVA_HOME}/man"
export PATH="${PATH}:${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
diff --git a/development/kicad/kicad.SlackBuild b/development/kicad/kicad.SlackBuild
index b2942d5e3f..4b80cc52a3 100644
--- a/development/kicad/kicad.SlackBuild
+++ b/development/kicad/kicad.SlackBuild
@@ -79,6 +79,7 @@ find -L . \
# KiCad 5.1.2 patch:
patch -p1 --verbose < $CWD/kicad_boost_hdr.patch
+patch -p1 --verbose < $CWD/kicad_std-header_for_boost1.7.3.patch
# Additional notes:
#
diff --git a/development/kicad/kicad_std-header_for_boost1.7.3.patch b/development/kicad/kicad_std-header_for_boost1.7.3.patch
new file mode 100644
index 0000000000..714e78f4f4
--- /dev/null
+++ b/development/kicad/kicad_std-header_for_boost1.7.3.patch
@@ -0,0 +1,14 @@
+Add missing include for std::algorithm for boost 1.7.3
+https://gitlab.com/kicad/code/kicad/-/commit/47297402d38cafefd54310ee7b536b60c8524ac0
+diff --git a/common/lib_tree_model.cpp b/common/lib_tree_model.cpp
+index 71fe74c7dcdaa2661584cbe89361bcc2f4729954..ed30b11de5e3db8b460984821965f4745911e1fd 100644
+--- a/common/lib_tree_model.cpp
++++ b/common/lib_tree_model.cpp
+@@ -21,6 +21,7 @@
+
+ #include <lib_tree_model.h>
+
++#include <algorithm>
+ #include <eda_pattern_match.h>
+ #include <lib_tree_item.h>
+ #include <make_unique.h>
diff --git a/development/latrace/fix-scanner-config-for-flex-2.6.x.patch b/development/latrace/fix-scanner-config-for-flex-2.6.x.patch
new file mode 100644
index 0000000000..301f4c5a96
--- /dev/null
+++ b/development/latrace/fix-scanner-config-for-flex-2.6.x.patch
@@ -0,0 +1,23 @@
+--- src/config-flex.l.orig 2011-07-25 07:18:18.000000000 -0400
++++ src/config-flex.l 2017-07-02 13:52:20.048382500 -0400
+@@ -106,19 +106,17 @@ OPTIONS { BEGIN(options); return OPTI
+ <options>"\n" { NEW_LINE(); }
+ <options>. { ; }
+
+ %%
+
+-#ifndef yywrap
+-int yywrap()
++int lt_config_wrap()
+ {
+ return 1;
+ /* XXX not to get the compiler 'not used' warning */
+ yyunput(0, NULL);
+ input();
+ }
+-#endif
+
+ void lt_config_error(const char *m)
+ {
+ printf("conf file [%s] line %d: %s\n",
+ lt_inc_stack(lt_config_sinc)->file,
diff --git a/development/latrace/latrace.SlackBuild b/development/latrace/latrace.SlackBuild
index 899601c4e5..bf2208d214 100644
--- a/development/latrace/latrace.SlackBuild
+++ b/development/latrace/latrace.SlackBuild
@@ -54,6 +54,9 @@ find -L . \
-type d -exec chmod 0755 {} \; -o \
-type f -exec chmod u+rw,go+r-w,a-s {} \;
+# Thanks archlinux!
+patch -p0 < $CWD/fix-scanner-config-for-flex-2.6.x.patch
+
autoconf
CFLAGS="$SLKCFLAGS" \
diff --git a/development/lmdb/README b/development/lmdb/README
deleted file mode 100644
index 9e2c8df0ff..0000000000
--- a/development/lmdb/README
+++ /dev/null
@@ -1,2 +0,0 @@
-LMDB is an ultra-fast, ultra-compact key-value embedded data store
-developed by Symas for the OpenLDAP Project.
diff --git a/development/lmdb/lmdb.SlackBuild b/development/lmdb/lmdb.SlackBuild
deleted file mode 100644
index b7c2e3e2fb..0000000000
--- a/development/lmdb/lmdb.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for LMDB
-
-# Copyright 2015 Jack Hunt, United Kingdom
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=lmdb
-VERSION=${VERSION:-0.9.14}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
-cd liblmdb
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-#Manually create dest dir's as there is no configure script.
-mkdir $PKG/usr
-mkdir $PKG/usr/man
-mkdir $PKG/usr/lib
-mkdir $PKG/usr/include
-
-sed -i '/^prefix/d' Makefile
-make prefix=/usr DESTDIR=$PKG
-make install prefix=/usr DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/lmdb/lmdb.info b/development/lmdb/lmdb.info
deleted file mode 100644
index f27e78bd6e..0000000000
--- a/development/lmdb/lmdb.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="lmdb"
-VERSION="0.9.14"
-HOMEPAGE="http://symas.com/mdb/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lmdb-0.9.14.tar.gz"
-MD5SUM="5808c3822595960f8e965754f84ee99e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Jack Hunt"
-EMAIL="jackmileshunt[at]gmail.com"
diff --git a/development/lmdb/slack-desc b/development/lmdb/slack-desc
deleted file mode 100644
index 22a92101a3..0000000000
--- a/development/lmdb/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-lmdb: lmdb (embedded data store)
-lmdb:
-lmdb: LMDB is an ultra-fast, ultra-compact key-value embedded data store
-lmdb: developed by Symas for the OpenLDAP Project.
-lmdb:
-lmdb: Online documentation available at:
-lmdb: http://symas.com/mdb/
-lmdb:
-lmdb:
-lmdb:
-lmdb:
diff --git a/development/meld3/meld3.SlackBuild b/development/meld3/meld3.SlackBuild
index 7dc06d9f16..3ef67e1459 100644
--- a/development/meld3/meld3.SlackBuild
+++ b/development/meld3/meld3.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=meld3
SRCNAM=meld
-VERSION=${VERSION:-3.18.3}
+VERSION=${VERSION:-3.20.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -70,6 +70,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/python-3.8.patch
+
python3 setup.py install --root=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/development/meld3/meld3.info b/development/meld3/meld3.info
index d311d6f413..abbb038df6 100644
--- a/development/meld3/meld3.info
+++ b/development/meld3/meld3.info
@@ -1,8 +1,8 @@
PRGNAM="meld3"
-VERSION="3.18.3"
+VERSION="3.20.1"
HOMEPAGE="http://meldmerge.org/"
-DOWNLOAD="https://download.gnome.org/sources/meld/3.18/meld-3.18.3.tar.xz"
-MD5SUM="81ab217622f856ee014f6b6c47a198f2"
+DOWNLOAD="https://download.gnome.org/sources/meld/3.20/meld-3.20.1.tar.xz"
+MD5SUM="0a2419d75fc8f8677fa6b4ce31ca8adc"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="gtksourceview3 pygobject3-python3"
diff --git a/development/meld3/python-3.8.patch b/development/meld3/python-3.8.patch
new file mode 100644
index 0000000000..36ff4bcf7c
--- /dev/null
+++ b/development/meld3/python-3.8.patch
@@ -0,0 +1,61 @@
+commit 9cb590f9804a89d8914d0d7d6c89c336f6d86d86
+Author: Kai Willadsen <kai.willadsen@gmail.com>
+Date: Mon May 6 08:15:23 2019 +1000
+
+ Update build helpers for Python 3.8 compatibility (#322)
+
+ The `linux_distribution` helper for the platform module has been removed
+ in Python 3.8, so we need an additional helper to check for the Debian-
+ style packaging layout.
+
+ Really this should be an `install_requires`, but moving our build
+ helpers to `setuptools` is a not-insignificant risk that I'd rather not
+ take when we're looking at moving to Meson.
+
+diff --git a/meld/build_helpers.py b/meld/build_helpers.py
+index 5977b3cd..f9fb302b 100644
+--- a/meld/build_helpers.py
++++ b/meld/build_helpers.py
+@@ -31,6 +31,15 @@ import platform
+ import sys
+ from distutils.log import info
+
++try:
++ import distro
++except ImportError:
++ python_version = tuple(int(x) for x in platform.python_version_tuple())
++ if python_version >= (3, 8):
++ print(
++ 'Missing build requirement "distro" Python module; '
++ 'install paths may be incorrect', file=sys.stderr)
++
+
+ def has_help(self):
+ return "build_help" in self.distribution.cmdclass and os.name != 'nt'
+@@ -404,11 +413,21 @@ class install(distutils.command.install.install):
+
+ def finalize_options(self):
+ special_cases = ('debian', 'ubuntu', 'linuxmint')
+- if (platform.system() == 'Linux' and
+- platform.linux_distribution()[0].lower() in special_cases):
+- # Maintain an explicit install-layout, but use deb by default
+- specified_layout = getattr(self, 'install_layout', None)
+- self.install_layout = specified_layout or 'deb'
++ if platform.system() == 'Linux':
++ # linux_distribution has been removed in Python 3.8; we require
++ # the third-party distro package for future handling.
++ try:
++ distribution = platform.linux_distribution()[0].lower()
++ except AttributeError:
++ try:
++ distribution = distro.id()
++ except NameError:
++ distribution = 'unknown'
++
++ if distribution in special_cases:
++ # Maintain an explicit install-layout, but use deb by default
++ specified_layout = getattr(self, 'install_layout', None)
++ self.install_layout = specified_layout or 'deb'
+
+ distutils.command.install.install.finalize_options(self)
+
diff --git a/development/menhir/menhir.SlackBuild b/development/menhir/menhir.SlackBuild
index 094a29eba9..62336c4021 100644
--- a/development/menhir/menhir.SlackBuild
+++ b/development/menhir/menhir.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=menhir
-VERSION=${VERSION:-20170101}
+VERSION=${VERSION:-20190924}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -93,7 +93,9 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGES INSTALLATION LICENSE manual.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION/
+rm -fR $PKG/usr/doc/$PRGNAM
+cp -a *.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/menhir/menhir.info b/development/menhir/menhir.info
index 1926acc370..5ce37a9367 100644
--- a/development/menhir/menhir.info
+++ b/development/menhir/menhir.info
@@ -1,8 +1,8 @@
PRGNAM="menhir"
-VERSION="20170101"
+VERSION="20190924"
HOMEPAGE="http://cristal.inria.fr/~fpottier/menhir/"
-DOWNLOAD="http://cristal.inria.fr/~fpottier/menhir/menhir-20170101.tar.gz"
-MD5SUM="78128bc6935d7c40d5da919c502678c0"
+DOWNLOAD="https://gitlab.inria.fr/fpottier/menhir/-/archive/20190924/menhir-20190924.tar.gz"
+MD5SUM="69b2cbcfb12ca0ca09ad0096c8716265"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ocamlbuild ocaml-findlib"
diff --git a/development/meson/README b/development/meson/README
deleted file mode 100644
index 6ead00c876..0000000000
--- a/development/meson/README
+++ /dev/null
@@ -1,9 +0,0 @@
-meson (The Meson Build System)
-
-Meson is an open source build system meant to be both extremely fast,
-and, even more importantly, as user friendly as possible.
-
-The main design point of Meson is that every moment a developer spends
-writing or debugging build definitions is a second wasted. So is every
-second spent waiting for the build system to actually start compiling
-code.
diff --git a/development/meson/meson.SlackBuild b/development/meson/meson.SlackBuild
deleted file mode 100644
index 79b6a73eb6..0000000000
--- a/development/meson/meson.SlackBuild
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for meson
-
-# Copyright 2017-2020 Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=meson
-VERSION=${VERSION:-0.52.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python3 setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mv $PKG/usr/share/man $PKG/usr/
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- COPYING README.md PKG-INFO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/meson/meson.info b/development/meson/meson.info
deleted file mode 100644
index ec493ba95e..0000000000
--- a/development/meson/meson.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="meson"
-VERSION="0.52.1"
-HOMEPAGE="http://mesonbuild.com"
-DOWNLOAD="https://github.com/mesonbuild/meson/releases/download/0.52.1/meson-0.52.1.tar.gz"
-MD5SUM="a5f0c99567d772508f649a28ded7f8ad"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3 ninja"
-MAINTAINER="Jeremy Hansen"
-EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/development/meson/slack-desc b/development/meson/slack-desc
deleted file mode 100644
index e3e1d45d83..0000000000
--- a/development/meson/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-meson: meson (The Meson Build System)
-meson:
-meson: Meson is an open source build system meant to be both extremely fast,
-meson: and, even more importantly, as user friendly as possible.
-meson:
-meson: The main design point of Meson is that every moment a developer spends
-meson: writing or debugging build definitions is a second wasted. So is every
-meson: second spent waiting for the build system to actually start compiling
-meson: code.
-meson:
-meson: HOMEPAGE: http://mesonbuild.com
diff --git a/development/mozjs/README b/development/mozjs/README
deleted file mode 100644
index bd78678034..0000000000
--- a/development/mozjs/README
+++ /dev/null
@@ -1,3 +0,0 @@
-SpiderMonkey is Mozilla's JavaScript engine written in C and C++. It
-is used in various Mozilla products, including Firefox, and is
-available under the MPL2.
diff --git a/development/mozjs/mozjs.SlackBuild b/development/mozjs/mozjs.SlackBuild
deleted file mode 100644
index 036763d89f..0000000000
--- a/development/mozjs/mozjs.SlackBuild
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for mozjs
-# Copyright 2018 David Woodfall <dave@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=mozjs
-VERSION=${VERSION:-45.0.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-patch -p1 --verbose <$CWD/patches/moz38-dont-hardcode-libc-soname.patch
-
-cd js/src
-
-# Going with the gentoo ebuild options. They completely disable all
-# optimisation so we'll see how that works out.
-# --enable-optimize="-O2" \
-# They have also enabled thread safety.
-
-MOZ_MAKE_FLAGS="$SLKCFLAGS" \
-MOZ_OPTIMIZE_FLAGS="" \
-MOZ_DEBUG_FLAGS="" \
-HOST_OPTIMIZE_FLAGS="" \
-MODULE_OPTIMIZE_FLAGS="" \
-MOZ_PGO_OPTIMIZE_FLAGS="" \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-jemalloc \
- --enable-threadsafe \
- --with-system-nspr \
- --enable-system-ffi \
- --enable-readline \
- --disable-optimize \
- --with-intl-api \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-# Get rid of any static libs
-find $PKG -iname '*.a' -o -iname '*.ajs' -delete
-
-# We don't want to clobber the stock js185 so we'll rename 'js' to 'mozjs' etc.
-(
- cd $PKG/usr/bin
- for bin in *
- do
- mv -v $bin moz$bin
- done
-)
-
-# Thanks to Arch
-# Resolve symlinks so they donʼt point to $srcdir
-for l in $(find "$PKG/usr/include/" -type l); do
- cp --remove-destination $(readlink $l) $l
-done
-
-# Fix to get elinks to build against it. Disabled for now.
-#sed -i "s%<cmath>%<cmath.h>%" $PKG/usr/include/mozjs-45/mozilla/MathAlgorithms.h
-#sed -i "s%<limits>%<limits.h>%" $PKG/usr/include/mozjs-45/js/Value.h
-#sed -i "/#include <new>/d" $PKG/usr/include/mozjs-45/js/Utility.h
-#sed -i "/#include <new>/d" $PKG/usr/include/mozjs-45/mozilla/Vector.h
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-cd ../..
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- INSTALL LICENSE README \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/mozjs/mozjs.info b/development/mozjs/mozjs.info
deleted file mode 100644
index f8415c2950..0000000000
--- a/development/mozjs/mozjs.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="mozjs"
-VERSION="45.0.2"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-DOWNLOAD="https://ftp.mozilla.org/pub/spidermonkey/releases/45.0.2/mozjs-45.0.2.tar.bz2"
-MD5SUM="2ca34f998d8b5ea79d8616dd26b5fbab"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/development/mozjs/patches/moz38-dont-hardcode-libc-soname.patch b/development/mozjs/patches/moz38-dont-hardcode-libc-soname.patch
deleted file mode 100644
index 708c749697..0000000000
--- a/development/mozjs/patches/moz38-dont-hardcode-libc-soname.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/testing/mozbase/mozinfo/mozinfo/mozinfo.py 2018-01-12 12:21:16.764318254 -0500
-+++ b/testing/mozbase/mozinfo/mozinfo/mozinfo.py 2018-01-12 12:22:23.392069398 -0500
-@@ -93,10 +93,11 @@
-
- if info['os'] == 'linux':
- import ctypes
-+ import ctypes.util
- import errno
- PR_SET_SECCOMP = 22
- SECCOMP_MODE_FILTER = 2
-- ctypes.CDLL("libc.so.6", use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0)
-+ ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0)
- info['has_sandbox'] = ctypes.get_errno() == errno.EFAULT
- else:
- info['has_sandbox'] = True
diff --git a/development/mozjs/slack-desc b/development/mozjs/slack-desc
deleted file mode 100644
index 0f9f7248d2..0000000000
--- a/development/mozjs/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
-mozjs: mozjs (Mozilla's JavaScript engine)
-mozjs:
-mozjs: SpiderMonkey is Mozilla's JavaScript engine written in C and C++. It
-mozjs: is used in various Mozilla products, including Firefox, and is
-mozjs: available under the MPL2.
-mozjs:
-mozjs:
-mozjs:
-mozjs:
-mozjs:
-mozjs:
diff --git a/development/mysql-pinba/mysql-pinba.SlackBuild b/development/mysql-pinba/mysql-pinba.SlackBuild
index cdf19f5036..e6f3bf0ebd 100644
--- a/development/mysql-pinba/mysql-pinba.SlackBuild
+++ b/development/mysql-pinba/mysql-pinba.SlackBuild
@@ -95,7 +95,7 @@ sed -i "s|sql/structs.h|structs.h|" src/ha_pinba.cc
sed -i "s|sql/handler.h|handler.h|" src/ha_pinba.cc
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
LIBS="$malloc_lib" \
./configure \
--prefix=/usr \
diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild
index b2344f4ef3..b0d607b78f 100644
--- a/development/mysql-workbench/mysql-workbench.SlackBuild
+++ b/development/mysql-workbench/mysql-workbench.SlackBuild
@@ -74,6 +74,11 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# From Archlinux: GCC 7.x complains about an unsupported flag; it also
+# introduced some new warnings, remove '-Werror' for the build to complete
+sed -i 's|-Wno-deprecated-register||' ext/scintilla/gtk/CMakeLists.txt
+sed -i '/^set/s|-Werror -Wall|-Wall|' CMakeLists.txt
+
# Patch from Ponce
patch -p1 < $CWD/config_and_ifconfig_paths.patch
diff --git a/development/ninja/README b/development/ninja/README
deleted file mode 100644
index 4881393f6e..0000000000
--- a/development/ninja/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Ninja is a small build system with a focus on speed. It differs from other
-build systems in two major respects: it is designed to have its input files
-generated by a higher-level build system, and it is designed to run builds as
-fast as possible.
diff --git a/development/ninja/ninja.SlackBuild b/development/ninja/ninja.SlackBuild
deleted file mode 100644
index aca4714cc4..0000000000
--- a/development/ninja/ninja.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ninja
-
-# Copyright 2015 Markus Rinne Finland
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=ninja
-VERSION=${VERSION:-1.10.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
- python configure.py --bootstrap
-
-install -D -m0755 ninja $PKG/usr/bin/ninja
-install -D -m0644 misc/bash-completion $PKG/usr/share/bash-completion/completions/ninja
-install -D -m0644 misc/zsh-completion $PKG/usr/share/zsh/site-functions/_ninja
-install -D -m0644 misc/ninja.vim $PKG/usr/share/vim/vimfiles/syntax/ninja.vim
-install -D -m0644 misc/ninja-mode.el $PKG/usr/share/emacs/site-lisp/ninja-mode.el
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- COPYING* README* RELEASING \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/ninja/ninja.info b/development/ninja/ninja.info
deleted file mode 100644
index 62989ad3f3..0000000000
--- a/development/ninja/ninja.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ninja"
-VERSION="1.10.1"
-HOMEPAGE="https://ninja-build.org/"
-DOWNLOAD="https://github.com/ninja-build/ninja/archive/v1.10.1/ninja-1.10.1.tar.gz"
-MD5SUM="05c1bb5ef41c85057fa6abdffa243dcd"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Markus Rinne"
-EMAIL="markus.ka.rinne@gmail.com"
diff --git a/development/ninja/slack-desc b/development/ninja/slack-desc
deleted file mode 100644
index 35a65f0947..0000000000
--- a/development/ninja/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-ninja: ninja (build system with a focus on speed)
-ninja:
-ninja: Ninja is a small build system with a focus on speed. It differs from
-ninja: other build systems in two major respects: it is designed to have its
-ninja: input files generated by a higher-level build system, and it is
-ninja: designed to run builds as fast as possible.
-ninja:
-ninja:
-ninja:
-ninja:
-ninja:
diff --git a/development/nvi/README b/development/nvi/README
deleted file mode 100644
index b44e27d365..0000000000
--- a/development/nvi/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Nvi is an implementation of the ex/vi text editor.
-Nvi supports all the historic ex/vi features except for open mode and the
-lisp edit option (it has a fully implemented underlying ex mode). Some
-additional features are: extended regular expressions, infinite undo, and
-multiple edit buffers. Nvi has a very small memory footprint.
diff --git a/development/nvi/nvi.SlackBuild b/development/nvi/nvi.SlackBuild
deleted file mode 100644
index 6ee6d5cb8b..0000000000
--- a/development/nvi/nvi.SlackBuild
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for nvi
-
-# Copyright 2008-2012 Robby Workman Northport, Alabama (USA)
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=nvi
-VERSION=${VERSION:-1.81.6}
-BUILD=${BUILD:-3}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Apply patches to eliminate bogus "DB_CREATE must be specified to create databases." error message on exit
-patch -p1 < $CWD/patches/nvi.diffs
-
-cd build.unix
- CFLAGS="$SLKCFLAGS" \
- ../dist/configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-widechar \
- --disable-static \
- --program-prefix="n" \
- --build=$ARCH-slackware-linux
- make -j1
- make -j1 install DESTDIR=$PKG
-cd ..
-
-# These are better as softlinks instead of hardlinks
-rm -f $PKG/usr/man/man1/{nex,nview}.1
-ln -s nvi.1 $PKG/usr/man/man1/nex.1
-ln -s nvi.1 $PKG/usr/man/man1/nview.1
-
-rm -rf $PKG/usr/man/cat*
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changes LICENSE README* TODO docs/html $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/nvi/nvi.info b/development/nvi/nvi.info
deleted file mode 100644
index 358c0fa50b..0000000000
--- a/development/nvi/nvi.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nvi"
-VERSION="1.81.6"
-HOMEPAGE="http://freecode.com/projects/nvi"
-DOWNLOAD="http://harrier.slackbuilds.org/misc/nvi-1.81.6.tar.bz2"
-MD5SUM="88d1e23115ee9f2961186b62e55f5704"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Don Allen"
-EMAIL="donaldcallen@gmail.com"
diff --git a/development/nvi/patches/nvi.diffs b/development/nvi/patches/nvi.diffs
deleted file mode 100644
index 98a45861e7..0000000000
--- a/development/nvi/patches/nvi.diffs
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up nvi-1.81.6/common/db.h patched-nvi-1.81.6/common/db.h
---- nvi-1.81.6/common/db.h 2007-11-18 11:41:42.000000000 -0500
-+++ patched-nvi-1.81.6/common/db.h 2014-10-04 08:53:11.000000000 -0400
-@@ -16,7 +16,10 @@
- (env)->remove(env, path, NULL, flags)
- #endif
-
--#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
-+# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 4) || DB_VERSION_MAJOR > 4
-+#define db_open(db,file,type,flags,mode) \
-+ (db)->open(db, NULL, file, NULL, type, flags | DB_CREATE, mode)
-+#elif DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
- #define db_open(db,file,type,flags,mode) \
- (db)->open(db, NULL, file, NULL, type, flags, mode)
- #else
-diff -up nvi-1.81.6/common/msg.c patched-nvi-1.81.6/common/msg.c
---- nvi-1.81.6/common/msg.c 2007-11-18 11:41:42.000000000 -0500
-+++ patched-nvi-1.81.6/common/msg.c 2014-10-04 08:55:13.000000000 -0400
-@@ -724,7 +724,8 @@ msg_open(SCR *sp, char *file)
- p = buf;
- } else
- p = file;
-- if ((sp->db_error = db_create(&db, 0, 0)) != 0 ||
-+ if (access(p, R_OK) != 0 ||
-+ (sp->db_error = db_create(&db, 0, 0)) != 0 ||
- (sp->db_error = db->set_re_source(db, p)) != 0 ||
- (sp->db_error = db_open(db, NULL, DB_RECNO, 0, 0)) != 0) {
- if (first) {
diff --git a/development/nvi/slack-desc b/development/nvi/slack-desc
deleted file mode 100644
index 07d0586601..0000000000
--- a/development/nvi/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-nvi: nvi (an implementation of the ex/vi text editor)
-nvi:
-nvi: Nvi is an implementation of the ex/vi text editor.
-nvi: Nvi supports all the historic ex/vi features except for open
-nvi: mode and the lisp edit option (it has a fully implemented
-nvi: underlying ex mode). Some additional features are:
-nvi: extended regular expressions, infinite undo, and multiple edit
-nvi: buffers. Nvi has a very small memory footprint.
-nvi:
-nvi: Homepage: http://www.bostic.com/vi/
-nvi:
diff --git a/development/ocaml/configure.patch b/development/ocaml/configure.patch
index a57b19fb56..31309d3511 100644
--- a/development/ocaml/configure.patch
+++ b/development/ocaml/configure.patch
@@ -1,13 +1,12 @@
---- configure_old 2014-05-23 22:45:22.000000000 +0200
-+++ configure 2014-05-23 22:45:31.000000000 +0200
-@@ -1612,6 +1612,10 @@
- nativecccompopts="$nativecccompopts -fomit-frame-pointer";;
- esac
-
-+# Add additional flags from the environment
-+bytecccompopts="$bytecccompopts $CFLAGS"
-+nativecccompopts="$nativecccompopts $CFLAGS"
-+
- # Finish generated files
-
- cclibs="$cclibs $mathlib"
+diff -Naur ocaml-4.08.1.orig/configure ocaml-4.08.1/configure
+--- ocaml-4.08.1.orig/configure 2019-08-05 19:32:44.000000000 +0200
++++ ocaml-4.08.1/configure 2019-09-06 10:35:25.454923040 +0200
+@@ -12424,7 +12424,7 @@
+ -fno-builtin-memcmp";
+ internal_cflags="$gcc_warnings" ;; #(
+ gcc-*) :
+- common_cflags="-O2 -fno-strict-aliasing -fwrapv";
++ common_cflags="@CFLAGS@ -fno-strict-aliasing -fwrapv";
+ internal_cflags="$gcc_warnings" ;; #(
+ msvc-*) :
+ common_cflags="-nologo -O2 -Gy- -MD"
diff --git a/development/ocaml/ocaml.SlackBuild b/development/ocaml/ocaml.SlackBuild
index 1f0ea4e709..4b03d252f6 100644
--- a/development/ocaml/ocaml.SlackBuild
+++ b/development/ocaml/ocaml.SlackBuild
@@ -24,7 +24,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ocaml
-VERSION=${VERSION:-4.03.0}
+VERSION=${VERSION:-4.08.1}
+MANVER=${MANVER:-4.08}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -70,17 +71,15 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-patch < $CWD/configure.patch
+sed "s|@CFLAGS@|$SLKCFLAGS -fcommon|" $CWD/configure.patch | patch -p1
-CFLAGS="$SLKCFLAGS" ./configure \
+./configure \
--prefix /usr \
--libdir /usr/lib${LIBDIRSUFFIX}/ocaml \
- --host $ARCH-slackware-linux
+ --mandir /usr/man
make -j1 world.opt
-make -j1 install \
- PREFIX=$PKG/usr \
- LIBDIR=$PKG/usr/lib${LIBDIRSUFFIX}/ocaml
+make -j1 DESTDIR=$PKG install
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -90,7 +89,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a Changes INSTALL* LICENSE README* VERSION \
$PKG/usr/doc/$PRGNAM-$VERSION
-tar -xvf $CWD/ocaml-4.03-refman-html.tar.gz --no-same-owner -C $PKG/usr/doc/$PRGNAM-$VERSION/
+tar -xvf $CWD/ocaml-$MANVER-refman-html.tar.gz --no-same-owner -C $PKG/usr/doc/$PRGNAM-$VERSION/
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/ocaml/ocaml.info b/development/ocaml/ocaml.info
index 620db74149..0747f3b19c 100644
--- a/development/ocaml/ocaml.info
+++ b/development/ocaml/ocaml.info
@@ -1,12 +1,12 @@
PRGNAM="ocaml"
-VERSION="4.03.0"
+VERSION="4.08.1"
HOMEPAGE="http://caml.inria.fr"
-DOWNLOAD="http://caml.inria.fr/pub/distrib/ocaml-4.03/ocaml-4.03.0.tar.xz \
- http://caml.inria.fr/pub/distrib/ocaml-4.03/ocaml-4.03-refman-html.tar.gz"
-MD5SUM="89f62881e03dfad0cf04991fbc03f955 \
- d3e44d3984d029d2e88ba219ad8e24c2"
+DOWNLOAD="http://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08.1.tar.xz \
+ http://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08-refman-html.tar.gz"
+MD5SUM="519f095a563323cdaa68301d58bf099d \
+ 20cbe4bd141f175d723f58cb9e89b215"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Markus Hutmacher"
-EMAIL="mailing@markhu.de"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/development/ocamlbuild/ocamlbuild.SlackBuild b/development/ocamlbuild/ocamlbuild.SlackBuild
index e28405a292..b9b187aefa 100644
--- a/development/ocamlbuild/ocamlbuild.SlackBuild
+++ b/development/ocamlbuild/ocamlbuild.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for ocamlbuild
-# Copyright 2016-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2016-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ocamlbuild
-VERSION=${VERSION:-0.12.0}
+VERSION=${VERSION:-0.14.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/development/ocamlbuild/ocamlbuild.info b/development/ocamlbuild/ocamlbuild.info
index 62fb240875..4012566025 100644
--- a/development/ocamlbuild/ocamlbuild.info
+++ b/development/ocamlbuild/ocamlbuild.info
@@ -1,8 +1,8 @@
PRGNAM="ocamlbuild"
-VERSION="0.12.0"
+VERSION="0.14.0"
HOMEPAGE="http://caml.inria.fr"
-DOWNLOAD="https://github.com/ocaml/ocamlbuild/archive/0.12.0/ocamlbuild-0.12.0.tar.gz"
-MD5SUM="442baa19470bd49150f153122e22907b"
+DOWNLOAD="https://github.com/ocaml/ocamlbuild/archive/0.14.0/ocamlbuild-0.14.0.tar.gz"
+MD5SUM="a7bf2fe594cd16907807c756b14d501f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ocaml"
diff --git a/development/odb/odb.SlackBuild b/development/odb/odb.SlackBuild
index ae2edf5919..a51dea0e5e 100644
--- a/development/odb/odb.SlackBuild
+++ b/development/odb/odb.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Thanks archlinux!
+patch -p1 < $CWD/odb_gcc6.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/development/odb/odb_gcc6.patch b/development/odb/odb_gcc6.patch
new file mode 100644
index 0000000000..6f7c9005c4
--- /dev/null
+++ b/development/odb/odb_gcc6.patch
@@ -0,0 +1,355 @@
+From 511dcf67322ad87fb32f97d1cf7725c129e83898 Mon Sep 17 00:00:00 2001
+From: Boris Kolpackov <boris@codesynthesis.com>
+Date: Fri, 5 Feb 2016 16:01:42 +0200
+Subject: [PATCH] Initial work to make ODB compatible with GCC 6
+
+---
+ odb/cxx-lexer.cxx | 4 ++++
+ odb/gcc-fwd.hxx | 23 ++++++++++++++++++++++-
+ odb/gcc.hxx | 10 ++++++++++
+ odb/include.cxx | 31 +++++++++++++++++++++----------
+ odb/parser.cxx | 8 ++++----
+ odb/plugin.cxx | 29 +++++++++++++++++++++++++++--
+ odb/semantics/elements.cxx | 4 ++--
+ 7 files changed, 90 insertions(+), 19 deletions(-)
+
+diff --git a/odb/cxx-lexer.cxx b/odb/cxx-lexer.cxx
+index 7029c7e..64df296 100644
+--- a/odb/cxx-lexer.cxx
++++ b/odb/cxx-lexer.cxx
+@@ -135,8 +135,12 @@ cpp_error_callback (
+ #if BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 5
+ int /*reason*/, // Added in GCC 4.6.0.
+ #endif
++#if BUILDING_GCC_MAJOR <= 5
+ location_t,
+ unsigned int,
++#else
++ rich_location*,
++#endif
+ char const* msg,
+ va_list *ap)
+ {
+diff --git a/odb/gcc-fwd.hxx b/odb/gcc-fwd.hxx
+index a120f05..618b106 100644
+--- a/odb/gcc-fwd.hxx
++++ b/odb/gcc-fwd.hxx
+@@ -7,6 +7,24 @@
+
+ #include <bversion.h>
+
++#if BUILDING_GCC_MAJOR >= 6
++
++// If we include <system.h> here, it pulls in all kinds of GCC trouble that
++// "poisons" standard C/C++ declarations; see safe-ctype.h. So instead we
++// are going to "exclude" safe-ctype.h. To compensate, however, we will
++// include it first thing in gcc.hxx.
++//
++# include <config.h>
++# define SAFE_CTYPE_H
++# include <system.h>
++# undef SAFE_CTYPE_H
++# include <coretypes.h>
++
++typedef unsigned int source_location; // <line-map.h>
++typedef source_location location_t; // <input.h>
++
++#else // GCC < 6
++
+ #if BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 8
+ # include <limits.h> // CHAR_BIT
+ # include <config.h>
+@@ -33,6 +51,9 @@ extern "C"
+
+ typedef unsigned int source_location; // <line-map.h>
+ typedef source_location location_t; // <input.h>
+-}
++
++} // extern "C"
++
++#endif
+
+ #endif // ODB_GCC_FWD_HXX
+diff --git a/odb/gcc.hxx b/odb/gcc.hxx
+index c953047..858d685 100644
+--- a/odb/gcc.hxx
++++ b/odb/gcc.hxx
+@@ -7,6 +7,10 @@
+
+ #include <odb/gcc-fwd.hxx>
+
++#if BUILDING_GCC_MAJOR >= 6
++# include <safe-ctype.h> // See gcc-fwd.hxx.
++#endif
++
+ // GCC header includes to get the plugin and parse tree declarations.
+ // The order is important and doesn't follow any kind of logic.
+ //
+@@ -145,4 +149,10 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];}
+ #define DECL_CHAIN(x) TREE_CHAIN(x)
+ #endif
+
++// In GCC 6, ANON_AGGRNAME_P became anon_aggrname_p().
++//
++#if BUILDING_GCC_MAJOR < 6
++# define anon_aggrname_p(X) ANON_AGGRNAME_P(X)
++#endif
++
+ #endif // ODB_GCC_HXX
+diff --git a/odb/include.cxx b/odb/include.cxx
+index 9c03f99..32d50a6 100644
+--- a/odb/include.cxx
++++ b/odb/include.cxx
+@@ -30,9 +30,18 @@ namespace
+ path path_;
+ };
+
++#if BUILDING_GCC_MAJOR >= 6
++ typedef line_map_ordinary line_map_type;
++#else
++ typedef line_map line_map_type;
++# ifndef linemap_check_ordinary
++# define linemap_check_ordinary(X) (X)
++# endif
++#endif
++
+ struct includes
+ {
+- typedef std::map<line_map const*, include_directive> map_type;
++ typedef std::map<line_map_type const*, include_directive> map_type;
+ bool trailing; // Included at the beginning or at the end of the main file.
+ map_type map;
+ };
+@@ -146,7 +155,9 @@ namespace
+ //
+ if (l > BUILTINS_LOCATION)
+ {
+- line_map const* lm (linemap_lookup (line_table, l));
++ line_map_type const* lm (
++ linemap_check_ordinary (
++ linemap_lookup (line_table, l)));
+
+ if (lm != 0 && !MAIN_FILE_P (lm))
+ {
+@@ -539,20 +550,20 @@ namespace
+ //
+ #if BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR <= 6
+ size_t used (line_table->used);
+- line_map const* maps (line_table->maps);
++ line_map_type const* maps (line_table->maps);
+ #else
+ size_t used (line_table->info_ordinary.used);
+- line_map const* maps (line_table->info_ordinary.maps);
++ line_map_type const* maps (line_table->info_ordinary.maps);
+ #endif
+
+ for (size_t i (0); i < used; ++i)
+ {
+- line_map const* m (maps + i);
++ line_map_type const* m (maps + i);
+
+ if (MAIN_FILE_P (m) || m->reason != LC_ENTER)
+ continue;
+
+- line_map const* ifm (INCLUDED_FROM (line_table, m));
++ line_map_type const* ifm (INCLUDED_FROM (line_table, m));
+
+ #if BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR <= 6
+ path f (m->to_file);
+@@ -582,7 +593,7 @@ namespace
+ for (includes::iterator j (i->second.begin ());
+ j != i->second.end (); ++j)
+ {
+- line_map const* lm (j->first);
++ line_map_type const* lm (j->first);
+ cerr << '\t' << lm->to_file << ":" << LAST_SOURCE_LINE (lm) << endl;
+ }
+ */
+@@ -591,13 +602,13 @@ namespace
+ // it is preferred over all others. Use the first one if there are
+ // several.
+ //
+- line_map const* main_lm (0);
++ line_map_type const* main_lm (0);
+ include_directive* main_inc (0);
+
+ for (includes::map_type::iterator j (i->second.map.begin ());
+ j != i->second.map.end (); ++j)
+ {
+- line_map const* lm (j->first);
++ line_map_type const* lm (j->first);
+
+ if (MAIN_FILE_P (lm))
+ {
+@@ -638,7 +649,7 @@ namespace
+ for (includes::map_type::iterator j (i->second.map.begin ());
+ j != i->second.map.end (); ++j)
+ {
+- line_map const* lm (j->first);
++ line_map_type const* lm (j->first);
+
+ #if BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR <= 6
+ string f (lm->to_file);
+diff --git a/odb/parser.cxx b/odb/parser.cxx
+index 275da33..842611f 100644
+--- a/odb/parser.cxx
++++ b/odb/parser.cxx
+@@ -1070,14 +1070,14 @@ emit_type_decl (tree decl)
+ // says that in typedef struct {} S; S becomes struct's
+ // name.
+ //
+- if (ANON_AGGRNAME_P (decl_name))
++ if (anon_aggrname_p (decl_name))
+ {
+ tree d (TYPE_NAME (t));
+
+ if (d != NULL_TREE &&
+ !DECL_ARTIFICIAL (d) &&
+ DECL_NAME (d) != NULL_TREE &&
+- !ANON_AGGRNAME_P (DECL_NAME (d)))
++ !anon_aggrname_p (DECL_NAME (d)))
+ {
+ decl = d;
+ decl_name = DECL_NAME (decl);
+@@ -1694,7 +1694,7 @@ create_type (tree t,
+ ts << "start anon/stub " << gcc_tree_code_name(tc) << " at "
+ << file << ":" << line << endl;
+
+- if (d == NULL_TREE || ANON_AGGRNAME_P (DECL_NAME (d)))
++ if (d == NULL_TREE || anon_aggrname_p (DECL_NAME (d)))
+ {
+ if (tc == RECORD_TYPE)
+ r = &emit_class<class_> (t, file, line, clmn);
+@@ -1791,7 +1791,7 @@ create_type (tree t,
+ ts << "start anon/stub " << gcc_tree_code_name(tc) << " at "
+ << file << ":" << line << endl;
+
+- if (d == NULL_TREE || ANON_AGGRNAME_P (DECL_NAME (d)))
++ if (d == NULL_TREE || anon_aggrname_p (DECL_NAME (d)))
+ {
+ r = &emit_enum (t, access, file, line, clmn);
+ }
+diff --git a/odb/plugin.cxx b/odb/plugin.cxx
+index fbbfe46..bc98f3e 100644
+--- a/odb/plugin.cxx
++++ b/odb/plugin.cxx
+@@ -45,14 +45,28 @@ path file_; // File being compiled.
+ paths inputs_; // List of input files in at-once mode or just file_.
+
+ bool (*cpp_error_prev) (
+- cpp_reader*, int, int, location_t, unsigned int, const char*, va_list*);
++ cpp_reader*,
++ int,
++ int,
++#if BUILDING_GCC_MAJOR >= 6
++ rich_location*,
++#else
++ location_t,
++ unsigned int,
++#endif
++ const char*,
++ va_list*);
+
+ static bool
+ cpp_error_filter (cpp_reader* r,
+ int level,
+ int reason,
++#if BUILDING_GCC_MAJOR >= 6
++ rich_location* l,
++#else
+ location_t l,
+ unsigned int column_override,
++#endif
+ const char* msg,
+ va_list* ap)
+ {
+@@ -66,7 +80,18 @@ cpp_error_filter (cpp_reader* r,
+ if (strstr (msg, "#pragma once") != 0)
+ return true;
+
+- return cpp_error_prev (r, level, reason, l, column_override, msg, ap);
++ return cpp_error_prev (
++ r,
++ level,
++ reason,
++#if BUILDING_GCC_MAJOR >= 6
++ l,
++#else
++ l,
++ column_override,
++#endif
++ msg,
++ ap);
+ }
+
+ // A prefix of the _cpp_file struct. This struct is not part of the
+diff --git a/odb/semantics/elements.cxx b/odb/semantics/elements.cxx
+index 43fb379..ae9e906 100644
+--- a/odb/semantics/elements.cxx
++++ b/odb/semantics/elements.cxx
+@@ -76,7 +76,7 @@ namespace semantics
+ if (tree decl = TYPE_NAME (n))
+ name = DECL_NAME (decl);
+
+- return name != 0 && ANON_AGGRNAME_P (name);
++ return name != 0 && anon_aggrname_p (name);
+ }
+
+ return true;
+@@ -125,7 +125,7 @@ namespace semantics
+ if (tree decl = TYPE_NAME (type))
+ {
+ name = DECL_NAME (decl);
+- if (name != 0 && ANON_AGGRNAME_P (name))
++ if (name != 0 && anon_aggrname_p (name))
+ return true;
+
+ tree s (CP_DECL_CONTEXT (decl));
+--
+1.7.10.4
+
+m 61d13eb53ade9f30a64892a901401bda5e42c335 Mon Sep 17 00:00:00 2001
+From: Boris Kolpackov <boris@codesynthesis.com>
+Date: Mon, 8 Feb 2016 18:39:21 +0200
+Subject: [PATCH] Make compilable with GCC 6 in C++14 mode
+
+---
+ odb/gcc.hxx | 9 ++++++---
+ odb/parser.cxx | 2 ++
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/odb/gcc.hxx b/odb/gcc.hxx
+index 858d685..a22357d 100644
+--- a/odb/gcc.hxx
++++ b/odb/gcc.hxx
+@@ -7,9 +7,12 @@
+
+ #include <odb/gcc-fwd.hxx>
+
+-#if BUILDING_GCC_MAJOR >= 6
+-# include <safe-ctype.h> // See gcc-fwd.hxx.
+-#endif
++// Actually, let's keep it out. With it included we can compile in C++98
++// but not in C++14 (GCC 6 default).
++//
++// #if BUILDING_GCC_MAJOR >= 6
++// # include <safe-ctype.h> // See gcc-fwd.hxx.
++// #endif
+
+ // GCC header includes to get the plugin and parse tree declarations.
+ // The order is important and doesn't follow any kind of logic.
+diff --git a/odb/parser.cxx b/odb/parser.cxx
+index 842611f..6dfff6f 100644
+--- a/odb/parser.cxx
++++ b/odb/parser.cxx
+@@ -1857,6 +1857,8 @@ create_type (tree t,
+ // the array type. In other words, we view it as "constant array"
+ // rather than "array of constant elements".
+ //
++ using semantics::array; // vs std::array.
++
+ tree bt (TREE_TYPE (t));
+ tree bt_mv (TYPE_MAIN_VARIANT (bt));
+ type& bt_node (emit_type (bt_mv, access::public_, file, line, clmn));
+--
+1.7.10.4
diff --git a/development/omake/omake-warn-error.diff b/development/omake/omake-warn-error.diff
deleted file mode 100644
index 3392c8f311..0000000000
--- a/development/omake/omake-warn-error.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- orig/lib/build/OCaml.om 2010-03-30 10:18:37 +0000
-+++ work/lib/build/OCaml.om 2010-03-30 12:41:33 +0000
-@@ -170,7 +170,7 @@
- #
- declare OCAMLDEPFLAGS
- public.OCAMLPPFLAGS =
--public.OCAMLFLAGS = -warn-error A
-+public.OCAMLFLAGS =
- public.OCAMLCFLAGS = -g
- public.OCAMLOPTFLAGS =
- public.OCAMLCPPFLAGS =
diff --git a/development/omake/omake.SlackBuild b/development/omake/omake.SlackBuild
index 32931e5db7..7bcea6cfbd 100644
--- a/development/omake/omake.SlackBuild
+++ b/development/omake/omake.SlackBuild
@@ -23,15 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=omake
-VERSION=${VERSION:-0.9.8.6}
+VERSION=${VERSION:-0.10.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-SRCVER=${VERSION}-0.rc1
-
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,9 +59,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,22 +69,16 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Fix things for newer OCaml
-patch -p1 <$CWD/omake-warn-error.diff
-
-# No configure, manual it is..
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-PREFIX=/usr \
-LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-INSTALL_ROOT=$PKG \
-make install
+# the newer omake doesn't want to respect our LIBDIRSUFFIX
+./configure --prefix /usr
+make -j1 all
+make -j1 install INSTALL_ROOT=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG.txt COMMENTS INSTALL LICENSE LICENSE.OMake doc/* \
+cp -a ChangeLog COMMENTS INSTALL LICENSE LICENSE.OMake doc/* \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/omake/omake.info b/development/omake/omake.info
index b33d0a1ce2..1721b9dd8f 100644
--- a/development/omake/omake.info
+++ b/development/omake/omake.info
@@ -1,8 +1,8 @@
PRGNAM="omake"
-VERSION="0.9.8.6"
-HOMEPAGE="http://omake.metaprl.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/omake-0.9.8.6-0.rc1.tar.gz"
-MD5SUM="fe39a476ef4e33b7ba2ca77a6bcaded2"
+VERSION="0.10.3"
+HOMEPAGE="http://projects.camlcity.org/projects/omake.html"
+DOWNLOAD="https://github.com/ocaml-omake/omake/archive/omake-0.10.3/omake-0.10.3.tar.gz"
+MD5SUM="134b1ea51a5cd90d32fec7ad27e82aa5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ocaml-findlib"
diff --git a/development/oniguruma/README b/development/oniguruma/README
deleted file mode 100644
index 8eb7bf9091..0000000000
--- a/development/oniguruma/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Oniguruma is a regular expressions library. The characteristics of
-this library is that different character encoding for every regular
-expression object can be specified.
diff --git a/development/oniguruma/oniguruma.SlackBuild b/development/oniguruma/oniguruma.SlackBuild
deleted file mode 100644
index 1b6d6fd240..0000000000
--- a/development/oniguruma/oniguruma.SlackBuild
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for oniguruma
-
-# Copyright 2015-2016 Eugene Wissner, Dachau, Germany
-# Copyright 2008, 2009, 2010, 2011 Phantom X, Goiania, Brazil.
-# Copyright 2006 Martijn Dekker, Groningen, Netherlands.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=oniguruma
-VERSION=${VERSION:-5.9.6_p1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-SRCNAM=onig-5.9.6
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM
-tar xvf $CWD/onig-$VERSION.tar.gz
-cd $SRCNAM
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-static \
- --with-rubydir=/usr/bin \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=${PKG}
-
-find ${PKG} \( -name '*.la' -o -name '*.a' \) -exec rm -f {} ';'
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING HISTORY README* index*.html doc/{API,FAQ,RE}* \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/oniguruma/oniguruma.info b/development/oniguruma/oniguruma.info
deleted file mode 100644
index d32eacccbd..0000000000
--- a/development/oniguruma/oniguruma.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="oniguruma"
-VERSION="5.9.6_p1"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-DOWNLOAD="https://github.com/kkos/oniguruma/releases/download/v5.9.6_p1/onig-5.9.6_p1.tar.gz"
-MD5SUM="b751cbb68d411076f400e40d413ed69b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Eugene Wissner"
-EMAIL="belka@caraus.de"
diff --git a/development/oniguruma/slack-desc b/development/oniguruma/slack-desc
deleted file mode 100644
index b8185a7c43..0000000000
--- a/development/oniguruma/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-oniguruma: oniguruma (Regular expressions library)
-oniguruma:
-oniguruma: Oniguruma is a regular expressions library. The characteristics of
-oniguruma: this library is that different character encoding for every regular
-oniguruma: expression object can be specified.
-oniguruma:
-oniguruma:
-oniguruma:
-oniguruma:
-oniguruma:
-oniguruma:
diff --git a/development/opencl-headers/README b/development/opencl-headers/README
deleted file mode 100644
index 4e432b6b4d..0000000000
--- a/development/opencl-headers/README
+++ /dev/null
@@ -1,3 +0,0 @@
-opencl-headers (headers file for OpenCL)
-
-This is a repackaging of the header files from khronos.org.
diff --git a/development/opencl-headers/opencl-headers.SlackBuild b/development/opencl-headers/opencl-headers.SlackBuild
deleted file mode 100644
index 930d45982e..0000000000
--- a/development/opencl-headers/opencl-headers.SlackBuild
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for opencl-headers
-# simply a repack of the original headers from khronos.org
-# tarballed by me for easy maintenance.
-# Copyright Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy, 2012
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=opencl-headers
-VERSION=${VERSION:-1.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG/usr/include/CL $OUTPUT
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -C $PKG/usr/include/CL/
-chown -R root.root $PKG/usr/include/CL/*
-find $PKG/usr/include/CL \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/opencl-headers/opencl-headers.info b/development/opencl-headers/opencl-headers.info
deleted file mode 100644
index 067b5f9261..0000000000
--- a/development/opencl-headers/opencl-headers.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="opencl-headers"
-VERSION="1.1"
-HOMEPAGE="https://www.khronos.org/opencl/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/opencl-headers-1.1.tar.xz"
-MD5SUM="3b9b4c49b3ddf37e275c5c22f94aa80a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
diff --git a/development/opencl-headers/slack-desc b/development/opencl-headers/slack-desc
deleted file mode 100644
index 456cf19c4f..0000000000
--- a/development/opencl-headers/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-opencl-headers: opencl-headers (headers file for OpenCL)
-opencl-headers:
-opencl-headers: This is a repackaging of the header files from khronos.org.
-opencl-headers:
-opencl-headers: homepage: https://www.khronos.org/opencl/
-opencl-headers:
-opencl-headers:
-opencl-headers:
-opencl-headers:
-opencl-headers:
-opencl-headers:
diff --git a/development/openocd/openocd.SlackBuild b/development/openocd/openocd.SlackBuild
index c75a62622a..e34954da41 100644
--- a/development/openocd/openocd.SlackBuild
+++ b/development/openocd/openocd.SlackBuild
@@ -5,13 +5,13 @@
# Written by thorsten johannvorderbrueggen <thorsten.johannvorderbrueggen@t-online.de>
PRGNAM=openocd
-VERSION=${VERSION:-0.8.0}
+VERSION=${VERSION:-0.10.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -51,7 +51,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=implicit-fallthrough= -Wno-error=format-truncation= -Wno-error=format-overflow=" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/development/openocd/openocd.info b/development/openocd/openocd.info
index 95d6cade91..a1d7add762 100644
--- a/development/openocd/openocd.info
+++ b/development/openocd/openocd.info
@@ -1,8 +1,8 @@
PRGNAM="openocd"
-VERSION="0.8.0"
+VERSION="0.10.0"
HOMEPAGE="http://openocd.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/openocd/files/openocd/0.8.0/openocd-0.8.0.tar.gz"
-MD5SUM="271086c0efe0c454db7ddb0f55ace218"
+DOWNLOAD="http://downloads.sourceforge.net/openocd/openocd-0.10.0.tar.gz"
+MD5SUM="8971d16aee5c2642b33ee55fc6c86239"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/perf/perf.SlackBuild b/development/perf/perf.SlackBuild
index 1a81ae0622..d50940fef6 100644
--- a/development/perf/perf.SlackBuild
+++ b/development/perf/perf.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=perf
-VERSION=${VERSION:-4.4.227}
+VERSION=${VERSION:-5.4.47}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/development/perf/perf.info b/development/perf/perf.info
index 1dcb42c495..ef62779f77 100644
--- a/development/perf/perf.info
+++ b/development/perf/perf.info
@@ -1,5 +1,5 @@
PRGNAM="perf"
-VERSION="4.4.227"
+VERSION="5.4.47"
HOMEPAGE="https://perf.wiki.kernel.org/index.php/Main_Page"
DOWNLOAD="http://www.pastemobile.org/static/perf.dummy"
MD5SUM="9cba6c70fb57a22a155073d54748b614"
diff --git a/development/php-apcu/php-apcu.SlackBuild b/development/php-apcu/php-apcu.SlackBuild
index 62019f9258..99cd064bb3 100644
--- a/development/php-apcu/php-apcu.SlackBuild
+++ b/development/php-apcu/php-apcu.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=php-apcu
SRCNAM=apcu
-VERSION=${VERSION:-4.0.11}
+VERSION=${VERSION:-5.1.17}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -99,7 +99,7 @@ mkdir -p $PKG/etc/php.d
cp $CWD/apcu.ini $PKG/etc/php.d/apcu.ini.new
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.md NOTICE TECHNOTES.txt TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md NOTICE TECHNOTES.txt $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/php-apcu/php-apcu.info b/development/php-apcu/php-apcu.info
index a2c510b6cc..85ef5cd464 100644
--- a/development/php-apcu/php-apcu.info
+++ b/development/php-apcu/php-apcu.info
@@ -1,8 +1,8 @@
PRGNAM="php-apcu"
-VERSION="4.0.11"
+VERSION="5.1.17"
HOMEPAGE="http://pecl.php.net/package/APCu/"
-DOWNLOAD="https://pecl.php.net/get/apcu-4.0.11.tgz"
-MD5SUM="13c0c0dd676e5a7905d54fa985d0ee62"
+DOWNLOAD="https://pecl.php.net/get/apcu-5.1.17.tgz"
+MD5SUM="8d60ffd6dcec221f8bce957a09511f87"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/poedit/poedit.SlackBuild b/development/poedit/poedit.SlackBuild
index 2319aba3bb..36f2fae14e 100644
--- a/development/poedit/poedit.SlackBuild
+++ b/development/poedit/poedit.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=poedit
-VERSION=${VERSION:-1.8.12}
+VERSION=${VERSION:-2.0.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -70,8 +70,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-patch --verbose -p1 < $CWD/setvalue.diff
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -80,7 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--build=$ARCH-slackware-linux \
-make
+make CPPFLAGS+=' -DUCHAR_TYPE=uint16_t'
make install-strip DESTDIR=$PKG
find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/development/poedit/poedit.info b/development/poedit/poedit.info
index b8391a4535..58048d5895 100644
--- a/development/poedit/poedit.info
+++ b/development/poedit/poedit.info
@@ -1,8 +1,8 @@
PRGNAM="poedit"
-VERSION="1.8.12"
+VERSION="2.0.6"
HOMEPAGE="https://www.poedit.net"
-DOWNLOAD="https://github.com/vslavik/poedit/releases/download/v1.8.12-oss/poedit-1.8.12.tar.gz"
-MD5SUM="7c16257fc8757fe658295b0e3a677670"
+DOWNLOAD="https://github.com/vslavik/poedit/releases/download/v2.0.6-oss/poedit-2.0.6.tar.gz"
+MD5SUM="1134fef2997884291083875506a922ed"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="wxGTK3 LucenePlusPlus gtkspell3"
diff --git a/development/poedit/setvalue.diff b/development/poedit/setvalue.diff
deleted file mode 100644
index 1c66943cea..0000000000
--- a/development/poedit/setvalue.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/fileviewer.cpp 2013-11-10 17:38:50.161359501 +0400
-+++ b/src/fileviewer.cpp 2013-11-10 17:37:59.958987117 +0400
-@@ -286,7 +286,7 @@
- linenum = 0;
-
- m_text->SetReadOnly(false);
-- m_text->SetValue(data);
-+ m_text->SetText(data);
- m_text->SetReadOnly(true);
-
- m_text->MarkerDeleteAll(1);
diff --git a/development/re2c/README b/development/re2c/README
deleted file mode 100644
index 227f25951c..0000000000
--- a/development/re2c/README
+++ /dev/null
@@ -1,6 +0,0 @@
-re2c is a tool for writing very fast and very flexible scanners. Unlike
-any other such tool, re2c focuses on generating high efficient code for
-regular expression matching. As a result this allows a much broader
-range of use than any traditional lexer offers. And last but not least
-re2c generates warning free code that is equal to hand-written code in
-terms of size, speed and quality.
diff --git a/development/re2c/re2c.SlackBuild b/development/re2c/re2c.SlackBuild
deleted file mode 100644
index dd71e03f81..0000000000
--- a/development/re2c/re2c.SlackBuild
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for re2c
-
-# Copyright 2008-2015 LukenShiro, Italy
-# Copyright 2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=re2c
-VERSION=${VERSION:-2.0.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-# .html file needs to be manually installed
-DOCFILES="README.md CHANGELOG LICENSE NO_WARRANTY"
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# --htmldir= is ignored
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --mandir=/usr/man \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-golang
-
-make
-make install-strip DESTDIR=$PKG
-
-# compress man pages
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-# remove windows-only files
-rm -rf lessons/001_upn_calculator/windows/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
-
-# copy other doc files
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cp -R examples/* /$PKG/usr/doc/$PRGNAM-$VERSION/examples/
-
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/re2c/re2c.info b/development/re2c/re2c.info
deleted file mode 100644
index 848f86a773..0000000000
--- a/development/re2c/re2c.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="re2c"
-VERSION="2.0.3"
-HOMEPAGE="http://re2c.org/"
-DOWNLOAD="https://github.com/skvadrik/re2c/releases/download/2.0.3/re2c-2.0.3.tar.xz"
-MD5SUM="2e0bd0ecbd20bf15a4648111f14a4f0a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
diff --git a/development/re2c/slack-desc b/development/re2c/slack-desc
deleted file mode 100644
index 3c90f77767..0000000000
--- a/development/re2c/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-re2c: re2c (regular expressions to C/C++ conversion tool)
-re2c:
-re2c: It is a tool for writing very fast and very flexible scanners. Unlike
-re2c: any other such tool, re2c focuses on generating high efficient code
-re2c: for regular expression matching. As a result this allows a much
-re2c: broader range of use than any traditional lexer offers. And last but
-re2c: not least re2c generates warning free code that is equal to
-re2c: hand-written code in terms of size, speed and quality
-re2c:
-re2c: Homepage: http://re2c.org
-re2c:
diff --git a/development/spice-protocol/spice-protocol.SlackBuild b/development/spice-protocol/spice-protocol.SlackBuild
index 1f7aa817c5..db12ac575f 100644
--- a/development/spice-protocol/spice-protocol.SlackBuild
+++ b/development/spice-protocol/spice-protocol.SlackBuild
@@ -1,6 +1,7 @@
#!/bin/sh
# Slackware build script for spice-protocol
+
# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
@@ -22,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=spice-protocol
-VERSION=${VERSION:-0.12.15}
+VERSION=${VERSION:-0.14.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -33,7 +34,7 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS COPYING CHANGELOG.md README.md"
set -e
diff --git a/development/spice-protocol/spice-protocol.info b/development/spice-protocol/spice-protocol.info
index 5dcc44acff..9bec7adafc 100644
--- a/development/spice-protocol/spice-protocol.info
+++ b/development/spice-protocol/spice-protocol.info
@@ -1,8 +1,8 @@
PRGNAM="spice-protocol"
-VERSION="0.12.15"
+VERSION="0.14.0"
HOMEPAGE="https://www.spice-space.org"
-DOWNLOAD="https://www.spice-space.org/download/releases/spice-protocol-0.12.15.tar.bz2"
-MD5SUM="e1db63e3ff0cb1f1c98277283356dc51"
+DOWNLOAD="https://www.spice-space.org/download/releases/spice-protocol-0.14.0.tar.bz2"
+MD5SUM="773a6b31df105a6b3c470eba201bed34"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/swfmill/swfmill.SlackBuild b/development/swfmill/swfmill.SlackBuild
index 5881f08825..910f31fa33 100644
--- a/development/swfmill/swfmill.SlackBuild
+++ b/development/swfmill/swfmill.SlackBuild
@@ -54,7 +54,7 @@ find -L . \
export CFLAGS=""
-export CXXFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing"
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/development/tora/README b/development/tora/README
index e1c08a248a..b109aec98a 100644
--- a/development/tora/README
+++ b/development/tora/README
@@ -5,3 +5,5 @@ through Qt's ODBC support.
For Oracle DBMS support, run the script like this,
ORACLE_HOME=/path/to/oracle/home ./tora.Slackbuild
+
+postgresql is an autodetected dependency.
diff --git a/development/tora/tora.SlackBuild b/development/tora/tora.SlackBuild
index 9245687cbb..e0150dab62 100644
--- a/development/tora/tora.SlackBuild
+++ b/development/tora/tora.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=tora
-VERSION=${VERSION:-2.1.3}
+VERSION=${VERSION:-20170725_d9fddb8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,11 +60,8 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
cd $PRGNAM-$VERSION
-
-patch -Np1 -i "${CWD}/include_unistd.patch"
-
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -79,12 +76,13 @@ cd build
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DWANT_INTERNAL_QSCINTILLA=0 \
+ -DWANT_INTERNAL_QSCINTILLA=1 \
+ -DWANT_INTERNAL_LOKI=1 \
-DCMAKE_BUILD_TYPE=Release ..
make
make install DESTDIR=$PKG
-
+cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -94,7 +92,7 @@ mkdir -p $PKG/usr/share/icons/hicolor/{32x32,16x16}/apps
mkdir -p $PKG/usr/share/applications
( cd $TMP/$PRGNAM-$VERSION
- cp -a AUTHORS BUGS ChangeLog COPYING* README* TODO NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+ cp -a AUTHORS ChangeLog COPYING* README* TODO NEWS $PKG/usr/doc/$PRGNAM-$VERSION
cp -a src/help/*.html $PKG/usr/doc/$PRGNAM-$VERSION/help
cp -a src/help/images/*.png $PKG/usr/doc/$PRGNAM-$VERSION/help/images
cp -a src/icons/tora.xpm $PKG/usr/share/icons/hicolor/32x32/apps
diff --git a/development/tora/tora.info b/development/tora/tora.info
index a03ef294b4..c90540fffe 100644
--- a/development/tora/tora.info
+++ b/development/tora/tora.info
@@ -1,10 +1,10 @@
PRGNAM="tora"
-VERSION="2.1.3"
+VERSION="3.2"
HOMEPAGE="http://torasql.com"
-DOWNLOAD="http://sourceforge.net/projects/tora/files/tora/2.1.3/tora-2.1.3.tar.bz2"
-MD5SUM="b3a4b5c827c300e75eea53874634e8a2"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/tora-20170725_d9fddb8.tar.xz"
+MD5SUM="0ebe7f9420b719d3062cf6598c9b8fc6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt5"
MAINTAINER="Giuseppe Di Terlizzi"
EMAIL="giuseppe.diterlizzi@gmail.com"
diff --git a/development/vala/README b/development/vala/README
deleted file mode 100644
index 8c6d4c8a21..0000000000
--- a/development/vala/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Vala is a new programming language that aims to bring modern programming
-language features to GNOME developers without imposing any additional
-runtime requirements and without using a different ABI compared to
-applications and libraries written in C.
diff --git a/development/vala/patch_support-gtk318.diff b/development/vala/patch_support-gtk318.diff
deleted file mode 100644
index cace5971c7..0000000000
--- a/development/vala/patch_support-gtk318.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- vala-0.34.2/vapi/gtk+-3.0.vapi.orig 2016-09-27 22:44:37.000000000 +1000
-+++ vala-0.34.2/vapi/gtk+-3.0.vapi 2016-11-14 16:24:16.635334244 +1000
-@@ -840,6 +840,7 @@
- [CCode (has_construct_function = false, type = "GtkWidget*")]
- public Button.with_mnemonic (string label);
- public bool always_show_image { get; set construct; }
-+ public bool focus_on_click { get; set; }
- public Gtk.Widget image { get; set; }
- public Gtk.PositionType image_position { get; set; }
- public string label { get; set construct; }
-@@ -1573,6 +1574,7 @@
- public Gtk.CellArea cell_area { owned get; construct; }
- public int column_span_column { get; set; }
- public int entry_text_column { get; set; }
-+ public bool focus_on_click { get; set; }
- public bool has_entry { get; construct; }
- [NoAccessorMethod]
- public bool has_frame { get; set; }
-@@ -2080,6 +2082,7 @@
- [CCode (has_construct_function = false, type = "GtkWidget*")]
- public FileChooserButton.with_dialog (Gtk.Dialog dialog);
- public Gtk.FileChooser dialog { construct; }
-+ public bool focus_on_click { get; set; }
- public string title { get; set; }
- public int width_chars { get; set; }
- public virtual signal void file_set ();
-@@ -6692,7 +6695,6 @@
- public unowned Gdk.Display get_display ();
- public bool get_double_buffered ();
- public int get_events ();
-- public bool get_focus_on_click ();
- public unowned Pango.FontMap? get_font_map ();
- public unowned Cairo.FontOptions? get_font_options ();
- public unowned Gdk.FrameClock? get_frame_clock ();
-@@ -6859,7 +6861,6 @@
- public void set_direction (Gtk.TextDirection dir);
- public void set_double_buffered (bool double_buffered);
- public void set_events (int events);
-- public void set_focus_on_click (bool focus_on_click);
- public void set_font_map (Pango.FontMap? font_map);
- public void set_font_options (Cairo.FontOptions? options);
- public void set_halign (Gtk.Align align);
-@@ -6927,7 +6928,6 @@
- public Gdk.EventMask events { get; set; }
- [NoAccessorMethod]
- public bool expand { get; set; }
-- public bool focus_on_click { get; set; }
- public Gtk.Align halign { get; set; }
- [NoAccessorMethod]
- public bool has_default { get; set; }
diff --git a/development/vala/slack-desc b/development/vala/slack-desc
deleted file mode 100644
index 77e7b20230..0000000000
--- a/development/vala/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-vala: vala (Compiler for the GObject type system)
-vala:
-vala: Vala is a new programming language that aims to bring modern
-vala: programming language features to GNOME developers without imposing
-vala: any additional runtime requirements and without using a different
-vala: ABI compared to applications and libraries written in C.
-vala:
-vala:
-vala:
-vala:
-vala:
diff --git a/development/vala/vala.SlackBuild b/development/vala/vala.SlackBuild
deleted file mode 100644
index b1a58fde29..0000000000
--- a/development/vala/vala.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Vala
-
-# Copyright 2009-2016 Erik W. Hanson, Minneapolis, MN, USA
-# Copyright 2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=vala
-VERSION=${VERSION:-0.34.9}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Patch to support older GTK+3
-patch -p1 < $CWD/patch_support-gtk318.diff
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --mandir=/usr/man/ \
- --disable-static \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README THANKS \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/vala/vala.info b/development/vala/vala.info
deleted file mode 100644
index a3db035038..0000000000
--- a/development/vala/vala.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="vala"
-VERSION="0.34.9"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-DOWNLOAD="https://download.gnome.org/sources/vala/0.34/vala-0.34.9.tar.xz"
-MD5SUM="f8bb81971065d7208447ad2437883a0d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/development/woff2/README b/development/woff2/README
deleted file mode 100644
index ab5a471f4a..0000000000
--- a/development/woff2/README
+++ /dev/null
@@ -1 +0,0 @@
-woff2 is a font compression reference code
diff --git a/development/woff2/slack-desc b/development/woff2/slack-desc
deleted file mode 100644
index 526392fda2..0000000000
--- a/development/woff2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-woff2: woff2 (Web Open Font Format 2 reference implementation)
-woff2:
-woff2: woff2 is a font compression reference code
-woff2:
-woff2:
-woff2:
-woff2:
-woff2:
-woff2: Project URL: https://github.com/google/woff2
-woff2:
-woff2:
diff --git a/development/woff2/woff2.SlackBuild b/development/woff2/woff2.SlackBuild
deleted file mode 100644
index 2b10ec23cc..0000000000
--- a/development/woff2/woff2.SlackBuild
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for woff2
-
-# Copyright 2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=woff2
-VERSION=${VERSION:-1.0.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-sed -i "s/NOT BUILD_SHARED_LIBS/TRUE/" CMakeLists.txt
-cmake -GNinja -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} .
-DESTDIR="$PKG" ninja install
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.txt *.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/woff2/woff2.info b/development/woff2/woff2.info
deleted file mode 100644
index d05a989518..0000000000
--- a/development/woff2/woff2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="woff2"
-VERSION="1.0.2"
-HOMEPAGE="https://github.com/google/woff2/"
-DOWNLOAD="https://github.com/google/woff2/archive/v1.0.2/woff2-1.0.2.tar.gz"
-MD5SUM="793c8844845351cb80730a74937e411b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="brotli ninja"
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/development/xa/xa.SlackBuild b/development/xa/xa.SlackBuild
index ffe7d9fba6..8929e7cb10 100644
--- a/development/xa/xa.SlackBuild
+++ b/development/xa/xa.SlackBuild
@@ -24,7 +24,7 @@
# they were included in the script tarball all along.
PRGNAM=xa
-VERSION=${VERSION:-2.3.10}
+VERSION=${VERSION:-2.3.11}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/development/xa/xa.info b/development/xa/xa.info
index 51ddf18a6c..62cc5df3ef 100644
--- a/development/xa/xa.info
+++ b/development/xa/xa.info
@@ -1,9 +1,9 @@
PRGNAM="xa"
-VERSION="2.3.10"
+VERSION="2.3.11"
HOMEPAGE="http://www.floodgap.com/retrotech/xa/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/xa-2.3.10.tar.gz \
+DOWNLOAD="http://www.floodgap.com/retrotech/xa/dists/xa-2.3.11.tar.gz \
https://slackware.uk/~urchlay/src/dxa-0.1.4.tar.gz"
-MD5SUM="14265129071922dd964d89599775d13e \
+MD5SUM="72cbd5619f75b0c9839b90c41d0f9ea6 \
3a7993751bcb94e5f9081cc2f27eee1d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/RetroArch/RetroArch.SlackBuild b/games/RetroArch/RetroArch.SlackBuild
index 8e3e2dea00..f33347aea3 100644
--- a/games/RetroArch/RetroArch.SlackBuild
+++ b/games/RetroArch/RetroArch.SlackBuild
@@ -141,6 +141,9 @@ patch -p1 < $CWD/gles.patch
# Set $lib to a portable array
eval "set -- $lib"
+export CC=clang
+export CXX=clang++
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch b/games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch
new file mode 100644
index 0000000000..1f07e24f46
--- /dev/null
+++ b/games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch
@@ -0,0 +1,22 @@
+diff -up alienarena-7.66/source/ref_gl/r_shadowmaps.c.no-qglBlitFramebufferEXT alienarena-7.66/source/ref_gl/r_shadowmaps.c
+--- alienarena-7.66/source/ref_gl/r_shadowmaps.c.no-qglBlitFramebufferEXT 2013-11-05 14:46:37.611487279 -0500
++++ alienarena-7.66/source/ref_gl/r_shadowmaps.c 2013-11-05 15:00:47.510933729 -0500
+@@ -95,12 +95,12 @@ void R_CheckFBOExtensions (void)
+
+ //must check for ability to blit(Many old ATI drivers do not support)
+ //TODO: redundant with previous check?
+- if(gl_state.hasFBOblit) {
+- if(!qglBlitFramebufferEXT) {
+- Com_Printf("glBlitFramebufferEXT not found...\n");
+- gl_state.hasFBOblit = false;
+- }
+- }
++ // if(gl_state.hasFBOblit) {
++ // if(!qglBlitFramebufferEXT) {
++ // Com_Printf("glBlitFramebufferEXT not found...\n");
++ // gl_state.hasFBOblit = false;
++ // }
++ //}
+ }
+
+
diff --git a/games/alienarena/alienarena.SlackBuild b/games/alienarena/alienarena.SlackBuild
index 3241f2f1c9..1d3d42b012 100644
--- a/games/alienarena/alienarena.SlackBuild
+++ b/games/alienarena/alienarena.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -59,15 +59,19 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION-linux20130827.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION-svn4307
+tar -xvf $CWD/$PRGNAM-$VERSION-svn4307.tar.xz
+cd $PRGNAM-$VERSION-svn4307
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -p1 < $CWD/alienarena-7.66-no-qglBlitFramebufferEXT.patch
+
+rm -rf source/unix/ode
sed -i -e "s|crx|$PRGNAM|g" -e "s|\.codred|\.${PRGNAM}|g" Tools/LinuxScripts/*
@@ -83,7 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \
--with-zlib \
--enable-ansi-color \
--with-system-libode \
- --with-xf86dga \
+ --without-xf86dga \
--with-icondir=/usr/share/pixmaps \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux
@@ -91,13 +95,13 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/share/applications
install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications
-cp -a COPYING Tools/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Tools/* $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
find $PKG/usr/doc -type f -exec chmod 0644 '{}' \;
diff --git a/games/alienarena/alienarena.info b/games/alienarena/alienarena.info
index a1fff59833..30878e5abc 100644
--- a/games/alienarena/alienarena.info
+++ b/games/alienarena/alienarena.info
@@ -1,8 +1,8 @@
PRGNAM="alienarena"
VERSION="7.66"
HOMEPAGE="http://icculus.org/alienarena/rpa/"
-DOWNLOAD="http://red.planetarena.org/files/alienarena-7.66-linux20130827.tar.gz"
-MD5SUM="50928622f614ccd9938943de5fd37c1a"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/alienarena-7.66-svn4307.tar.xz"
+MD5SUM="bdaa12739a196df9fc1abc18a9ccfbbe"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="OpenAL ode"
diff --git a/games/alienarena/checkout_code.sh b/games/alienarena/checkout_code.sh
new file mode 100644
index 0000000000..d78a5c0e1a
--- /dev/null
+++ b/games/alienarena/checkout_code.sh
@@ -0,0 +1,6 @@
+svn co svn://svn.icculus.org/alienarena/trunk
+cd trunk
+svn update -r 4307
+cd ..
+mv trunk alienarena-7.66-svn4307
+tar --exclude-vcs -cJf alienarena-7.66-svn4307.tar.xz alienarena-7.66-svn4307
diff --git a/games/arx-libertatis/arx-libertatis-1.1.2-cmake3.5.patch b/games/arx-libertatis/arx-libertatis-1.1.2-cmake3.5.patch
deleted file mode 100644
index 98f05e38cf..0000000000
--- a/games/arx-libertatis/arx-libertatis-1.1.2-cmake3.5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./cmake/VersionString.cmake.orig ./cmake/VersionString.cmake
---- ./cmake/VersionString.cmake.orig 2016-03-22 19:18:55.656290322 +0200
-+++ ./cmake/VersionString.cmake 2016-03-22 19:19:08.239813098 +0200
-@@ -33,7 +33,7 @@ function(version_file SRC DST VERSION_SO
-
- foreach(arg IN LISTS VERSION_SOURCES)
-
-- if(mode STREQUAL "variable")
-+ if("${mode}" STREQUAL "variable")
- set(mode "file")
- else()
- get_filename_component(arg "${arg}" ABSOLUTE)
diff --git a/games/arx-libertatis/arx-libertatis.SlackBuild b/games/arx-libertatis/arx-libertatis.SlackBuild
index 4ea8ad7a4f..7e6b7133b2 100644
--- a/games/arx-libertatis/arx-libertatis.SlackBuild
+++ b/games/arx-libertatis/arx-libertatis.SlackBuild
@@ -23,7 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=arx-libertatis
-VERSION=${VERSION:-1.1.2}
+VERSION=${VERSION:-1.2_dev_2019_07_22}
+SRCVER=$(echo $VERSION | tr _ - )
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -59,9 +60,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.xz
+cd $PRGNAM-$SRCVER
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,9 +70,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Fix build with cmake3.5 (patch thanks to Mageia)
-patch -p1 < $CWD/arx-libertatis-1.1.2-cmake3.5.patch
-
mkdir -p build
cd build
cmake \
@@ -97,7 +95,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ARX_PUBLIC_LICENSE.txt AUTHORS CHANGELOG *.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE* AUTHORS CHANGELOG *.md COPYING VERSION $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/games/arx-libertatis/arx-libertatis.info b/games/arx-libertatis/arx-libertatis.info
index f0955d2d2b..536e92699a 100644
--- a/games/arx-libertatis/arx-libertatis.info
+++ b/games/arx-libertatis/arx-libertatis.info
@@ -1,10 +1,10 @@
PRGNAM="arx-libertatis"
-VERSION="1.1.2"
+VERSION="1.2_dev_2019_07_22"
HOMEPAGE="http://arx-libertatis.org"
-DOWNLOAD="http://downloads.sourceforge.net/project/arx/arx-libertatis-1.1.2/arx-libertatis-1.1.2.tar.xz"
-MD5SUM="543dfdaaaaf7c337227c1b6a3087589a"
+DOWNLOAD="https://arx-libertatis.org/files/snapshots/arx-libertatis-1.2-dev-2019-07-22/arx-libertatis-1.2-dev-2019-07-22.tar.xz"
+MD5SUM="eda328e8cf753678e924b3bd9c629d79"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="OpenAL zenity"
+REQUIRES="OpenAL glm zenity"
MAINTAINER="Dimitris Zlatanidis"
EMAIL="d.zlatanidis@gmail.com"
diff --git a/games/assaultcube/assaultcube-gcc6.patch b/games/assaultcube/assaultcube-gcc6.patch
new file mode 100644
index 0000000000..521372ee9d
--- /dev/null
+++ b/games/assaultcube/assaultcube-gcc6.patch
@@ -0,0 +1,301 @@
+From 752950989b4e286459ca9aee3d61a868d7b20fa4 Mon Sep 17 00:00:00 2001
+From: ac-stef <ac_stef@users.sf.net>
+Date: Sat, 27 Feb 2016 21:28:23 +0100
+Subject: [PATCH] fix some errors and warnings for GCC 6
+
+* do not use std::abs() because math.h includes one, that converts ints
+ to double. Use own iabs(), which directly uses labs() instead.
+* don't use the word "gamma" as name for variables
+* don't use a homebrew round() function
+---
+ source/src/bot/bot_waypoint.cpp | 12 ++++++------
+ source/src/command.cpp | 2 +-
+ source/src/command.h | 1 +
+ source/src/crypto.cpp | 2 +-
+ source/src/editing.cpp | 6 +++---
+ source/src/entity.h | 2 +-
+ source/src/main.cpp | 8 ++++----
+ source/src/platform.h | 9 +--------
+ source/src/protos.h | 3 ++-
+ source/src/rendercubes.cpp | 8 ++++----
+ source/src/rendertext.cpp | 4 ++--
+ source/src/tools.h | 3 +--
+ source/src/world.cpp | 6 +++---
+ source/src/worldocull.cpp | 2 +-
+ source/src/worldrender.cpp | 4 ++--
+ 15 files changed, 33 insertions(+), 39 deletions(-)
+
+diff --git a/source/src/bot/bot_waypoint.cpp b/source/src/bot/bot_waypoint.cpp
+index 520c686..7b265ef 100644
+--- a/source/src/bot/bot_waypoint.cpp
++++ b/source/src/bot/bot_waypoint.cpp
+@@ -1221,7 +1221,7 @@ void CWaypointClass::CalcCost(node_s *pNode)
+ flCost += (1.0f-flFraction)*0.5f;
+ }
+
+- if ((abs(a) > 4) || (abs(b) > 4)) continue;
++ if ((iabs(a) > 4) || (iabs(b) > 4)) continue;
+
+ vec from = to;
+ to.z -= (JUMP_HEIGHT - 1.0f);
+@@ -1249,7 +1249,7 @@ void CWaypointClass::CalcCost(node_s *pNode)
+ flCost += (1.0f-flFraction)*0.5f;
+ }
+
+- if ((abs(a) > 4) || (abs(b) > 4)) continue;
++ if ((iabs(a) > 4) || (iabs(b) > 4)) continue;
+
+ vec from = to;
+ to.z -= (JUMP_HEIGHT - 1.0f);
+@@ -1671,12 +1671,12 @@ node_s *CWaypointClass::GetNearestTriggerFloodWP(vec v_origin, float flRange)
+ void CWaypointClass::GetNodeIndexes(const vec &v_origin, short *i, short *j)
+ {
+ // Function code by cheesy and PMB
+- //*i = abs((int)((int)(v_origin.x + (2*ssize)) / SECTOR_SIZE));
+- //*j = abs((int)((int)(v_origin.y + (2*ssize)) / SECTOR_SIZE));
++ //*i = iabs((int)((int)(v_origin.x + (2*ssize)) / SECTOR_SIZE));
++ //*j = iabs((int)((int)(v_origin.y + (2*ssize)) / SECTOR_SIZE));
+ //*i = (int)((v_origin.x) / ssize * MAX_MAP_GRIDS);
+ //*j = (int)((v_origin.y) / ssize * MAX_MAP_GRIDS);
+- *i = abs((int)((v_origin.x) / MAX_MAP_GRIDS));
+- *j = abs((int)((v_origin.y) / MAX_MAP_GRIDS));
++ *i = iabs((int)((v_origin.x) / MAX_MAP_GRIDS));
++ *j = iabs((int)((v_origin.y) / MAX_MAP_GRIDS));
+
+ if (*i > MAX_MAP_GRIDS - 1)
+ *i = MAX_MAP_GRIDS - 1;
+diff --git a/source/src/command.cpp b/source/src/command.cpp
+index 668f3bf..2a5c90d 100644
+--- a/source/src/command.cpp
++++ b/source/src/command.cpp
+@@ -499,7 +499,7 @@ char *executeret(const char *p) // all evaluation hap
+ if(lc<=seer_t1.length())
+ {
+ int dt = seer_t1[seer_index] - seer_t1[lc];
+- if(abs(dt)<2)
++ if(iabs(dt)<2)
+ {
+ conoutf("SCRIPT EXECUTION warning [%d:%s]", &p, p);
+ seer_t2.add(seer_t1[seer_index]);
+diff --git a/source/src/command.h b/source/src/command.h
+index a3ca68a..2a3de0c 100644
+--- a/source/src/command.h
++++ b/source/src/command.h
+@@ -86,6 +86,7 @@ enum { IEXC_CORE = 0, IEXC_CFG, IEXC_PROMPT, IEXC_MAPCFG, IEXC_MDLCFG, IEXC_NUM
+ #define VARNP(name, global, min, cur, max) int global = variable(#name, min, cur, max, &global, NULL, true)
+ #define VARF(name, min, cur, max, body) extern int name; void var_##name() { body; } int name = variable(#name, min, cur, max, &name, var_##name, false)
+ #define VARFP(name, min, cur, max, body) extern int name; void var_##name() { body; } int name = variable(#name, min, cur, max, &name, var_##name, true)
++#define VARNFP(name, global, min, cur, max, body) extern int global; void var_##name() { body; } int global = variable(#name, min, cur, max, &global, var_##name, true)
+
+ #define FVARP(name, min, cur, max) float name = fvariable(#name, min, cur, max, &name, NULL, true)
+ #define FVAR(name, min, cur, max) float name = fvariable(#name, min, cur, max, &name, NULL, false)
+diff --git a/source/src/crypto.cpp b/source/src/crypto.cpp
+index 44041be..0684750 100644
+--- a/source/src/crypto.cpp
++++ b/source/src/crypto.cpp
+@@ -778,7 +778,7 @@ static const char *hashchunktoa(tiger::chunk h) // portable solution instead o
+ const char *genpwdhash(const char *name, const char *pwd, int salt)
+ {
+ static string temp;
+- formatstring(temp)("%s %d %s %s %d", pwd, salt, name, pwd, abs(PROTOCOL_VERSION));
++ formatstring(temp)("%s %d %s %s %d", pwd, salt, name, pwd, iabs(PROTOCOL_VERSION));
+ tiger::hashval hash;
+ tiger::hash((uchar *)temp, (int)strlen(temp), hash);
+ formatstring(temp)("%s %s %s", hashchunktoa(hash.chunks[0]), hashchunktoa(hash.chunks[1]), hashchunktoa(hash.chunks[2]));
+diff --git a/source/src/editing.cpp b/source/src/editing.cpp
+index 8d5e1ff..745aa98 100644
+--- a/source/src/editing.cpp
++++ b/source/src/editing.cpp
+@@ -137,11 +137,11 @@ void checkselections()
+ void makesel(bool isnew)
+ {
+ block &cursel = sels.last(); //RR 10/12/12 - FIXEME, error checking should happen with "isnew", not here checking if it really is new.
+- if(isnew || sels.length() == 0) addselection(min(lastx, cx), min(lasty, cy), abs(lastx-cx)+1, abs(lasty-cy)+1, max(lasth, ch));
++ if(isnew || sels.length() == 0) addselection(min(lastx, cx), min(lasty, cy), iabs(lastx-cx)+1, iabs(lasty-cy)+1, max(lasth, ch));
+ else
+ {
+ cursel.x = min(lastx, cx); cursel.y = min(lasty, cy);
+- cursel.xs = abs(lastx-cx)+1; cursel.ys = abs(lasty-cy)+1;
++ cursel.xs = iabs(lastx-cx)+1; cursel.ys = iabs(lasty-cy)+1;
+ cursel.h = max(lasth, ch);
+ correctsel(cursel);
+ }
+@@ -849,7 +849,7 @@ void movemap(int xo, int yo, int zo) // move whole map
+ }
+ if(xo || yo)
+ {
+- block b = { max(-xo, 0), max(-yo, 0), ssize - abs(xo), ssize - abs(yo) }, *cp = blockcopy(b);
++ block b = { max(-xo, 0), max(-yo, 0), ssize - iabs(xo), ssize - iabs(yo) }, *cp = blockcopy(b);
+ cp->x = max(xo, 0);
+ cp->y = max(yo, 0);
+ blockpaste(*cp);
+diff --git a/source/src/entity.h b/source/src/entity.h
+index e2ad32d..84ac385 100644
+--- a/source/src/entity.h
++++ b/source/src/entity.h
+@@ -538,7 +538,7 @@ class playerent : public dynent, public playerstate
+ {
+ const int maxskin[2] = { 4, 6 };
+ t = team_base(t < 0 ? team : t);
+- nextskin[t] = abs(s) % maxskin[t];
++ nextskin[t] = iabs(s) % maxskin[t];
+ }
+ };
+
+diff --git a/source/src/main.cpp b/source/src/main.cpp
+index 0d57c0c..c51cd74 100644
+--- a/source/src/main.cpp
++++ b/source/src/main.cpp
+@@ -519,11 +519,11 @@ void setresdata(char *s, enet_uint32 c)
+ COMMANDF(screenres, "ii", (int *w, int *h) { screenres(*w, *h); });
+
+ static int curgamma = 100;
+-VARFP(gamma, 30, 100, 300,
++VARNFP(gamma, vgamma, 30, 100, 300,
+ {
+- if(gamma == curgamma) return;
+- curgamma = gamma;
+- float f = gamma/100.0f;
++ if(vgamma == curgamma) return;
++ curgamma = vgamma;
++ float f = vgamma/100.0f;
+ if(SDL_SetGamma(f,f,f)==-1) conoutf("Could not set gamma: %s", SDL_GetError());
+ });
+
+diff --git a/source/src/platform.h b/source/src/platform.h
+index aece7e2..fd2eef1 100644
+--- a/source/src/platform.h
++++ b/source/src/platform.h
+@@ -2,14 +2,6 @@
+ #ifdef _FORTIFY_SOURCE
+ #undef _FORTIFY_SOURCE
+ #endif
+-
+- #define gamma __gamma
+-#endif
+-
+-#include <math.h>
+-
+-#ifdef __GNUC__
+- #undef gamma
+ #endif
+
+ #include <string.h>
+@@ -19,6 +11,7 @@
+ #include <ctype.h>
+ #include <time.h>
+ #include <limits.h>
++#include <math.h>
+ #ifdef __GNUC__
+ #include <new>
+ #include <signal.h>
+diff --git a/source/src/protos.h b/source/src/protos.h
+index 1c07fad..97b0ee0 100644
+--- a/source/src/protos.h
++++ b/source/src/protos.h
+@@ -1053,7 +1053,8 @@ struct servercommandline
+ {
+ demo_interm = true;
+ }
+- else if(ai > 0) maxdemos = ai; break;
++ else if(ai > 0) maxdemos = ai;
++ break;
+ }
+ case 'W': demopath = a; break;
+ case 'r': maprot = a; break;
+diff --git a/source/src/rendercubes.cpp b/source/src/rendercubes.cpp
+index 1940da8..2be7fb0 100644
+--- a/source/src/rendercubes.cpp
++++ b/source/src/rendercubes.cpp
+@@ -216,9 +216,9 @@ void render_flat(int wtex, int x, int y, int size, int h, sqr *l1, sqr *l4, sqr
+ else // continue strip
+ {
+ int lighterr = lighterror*2;
+- if((abs(ol1r-l3->r)<lighterr && abs(ol2r-l4->r)<lighterr // skip vertices if light values are close enough
+- && abs(ol1g-l3->g)<lighterr && abs(ol2g-l4->g)<lighterr
+- && abs(ol1b-l3->b)<lighterr && abs(ol2b-l4->b)<lighterr) || !wtex)
++ if((iabs(ol1r-l3->r)<lighterr && iabs(ol2r-l4->r)<lighterr // skip vertices if light values are close enough
++ && iabs(ol1g-l3->g)<lighterr && iabs(ol2g-l4->g)<lighterr
++ && iabs(ol1b-l3->b)<lighterr && iabs(ol2b-l4->b)<lighterr) || !wtex)
+ {
+ verts.setsize(verts.length()-2);
+ nquads--;
+@@ -375,7 +375,7 @@ void render_square(int wtex, float floor1, float floor2, float ceil1, float ceil
+ {
+ int lighterr = lighterror*2;
+ if((!hf && !ohf)
+- && ((abs(ol1r-l2->r)<lighterr && abs(ol1g-l2->g)<lighterr && abs(ol1b-l2->b)<lighterr) || !wtex)) // skip vertices if light values are close enough
++ && ((iabs(ol1r-l2->r)<lighterr && iabs(ol1g-l2->g)<lighterr && iabs(ol1b-l2->b)<lighterr) || !wtex)) // skip vertices if light values are close enough
+ {
+ verts.setsize(verts.length()-2);
+ nquads--;
+diff --git a/source/src/rendertext.cpp b/source/src/rendertext.cpp
+index 0ed23af..b55da4f 100644
+--- a/source/src/rendertext.cpp
++++ b/source/src/rendertext.cpp
+@@ -330,7 +330,7 @@ static void text_color(char c, char *stack, int size, int &sp, bvec color, int a
+ if(c=='r') c = stack[(sp > 0) ? --sp : sp]; // restore color
+ else if(c == 'b') { if(allowblinkingtext && !ignoreblinkingbit) stack[sp] *= -1; } // blinking text - only if allowed
+ else stack[sp] = c;
+- switch(abs(stack[sp]))
++ switch(iabs(stack[sp]))
+ {
+ case '0': color = bvec( 2, 255, 128 ); break; // green: player talk
+ case '1': color = bvec( 96, 160, 255 ); break; // blue: team chat
+@@ -380,7 +380,7 @@ static void text_color(char c, char *stack, int size, int &sp, bvec color, int a
+ //default: color = bvec( 255, 255, 255 ); break;
+ }
+ int b = (int) (sinf(lastmillis / 200.0f) * 115.0f);
+- b = stack[sp] > 0 ? 100 : min(abs(b), 100);
++ b = stack[sp] > 0 ? 100 : min(iabs(b), 100);
+ glColor4ub(color.x, color.y, color.z, (a * b) / 100);
+ }
+ }
+diff --git a/source/src/tools.h b/source/src/tools.h
+index 0aeacff..9eb5a38 100644
+--- a/source/src/tools.h
++++ b/source/src/tools.h
+@@ -54,8 +54,7 @@ static inline T min(T a, T b)
+ {
+ return a < b ? a : b;
+ }
+-
+-static inline float round(float x) { return floor(x + 0.5f); }
++inline int iabs(int n) { return labs(n); }
+
+ #define clamp(a,b,c) (max(b, min(a, c)))
+ #define rnd(x) ((int)(randomMT()&0xFFFFFF)%(x))
+diff --git a/source/src/world.cpp b/source/src/world.cpp
+index 6a1c7bb..99a70eb 100644
+--- a/source/src/world.cpp
++++ b/source/src/world.cpp
+@@ -79,9 +79,9 @@ void remip(const block &b, int level)
+ || o[i]->ceil!=o[3]->ceil
+ || o[i]->ftex!=o[3]->ftex
+ || o[i]->ctex!=o[3]->ctex
+- || abs(o[i+1]->r-o[0]->r)>lighterr // perfect mip even if light is not exactly equal
+- || abs(o[i+1]->g-o[0]->g)>lighterr
+- || abs(o[i+1]->b-o[0]->b)>lighterr
++ || iabs(o[i+1]->r-o[0]->r)>lighterr // perfect mip even if light is not exactly equal
++ || iabs(o[i+1]->g-o[0]->g)>lighterr
++ || iabs(o[i+1]->b-o[0]->b)>lighterr
+ || o[i]->utex!=o[3]->utex
+ || o[i]->wtex!=o[3]->wtex) goto c;
+ }
+diff --git a/source/src/worldrender.cpp b/source/src/worldrender.cpp
+index 8fd3104..45aa606 100644
+--- a/source/src/worldrender.cpp
++++ b/source/src/worldrender.cpp
+@@ -297,10 +297,10 @@ void distlod(int &low, int &high, int angle, float widef)
+ void render_world(float vx, float vy, float vh, float changelod, int yaw, int pitch, float fov, float fovy, int w, int h)
+ {
+ loopi(LARGEST_FACTOR) stats[i] = 0;
+- min_lod = minimap || (player1->isspectating() && player1->spectatemode == SM_OVERVIEW) ? MAX_LOD : MIN_LOD+abs(pitch)/12;
++ min_lod = minimap || (player1->isspectating() && player1->spectatemode == SM_OVERVIEW) ? MAX_LOD : MIN_LOD+iabs(pitch)/12;
+ yaw = 360-yaw;
+ float widef = fov/75.0f;
+- int cdist = abs(yaw%90-45);
++ int cdist = iabs(yaw%90-45);
+ if(cdist<7) // hack to avoid popup at high fovs at 45 yaw
+ {
+ min_lod = max(min_lod, (int)(MIN_LOD+(10-cdist)/1.0f*widef)); // less if lod worked better
diff --git a/games/assaultcube/assaultcube.SlackBuild b/games/assaultcube/assaultcube.SlackBuild
index 0f5f023de6..21563e48f1 100644
--- a/games/assaultcube/assaultcube.SlackBuild
+++ b/games/assaultcube/assaultcube.SlackBuild
@@ -67,6 +67,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/assaultcube-gcc6.patch
+
# Use custom SLKCFLAGS, remove end-of-line encoding and remove precompiled binaries.
patch -p1 < $CWD/Makefile.patch
sed -i 's/\r//g' changelog.txt
diff --git a/games/berusky2/berusky2.SlackBuild b/games/berusky2/berusky2.SlackBuild
index c6021d1496..eee4fade35 100644
--- a/games/berusky2/berusky2.SlackBuild
+++ b/games/berusky2/berusky2.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=berusky2
-VERSION=${VERSION:-0.10}
+VERSION=${VERSION:-20170630_974e2e5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -69,6 +69,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+autoreconf -fi
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/games/berusky2/berusky2.info b/games/berusky2/berusky2.info
index 58aeeb1346..7db48900d1 100644
--- a/games/berusky2/berusky2.info
+++ b/games/berusky2/berusky2.info
@@ -1,8 +1,8 @@
PRGNAM="berusky2"
-VERSION="0.10"
+VERSION="20170630_974e2e5"
HOMEPAGE="http://anakreon.cz/?q=node/2"
-DOWNLOAD="http://downloads.sourceforge.net/project/berusky2/berusky2-0.10/berusky2-0.10.tar.gz"
-MD5SUM="3c2d5217f7a61a6fbc13d689b88ec4e4"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/berusky2-20170630_974e2e5.tar.xz"
+MD5SUM="f4a1306eeff8a38591898cafa6d1934d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="freealut berusky2-data"
diff --git a/games/blobwars/blobwars.SlackBuild b/games/blobwars/blobwars.SlackBuild
index 1808f6e6e5..14df961364 100644
--- a/games/blobwars/blobwars.SlackBuild
+++ b/games/blobwars/blobwars.SlackBuild
@@ -63,7 +63,7 @@ sed -i "s_blobwars/man_blobwars-$VERSION/man_" data/titleWidgets
#doc dir fixed for slackware and help display bug.
#note. the trailing / on the first make command is intentional.
-make USEPAK=1 CFLAGS="$SLKCFLAGS" DOCDIR="/usr/doc/$PRGNAM-$VERSION/"
+make USEPAK=1 CFLAGS="$SLKCFLAGS -Wno-error=format-truncation=" DOCDIR="/usr/doc/$PRGNAM-$VERSION/"
make install USEPAK=1 DESTDIR=$PKG DOCDIR="/usr/doc/$PRGNAM-$VERSION"
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/games/bloodfrontier/bloodfrontier.SlackBuild b/games/bloodfrontier/bloodfrontier.SlackBuild
index 0f85e8fca2..2470383f75 100644
--- a/games/bloodfrontier/bloodfrontier.SlackBuild
+++ b/games/bloodfrontier/bloodfrontier.SlackBuild
@@ -64,7 +64,7 @@ sed -i "s|X11R6/lib|lib${LIBDIRSUFFIX} -lX11|" src/Makefile
make -C src \
CFLAGS="$SLKCFLAGS" \
- CXXFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS -Wno-narrowing" \
LDFLAGS="$SLKLDFLAGS"
mkdir -p $PKG/usr/bin $PKG/usr/lib${LIBDIRSUFFIX}/bloodfrontier/bin
diff --git a/games/brainparty/brainparty.SlackBuild b/games/brainparty/brainparty.SlackBuild
index 71770366d2..8536a94331 100644
--- a/games/brainparty/brainparty.SlackBuild
+++ b/games/brainparty/brainparty.SlackBuild
@@ -51,6 +51,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Thanks debian
+patch -p1 < $CWD/patches/gcc-6.patch
+
# Save directory patch. Data directory patch. Use custom SLKCFLAGS.
patch -p1 < $CWD/patches/brainparty-0.5-savegame.patch
patch -p1 < $CWD/patches/brainparty-0.5-data-directory.patch
diff --git a/games/brainparty/patches/gcc-6.patch b/games/brainparty/patches/gcc-6.patch
new file mode 100644
index 0000000000..67dfadd540
--- /dev/null
+++ b/games/brainparty/patches/gcc-6.patch
@@ -0,0 +1,47 @@
+Description: Fix FTBFS on GCC 6 by removing use of hash_set class
+Author: James Cowgill <jcowgill@debian.org>
+Bug-Debian: https://bugs.debian.org/811885
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/WordList.h
++++ b/WordList.h
+@@ -18,24 +18,11 @@
+ #ifndef __WORDLIST_H__
+ #define __WORDLIST_H__
+
++#include <string>
+ #include <vector>
+-#include <ext/hash_set>
++#include <unordered_set>
+
+-using namespace std;
+-using namespace __gnu_cxx;
+-
+-namespace __gnu_cxx
+-{
+- template<> struct hash< std::string >
+- {
+- size_t operator()( const std::string& x ) const
+- {
+- return hash< const char* >()( x.c_str() );
+- }
+- };
+-}
+-
+-typedef hash_set<string, hash<string> > string_hash_set;
++typedef std::unordered_set<std::string> string_hash_set;
+
+ class WordList {
+ private:
+--- a/Makefile
++++ b/Makefile
+@@ -17,6 +17,9 @@ else
+ OSXCOMPAT =
+ endif
+
++# enable c++11
++CXXFLAGS += -std=c++11
++
+ # object files have corresponding source files
+ CXX = g++
+
diff --git a/games/chroma/chroma.SlackBuild b/games/chroma/chroma.SlackBuild
index f46788b147..420528367e 100644
--- a/games/chroma/chroma.SlackBuild
+++ b/games/chroma/chroma.SlackBuild
@@ -11,7 +11,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -46,10 +46,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Removed some inline declarations (incompatible with newer versions of gcc)
+patch -p1 < $CWD/gcc.patch
CFLAGS="$SLKCFLAGS" \
./configure \
@@ -61,7 +64,7 @@ CFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/share/{applications,pixmaps}
diff --git a/games/chroma/gcc.patch b/games/chroma/gcc.patch
new file mode 100644
index 0000000000..22ef1b2ea7
--- /dev/null
+++ b/games/chroma/gcc.patch
@@ -0,0 +1,30 @@
+diff -Naur chroma-1.15.orig/sdlshadowdisplay.c chroma-1.15/sdlshadowdisplay.c
+--- chroma-1.15.orig/sdlshadowdisplay.c 2013-04-20 08:07:00.000000000 +0200
++++ chroma-1.15/sdlshadowdisplay.c 2017-08-02 12:07:56.327010753 +0200
+@@ -88,7 +88,7 @@
+ void displayshadowed_level(struct level* plevel);
+ void displayshadowed_movers(struct level* plevel, int redraw);
+
+-inline void displayshadowed_piece(struct level* plevel, int p, int x, int y, int d)
++void displayshadowed_piece(struct level* plevel, int p, int x, int y, int d)
+ {
+ SDL_Surface *pimage;
+
+@@ -255,7 +255,7 @@
+ }
+ }
+
+-inline void displayshadowed_pieceshadow(struct level* plevel, int p, int x, int y, int d)
++void displayshadowed_pieceshadow(struct level* plevel, int p, int x, int y, int d)
+ {
+ SDL_Surface *pimage;
+
+@@ -310,7 +310,7 @@
+ SDL_BlitSurface(pimage, &srect, screen_surface, &drect);
+ }
+
+-inline void displayshadowed_piecebase(struct level* plevel, int x, int y)
++void displayshadowed_piecebase(struct level* plevel, int x, int y)
+ {
+ int p;
+ SDL_Surface *pimage;
diff --git a/games/crrcsim/crrcsim.SlackBuild b/games/crrcsim/crrcsim.SlackBuild
index ab12c3bab1..67fc8d4734 100644
--- a/games/crrcsim/crrcsim.SlackBuild
+++ b/games/crrcsim/crrcsim.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# https://aur.archlinux.org/packages/crrcsim/#comment-668700
+patch -p1 < $CWD/fix_bug.patch
+
# Boost libraries are now threadsafe; -mt has been dropped
sed -i 's/boost_thread-mt/boost_thread/g' configure.ac
./autogen.sh
diff --git a/games/crrcsim/fix_bug.patch b/games/crrcsim/fix_bug.patch
new file mode 100644
index 0000000000..b8eadeece9
--- /dev/null
+++ b/games/crrcsim/fix_bug.patch
@@ -0,0 +1,12 @@
+diff -ru crrcsim-0.9.13.old/src/mod_video/crrc_animation.cpp crrcsim-0.9.13/src/mod_video/crrc_animation.cpp
+--- crrcsim-0.9.13.old/src/mod_video/crrc_animation.cpp 2016-04-10 09:57:14.000000000 -0700
++++ crrcsim-0.9.13/src/mod_video/crrc_animation.cpp 2018-10-30 16:13:09.055770007 -0700
+@@ -84,7 +84,7 @@
+ else
+ {
+ std::cerr << "createAnimation: unknown animation type \'"
+- << type << "\'" << std::cerr;
++ << type << "\'" << std::endl;
+ }
+
+ if (anim != NULL)
diff --git a/games/desmume/desmume.SlackBuild b/games/desmume/desmume.SlackBuild
index 4e5fec368b..c410fec43c 100644
--- a/games/desmume/desmume.SlackBuild
+++ b/games/desmume/desmume.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=desmume
-VERSION=${VERSION:-0.9.11}
+VERSION=${VERSION:-20190129_3e73a55}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -69,16 +69,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Fix end-of-line encoding.
-for i in AUTHORS; do
- cp -a $i ${i}.new
- sed -i 's/\r//' ${i}.new
- touch -r $i ${i}.new
- mv ${i}.new $i
-done
+# https://github.com/TASVideos/desmume
-# Fix missing header.
-patch -p1 < $CWD/osmesa-header-fix.patch
+cd $PRGNAM/src/frontend/posix
+./autogen.sh
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -88,7 +82,6 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--enable-osmesa \
--enable-hud \
- --enable-gdb-stub \
--enable-wifi \
--enable-openal \
--enable-glade \
@@ -99,6 +92,8 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
+cd ../../..
+
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -106,7 +101,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS ChangeLog COPYING INSTALL README README.LIN ds*.txt \
+ AUTHORS ChangeLog COPYING README README.LIN doc/ds*.txt \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/games/desmume/desmume.info b/games/desmume/desmume.info
index b06dd8381e..3cbebdfbd0 100644
--- a/games/desmume/desmume.info
+++ b/games/desmume/desmume.info
@@ -1,8 +1,8 @@
PRGNAM="desmume"
-VERSION="0.9.11"
+VERSION="20190129_3e73a55"
HOMEPAGE="http://desmume.org/"
-DOWNLOAD="http://downloads.sourceforge.net/desmume/desmume-0.9.11.tar.gz"
-MD5SUM="269b5d4ddc5715720469a9d0efc53044"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/desmume-20190129_3e73a55.tar.xz"
+MD5SUM="d198b000834ed0e13a73051caa91ec7c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="OpenAL agg gtkglext soundtouch zziplib"
diff --git a/games/desmume/osmesa-header-fix.patch b/games/desmume/osmesa-header-fix.patch
deleted file mode 100644
index 7ba5bd070f..0000000000
--- a/games/desmume/osmesa-header-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur desmume-0.9.11.orig/src/gtk/osmesa_3Demu.cpp desmume-0.9.11/src/gtk/osmesa_3Demu.cpp
---- desmume-0.9.11.orig/src/gtk/osmesa_3Demu.cpp 2015-02-14 15:05:26.000000000 +0000
-+++ desmume-0.9.11/src/gtk/osmesa_3Demu.cpp 2015-05-09 02:00:11.279367208 +0000
-@@ -20,6 +20,7 @@
-
- #ifdef HAVE_LIBOSMESA
- #include <stdlib.h>
-+#include <stdio.h>
- #include <GL/osmesa.h>
- #include "../OGLRender.h"
- #include "osmesa_3Demu.h"
diff --git a/games/dolphin-emu/dolphin-emu.SlackBuild b/games/dolphin-emu/dolphin-emu.SlackBuild
index a254bf93aa..8d72963747 100644
--- a/games/dolphin-emu/dolphin-emu.SlackBuild
+++ b/games/dolphin-emu/dolphin-emu.SlackBuild
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=dolphin-emu
-VERSION=${VERSION:-5.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20181020_9c9d598}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
diff --git a/games/dolphin-emu/dolphin-emu.info b/games/dolphin-emu/dolphin-emu.info
index 657b8e5cf0..43c7412c5e 100644
--- a/games/dolphin-emu/dolphin-emu.info
+++ b/games/dolphin-emu/dolphin-emu.info
@@ -1,10 +1,10 @@
PRGNAM="dolphin-emu"
-VERSION="5.0"
+VERSION="20181020_9c9d598"
HOMEPAGE="https://dolphin-emu.org/"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/dolphin-emu/dolphin/archive/5.0/dolphin-5.0.tar.gz"
-MD5SUM_x86_64="ed94272956adbec690808f6e4d8ff065"
+DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/dolphin-20181020_9c9d598.tar.xz"
+MD5SUM_x86_64="1d8b06556e7622fd404049fbb90849db"
REQUIRES=""
MAINTAINER="Larry Hajali"
EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/games/etlegacy-from-source/README b/games/etlegacy-from-source/README
new file mode 100644
index 0000000000..4d6185212f
--- /dev/null
+++ b/games/etlegacy-from-source/README
@@ -0,0 +1,25 @@
+Wolfenstein Enemy Territory: Legacy is a project that aims to create
+a fully compatible client and server for the popular online FPS game
+Wolfenstein: Enemy Territory.
+
+It's based on its source code released under the GPLv3 license.
+
+The main goal of this project is to fix bugs, remove old dependencies
+and make it playable on all major operating systems while still
+remaining compatible with the ET 2.60b version and as many of its mods
+as possible.
+
+This script builds the server with omni-bot support (x86 32bit only).
+(http://www.omni-bot.com/)
+
+To play you *need* also the data files from the original game
+(etlegacy-data).
+
+* WARNING *
+
+To have a client/server compatible with the existing ones (to play
+on the existing online servers), build it on/for a 32bit platform.
+
+This version of the game is built from source: the resulting package
+conflicts with the etlegacy SlackBuild you can find on SBo so install
+only one of the two.
diff --git a/office/juffed/doinst.sh b/games/etlegacy-from-source/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/office/juffed/doinst.sh
+++ b/games/etlegacy-from-source/doinst.sh
diff --git a/games/etlegacy-from-source/etlegacy-from-source.SlackBuild b/games/etlegacy-from-source/etlegacy-from-source.SlackBuild
new file mode 100644
index 0000000000..96b6b57450
--- /dev/null
+++ b/games/etlegacy-from-source/etlegacy-from-source.SlackBuild
@@ -0,0 +1,186 @@
+#!/bin/sh
+
+# Slackware build script for etlegacy-from-source
+# Copyright 2013-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=etlegacy-from-source
+SRCNAM=etlegacy
+VERSION=${VERSION:-20200328_050087d}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i*86) ARCH=i686 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+w_omnibot=1
+if [ "$ARCH" = "i386" ]; then
+ SLKCFLAGS="-O2 -march=i386 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=core2"
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ w_omnibot=0
+else
+ SLKCFLAGS="-O2"
+ w_omnibot=0
+fi
+
+set -e # Exit on most errors
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix location of the omnibot.zip, man install path
+# and leave the relative path to binaries off
+sed -i "s|share/man|man|" CMakeLists.txt
+sed -i "s|^\.\/etl|etl|" misc/etl_bot.sh misc/etlded_bot.sh
+
+mkdir -p build/legacy
+cd build
+ cp -a $CWD/omnibot-linux-latest.tar.gz legacy/
+ cp -a $CWD/wolfadmin.tar.gz legacy/
+ # We have to use bundled lua and sdl
+ cmake \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DINSTALL_DEFAULT_BINDIR="bin" \
+ -DINSTALL_DEFAULT_MODDIR="share/$SRCNAM" \
+ -DINSTALL_DEFAULT_BASEDIR="/usr/share/$SRCNAM" \
+ -DBUILD_CLIENT=1 \
+ -DBUILD_SERVER=1 \
+ -DBUILD_MOD=1 \
+ -DBUILD_MOD_PK3=1 \
+ -DBUILD_PAK3_PK3=1 \
+ -DFEATURE_CURL=1 \
+ -DFEATURE_OGG_VORBIS=1 \
+ -DFEATURE_THEORA=1 \
+ -DFEATURE_OPENAL=1 \
+ -DFEATURE_FREETYPE=1 \
+ -DFEATURE_TRACKER=0 \
+ -DFEATURE_GETTEXT=1 \
+ -DFEATURE_JANSSON=0 \
+ -DFEATURE_DBMS=1 \
+ -DFEATURE_LUA=1 \
+ -DFEATURE_MULTIVIEW=1 \
+ -DFEATURE_EDV=1 \
+ -DFEATURE_ANTICHEAT=1 \
+ -DFEATURE_RATING=1 \
+ -DFEATURE_AUTOUPDATE=0 \
+ -DFEATURE_LUASQL=1 \
+ -DFEATURE_OMNIBOT=$w_omnibot \
+ -DINSTALL_EXTRA=1 \
+ -DINSTALL_OMNIBOT=$w_omnibot \
+ -DINSTALL_GEOIP=1 \
+ -DINSTALL_WOLFADMIN=1 \
+ -DCROSS_COMPILE32=0 \
+ -DFEATURE_OGG_VORBIS=1 \
+ -DFEATURE_FREETYPE=1 \
+ -DFEATURE_AUTOUPDATE=0 \
+ -DFEATURE_IPV6=0 \
+ -DFEATURE_GETTEXT=1 \
+ -DFEATURE_RENDERER2=1 \
+ -DFEATURE_RENDERER_GLES=0 \
+ -DRENDERER_DYNAMIC=1 \
+ -DBUNDLED_LIBS=1 \
+ -DBUNDLED_SDL=1 \
+ -DBUNDLED_LUA=1 \
+ -DBUNDLED_OGG_VORBIS=1 \
+ -DBUNDLED_THEORA=1 \
+ -DBUNDLED_SQLITE3=1 \
+ -DBUNDLED_JANSSON=0 \
+ -DBUNDLED_ZLIB=1 \
+ -DBUNDLED_MINIZIP=1 \
+ -DBUNDLED_CURL=1 \
+ -DBUNDLED_OPENAL=1 \
+ -DBUNDLED_JPEG=1 \
+ -DBUNDLED_GLEW=0 \
+ -DBUNDLED_FREETYPE=1 \
+ -DCMAKE_BUILD_TYPE=Release ..
+
+ # JIC, sanitize the just-uncompressed stuff
+ chown -R root:root legacy
+ find -L legacy \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ make
+ make install DESTDIR=$PKG
+cd ..
+
+# Move man pages in the proper place
+mv $PKG/usr/share/man $PKG/usr/man
+
+# Install a script to open urls, and move two scripts to launch the client and
+# the dedicated server with omnibot support in the binaries folder
+install -m 0755 $CWD/files/openurl.sh $PKG/usr/bin/openurl.sh
+mv $PKG/usr/share/$SRCNAM/etl*.sh $PKG/usr/bin/
+chmod 755 $PKG/usr/bin/etl*.sh
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# Install an icon, a desktop file and man pages
+install -m 0644 -D $CWD/files/$SRCNAM.svg \
+ $PKG/usr/share/pixmaps/$SRCNAM.svg
+install -m 0644 -D $CWD/files/$SRCNAM.desktop \
+ $PKG/usr/share/applications/$SRCNAM.desktop
+mkdir -p $PKG/usr/man/man6
+gzip -9 -c docs/linux/man/man6/etl.6 > $PKG/usr/man/man6/etl.6.gz
+gzip -9 -c docs/linux/man/man6/etlded.6 > $PKG/usr/man/man6/etlded.6.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv \
+ $PKG/usr/share/$SRCNAM/*.txt \
+ $PKG/usr/doc/$PRGNAM-$VERSION
+cp README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/etlegacy-from-source/etlegacy-from-source.info b/games/etlegacy-from-source/etlegacy-from-source.info
new file mode 100644
index 0000000000..816a56aa18
--- /dev/null
+++ b/games/etlegacy-from-source/etlegacy-from-source.info
@@ -0,0 +1,16 @@
+PRGNAM="etlegacy"
+VERSION="20200328_050087d"
+HOMEPAGE="http://www.etlegacy.com"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/etlegacy-20200328_050087d.tar.xz \
+ http://ponce.cc/slackware/sources/repo/omnibot-linux-latest.tar.gz \
+ http://ponce.cc/slackware/sources/repo/wolfadmin.tar.gz \
+ http://ponce.cc/slackware/sources/repo/GeoIP.dat.gz"
+MD5SUM="b7b2500694fc217aef7d2b3803637fc0 \
+ eddeb7d4033cebc269d00e06bbccbfb6 \
+ c919afd544c1a0e9a08d5a0128247214 \
+ 5ac81d5de50c557be104e4c43f851c36"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README% etlegacy-data zenity"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/games/etlegacy-from-source/files/etlegacy.desktop b/games/etlegacy-from-source/files/etlegacy.desktop
new file mode 100644
index 0000000000..2618c0c13e
--- /dev/null
+++ b/games/etlegacy-from-source/files/etlegacy.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=ETLegacy
+Comment=ET: Legacy (Collaborative online FPS)
+Exec=etl
+Icon=etl
+Terminal=false
+Type=Application
+Categories=Game;
+StartupNotify=false
diff --git a/games/etlegacy-from-source/files/etlegacy.svg b/games/etlegacy-from-source/files/etlegacy.svg
new file mode 100644
index 0000000000..51754d1889
--- /dev/null
+++ b/games/etlegacy-from-source/files/etlegacy.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ version="1.1"
+ width="273.6875"
+ height="173.40625"
+ viewBox="0 0 218.95 138.72526"
+ id="svg2">
+ <metadata
+ id="metadata16">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs14">
+ <linearGradient
+ id="linearGradient5430">
+ <stop
+ id="stop5432"
+ style="stop-color:#df3323;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop5434"
+ style="stop-color:#3d0000;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="134.5764"
+ y1="2.2628517"
+ x2="134.5764"
+ y2="150.06567"
+ id="linearGradient5438"
+ xlink:href="#linearGradient5430"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.80000151,0,0,0.80000151,1.4747917,2.0250038)"
+ spreadMethod="pad" />
+ </defs>
+ <path
+ d="m 141.47506,0 -2.025,0.025 -2.20001,0.025 -0.025,0 -0.05,0 c -0.56094,0.029611 -1.70494,0.1655976 -3.625,0.4000007 -1.92006,0.2344032 -4.43694,0.566477 -7.10002,1.0000019 -2.76457,0.4500476 -5.64229,1.0096873 -8.15001,1.6750032 -2.39466,0.6353177 -4.73741,1.1624015 -6.65002,3.0750058 -1.11785,1.1178567 -1.76614,2.3933294 -2.175,3.6250069 C 109.06614,8.5933348 108.41785,7.3178683 107.3,6.2000117 105.38739,4.2874074 103.04464,3.7603236 100.64998,3.1250059 98.142257,2.45969 95.264537,1.9000503 92.499964,1.4500027 89.859095,1.0200941 87.367626,0.683809 85.474951,0.4500008 83.582275,0.2161926 82.445337,0.0816673 81.924944,0.0500001 c -0.002,2.358e-4 -0.0219,2.018e-4 -0.025,0 -0.05436,-0.00354 -0.104368,0.00167 -0.15,0 -0.09126,-0.00334 -0.182568,0.00226 -0.300001,0 -0.234863,-0.00451 -0.536171,-0.022255 -0.825001,-0.025 -0.577661,-0.00549 -1.150002,0 -1.150002,0 l -2.000004,0 0,2.0000038 0,13.0000251 -72.650138,0 -4.82500917679,0 0,8.000015 L 3.3997953,26.45005 42.39987,65.450124 l 0.600001,0.575001 0.825001,0 35.650068,0 0,58.850115 0,4.85001 3.425006,-3.45001 13.575026,-13.62503 0,21.22504 0,4.85001 3.425005,-3.45 14.575033,-14.62503 0,4.22501 0,4.82501 3.42501,-3.40001 21.00004,-21.00004 0.575,-0.60001 0,-0.825 0,-37.850065 35.65006,0 0.825,0 0.6,-0.575001 39.00008,-39.000074 3.4,-3.425006 0,-8.000015 -4.82501,0 -72.65013,0 0,-13.0000251 z m -59.875116,4.0500076 0.075,0 c 0.01691,0.00103 1.091842,0.132738 1.725003,0.2000004 z m 55.700106,0 0.075,0 0.1,0 0,0.2250004 -2,0 c 0.72505,-0.076119 1.78584,-0.2215776 1.825,-0.2250004 z M 83.824948,4.3000081 c 0.505641,0.055705 0.521361,0.044253 1.175002,0.1250002 1.655203,0.2044728 3.853399,0.5170549 6.125012,0.8750017 C 88.120084,4.8294493 85.543799,4.4927178 83.824948,4.3000081 z m 50.925102,0.05 c -1.61252,0.1827352 -3.91957,0.4916419 -6.57501,0.9000017 2.14817,-0.332921 4.26472,-0.6314689 5.85001,-0.8250016 0.40573,-0.049532 0.36769,-0.034762 0.725,-0.075 z m -34.950073,2.675005 c 1.462323,0.389813 2.501633,0.7939944 3.350013,1.2250023 -0.15979,-0.072953 -0.27743,-0.1411677 -0.475,-0.2250004 -0.73852,-0.313363 -1.74502,-0.6878195 -2.875013,-1.0000019 z m 19.350043,0 c -1.12999,0.3121818 -2.13649,0.686639 -2.87501,1.0000019 -0.19757,0.083833 -0.31521,0.1520469 -0.475,0.2250004 0.84838,-0.4310079 1.88769,-0.8351893 3.35001,-1.2250023 z m -33.675069,1.550003 c 1.673843,0.2029118 3.290574,0.3746285 5.750011,0.7750014 2.615437,0.4257684 5.275002,0.9244885 7.350015,1.4750025 0.97355,0.25829 1.877973,0.600456 2.525003,0.875002 0.2086,0.08851 0.35117,0.155736 0.50001,0.225 0.0575,0.137843 0.13205,0.275764 0.2,0.475002 0.0976,0.286085 0.1654,0.634726 0.25,0.975001 -0.97037,0.241444 -2.243943,0.668929 -3.400013,1.825004 -1.3422,1.342202 -1.77999,2.924928 -1.975005,3.900007 -0.207144,1.03545 -0.201016,1.881533 -0.2,1.925004 2.4e-5,0.0011 0,0.05 0,0.05 l 0,16.950032 -65.325124,0 -3.000005,-3.000006 27.325051,0 0.825002,0 0.600001,-0.575001 4.000008,-4.000007 3.400006,-3.425007 -4.825009,0 -39.325074,0 -4.000008,-4.000007 58.47511,0 -5.57501,5.57501 -3.400007,3.425007 4.82501,0 13.000024,0 2.000004,0 0,-2.000004 z m 48.000099,0 0,21.4500409 0,2.000004 2,0 13.00002,0 4.82501,0 -3.4,-3.425007 -5.57501,-5.57501 58.47511,0 -4.00001,4.000007 -39.32508,0 -4.825,0 3.4,3.425007 4.00001,4.000007 0.6,0.575001 0.825,0 27.32505,0 -3,3.000006 -65.32513,0 0,-16.950032 c 0,0 -2e-5,-0.04888 0,-0.05 0.001,-0.04347 0.007,-0.889474 -0.2,-1.925004 -0.19501,-0.975067 -0.63279,-2.557801 -1.975,-3.900007 -1.15607,-1.156066 -2.42964,-1.583559 -3.40001,-1.825004 0.0846,-0.340275 0.15244,-0.688916 0.25,-0.975001 0.0679,-0.199238 0.14251,-0.337159 0.20001,-0.475002 0.14882,-0.06926 0.2914,-0.136491 0.5,-0.225 0.64703,-0.274545 1.55145,-0.616712 2.525,-0.875002 2.07501,-0.550514 4.73458,-1.0492341 7.35001,-1.4750025 2.45944,-0.4003729 4.07617,-0.5720896 5.75002,-0.7750014 z M 105.44999,10.75002 c 0.36286,0.911786 0.61428,1.899778 0.775,3.025006 0.11508,0.806639 0.13951,1.402629 0.2,1.950004 l 0.025,1.300002 -1.975,0 1.725,-0.025 0.1,-1.875003 c 0,0 0.031,-0.608393 -0.075,-1.350003 -0.13725,-0.96083 -0.38475,-1.897196 -0.65,-2.675005 -0.0439,-0.128608 -0.0802,-0.229896 -0.125,-0.350001 z m 8.05002,0 c -0.0448,0.120105 -0.0811,0.221393 -0.125,0.350001 -0.26525,0.777809 -0.51275,1.714175 -0.65,2.675005 0.16075,-1.125247 0.41213,-2.113214 0.775,-3.025006 z m -0.875,4.125008 -0.1,1.575003 0,-0.725001 c 0.0264,-0.239123 0.0753,-0.570767 0.1,-0.850002 z m -0.125,2.125004 1.975,0.025 -1,0 -0.975,0 z m -8.17502,0.025 c -0.041,0.0024 -0.4443,0.04387 -0.975,0.150001 -0.36337,0.07267 -0.66015,0.160047 -0.9,0.25 -0.0624,0.02341 -0.11939,0.02704 -0.175,0.05 0.33272,-0.161248 0.70162,-0.275325 1.075,-0.35 0.48654,-0.09731 0.975,-0.100001 0.975,-0.100001 z m 10.27502,0 c 0.17915,0.0019 0.4303,-0.01394 1,0.100001 0.37338,0.07468 0.74228,0.188751 1.075,0.35 -0.0556,-0.02295 -0.11256,-0.02659 -0.175,-0.05 -0.23984,-0.08995 -0.53662,-0.177325 -0.9,-0.25 -0.54393,-0.108764 -0.97882,-0.148809 -1,-0.150001 z m -13.67503,1.800004 c -0.0229,0.0556 -0.0266,0.112574 -0.05,0.175 -0.0899,0.239816 -0.17732,0.536711 -0.25,0.900002 -0.10298,0.515223 -0.12122,0.888151 -0.125,0.950002 2.7e-4,-0.09844 -0.0292,-0.429085 0.075,-0.950002 0.0747,-0.373381 0.18875,-0.742282 0.35,-1.075002 z m 17.10004,0 c 0.16124,0.332717 0.27532,0.701615 0.35,1.075002 0.1042,0.520844 0.0747,0.851573 0.075,0.950002 -0.004,-0.06189 -0.0219,-0.434562 -0.125,-0.950002 -0.0727,-0.36332 -0.16004,-0.660121 -0.25,-0.900002 -0.0234,-0.06244 -0.027,-0.119368 -0.05,-0.175 z m -13.55003,10.200019 c 0.0155,-0.0012 0.1,0 0.1,0 l 1.9,0 1.97501,0 0.025,0 2,0 0.025,0 2.97501,0 0.9,0 c 0,0 0.0845,-0.0012 0.1,0 l 0,0.1 0,8.900017 -10.00002,0 0,-8.900017 z m -23.000047,-7.150014 0,6.150012 -6.150011,0 5.57501,-5.57501 z m 56.000107,0 0.575,0.575002 5.57501,5.57501 -6.15001,0 z m -98.325187,24.150046 57.325109,0 0,38.000072 0,4.825009 3.425005,-3.400007 4.000013,-4.000007 0.575,-0.600001 0,-0.825002 0,-34.000064 10.00002,0 0,38.000072 0,4.825009 3.42501,-3.400007 4,-4.000007 0.575,-0.600001 0,-0.825002 0,-34.000064 57.32511,0 -4,4.000008 -42.32508,0 -2.00001,0 0,2.000003 0,41.325078 -9.00002,9.000014 0,-12.32502 0,-4.825009 -3.425,3.400006 -4.00001,4.000008 -0.575,0.600001 0,0.825002 0,7.325012 -10.00002,10.00002 0,-21.17504 0,-4.825009 -3.42501,3.400007 -13.575025,13.600022 0,-50.325092 0,-2.000003 -2.000004,0 -42.32508,0 z"
+ id="path3892"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <path
+ d="m 80.899942,3.4500065 0,13.5750255 c 0.0057,0.747658 -0.677344,1.430652 -1.425003,1.425003 l -74.4251406,0 36.1500686,36.150068 40.275076,0 c 0.747658,-0.0057 1.430651,0.677345 1.425003,1.425003 l 0,57.425104 14.575031,-14.625023 c 0.39153,-0.399953 1.03245,-0.531513 1.54988,-0.318145 0.51742,0.213376 0.87931,0.758473 0.87512,1.318146 l 0,22.625042 15.575033,-15.62503 c 0.39153,-0.39995 1.03246,-0.53151 1.54988,-0.31814 0.51743,0.21337 0.87932,0.75847 0.87512,1.31814 l 0,5.62501 18.15004,-18.15003 0,-39.275074 c -0.006,-0.747658 0.67734,-1.430652 1.425,-1.425003 l 40.27508,0 36.15007,-36.150068 -74.42514,0 c -0.74766,0.0057 -1.43066,-0.677345 -1.42501,-1.425003 l 0,-13.5500255 -0.75,0 0,-0.025 c -0.12117,0.00807 -1.49587,0.1472265 -3.35,0.3750007 -1.88147,0.2311324 -4.34424,0.5758045 -6.95002,1.0000019 -2.69691,0.4390327 -5.46733,0.9811276 -7.80001,1.600003 -2.41264,0.6400874 -3.98999,1.0649805 -5.12501,2.2000042 -1.33333,1.3333278 -1.65391,3.1773877 -1.92501,5.0750097 -0.12252,0.857658 -0.14082,1.502959 -0.2,2.025004 l -0.025,1.875003 1.55001,0 1,0 c 0.0252,0.0076 0.0502,0.01597 0.075,0.025 0,0 0.40683,0.02138 0.925,0.125 0.31902,0.0638 0.5829,0.143578 0.8,0.225001 0.10855,0.04071 0.21314,0.08552 0.3,0.125 0.0434,0.01974 0.0715,0.02167 0.125,0.05 0.0535,0.02833 0.0276,-0.07243 0.375,0.275001 0.34819,0.347604 0.24662,0.321414 0.275,0.375 0.0284,0.05358 0.0302,0.08154 0.05,0.125001 0.0395,0.08692 0.0843,0.191437 0.125,0.3 0.0814,0.217128 0.16121,0.481024 0.225,0.800002 0.10364,0.518223 0.125,0.925002 0.125,0.925002 0.009,0.02476 0.0174,0.04978 0.025,0.075 l 0,19.000036 c 0.006,0.747644 -0.67732,1.430629 -1.42496,1.425002 l -14.00002,0 c -0.74766,0.0057 -1.43065,-0.677344 -1.42501,-1.425002 l 0,-19.000036 c 0.008,-0.02522 0.016,-0.05024 0.025,-0.075 0,0 0.0214,-0.406945 0.125,-0.925002 0.0638,-0.318958 0.1436,-0.582921 0.225,-0.800002 0.0407,-0.10854 0.0855,-0.213147 0.125,-0.3 0.0198,-0.04342 0.0217,-0.0715 0.05,-0.125001 0.0283,-0.0535 -0.0723,-0.02764 0.275,-0.375 0.34793,-0.348311 0.32148,-0.246652 0.37501,-0.275001 0.0535,-0.02835 0.0816,-0.03026 0.125,-0.05 0.0869,-0.03949 0.19144,-0.08429 0.3,-0.125 0.21711,-0.08142 0.48099,-0.161197 0.8,-0.225001 0.51824,-0.103637 0.925,-0.125 0.925,-0.125 0.0247,-0.009 0.0498,-0.01737 0.075,-0.025 l 2,0 0.55,0 -0.025,-1.875003 c -0.0591,-0.521651 -0.0776,-1.167032 -0.2,-2.025004 -0.271,-1.897581 -0.59162,-3.7416741 -1.92496,-5.0750097 C 103.73996,7.4899926 102.16262,7.0650995 99.749977,6.4250121 97.417297,5.8061367 94.64688,5.2640418 91.949963,4.8250091 89.364134,4.4040604 86.933122,4.0566076 85.07495,3.8250072 83.216778,3.5934068 81.821792,3.4558999 81.724944,3.4500065 c -0.01664,2.946e-4 -0.03336,2.946e-4 -0.05,0 -5.04e-4,-3.11e-5 -0.05432,-0.00264 -0.05,0 -0.0108,-3.603e-4 -0.03648,3.705e-4 -0.05,0 -0.05408,-0.00148 -0.114734,0.00133 -0.2,0 -0.130649,-0.00204 -0.307376,0.00137 -0.475001,0 z"
+ id="path3885"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient5438);fill-opacity:1;stroke:none;stroke-width:4.00000763;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <path
+ d="m 79.474939,2.0250038 0,15.0000282 -77.850147,0 39.000074,39.000074 40.850077,0 0,60.850114 17.000034,-17.050032 c 0,8.683352 0,17.366702 0,26.050052 l 18.000033,-18.05004 0,9.05002 21.00004,-21.000039 0,-39.850075 40.85008,0 39.00007,-39.000074 -77.85014,0 0,-15.0000282 -2.19342,0.030005 c -0.56842,0.030005 -5.24819,0.5139758 -10.50661,1.3699977 -2.72494,0.4435953 -5.54482,0.9868914 -7.95001,1.6250031 -2.40519,0.6381117 -4.29291,1.1178968 -5.75001,2.5750049 -1.70711,1.7071081 -2.05238,3.9666185 -2.32501,5.8750105 -0.14279,0.999532 -0.19036,1.874272 -0.23268,2.199639 l -0.0423,3.325372 3.00001,0 1,0 c 0,0 0.30115,0.01525 0.725,0.1 0.42385,0.08477 0.84641,0.271405 0.875,0.300001 0.0286,0.02859 0.21523,0.451146 0.3,0.875001 0.0848,0.423855 0.1,0.725002 0.1,0.725002 l 0,19.000036 -14.00002,0 0,-19.000036 c 0,0 0.0153,-0.301147 0.1,-0.725002 0.0848,-0.423855 0.2714,-0.846406 0.3,-0.875001 0.0286,-0.02859 0.45115,-0.21523 0.875,-0.300001 0.4239,-0.08477 0.725,-0.1 0.725,-0.1 l 2,0 2.00001,0 -0.0424,-3.325372 c -0.0423,-0.325367 -0.0901,-1.200107 -0.23264,-2.199639 -0.27262,-1.908392 -0.61788,-4.1679025 -2.32499,-5.8750106 -1.4571,-1.4571081 -3.34482,-1.9368932 -5.75001,-2.5750049 C 97.719787,4.4118978 94.899905,3.8686017 92.174963,3.4250064 86.958546,2.5758217 82.355913,2.0923049 81.802928,2.0586543 81.714408,2.034763 79.474939,2.0250038 79.474939,2.0250038 z m 4.000008,4.250008 c 1.883196,0.2104537 4.619937,0.537548 8.075015,1.1000021 2.650061,0.4314048 5.361455,0.9443646 7.550015,1.5250029 2.188563,0.5806383 3.932123,1.4821112 3.975013,1.5250032 0.29289,0.292891 0.94763,2.033399 1.175,3.625006 0.0742,0.519018 0.05,0.975002 0.05,0.975002 0,0 -0.64839,0.0097 -1.34996,0.150001 -0.82616,0.165229 -1.90361,0.478597 -2.87501,1.450002 -0.971403,0.971405 -1.284773,2.048861 -1.450003,2.875006 -0.16527,0.826145 -0.15004,1.525003 -0.15004,1.525003 l 0,19.000036 -68.17513,0 -7.000014,-7.000014 32.175061,0 4.000008,-4.000007 -40.175076,0 -8.000015,-8.000015 68.175128,0 -9.000017,9.000017 13.000025,0 z m 52.000103,0 0,23.7500452 13.00002,0 -9.00001,-9.000017 68.17512,0 -8.00001,8.000015 -40.17508,0 4.00001,4.000007 32.17506,0 -7.00001,7.000014 -68.17513,0 0,-19.000036 c 0,0 0.0153,-0.698858 -0.15,-1.525003 -0.16523,-0.826145 -0.47859,-1.903601 -1.45,-2.875006 -0.97141,-0.971405 -2.04886,-1.284773 -2.87501,-1.450002 -0.74271,-0.148543 -1.25461,-0.148713 -1.375,-0.150001 0.034,-0.432859 8e-4,-0.455984 0.075,-0.975002 0.22737,-1.591607 0.88211,-3.332115 1.175,-3.625006 0.0429,-0.0429 1.78645,-0.9443649 3.97501,-1.5250032 2.18855,-0.5806383 4.89995,-1.0935981 7.55001,-1.5250029 3.45508,-0.5624541 6.19182,-0.8895484 8.07502,-1.1000021 z M 34.299854,44.025083 l 64.175123,0 0,40.000076 4.000013,-4.000008 0,-36.000068 14.00002,0 0,40.000076 4.00001,-4.000008 0,-36.000068 64.17512,0 -8.00001,8.000015 -43.17509,0 0,42.17508 -13.00002,13.000022 0,-17.17503 -4.00001,4.000007 0,8.175013 -14.00002,14.00003 0,-26.02505 -17.000039,17.02503 0,-55.175102 -43.175082,0 z"
+ id="stroke_curved_top_left"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <g
+ transform="translate(1.4749954,152.42528)"
+ id="g3771">
+ <path
+ d="m 103,15 c 0,0 -2,0 -3,1 -1,1 -1,3 -1,3 M 80,2 c 0,0 20,2 23,5 2,2 2,8 2,8"
+ id="path3773"
+ style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 113,15 c 0,0 2,0 3,1 1,1 1,3 1,3 M 136,2 c 0,0 -20,2 -23,5 -2,2 -2,8 -2,8"
+ id="path3775"
+ style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 99,19 c 0,0 0,58 0,58 M 82,93 c 0,0 0,-41 0,-41 0,0 -42,0 -42,0 0,0 -35,-35 -35,-35 0,0 75,0 75,0 m 25,-2 c 0,0 -2,0 -2,0 M 80,2 c 0,0 0,24 0,24 m -27,3 c 0,0 -36,0 -36,0 m 91,11 c 0,0 -80,0 -80,0"
+ id="path3777"
+ style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 117,19 c 0,0 0,58 0,58 m 17,16 c 0,0 0,-41 0,-41 0,0 42,0 42,0 0,0 35,-35 35,-35 0,0 -75,0 -75,0 m -25,-2 c 0,0 2,0 2,0 M 136,2 c 0,0 0,24 0,24 m 27,3 c 0,0 36,0 36,0 m -91,11 c 0,0 80,0 80,0"
+ id="path3779"
+ style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 134,89 c 0,0 0,4 0,4 0,0 -17,17 -17,17 0,0 0,-9 0,-9 0,0 -18,18 -18,18 0,0 0,-26 0,-26 0,0 -17,17 -17,17 0,0 0,-17 0,-17 m 35,0 c 0,0 0,8 0,8"
+ id="path3781"
+ style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 138,2 c 0,0 0,-2 0,-2 0,0 -2,0 -2,0 0,0 0,2 0,2 0,0 2,0 2,0 z m -4,24 c 0,0 0,2 0,2 0,0 13,0 13,0 0,0 -9,-9 -9,-9 0,0 -4,0 -4,0 0,0 0,7 0,7 z m 30,5 c 0,0 -2,0 -2,0 0,0 -4,-4 -4,-4 0,0 6,0 6,0 0,0 0,4 0,4 z M 112,17 c 0,0 -3,0 -3,0 0,0 0,-3 0,-3 0,0 3,0 3,0 0,0 0,3 0,3 z"
+ id="path3783"
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+ <path
+ d="m 78,2 c 0,0 0,-2 0,-2 0,0 2,0 2,0 0,0 0,2 0,2 0,0 -2,0 -2,0 z m 4,24 c 0,0 0,2 0,2 0,0 -13,0 -13,0 0,0 9,-9 9,-9 0,0 4,0 4,0 0,0 0,7 0,7 z m -30,5 c 0,0 2,0 2,0 0,0 4,-4 4,-4 0,0 -6,0 -6,0 0,0 0,4 0,4 z m 52,-14 c 0,0 3,0 3,0 0,0 0,-3 0,-3 0,0 -3,0 -3,0 0,0 0,3 0,3 z"
+ id="path3785"
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+ <path
+ d="m 97,82 c 0,0 4,-4 4,-4 0,0 0,-1 0,-1 0,0 -4,0 -4,0 0,0 0,5 0,5 z m 18,0 c 0,0 4,-4 4,-4 0,0 0,-1 0,-1 0,0 -4,0 -4,0 0,0 0,5 0,5 z m 0,11 c 0,0 4,0 4,0 0,0 0,-5 0,-5 0,0 -4,4 -4,4 0,0 0,1 0,1 z"
+ id="path3787"
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+ </g>
+</svg>
diff --git a/games/etlegacy-from-source/files/get_tarball_from_git.sh b/games/etlegacy-from-source/files/get_tarball_from_git.sh
new file mode 100644
index 0000000000..a0f1819819
--- /dev/null
+++ b/games/etlegacy-from-source/files/get_tarball_from_git.sh
@@ -0,0 +1,25 @@
+rm -fR /tmp/tmp-etlegacy
+mkdir -p /tmp/tmp-etlegacy
+cd /tmp/tmp-etlegacy
+git clone git://github.com/etlegacy/etlegacy.git
+cd etlegacy
+git submodule init
+git submodule update
+cd libs
+git archive master > ../../libs.tar
+cd ..
+COMMIT=$( git log -1 | head -1 | cut -c 8-14 )
+COMMDATE=$( git log -1 --date=short | grep ^Date | awk '{print $2}' | sed 's/-//g' )
+rm -f /tmp/etlegacy-${COMMDATE}_${COMMIT}.tar.xz
+git archive master > ../src.tar
+cd ..
+mkdir etlegacy-${COMMDATE}_${COMMIT}
+cd etlegacy-${COMMDATE}_${COMMIT}
+tar xf ../src.tar
+cd libs
+tar xf ../../libs.tar
+cd ..
+cd ..
+rm -f src.tar libs.tar scripts.tar
+tar Jcf /tmp/etlegacy-${COMMDATE}_${COMMIT}.tar.xz etlegacy-${COMMDATE}_${COMMIT}
+echo "/tmp/etlegacy-${COMMDATE}_${COMMIT}.tar.xz done."
diff --git a/games/etlegacy-from-source/files/openurl.sh b/games/etlegacy-from-source/files/openurl.sh
new file mode 100644
index 0000000000..274f12d08d
--- /dev/null
+++ b/games/etlegacy-from-source/files/openurl.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# use this script to customize the way the engine should open URLs
+
+for test_browser in firefox seamonkey opera
+do
+ browser=`which $test_browser`
+ if [ "x$browser" != "x" ]
+ then
+ $browser -remote "openURL($1,new-window)" || $browser "$1"
+ exit
+ fi
+done
+# xterm -e lynx "$1"
+
+exit 0
diff --git a/games/etlegacy-from-source/slack-desc b/games/etlegacy-from-source/slack-desc
new file mode 100644
index 0000000000..e6866b09b8
--- /dev/null
+++ b/games/etlegacy-from-source/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+etlegacy-from-source: etlegacy-from-source (collaborative FPS)
+etlegacy-from-source:
+etlegacy-from-source: Wolfenstein Enemy Territory : Legacy is a project that aims to create
+etlegacy-from-source: a fully compatible client and server for the popular online FPS game
+etlegacy-from-source: Wolfenstein: Enemy Territory.
+etlegacy-from-source: It's based on its source code released under the GPLv3 license.
+etlegacy-from-source: The main goal of this project is to fix bugs, remove old dependencies
+etlegacy-from-source: and make it playable on all major operating systems while still
+etlegacy-from-source: remaining compatible with the ET 2.60b version and as many of its mods
+etlegacy-from-source: as possible. This version is built from source.
+etlegacy-from-source: homepage: http://www.etlegacy.com/
diff --git a/games/f1spirit/03_gcc6.patch b/games/f1spirit/03_gcc6.patch
new file mode 100644
index 0000000000..fbae3bd832
--- /dev/null
+++ b/games/f1spirit/03_gcc6.patch
@@ -0,0 +1,12 @@
+diff -Naur f1spirit-0.rc9.1615.orig/sources/auxiliar.cpp f1spirit-0.rc9.1615/sources/auxiliar.cpp
+--- f1spirit-0.rc9.1615.orig/sources/auxiliar.cpp 2009-02-06 10:54:49.000000000 +0100
++++ f1spirit-0.rc9.1615/sources/auxiliar.cpp 2017-06-23 11:57:14.145689872 +0200
+@@ -93,7 +93,7 @@
+
+ if (tmp == 0 ||
+ mask == 0)
+- return false;
++ return 0;
+
+ res = SDL_DisplayFormatAlpha(tmp);
+
diff --git a/games/f1spirit/f1spirit.SlackBuild b/games/f1spirit/f1spirit.SlackBuild
index 8109ea68a7..4b9206d624 100644
--- a/games/f1spirit/f1spirit.SlackBuild
+++ b/games/f1spirit/f1spirit.SlackBuild
@@ -53,6 +53,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Fix for the newer gccs
+patch -p1 < $CWD/03_gcc6.patch
+
make install PREFIX=$PKG/usr
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/games/freeorion/freeorion.SlackBuild b/games/freeorion/freeorion.SlackBuild
index 2277787124..c8e9130001 100644
--- a/games/freeorion/freeorion.SlackBuild
+++ b/games/freeorion/freeorion.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=freeorion
-VERSION=${VERSION:-0.4.8}
+VERSION=${VERSION:-20191103_0d4f025}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/games/freeorion/freeorion.info b/games/freeorion/freeorion.info
index 6796385b79..962badc3f0 100644
--- a/games/freeorion/freeorion.info
+++ b/games/freeorion/freeorion.info
@@ -1,8 +1,8 @@
PRGNAM="freeorion"
-VERSION="0.4.8"
+VERSION="20191103_0d4f025"
HOMEPAGE="http://www.freeorion.org"
-DOWNLOAD="https://github.com/freeorion/freeorion/archive/v0.4.8/freeorion-0.4.8.tar.gz"
-MD5SUM="df605a8b6c4de264f2319610dea99dbe"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/freeorion-20191103_0d4f025.tar.xz"
+MD5SUM="4715fa91776ac49640b55756893ddb29"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="SDL2 OpenAL"
diff --git a/games/frogatto/frogatto.SlackBuild b/games/frogatto/frogatto.SlackBuild
index c292542f79..ab84386732 100644
--- a/games/frogatto/frogatto.SlackBuild
+++ b/games/frogatto/frogatto.SlackBuild
@@ -69,13 +69,13 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Fix linking with boost libs
-sed -i 's,-mt,,g' Makefile
+# Fix linking with boost libs and remove -Werror
+sed -i -e 's,-mt,,g' -e 's, -Werror,,' Makefile
make \
OPTIMIZE=no \
USE_CCACHE=no \
- CXX=g++ \
+ CXX=clang++ \
CXXFLAGS="$SLKCFLAGS" \
LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}"
diff --git a/games/gargoyle/gargoyle.SlackBuild b/games/gargoyle/gargoyle.SlackBuild
index fd26829adf..d38d8dca90 100644
--- a/games/gargoyle/gargoyle.SlackBuild
+++ b/games/gargoyle/gargoyle.SlackBuild
@@ -59,7 +59,7 @@ jam -s DESTDIR=$PKG \
-s _BINDIR=/usr/libexec/gargoyle \
-s _APPDIR=/usr/libexec/gargoyle \
-s _LIBDIR=/usr/lib$LIBDIRSUFFIX/gargoyle \
- -s CCFLAGS="$SLKCFLAGS -fgnu89-inline" \
+ -s CCFLAGS="$SLKCFLAGS -fgnu89-inline -fpermissive" \
-dx \
install
diff --git a/games/glob2/c++14.patch b/games/glob2/c++14.patch
new file mode 100644
index 0000000000..6465f659af
--- /dev/null
+++ b/games/glob2/c++14.patch
@@ -0,0 +1,46 @@
+# HG changeset patch
+# User Jonathan Wakely <jwakely@redhat.com>
+# Date 1485875296 0
+# Node ID c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a
+# Parent c4da01699846179d8bf21e8dae2b973158ec0775
+Fix last argument to ChooseMapScreen constructor
+
+Since C++14 'false' is not a valid null pointer constant, so cannot be passed
+to functions expecting pointer arguments.
+
+diff --git a/src/EditorMainMenu.cpp b/src/EditorMainMenu.cpp
+--- a/src/EditorMainMenu.cpp
++++ b/src/EditorMainMenu.cpp
+@@ -90,7 +90,7 @@
+ }
+ else if (par1==LOADMAP)
+ {
+- ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", false);
++ ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", NULL);
+ int rc=chooseMapScreen.execute(globalContainer->gfx, 40);
+ if (rc==ChooseMapScreen::OK)
+ {
+diff --git a/src/LANMenuScreen.cpp b/src/LANMenuScreen.cpp
+--- a/src/LANMenuScreen.cpp
++++ b/src/LANMenuScreen.cpp
+@@ -62,7 +62,7 @@
+ }
+ else if(par1 == HOST)
+ {
+- ChooseMapScreen cms("maps", "map", false, "games", "game", false);
++ ChooseMapScreen cms("maps", "map", false, "games", "game", NULL);
+ int rc = cms.execute(globalContainer->gfx, 40);
+ if(rc == ChooseMapScreen::OK)
+ {
+diff --git a/src/YOGClientLobbyScreen.cpp b/src/YOGClientLobbyScreen.cpp
+--- a/src/YOGClientLobbyScreen.cpp
++++ b/src/YOGClientLobbyScreen.cpp
+@@ -326,7 +326,7 @@
+
+ void YOGClientLobbyScreen::hostGame()
+ {
+- ChooseMapScreen cms("maps", "map", false, "games", "game", false);
++ ChooseMapScreen cms("maps", "map", false, "games", "game", NULL);
+ int rc = cms.execute(globalContainer->gfx, 40);
+ if(rc == ChooseMapScreen::OK)
+ {
diff --git a/games/glob2/glob2.SlackBuild b/games/glob2/glob2.SlackBuild
index 6bb719cd26..435af508ff 100644
--- a/games/glob2/glob2.SlackBuild
+++ b/games/glob2/glob2.SlackBuild
@@ -71,6 +71,9 @@ find -L . \
patch -p1 < $CWD/fixes.patch
+# From upstream
+patch -p1 < $CWD/c++14.patch
+
mkdir -p $PKG/usr/bin \
$PKG/usr/share/games/$PRGNAM
diff --git a/games/gnubg/gnubg.SlackBuild b/games/gnubg/gnubg.SlackBuild
index 2e987b8125..6ba3010227 100644
--- a/games/gnubg/gnubg.SlackBuild
+++ b/games/gnubg/gnubg.SlackBuild
@@ -69,8 +69,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-./autogen.sh
-
LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
CFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/games/goonies/gcc6.patch b/games/goonies/gcc6.patch
new file mode 100644
index 0000000000..f586243cf1
--- /dev/null
+++ b/games/goonies/gcc6.patch
@@ -0,0 +1,12 @@
+diff -Naur goonies-1.4.1528.orig/src/auxiliar.cpp goonies-1.4.1528/src/auxiliar.cpp
+--- goonies-1.4.1528.orig/src/auxiliar.cpp 2009-03-12 09:43:32.000000000 +0100
++++ goonies-1.4.1528/src/auxiliar.cpp 2017-06-23 10:24:12.765749591 +0200
+@@ -94,7 +94,7 @@
+
+ if (tmp == 0 ||
+ mask == 0)
+- return false;
++ return 0;
+
+ res = SDL_DisplayFormatAlpha(tmp);
+
diff --git a/games/goonies/goonies.SlackBuild b/games/goonies/goonies.SlackBuild
index a301b7f37d..ecbb660621 100644
--- a/games/goonies/goonies.SlackBuild
+++ b/games/goonies/goonies.SlackBuild
@@ -71,6 +71,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Fix for the newer compilers
+patch -p1 < $CWD/gcc6.patch
+
# fix linker and installation paths
patch -p1 < $CWD/makefile.patch
diff --git a/games/innoextract/innoextract.SlackBuild b/games/innoextract/innoextract.SlackBuild
index 115e82dc41..86e4032ac1 100644
--- a/games/innoextract/innoextract.SlackBuild
+++ b/games/innoextract/innoextract.SlackBuild
@@ -76,6 +76,7 @@ cd build
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release .. \
+ -DBoost_NO_BOOST_CMAKE=ON \
-DCMAKE_INSTALL_MANDIR=man
make
make install DESTDIR=$PKG
diff --git a/games/m64py/m64py.SlackBuild b/games/m64py/m64py.SlackBuild
index 6fcd6922c2..485b6d4314 100644
--- a/games/m64py/m64py.SlackBuild
+++ b/games/m64py/m64py.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=m64py
-VERSION=${VERSION:-0.2.2}
+VERSION=${VERSION:-0.2.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -76,7 +76,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS ChangeLog COPYING LICENSES PKG-INFO README.md \
+ AUTHORS CHANGELOG COPYING LICENSES PKG-INFO README.rst \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/games/m64py/m64py.info b/games/m64py/m64py.info
index a94a536ce8..ceb0ea20e0 100644
--- a/games/m64py/m64py.info
+++ b/games/m64py/m64py.info
@@ -1,10 +1,10 @@
PRGNAM="m64py"
-VERSION="0.2.2"
+VERSION="0.2.5"
HOMEPAGE="http://m64py.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/m64py/m64py-0.2.2/m64py-0.2.2.tar.gz"
-MD5SUM="78e8144e5f598f5a2b9fd926dd8788a8"
+DOWNLOAD="http://downloads.sourceforge.net/m64py/m64py-0.2.5.tar.gz"
+MD5SUM="201a5b08a7ed43db26af6067a064e116"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="mupen64plus"
+REQUIRES="PySDL2 mupen64plus"
MAINTAINER="M.Dinslage"
EMAIL="daedra1980@gmail.com"
diff --git a/games/micropolis/micropolis.SlackBuild b/games/micropolis/micropolis.SlackBuild
index 2f74efd4ae..b9617b5e6c 100644
--- a/games/micropolis/micropolis.SlackBuild
+++ b/games/micropolis/micropolis.SlackBuild
@@ -78,7 +78,7 @@ find . -iname \*makefile\* -o -iname \*.mk \
# comment out the next line to disable the airplane crash disaster
sed -i -e 's/-DNO_AIRCRASH//' src/sim/makefile
-make -j1 PREFIX=/usr DOCDIR=/usr/doc/$PRGNAM-$VERSION SLKCFLAGS="$SLKCFLAGS"
+make -j1 PREFIX=/usr DOCDIR=/usr/doc/$PRGNAM-$VERSION SLKCFLAGS="$SLKCFLAGS -DTCL_IEEE_FP_MATH"
make -j1 install PREFIX=/usr DOCDIR=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG
# Make .desktop file pass desktop-file-validate
diff --git a/games/mupen64plus/fix_multiple_definition_errors.patch b/games/mupen64plus/fix_multiple_definition_errors.patch
new file mode 100644
index 0000000000..5fa3372ab1
--- /dev/null
+++ b/games/mupen64plus/fix_multiple_definition_errors.patch
@@ -0,0 +1,11 @@
+diff -Naur mupen64plus-bundle-src-2.5.orig/source/mupen64plus-core/src/main/workqueue.h mupen64plus-bundle-src-2.5/source/mupen64plus-core/src/main/workqueue.h
+--- mupen64plus-bundle-src-2.5.orig/source/mupen64plus-core/src/main/workqueue.h 2015-04-27 00:42:49.000000000 +0200
++++ mupen64plus-bundle-src-2.5/source/mupen64plus-core/src/main/workqueue.h 2020-05-08 19:04:37.956818550 +0200
+@@ -27,7 +27,6 @@
+
+ struct work_struct;
+
+-struct work_struct *work;
+ typedef void (*work_func_t)(struct work_struct *work);
+ struct work_struct {
+ work_func_t func;
diff --git a/games/mupen64plus/mupen64plus.SlackBuild b/games/mupen64plus/mupen64plus.SlackBuild
index 58e16242cd..645a362fb8 100644
--- a/games/mupen64plus/mupen64plus.SlackBuild
+++ b/games/mupen64plus/mupen64plus.SlackBuild
@@ -51,6 +51,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# https://github.com/mupen64plus/mupen64plus-core/issues/712#issuecomment-588871449
+patch -p1 < $CWD/fix_multiple_definition_errors.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./m64p_build.sh V=1
diff --git a/games/neverball/gcc10.patch b/games/neverball/gcc10.patch
new file mode 100644
index 0000000000..83e0a3a356
--- /dev/null
+++ b/games/neverball/gcc10.patch
@@ -0,0 +1,41 @@
+From a42492b8db06934c7a794630db92e3ff6ebaadaa Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Mon, 3 Feb 2020 20:25:57 +0000
+Subject: [PATCH] share/text.h: fix build failure against gcc-10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+cc .. -o neverball ...
+ld: ball/st_save.o:(.bss+0x0):
+ multiple definition of `text_input'; share/text.o:(.bss+0x0): first defined here
+```
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+Reported-by: Toralf Förster
+Bug: https://bugs.gentoo.org/708050
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ share/text.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/share/text.h b/share/text.h
+index baee7921a..8a2d6f591 100644
+--- a/share/text.h
++++ b/share/text.h
+@@ -15,7 +15,7 @@ int text_length(const char *);
+
+ /*---------------------------------------------------------------------------*/
+
+-char text_input[MAXSTR];
++extern char text_input[MAXSTR];
+
+ void text_input_start(void (*cb)(int typing));
+ void text_input_stop(void);
diff --git a/games/neverball/neverball.SlackBuild b/games/neverball/neverball.SlackBuild
index c6bb39b7f9..38ecd9d032 100644
--- a/games/neverball/neverball.SlackBuild
+++ b/games/neverball/neverball.SlackBuild
@@ -72,6 +72,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+patch -p1 < $CWD/gcc10.patch
+
# Patch Makefile to change data directory and to make it compile
# with appropriate flags
patch -p1 < $CWD/Makefile.diff || exit 1
diff --git a/games/nlarn/nlarn.SlackBuild b/games/nlarn/nlarn.SlackBuild
index d182511647..fef6664c4e 100644
--- a/games/nlarn/nlarn.SlackBuild
+++ b/games/nlarn/nlarn.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# set our CFLAGS, disable -Werror and use ncurses6-config
+sed -i -e "s|-Werror ||" -e "s|-O2|$SLKCFLAGS|" -e "s|ncurses5|ncurses6|" Makefile
+
make
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/games/noteye/noteye.SlackBuild b/games/noteye/noteye.SlackBuild
index 828e65f220..4ae54029b8 100644
--- a/games/noteye/noteye.SlackBuild
+++ b/games/noteye/noteye.SlackBuild
@@ -74,6 +74,9 @@ sed -i 's,-llua5.1,-llua,g' src/Makefile
# store the writable high score file in /var, not /usr/share.
sed -i 's,"hydrascores.sav","/var/games/hydrascores.sav",' hydra/hydra.cpp
+# use clang++ as the code won't build with gcc >= 5.x
+sed -i 's|g++ |clang++ |' src/Makefile
+
make -C src CFLAGS="$SLKCFLAGS"
# The 'make install' target is bad and wrong. Don't use.
diff --git a/games/openlierox/http_curl.patch b/games/openlierox/http_curl.patch
deleted file mode 100644
index c74fcd3d22..0000000000
--- a/games/openlierox/http_curl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- openlierox-0.58_rc3/include/HTTP.original.h 2014-04-19 19:58:09.213990582 +0300
-+++ openlierox-0.58_rc3/include/HTTP.h 2014-04-21 13:45:11.485876525 +0300
-@@ -21,7 +21,6 @@
-
- #include <string>
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
-
- #include "Networking.h"
---- openlierox-0.58_rc3/src/common/HTTP.original.cpp 2014-04-19 20:48:13.255434896 +0300
-+++ openlierox-0.58_rc3/src/common/HTTP.cpp 2014-04-21 13:48:08.493663623 +0300
-@@ -25,7 +25,6 @@
- #include <stdlib.h>
- #endif
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
-
- #include "LieroX.h"
diff --git a/games/openlierox/openlierox.SlackBuild b/games/openlierox/openlierox.SlackBuild
index 352f4ce332..3a407c408d 100644
--- a/games/openlierox/openlierox.SlackBuild
+++ b/games/openlierox/openlierox.SlackBuild
@@ -23,8 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=openlierox
-VERSION=${VERSION:-0.58_rc3}
-SRCVER=$(echo $VERSION | tr _ .)
+VERSION=${VERSION:-20170313_3825306}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -61,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -70,9 +69,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# curl/types.h removed because not supported from new CURL versions
-patch -p1 < $CWD/http_curl.patch
-
mkdir -p build
cd build
cmake . \
diff --git a/games/openlierox/openlierox.info b/games/openlierox/openlierox.info
index 44f5cb5814..f3115748bd 100644
--- a/games/openlierox/openlierox.info
+++ b/games/openlierox/openlierox.info
@@ -1,10 +1,10 @@
PRGNAM="openlierox"
-VERSION="0.58_rc3"
+VERSION="20170313_3825306"
HOMEPAGE="http://www.openlierox.net/"
-DOWNLOAD="https://github.com/albertz/openlierox/archive/0.58_rc3.tar.gz"
-MD5SUM="4ce050ca069b1ebe2fb720b3a1c2c760"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/openlierox-20170313_3825306.tar.xz"
+MD5SUM="7540eab45506561ccae1e75cf42a8fdd"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="HawkNL"
+REQUIRES="HawkNL freealut"
MAINTAINER="Dimitris Zlatanidis"
EMAIL="d.zlatanidis@gmail.com"
diff --git a/games/openmw/openmw.SlackBuild b/games/openmw/openmw.SlackBuild
index 25bc48a8eb..c11851b2b7 100644
--- a/games/openmw/openmw.SlackBuild
+++ b/games/openmw/openmw.SlackBuild
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=openmw
-VERSION=${VERSION:-0.41.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.45.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
diff --git a/games/openmw/openmw.info b/games/openmw/openmw.info
index 8e7ffddf3f..064bab8e13 100644
--- a/games/openmw/openmw.info
+++ b/games/openmw/openmw.info
@@ -1,8 +1,8 @@
PRGNAM="openmw"
-VERSION="0.41.0"
+VERSION="0.45.0"
HOMEPAGE="https://openmw.org"
-DOWNLOAD="https://github.com/OpenMW/openmw/archive/openmw-0.41.0.tar.gz"
-MD5SUM="8a939016d489b9cffdcd82aa36ed4973"
+DOWNLOAD="https://github.com/OpenMW/openmw/archive/openmw-0.45.0.tar.gz"
+MD5SUM="6f6821aeb64b46a90a73d811846c8825"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="FreeImage OpenAL unshield ffmpeg OpenSceneGraph SDL2 MyGUI bullet"
diff --git a/games/openttd/openttd.SlackBuild b/games/openttd/openttd.SlackBuild
index 5e9956d310..4a15f32f59 100644
--- a/games/openttd/openttd.SlackBuild
+++ b/games/openttd/openttd.SlackBuild
@@ -89,7 +89,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" \
./configure \
--prefix-dir=/usr \
--binary-dir=/games \
diff --git a/games/pingus/missing-header.patch b/games/pingus/missing-header.patch
new file mode 100644
index 0000000000..cc1dcdbb85
--- /dev/null
+++ b/games/pingus/missing-header.patch
@@ -0,0 +1,22 @@
+From df6e2f445d3e2925a94d22faeb17be9444513e92 Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Mon, 30 Jan 2017 15:41:53 +0000
+Subject: [PATCH] Add missing header for std::function and std::bind
+
+---
+ src/pingus/screens/demo_session.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pingus/screens/demo_session.cpp b/src/pingus/screens/demo_session.cpp
+index e3ec49a2c..f887e50f0 100644
+--- a/src/pingus/screens/demo_session.cpp
++++ b/src/pingus/screens/demo_session.cpp
+@@ -18,6 +18,7 @@
+
+ #include <algorithm>
+ #include <iostream>
++#include <functional>
+
+ #include "engine/gui/gui_manager.hpp"
+ #include "engine/gui/surface_button.hpp"
+
diff --git a/games/pingus/pingus.SlackBuild b/games/pingus/pingus.SlackBuild
index e7abf19ddf..a548e5c2a2 100644
--- a/games/pingus/pingus.SlackBuild
+++ b/games/pingus/pingus.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Thanks archlinux
+patch -p1 < $CWD/missing-header.patch
+
mkdir -p build
scons \
diff --git a/games/pokerth/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch b/games/pokerth/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch
new file mode 100644
index 0000000000..2e8c9c50c5
--- /dev/null
+++ b/games/pokerth/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch
@@ -0,0 +1,14 @@
+Boost 1.65 made 'advance()' ambiguous.
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=629966
+
+--- a/src/gui/qt/gametable/gametableimpl.cpp
++++ b/src/gui/qt/gametable/gametableimpl.cpp
+@@ -3859,7 +3859,7 @@
+ int playerCount = static_cast<int>(seatList->size());
+ if (id < playerCount) {
+ PlayerListIterator pos = seatList->begin();
+- advance(pos, id);
++ std::advance(pos, id);
+ myStartWindow->getSession()->startVoteKickPlayer((*pos)->getMyUniqueID());
+ }
+ }
diff --git a/games/pokerth/pokerth-1.1.2-boost-1.66-remove-deprecated.patch b/games/pokerth/pokerth-1.1.2-boost-1.66-remove-deprecated.patch
new file mode 100644
index 0000000000..d265eb1db9
--- /dev/null
+++ b/games/pokerth/pokerth-1.1.2-boost-1.66-remove-deprecated.patch
@@ -0,0 +1,26 @@
+diff -Naur pokerth-1.1.2-rc.orig/src/net/common/clientthread.cpp pokerth-1.1.2-rc/src/net/common/clientthread.cpp
+--- pokerth-1.1.2-rc.orig/src/net/common/clientthread.cpp 2017-08-16 14:24:03.000000000 +0200
++++ pokerth-1.1.2-rc/src/net/common/clientthread.cpp 2017-12-23 21:48:58.660592917 +0100
+@@ -993,8 +993,7 @@
+ newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v6()));
+ else
+ newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v4()));
+- boost::asio::socket_base::non_blocking_io command(true);
+- newSock->io_control(command);
++ newSock->non_blocking(true);
+ newSock->set_option(tcp::no_delay(true));
+ newSock->set_option(boost::asio::socket_base::keep_alive(true));
+
+diff -Naur pokerth-1.1.2-rc.orig/src/net/serveraccepthelper.h pokerth-1.1.2-rc/src/net/serveraccepthelper.h
+--- pokerth-1.1.2-rc.orig/src/net/serveraccepthelper.h 2017-08-16 14:24:03.000000000 +0200
++++ pokerth-1.1.2-rc/src/net/serveraccepthelper.h 2017-12-23 22:05:51.075613870 +0100
+@@ -122,8 +122,7 @@
+ const boost::system::error_code &error)
+ {
+ if (!error) {
+- boost::asio::socket_base::non_blocking_io command(true);
+- acceptedSocket->io_control(command);
++ acceptedSocket->non_blocking(true);
+ acceptedSocket->set_option(typename P::no_delay(true));
+ acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true));
+ boost::shared_ptr<SessionData> sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService));
diff --git a/games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix1.patch b/games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix1.patch
new file mode 100644
index 0000000000..cfdcf9b7da
--- /dev/null
+++ b/games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix1.patch
@@ -0,0 +1,75 @@
+From c769c9238ad62178f506038178714a1c35aa2769 Mon Sep 17 00:00:00 2001
+From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com>
+Date: Tue, 16 Apr 2019 08:38:01 +0200
+Subject: [PATCH] Replace make_shared with new in some cases
+
+Replace make_shared for asio types that take a lib::ref as a parameter.
+This should fix the ASIO change (boostorg/asio@59066d8) for 1.70,
+while keeping it backwards compatible to older boost versions.
+---
+ websocketpp/transport/asio/connection.hpp | 7 ++++---
+ websocketpp/transport/asio/endpoint.hpp | 3 +--
+ websocketpp/transport/asio/security/none.hpp | 3 +--
+ websocketpp/transport/asio/security/tls.hpp | 3 +--
+ 4 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp
+index 60f88a79..1ccda8f3 100644
+--- a/websocketpp/transport/asio/connection.hpp
++++ b/websocketpp/transport/asio/connection.hpp
+@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_con_type {
+ * needed.
+ */
+ timer_ptr set_timer(long duration, timer_handler callback) {
+- timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
+- lib::ref(*m_io_service),
+- lib::asio::milliseconds(duration)
++ timer_ptr new_timer(
++ new lib::asio::steady_timer(
++ *m_io_service,
++ lib::asio::milliseconds(duration))
+ );
+
+ if (config::enable_multithreading) {
+diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp
+index ddab2c74..4b719a97 100644
+--- a/websocketpp/transport/asio/endpoint.hpp
++++ b/websocketpp/transport/asio/endpoint.hpp
+@@ -195,8 +195,7 @@ class endpoint : public config::socket_type {
+
+ m_io_service = ptr;
+ m_external_io_service = true;
+- m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
+- lib::ref(*m_io_service));
++ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service));
+
+ m_state = READY;
+ ec = lib::error_code();
+diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp
+index 5c8293db..6c7d3524 100644
+--- a/websocketpp/transport/asio/security/none.hpp
++++ b/websocketpp/transport/asio/security/none.hpp
+@@ -168,8 +168,7 @@ class connection : public lib::enable_shared_from_this<connection> {
+ return socket::make_error_code(socket::error::invalid_state);
+ }
+
+- m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
+- lib::ref(*service));
++ m_socket.reset(new lib::asio::ip::tcp::socket(*service));
+
+ if (m_socket_init_handler) {
+ m_socket_init_handler(m_hdl, *m_socket);
+diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp
+index c76fd9aa..04ac3790 100644
+--- a/websocketpp/transport/asio/security/tls.hpp
++++ b/websocketpp/transport/asio/security/tls.hpp
+@@ -193,8 +193,7 @@ class connection : public lib::enable_shared_from_this<connection> {
+ if (!m_context) {
+ return socket::make_error_code(socket::error::invalid_tls_context);
+ }
+- m_socket = lib::make_shared<socket_type>(
+- _WEBSOCKETPP_REF(*service),lib::ref(*m_context));
++ m_socket.reset(new socket_type(*service, *m_context));
+
+ if (m_socket_init_handler) {
+ m_socket_init_handler(m_hdl, get_socket());
diff --git a/games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix2.patch b/games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix2.patch
new file mode 100644
index 0000000000..64faab9d37
--- /dev/null
+++ b/games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix2.patch
@@ -0,0 +1,52 @@
+From f810ca2e800e9b55be41c5911cf1d1185fcd516b Mon Sep 17 00:00:00 2001
+From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com>
+Date: Wed, 17 Apr 2019 10:06:18 +0000
+Subject: [PATCH] Fix missed entries; fix testing
+
+(Note: the CmakeLists.txt patch is cut off because we don't have it)
+
+---
+ CMakeLists.txt | 2 +-
+ websocketpp/transport/asio/connection.hpp | 3 +--
+ websocketpp/transport/asio/endpoint.hpp | 7 ++-----
+ 3 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp
+index 1ccda8f3..57dda74a 100644
+--- a/websocketpp/transport/asio/connection.hpp
++++ b/websocketpp/transport/asio/connection.hpp
+@@ -462,8 +462,7 @@ class connection : public config::socket_type::socket_con_type {
+ m_io_service = io_service;
+
+ if (config::enable_multithreading) {
+- m_strand = lib::make_shared<lib::asio::io_service::strand>(
+- lib::ref(*io_service));
++ m_strand.reset(new lib::asio::io_service::strand(*io_service));
+ }
+
+ lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
+diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp
+index 4b719a97..94509adb 100644
+--- a/websocketpp/transport/asio/endpoint.hpp
++++ b/websocketpp/transport/asio/endpoint.hpp
+@@ -687,9 +687,7 @@ class endpoint : public config::socket_type {
+ * @since 0.3.0
+ */
+ void start_perpetual() {
+- m_work = lib::make_shared<lib::asio::io_service::work>(
+- lib::ref(*m_io_service)
+- );
++ m_work.reset(new lib::asio::io_service::work(*m_io_service));
+ }
+
+ /// Clears the endpoint's perpetual flag, allowing it to exit when empty
+@@ -853,8 +851,7 @@ class endpoint : public config::socket_type {
+
+ // Create a resolver
+ if (!m_resolver) {
+- m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
+- lib::ref(*m_io_service));
++ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service));
+ }
+
+ tcon->set_uri(u);
diff --git a/games/pokerth/pokerth-1.1.2-boost-1.73-placeholders.patch b/games/pokerth/pokerth-1.1.2-boost-1.73-placeholders.patch
new file mode 100644
index 0000000000..8044977c10
--- /dev/null
+++ b/games/pokerth/pokerth-1.1.2-boost-1.73-placeholders.patch
@@ -0,0 +1,18 @@
+diff -Naur pokerth-1.1.2-rc.orig/src/net/common/serveracceptwebhelper.cpp pokerth-1.1.2-rc/src/net/common/serveracceptwebhelper.cpp
+--- pokerth-1.1.2-rc.orig/src/net/common/serveracceptwebhelper.cpp 2017-08-16 14:24:03.000000000 +0200
++++ pokerth-1.1.2-rc/src/net/common/serveracceptwebhelper.cpp 2020-06-23 14:13:56.395204000 +0200
+@@ -58,10 +58,10 @@
+
+ m_webSocketServer->init_asio(m_ioService.get());
+
+- m_webSocketServer->set_validate_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::validate), this, _1));
+- m_webSocketServer->set_open_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_open), this, _1));
+- m_webSocketServer->set_close_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_close), this, _1));
+- m_webSocketServer->set_message_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_message), this, _1, _2));
++ m_webSocketServer->set_validate_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::validate), this, boost::placeholders::_1));
++ m_webSocketServer->set_open_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_open), this, boost::placeholders::_1));
++ m_webSocketServer->set_close_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_close), this, boost::placeholders::_1));
++ m_webSocketServer->set_message_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_message), this, boost::placeholders::_1, boost::placeholders::_2));
+
+ m_webSocketServer->listen(serverPort);
+ m_webSocketServer->start_accept();
diff --git a/games/pokerth/pokerth.SlackBuild b/games/pokerth/pokerth.SlackBuild
index 5412cb9fbe..6eb86b30af 100644
--- a/games/pokerth/pokerth.SlackBuild
+++ b/games/pokerth/pokerth.SlackBuild
@@ -26,14 +26,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=pokerth
-SRCNAM=PokerTH
-VERSION=${VERSION:-1.1.1}
+VERSION=${VERSION:-1.1.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -44,8 +43,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,11 +60,11 @@ fi
set -e
rm -rf $PKG
-rm -rf $TMP/$SRCNAM-$VERSION-src
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-tar xvf $CWD/$SRCNAM-$VERSION-src.tar.bz2
-cd $SRCNAM-$VERSION-src
+rm -rf $PRGNAM-$VERSION-rc
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION-rc
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -73,18 +72,24 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# The headers to which this file points have moved in the newer libircclient...
-# Thanks ponce.
-sed -i "s|libircclient/||" src/net/common/ircthread.cpp
+patch -p1 < $CWD/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch
+patch -p1 < $CWD/pokerth-1.1.2-boost-1.66-remove-deprecated.patch
+( cd src/third_party/websocketpp
+ patch -p1 < $CWD/pokerth-1.1.2-boost-1.70-websocket-fix1.patch
+ patch -p1 < $CWD/pokerth-1.1.2-boost-1.70-websocket-fix2.patch )
+patch -p1 < $CWD/pokerth-1.1.2-boost-1.73-placeholders.patch
-qmake pokerth.pro
+qmake -spec linux-g++ pokerth.pro
+make
+mkdir -p $PKG/usr/bin
+install -s -D -m 0755 bin/pokerth_server $PKG/usr/bin
+install -s -D -m 0755 chatcleaner $PKG/usr/bin
+make clean
-make #CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
+qmake CONFIG+="client" -spec linux-g++ pokerth.pro
+make
make install DESTDIR=$PKG INSTALL_ROOT=$PKG
-mkdir -p $PKG/usr/bin
-install -s -D -m 0755 $TMP/$SRCNAM-$VERSION-src/bin/pokerth_server $PKG/usr/bin
-
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a COPYING INSTALL TODO ChangeLog \
$PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/pokerth/pokerth.info b/games/pokerth/pokerth.info
index 24588c1909..e3a18f5b1a 100644
--- a/games/pokerth/pokerth.info
+++ b/games/pokerth/pokerth.info
@@ -1,8 +1,8 @@
PRGNAM="pokerth"
-VERSION="1.1.1"
+VERSION="1.1.2"
HOMEPAGE="https://www.pokerth.net"
-DOWNLOAD="https://downloads.sourceforge.net/pokerth/PokerTH-1.1.1-src.tar.bz2"
-MD5SUM="a7f76f95782099f966e5f2b6809f502a"
+DOWNLOAD="https://downloads.sourceforge.net/pokerth/pokerth-1.1.2.tar.gz"
+MD5SUM="8fd7d7fc7ece17315e58aa3240dd4586"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libgsasl libircclient tinyxml protobuf"
diff --git a/games/pysolfc/pillow6.patch b/games/pysolfc/pillow6.patch
new file mode 100644
index 0000000000..80f0f1868e
--- /dev/null
+++ b/games/pysolfc/pillow6.patch
@@ -0,0 +1,47 @@
+From fa20e7f834a1385f383f09a3aa8f4fb4bb86da18 Mon Sep 17 00:00:00 2001
+From: Shlomi Fish <shlomif@shlomifish.org>
+Date: Fri, 5 Apr 2019 17:13:13 +0300
+Subject: [PATCH] Try fixing issue #108 - compat with pillow 6.0
+
+See https://github.com/shlomif/PySolFC/issues/108 .
+---
+ pysollib/mfxutil.py | 2 +-
+ pysollib/ui/tktile/tkutil.py | 11 +++--------
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py
+index a0d0aed4..f461ed10 100644
+--- a/pysollib/mfxutil.py
++++ b/pysollib/mfxutil.py
+@@ -51,7 +51,7 @@
+ from PIL import PpmImagePlugin # noqa: F401
+ Image._initialized = 2
+ USE_PIL = False
+-if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7':
++if TOOLKIT == 'tk' and Image:
+ USE_PIL = True
+
+ # debug
+diff --git a/pysollib/ui/tktile/tkutil.py b/pysollib/ui/tktile/tkutil.py
+index af43130a..0319e6d3 100644
+--- a/pysollib/ui/tktile/tkutil.py
++++ b/pysollib/ui/tktile/tkutil.py
+@@ -353,15 +353,10 @@ def shadowImage(image, color='#3896f8', factor=0.3):
+ if not hasattr(image, '_pil_image'):
+ return None
+ im = image._pil_image
+- if Image.VERSION >= '1.1.7':
+- # use an alpha image
+- sh = Image.new('RGBA', im.size, color)
+- sh.putalpha(100)
+- out = Image.composite(sh, im, im)
+- return PIL_Image(image=out)
++ # use an alpha image
+ sh = Image.new('RGBA', im.size, color)
+- tmp = Image.blend(im, sh, factor)
+- out = Image.composite(tmp, im, im)
++ sh.putalpha(100)
++ out = Image.composite(sh, im, im)
+ return PIL_Image(image=out)
+
+
diff --git a/games/pysolfc/pysolfc.SlackBuild b/games/pysolfc/pysolfc.SlackBuild
index 02ef038041..1c2b20b606 100644
--- a/games/pysolfc/pysolfc.SlackBuild
+++ b/games/pysolfc/pysolfc.SlackBuild
@@ -76,6 +76,8 @@ chown -R root:root .
find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
\! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+patch -p1 < $CWD/pillow6.patch
+
# 20181012 bkw: Slightly dirty hack, to combat a dirty hack from upstream.
# Begin rant:
# Basically, the old versions of pysol used the python 'random' library,
diff --git a/games/quakespasm/README b/games/quakespasm/README
new file mode 100644
index 0000000000..0761ca3e56
--- /dev/null
+++ b/games/quakespasm/README
@@ -0,0 +1 @@
+This is an engine for iD software's Quake.
diff --git a/python/python-future/doinst.sh b/games/quakespasm/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/python/python-future/doinst.sh
+++ b/games/quakespasm/doinst.sh
diff --git a/games/quakespasm/quakespasm.SlackBuild b/games/quakespasm/quakespasm.SlackBuild
new file mode 100644
index 0000000000..eceb66be24
--- /dev/null
+++ b/games/quakespasm/quakespasm.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for quakespasm
+
+# Copyright 2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=quakespasm
+VERSION=${VERSION:-0.93.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i686 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+DOCS="LICENSE.txt Quakespasm*"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cd Quake
+make DO_USERDIRS=1 USE_SDL2=1
+cd ..
+# manual installation
+install -D -m0755 Quake/$PRGNAM $PKG/usr/games/$PRGNAM
+install -D -m0644 Misc/QuakeSpasm_512.png $PKG/usr/share/pixmaps/$PRGNAM.png
+install -D -m0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/quakespasm/quakespasm.desktop b/games/quakespasm/quakespasm.desktop
new file mode 100644
index 0000000000..b143371c46
--- /dev/null
+++ b/games/quakespasm/quakespasm.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Quakespasm
+GenericName=Quakespasm port of ID Software's Quake
+Exec=quakespasm
+Terminal=false
+Type=Application
+Categories=Game;
+Icon=quakespasm
+StartupNotify=false
diff --git a/games/quakespasm/quakespasm.info b/games/quakespasm/quakespasm.info
new file mode 100644
index 0000000000..79c67d69d0
--- /dev/null
+++ b/games/quakespasm/quakespasm.info
@@ -0,0 +1,10 @@
+PRGNAM="quakespasm"
+VERSION="0.93.1"
+HOMEPAGE="https://quakespasm.sourceforge.net"
+DOWNLOAD="https://downloads.sourceforge.net/quakespasm/quakespasm-0.93.1.tgz"
+MD5SUM="cfb60350081c5526d2bb3320280c1f8c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="SDL2"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/games/quakespasm/slack-desc b/games/quakespasm/slack-desc
new file mode 100644
index 0000000000..5b7ef8a8db
--- /dev/null
+++ b/games/quakespasm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+quakespasm: quakespasm (quake engine)
+quakespasm:
+quakespasm: This is an engine for iD software's Quake.
+quakespasm:
+quakespasm: homepage: https://quakespasm.sourceforge.net
+quakespasm:
+quakespasm:
+quakespasm:
+quakespasm:
+quakespasm:
+quakespasm:
diff --git a/games/rlvm/gcc.patch b/games/rlvm/gcc.patch
new file mode 100644
index 0000000000..fc4bedfb69
--- /dev/null
+++ b/games/rlvm/gcc.patch
@@ -0,0 +1,24 @@
+From 668863d2222b962ee8e7d9829e972ef05c990302 Mon Sep 17 00:00:00 2001
+From: Elliot Glaysher <glaysher@umich.edu>
+Date: Sun, 22 May 2016 10:29:27 -0700
+Subject: [PATCH] Theoretical compile fix for gcc 4 series.
+
+Adds <iostream> to GraphicsObject.
+
+Closes #76.
+---
+ src/systems/base/graphics_object.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/systems/base/graphics_object.cc b/src/systems/base/graphics_object.cc
+index 9490b3b0..af22177d 100644
+--- a/src/systems/base/graphics_object.cc
++++ b/src/systems/base/graphics_object.cc
+@@ -36,6 +36,7 @@
+ #include <boost/serialization/shared_ptr.hpp>
+
+ #include <algorithm>
++#include <iostream>
+ #include <numeric>
+ #include <sstream>
+ #include <string>
diff --git a/games/rlvm/rlvm.SlackBuild b/games/rlvm/rlvm.SlackBuild
index cce10004ed..b4561a4ddd 100644
--- a/games/rlvm/rlvm.SlackBuild
+++ b/games/rlvm/rlvm.SlackBuild
@@ -59,6 +59,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# From upstream
+patch -p1 < $CWD/gcc.patch
+
scons --release
mkdir -p ${PKG}/usr/games ${PKG}/usr/bin
diff --git a/games/roadfighter/gcc.patch b/games/roadfighter/gcc.patch
new file mode 100644
index 0000000000..c7e3e3895a
--- /dev/null
+++ b/games/roadfighter/gcc.patch
@@ -0,0 +1,11 @@
+--- src/auxiliar.cpp 2016-06-07 16:18:19.672015830 +0200
++++ src/auxiliar.cpp 2016-06-07 16:18:41.678235683 +0200
+@@ -84,7 +84,7 @@
+ mask=IMG_Load(name);
+
+ if (tmp==0 ||
+- mask==0) return false;
++ mask==0) return 0;
+
+ res=SDL_DisplayFormatAlpha(tmp);
+
diff --git a/games/roadfighter/roadfighter.SlackBuild b/games/roadfighter/roadfighter.SlackBuild
index 2679ac6887..d6215675c6 100644
--- a/games/roadfighter/roadfighter.SlackBuild
+++ b/games/roadfighter/roadfighter.SlackBuild
@@ -74,6 +74,9 @@ find -L . \
# fix installation path
patch -p1 < $CWD/makefile.patch
+# fix building with the newer gcc
+patch -p0 < $CWD/gcc.patch
+
make
make install PREFIX=$PKG
diff --git a/games/speed-dreams/speed-dreams-params-conversion.patch b/games/speed-dreams/speed-dreams-params-conversion.patch
new file mode 100644
index 0000000000..16bd19d2f7
--- /dev/null
+++ b/games/speed-dreams/speed-dreams-params-conversion.patch
@@ -0,0 +1,22 @@
+--- src/libs/tgf/params.cpp.orig 2017-02-14 10:32:38.701066427 +0100
++++ src/libs/tgf/params.cpp 2017-02-14 10:33:19.425879383 +0100
+@@ -3809,7 +3809,7 @@
+ if( lastSlash != NULL && key )
+ {
+ *key = lastSlash + 1;
+- lastSlash = '\0';
++ lastSlash = NULL;
+ }
+ else if( key )
+ {
+--- src/libs/tgfclient/openalmusicplayer.cpp.orig 2017-02-14 13:14:10.870735828 +0100
++++ src/libs/tgfclient/openalmusicplayer.cpp 2017-02-14 13:15:11.592684153 +0100
+@@ -171,7 +171,7 @@
+ {
+ char pcm[BUFFERSIZE];
+ int size = 0;
+- const char* error = '\0';
++ const char* error = NULL;
+
+ if (!_stream->read(pcm, BUFFERSIZE, &size, error)) {
+ GfLogError("OpenALMusicPlayer: Stream read error: %s\n", error);
diff --git a/games/speed-dreams/speed-dreams.SlackBuild b/games/speed-dreams/speed-dreams.SlackBuild
index 1812248a77..f304ab2256 100644
--- a/games/speed-dreams/speed-dreams.SlackBuild
+++ b/games/speed-dreams/speed-dreams.SlackBuild
@@ -57,6 +57,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Thanks fedora
+patch -p0 < $CWD/speed-dreams-params-conversion.patch
+
mkdir build
cd build
diff --git a/games/supertux/supertux-0.6.2_rc1-boost-1.73.patch b/games/supertux/supertux-0.6.2_rc1-boost-1.73.patch
new file mode 100644
index 0000000000..55fa95b70f
--- /dev/null
+++ b/games/supertux/supertux-0.6.2_rc1-boost-1.73.patch
@@ -0,0 +1,25 @@
+From dec7fb943c532f855e5c0ae2eb39d2d82a46a506 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sat, 9 May 2020 03:04:02 +0200
+Subject: [PATCH] Fix build with boost-1.73
+
+---
+ src/editor/object_settings.hpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/editor/object_settings.hpp b/src/editor/object_settings.hpp
+index bc9049a94..15b77b1e4 100644
+--- a/src/editor/object_settings.hpp
++++ b/src/editor/object_settings.hpp
+@@ -22,6 +22,8 @@
+
+ #include "editor/object_option.hpp"
+
++#include <algorithm>
++
+ class Color;
+ enum class Direction;
+ enum class WalkMode;
+--
+2.26.2
+
diff --git a/games/supertux/supertux.SlackBuild b/games/supertux/supertux.SlackBuild
index 122b06e07b..e3f5b251f2 100644
--- a/games/supertux/supertux.SlackBuild
+++ b/games/supertux/supertux.SlackBuild
@@ -25,7 +25,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=supertux
-VERSION=${VERSION:-0.6.1}
+VERSION=${VERSION:-0.6.2_rc.1}
+SRCVERSION=$(echo $VERSION | tr _ - )
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -61,9 +62,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/SuperTux-v$VERSION-Source.tar.gz
-cd SuperTux-v$VERSION-Source
+rm -rf $PRGNAM-$SRCVERSION
+tar xvf $CWD/SuperTux-v$SRCVERSION-Source.tar.gz
+cd SuperTux-v$SRCVERSION-Source
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,6 +72,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/supertux-0.6.2_rc1-boost-1.73.patch
+
mkdir -p build
cd build
cmake \
diff --git a/games/supertux/supertux.info b/games/supertux/supertux.info
index 6107a41d6f..b25959b728 100644
--- a/games/supertux/supertux.info
+++ b/games/supertux/supertux.info
@@ -1,8 +1,8 @@
PRGNAM="supertux"
-VERSION="0.6.1"
+VERSION="0.6.2_rc.1"
HOMEPAGE="https://github.com/SuperTux/supertux"
-DOWNLOAD="https://github.com/SuperTux/supertux/releases/download/v0.6.1/SuperTux-v0.6.1-Source.tar.gz"
-MD5SUM="d7c9d70ef8501b4786908353202066e4"
+DOWNLOAD="https://github.com/SuperTux/supertux/releases/download/v0.6.2-rc.1/SuperTux-v0.6.2-rc.1-Source.tar.gz"
+MD5SUM="e4f1b5b112b729bfda801d058d09b7c0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="SDL2_image OpenAL physfs"
diff --git a/games/supertuxkart/mesa-18.3.patch b/games/supertuxkart/mesa-18.3.patch
new file mode 100644
index 0000000000..b144177255
--- /dev/null
+++ b/games/supertuxkart/mesa-18.3.patch
@@ -0,0 +1,23 @@
+From 3a3953f38c3555e87f3608d0291dbfccf34e9775 Mon Sep 17 00:00:00 2001
+From: Deve <deveee@gmail.com>
+Date: Wed, 21 Nov 2018 21:07:55 +0100
+Subject: [PATCH] Fix for system glew
+
+---
+ src/graphics/gl_headers.hpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
+index fc9867cb59..290805cafe 100644
+--- a/src/graphics/gl_headers.hpp
++++ b/src/graphics/gl_headers.hpp
+@@ -25,6 +25,9 @@
+ extern "C" {
+ #if !defined(USE_GLES2)
+ # include <GL/glew.h>
++// This is a workaround for mesa drivers that now use __gl_glext_h_ instead of
++// __glext_h_ in header file which is not defined in current glew version
++# define __gl_glext_h_
+ #endif
+ }
+ #include <cinttypes>
diff --git a/games/supertuxkart/supertuxkart.SlackBuild b/games/supertuxkart/supertuxkart.SlackBuild
index 5e2c1c0cc2..d4a99ecbf3 100644
--- a/games/supertuxkart/supertuxkart.SlackBuild
+++ b/games/supertuxkart/supertuxkart.SlackBuild
@@ -80,6 +80,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# From upstream
+patch -p1 < $CWD/mesa-18.3.patch
+
mkdir -p build
cd build
cmake \
diff --git a/games/torcs/torcs.SlackBuild b/games/torcs/torcs.SlackBuild
index 76ee0f1fae..479625aa7b 100644
--- a/games/torcs/torcs.SlackBuild
+++ b/games/torcs/torcs.SlackBuild
@@ -58,7 +58,7 @@ find -L . \
patch -p1 < $CWD/gcc7.diff
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--libdir=/usr/lib$LIBDIRSUFFIX \
diff --git a/games/trackballs/README b/games/trackballs/README
index 497414136d..31e39dfd50 100644
--- a/games/trackballs/README
+++ b/games/trackballs/README
@@ -7,7 +7,7 @@ the destination is reached you continue on to the next, more difficult
level... unless the time runs out.
This Slackware package can include the music and/or extra levels available
-at the trackballs home page: http://trackballs.sourceforge.net
+at http://trackballs.sourceforge.net
To add the music, download the file "trackballs-music-1.4.tar.bz2"
and save it in the same directory as the SlackBuild script. If using
diff --git a/games/trackballs/patches/abs.diff b/games/trackballs/patches/abs.diff
deleted file mode 100644
index 597971906d..0000000000
--- a/games/trackballs/patches/abs.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur trackballs-1.1.4/src/glHelp.cc trackballs-1.1.4.patched/src/glHelp.cc
---- trackballs-1.1.4/src/glHelp.cc 2007-04-07 09:15:09.000000000 -0400
-+++ trackballs-1.1.4.patched/src/glHelp.cc 2017-06-21 11:58:32.035646783 -0400
-@@ -129,7 +129,6 @@
- // why is this removed? should it not be done???
- glDeleteTextures(1,&texture);
- }
--inline Real abs(Real v) {return v>0.0?v:-v;}
- double mousePointerPhase=0.0;
-
- void tickMouse(Real td) {
-diff -Naur trackballs-1.1.4/src/menuMode.cc trackballs-1.1.4.patched/src/menuMode.cc
---- trackballs-1.1.4/src/menuMode.cc 2007-04-07 09:16:26.000000000 -0400
-+++ trackballs-1.1.4.patched/src/menuMode.cc 2017-06-21 11:58:36.201646790 -0400
-@@ -163,7 +163,6 @@
- case MENU_EDITOR: GameMode::activate(EditMode::editMode); break;
- }
- }
--inline Real abs(Real v) {return v>0.0?v:-v;}
-
- void MenuMode::idle(Real td) {
- int w,h,i,x,y;
diff --git a/games/trackballs/patches/trackballs-1.1.4-guile20.patch b/games/trackballs/patches/trackballs-1.1.4-guile20.patch
deleted file mode 100644
index 79a9174ce0..0000000000
--- a/games/trackballs/patches/trackballs-1.1.4-guile20.patch
+++ /dev/null
@@ -1,310 +0,0 @@
---- trackballs-1.1.4/src/game.cc 2007-05-25 12:24:42.000000000 +0200
-+++ trackballs-1.1.4.new/src/game.cc 2011-05-18 12:51:33.350253294 +0200
-@@ -65,7 +65,7 @@
- /* Load the bootup script */
- char scmname[256];
- snprintf(scmname,sizeof(scmname),"%s/levels/boot.scm",SHARE_DIR);
-- gh_eval_file(scmname);
-+ scm_c_primitive_load(scmname);
-
- player1 = new Player(gamer);
- loadLevel(name);
-@@ -110,7 +110,7 @@
-
- if(map) delete map;
- map = new Map(mapname);
-- gh_eval_file(scmname);
-+ scm_c_primitive_load(scmname);
-
- if(player1)
- player1->timeLeft = startTime;
---- trackballs-1.1.4/src/guile.cc.x 2007-05-25 16:40:36.000000000 +0200
-+++ trackballs-1.1.4.new/src/guile.cc.x 2011-05-18 12:55:59.574253365 +0200
-@@ -1,88 +1,88 @@
- /* cpp arguments: guile.cc -DLOCALEDIR="/usr/local/share/locale" -DHAVE_CONFIG_H -I. -I.. -DSHARE_DIR="/usr/local/share/trackballs" -DPACKAGE="trackballs" -DVERSION="1.1.4" -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I./ -I../ */
-- scm_c_define_gsubr (s_player, 0, 0, 0, (SCM (*)()) player); ;
-- scm_c_define_gsubr (s_new_mr_black, 2, 0, 0, (SCM (*)()) new_mr_black); ;
-- scm_c_define_gsubr (s_new_baby, 2, 0, 0, (SCM (*)()) new_baby); ;
-- scm_c_define_gsubr (s_add_teleport, 5, 0, 0, (SCM (*)()) add_teleport); ;
-- scm_c_define_gsubr (s_add_bird, 6, 0, 0, (SCM (*)()) add_bird); ;
-- scm_c_define_gsubr (s_add_flag, 5, 0, 0, (SCM (*)()) add_flag); ;
-- scm_c_define_gsubr (s_add_colormodifier, 7, 0, 0, (SCM (*)()) add_colormodifier); ;
-- scm_c_define_gsubr (s_add_heightmodifier, 7, 3, 0, (SCM (*)()) add_heightmodifier); ;
-- scm_c_define_gsubr (s_add_cactus, 3, 0, 0, (SCM (*)()) add_cactus); ;
-- scm_c_define_gsubr (s_add_spike, 4, 0, 0, (SCM (*)()) add_spike); ;
-- scm_c_define_gsubr (s_add_sidespike, 5, 0, 0, (SCM (*)()) add_sidespike); ;
-- scm_c_define_gsubr (s_add_goal, 4, 0, 0, (SCM (*)()) add_goal); ;
-- scm_c_define_gsubr (s_sign, 6, 1, 0, (SCM (*)()) sign); ;
-- scm_c_define_gsubr (s_add_modpill, 5, 0, 0, (SCM (*)()) add_modpill); ;
-- scm_c_define_gsubr (s_forcefield, 8, 0, 0, (SCM (*)()) forcefield); ;
-- scm_c_define_gsubr (s_fun_switch, 4, 0, 0, (SCM (*)()) fun_switch); ;
-- scm_c_define_gsubr (s_new_pipe, 7, 0, 0, (SCM (*)()) new_pipe); ;
-- scm_c_define_gsubr (s_pipe_connector, 4, 0, 0, (SCM (*)()) pipe_connector); ;
-- scm_c_define_gsubr (s_diamond, 2, 1, 0, (SCM (*)()) diamond); ;
-- scm_c_define_gsubr (s_fountain, 6, 0, 0, (SCM (*)()) fountain); ;
-- scm_c_define_gsubr (s_set_position, 3, 1, 0, (SCM (*)()) set_position); ;
-- scm_c_define_gsubr (s_get_position_x, 1, 0, 0, (SCM (*)()) get_position_x); ;
-- scm_c_define_gsubr (s_get_position_y, 1, 0, 0, (SCM (*)()) get_position_y); ;
-- scm_c_define_gsubr (s_get_position_z, 1, 0, 0, (SCM (*)()) get_position_z); ;
-- scm_c_define_gsubr (s_set_modtime, 3, 0, 0, (SCM (*)()) set_modtime); ;
-- scm_c_define_gsubr (s_set_acceleration, 2, 0, 0, (SCM (*)()) set_acceleration); ;
-- scm_c_define_gsubr (s_set_horizon, 2, 0, 0, (SCM (*)()) set_horizon); ;
-- scm_c_define_gsubr (s_set_primary_color, 4, 1, 0, (SCM (*)()) set_primary_color); ;
-- scm_c_define_gsubr (s_set_secondary_color, 4, 1, 0, (SCM (*)()) set_secondary_color); ;
-- scm_c_define_gsubr (s_set_specular_color, 4, 1, 0, (SCM (*)()) set_specular_color); ;
-- scm_c_define_gsubr (s_set_flag, 3, 0, 0, (SCM (*)()) set_flag); ;
-- scm_c_define_gsubr (s_set_wind, 3, 0, 0, (SCM (*)()) set_wind); ;
-- scm_c_define_gsubr (s_set_speed, 2, 0, 0, (SCM (*)()) set_speed); ;
-- scm_c_define_gsubr (s_set_texture, 2, 0, 0, (SCM (*)()) set_texture); ;
-- scm_c_define_gsubr (s_set_fountain_strength, 2, 0, 0, (SCM (*)()) set_fountain_strength); ;
-- scm_c_define_gsubr (s_set_fountain_velocity, 4, 0, 0, (SCM (*)()) set_fountain_velocity); ;
-- scm_c_define_gsubr (s_score_on_death, 2, 0, 0, (SCM (*)()) score_on_death); ;
-- scm_c_define_gsubr (s_time_on_death, 2, 0, 0, (SCM (*)()) time_on_death); ;
-- scm_c_define_gsubr (s_default_on_death, 3, 0, 0, (SCM (*)()) default_on_death); ;
-- scm_c_define_gsubr (s_add_cyclic_platform, 8, 0, 0, (SCM (*)()) add_cyclic_platform); ;
-- scm_c_define_gsubr (s_animator, 7, 0, 0, (SCM (*)()) animator); ;
-- scm_c_define_gsubr (s_set_onoff, 2, 0, 0, (SCM (*)()) set_onoff); ;
-- scm_c_define_gsubr (s_animator_value, 1, 0, 0, (SCM (*)()) animator_value); ;
-- scm_c_define_gsubr (s_set_animator_direction, 2, 0, 0, (SCM (*)()) set_animator_direction); ;
-- scm_c_define_gsubr (s_set_animator_position, 2, 0, 0, (SCM (*)()) set_animator_position); ;
-- scm_c_define_gsubr (s_day, 0, 0, 0, (SCM (*)()) day); ;
-- scm_c_define_gsubr (s_night, 0, 0, 0, (SCM (*)()) night); ;
-- scm_c_define_gsubr (s_fog, 0, 1, 0, (SCM (*)()) fog); ;
-- scm_c_define_gsubr (s_thick_fog, 0, 0, 0, (SCM (*)()) thick_fog); ;
-- scm_c_define_gsubr (s_fog_color, 3, 0, 0, (SCM (*)()) fog_color); ;
-- scm_c_define_gsubr (s_set_bonus_level, 1, 0, 0, (SCM (*)()) set_bonus_level); ;
-- scm_c_define_gsubr (s_set_track_name, 1, 0, 0, (SCM (*)()) set_track_name); ;
-- scm_c_define_gsubr (s_set_author, 1, 0, 0, (SCM (*)()) set_author); ;
-- scm_c_define_gsubr (s_start_time, 1, 0, 0, (SCM (*)()) start_time); ;
-- scm_c_define_gsubr (s_set_time, 1, 0, 0, (SCM (*)()) set_time); ;
-- scm_c_define_gsubr (s_get_time, 0, 0, 0, (SCM (*)()) get_time); ;
-- scm_c_define_gsubr (s_add_time, 1, 0, 0, (SCM (*)()) add_time); ;
-- scm_c_define_gsubr (s_set_score, 1, 0, 0, (SCM (*)()) set_score); ;
-- scm_c_define_gsubr (s_get_score, 0, 0, 0, (SCM (*)()) get_score); ;
-- scm_c_define_gsubr (s_add_score, 1, 0, 0, (SCM (*)()) add_score); ;
-- scm_c_define_gsubr (s_set_start_position, 2, 0, 0, (SCM (*)()) set_start_position); ;
-- scm_c_define_gsubr (s_snow, 1, 0, 0, (SCM (*)()) snow); ;
-- scm_c_define_gsubr (s_rain, 1, 0, 0, (SCM (*)()) rain); ;
-- scm_c_define_gsubr (s_difficulty, 0, 0, 0, (SCM (*)()) difficulty); ;
-- scm_c_define_gsubr (s_use_grid, 1, 0, 0, (SCM (*)()) use_grid); ;
-- scm_c_define_gsubr (s_map_is_transparent, 1, 0, 0, (SCM (*)()) map_is_transparent); ;
-- scm_c_define_gsubr (s_jump, 1, 0, 0, (SCM (*)()) jump); ;
-- scm_c_define_gsubr (s_scale_oxygen, 1, 0, 0, (SCM (*)()) scale_oxygen); ;
-- scm_c_define_gsubr (s_set_cell_flag, 6, 0, 0, (SCM (*)()) set_cell_flag); ;
-- scm_c_define_gsubr (s_set_cell_velocity, 6, 0, 0, (SCM (*)()) set_cell_velocity); ;
-- scm_c_define_gsubr (s_set_cell_heights, 8, 1, 0, (SCM (*)()) set_cell_heights); ;
-- scm_c_define_gsubr (s_set_cell_water_heights, 8, 1, 0, (SCM (*)()) set_cell_water_heights); ;
-- scm_c_define_gsubr (s_set_cell_colors, 8, 1, 0, (SCM (*)()) set_cell_colors); ;
-- scm_c_define_gsubr (s_set_cell_wall_colors, 8, 1, 0, (SCM (*)()) set_cell_wall_colors); ;
-- scm_c_define_gsubr (s_play_effect, 1, 0, 0, (SCM (*)()) play_effect); ;
-- scm_c_define_gsubr (s_camera_angle, 2, 0, 0, (SCM (*)()) camera_angle); ;
-- scm_c_define_gsubr (s_restart_time, 1, 0, 0, (SCM (*)()) restart_time); ;
-- scm_c_define_gsubr (s_clear_song_preferences, 0, 0, 0, (SCM (*)()) clear_song_preferences); ;
-- scm_c_define_gsubr (s_force_next_song, 0, 0, 0, (SCM (*)()) force_next_song); ;
-- scm_c_define_gsubr (s_set_song_preference, 2, 0, 0, (SCM (*)()) set_song_preference); ;
-- scm_c_define_gsubr (s_trigger, 4, 0, 0, (SCM (*)()) trigger); ;
-- scm_c_define_gsubr (s_smart_trigger, 5, 0, 0, (SCM (*)()) smart_trigger); ;
-- scm_c_define_gsubr (s_on_event, 3, 0, 0, (SCM (*)()) on_event); ;
-- scm_c_define_gsubr (s_get_event_callback, 2, 0, 0, (SCM (*)()) get_event_callback); ;
-+ scm_c_define_gsubr (s_player, 0, 0, 0, (void *) player); ;
-+ scm_c_define_gsubr (s_new_mr_black, 2, 0, 0, (void *) new_mr_black); ;
-+ scm_c_define_gsubr (s_new_baby, 2, 0, 0, (void *) new_baby); ;
-+ scm_c_define_gsubr (s_add_teleport, 5, 0, 0, (void *) add_teleport); ;
-+ scm_c_define_gsubr (s_add_bird, 6, 0, 0, (void *) add_bird); ;
-+ scm_c_define_gsubr (s_add_flag, 5, 0, 0, (void *) add_flag); ;
-+ scm_c_define_gsubr (s_add_colormodifier, 7, 0, 0, (void *) add_colormodifier); ;
-+ scm_c_define_gsubr (s_add_heightmodifier, 7, 3, 0, (void *) add_heightmodifier); ;
-+ scm_c_define_gsubr (s_add_cactus, 3, 0, 0, (void *) add_cactus); ;
-+ scm_c_define_gsubr (s_add_spike, 4, 0, 0, (void *) add_spike); ;
-+ scm_c_define_gsubr (s_add_sidespike, 5, 0, 0, (void *) add_sidespike); ;
-+ scm_c_define_gsubr (s_add_goal, 4, 0, 0, (void *) add_goal); ;
-+ scm_c_define_gsubr (s_sign, 6, 1, 0, (void *) sign); ;
-+ scm_c_define_gsubr (s_add_modpill, 5, 0, 0, (void *) add_modpill); ;
-+ scm_c_define_gsubr (s_forcefield, 8, 0, 0, (void *) forcefield); ;
-+ scm_c_define_gsubr (s_fun_switch, 4, 0, 0, (void *) fun_switch); ;
-+ scm_c_define_gsubr (s_new_pipe, 7, 0, 0, (void *) new_pipe); ;
-+ scm_c_define_gsubr (s_pipe_connector, 4, 0, 0, (void *) pipe_connector); ;
-+ scm_c_define_gsubr (s_diamond, 2, 1, 0, (void *) diamond); ;
-+ scm_c_define_gsubr (s_fountain, 6, 0, 0, (void *) fountain); ;
-+ scm_c_define_gsubr (s_set_position, 3, 1, 0, (void *) set_position); ;
-+ scm_c_define_gsubr (s_get_position_x, 1, 0, 0, (void *) get_position_x); ;
-+ scm_c_define_gsubr (s_get_position_y, 1, 0, 0, (void *) get_position_y); ;
-+ scm_c_define_gsubr (s_get_position_z, 1, 0, 0, (void *) get_position_z); ;
-+ scm_c_define_gsubr (s_set_modtime, 3, 0, 0, (void *) set_modtime); ;
-+ scm_c_define_gsubr (s_set_acceleration, 2, 0, 0, (void *) set_acceleration); ;
-+ scm_c_define_gsubr (s_set_horizon, 2, 0, 0, (void *) set_horizon); ;
-+ scm_c_define_gsubr (s_set_primary_color, 4, 1, 0, (void *) set_primary_color); ;
-+ scm_c_define_gsubr (s_set_secondary_color, 4, 1, 0, (void *) set_secondary_color); ;
-+ scm_c_define_gsubr (s_set_specular_color, 4, 1, 0, (void *) set_specular_color); ;
-+ scm_c_define_gsubr (s_set_flag, 3, 0, 0, (void *) set_flag); ;
-+ scm_c_define_gsubr (s_set_wind, 3, 0, 0, (void *) set_wind); ;
-+ scm_c_define_gsubr (s_set_speed, 2, 0, 0, (void *) set_speed); ;
-+ scm_c_define_gsubr (s_set_texture, 2, 0, 0, (void *) set_texture); ;
-+ scm_c_define_gsubr (s_set_fountain_strength, 2, 0, 0, (void *) set_fountain_strength); ;
-+ scm_c_define_gsubr (s_set_fountain_velocity, 4, 0, 0, (void *) set_fountain_velocity); ;
-+ scm_c_define_gsubr (s_score_on_death, 2, 0, 0, (void *) score_on_death); ;
-+ scm_c_define_gsubr (s_time_on_death, 2, 0, 0, (void *) time_on_death); ;
-+ scm_c_define_gsubr (s_default_on_death, 3, 0, 0, (void *) default_on_death); ;
-+ scm_c_define_gsubr (s_add_cyclic_platform, 8, 0, 0, (void *) add_cyclic_platform); ;
-+ scm_c_define_gsubr (s_animator, 7, 0, 0, (void *) animator); ;
-+ scm_c_define_gsubr (s_set_onoff, 2, 0, 0, (void *) set_onoff); ;
-+ scm_c_define_gsubr (s_animator_value, 1, 0, 0, (void *) animator_value); ;
-+ scm_c_define_gsubr (s_set_animator_direction, 2, 0, 0, (void *) set_animator_direction); ;
-+ scm_c_define_gsubr (s_set_animator_position, 2, 0, 0, (void *) set_animator_position); ;
-+ scm_c_define_gsubr (s_day, 0, 0, 0, (void *) day); ;
-+ scm_c_define_gsubr (s_night, 0, 0, 0, (void *) night); ;
-+ scm_c_define_gsubr (s_fog, 0, 1, 0, (void *) fog); ;
-+ scm_c_define_gsubr (s_thick_fog, 0, 0, 0, (void *) thick_fog); ;
-+ scm_c_define_gsubr (s_fog_color, 3, 0, 0, (void *) fog_color); ;
-+ scm_c_define_gsubr (s_set_bonus_level, 1, 0, 0, (void *) set_bonus_level); ;
-+ scm_c_define_gsubr (s_set_track_name, 1, 0, 0, (void *) set_track_name); ;
-+ scm_c_define_gsubr (s_set_author, 1, 0, 0, (void *) set_author); ;
-+ scm_c_define_gsubr (s_start_time, 1, 0, 0, (void *) start_time); ;
-+ scm_c_define_gsubr (s_set_time, 1, 0, 0, (void *) set_time); ;
-+ scm_c_define_gsubr (s_get_time, 0, 0, 0, (void *) get_time); ;
-+ scm_c_define_gsubr (s_add_time, 1, 0, 0, (void *) add_time); ;
-+ scm_c_define_gsubr (s_set_score, 1, 0, 0, (void *) set_score); ;
-+ scm_c_define_gsubr (s_get_score, 0, 0, 0, (void *) get_score); ;
-+ scm_c_define_gsubr (s_add_score, 1, 0, 0, (void *) add_score); ;
-+ scm_c_define_gsubr (s_set_start_position, 2, 0, 0, (void *) set_start_position); ;
-+ scm_c_define_gsubr (s_snow, 1, 0, 0, (void *) snow); ;
-+ scm_c_define_gsubr (s_rain, 1, 0, 0, (void *) rain); ;
-+ scm_c_define_gsubr (s_difficulty, 0, 0, 0, (void *) difficulty); ;
-+ scm_c_define_gsubr (s_use_grid, 1, 0, 0, (void *) use_grid); ;
-+ scm_c_define_gsubr (s_map_is_transparent, 1, 0, 0, (void *) map_is_transparent); ;
-+ scm_c_define_gsubr (s_jump, 1, 0, 0, (void *) jump); ;
-+ scm_c_define_gsubr (s_scale_oxygen, 1, 0, 0, (void *) scale_oxygen); ;
-+ scm_c_define_gsubr (s_set_cell_flag, 6, 0, 0, (void *) set_cell_flag); ;
-+ scm_c_define_gsubr (s_set_cell_velocity, 6, 0, 0, (void *) set_cell_velocity); ;
-+ scm_c_define_gsubr (s_set_cell_heights, 8, 1, 0, (void *) set_cell_heights); ;
-+ scm_c_define_gsubr (s_set_cell_water_heights, 8, 1, 0, (void *) set_cell_water_heights); ;
-+ scm_c_define_gsubr (s_set_cell_colors, 8, 1, 0, (void *) set_cell_colors); ;
-+ scm_c_define_gsubr (s_set_cell_wall_colors, 8, 1, 0, (void *) set_cell_wall_colors); ;
-+ scm_c_define_gsubr (s_play_effect, 1, 0, 0, (void *) play_effect); ;
-+ scm_c_define_gsubr (s_camera_angle, 2, 0, 0, (void *) camera_angle); ;
-+ scm_c_define_gsubr (s_restart_time, 1, 0, 0, (void *) restart_time); ;
-+ scm_c_define_gsubr (s_clear_song_preferences, 0, 0, 0, (void *) clear_song_preferences); ;
-+ scm_c_define_gsubr (s_force_next_song, 0, 0, 0, (void *) force_next_song); ;
-+ scm_c_define_gsubr (s_set_song_preference, 2, 0, 0, (void *) set_song_preference); ;
-+ scm_c_define_gsubr (s_trigger, 4, 0, 0, (void *) trigger); ;
-+ scm_c_define_gsubr (s_smart_trigger, 5, 0, 0, (void *) smart_trigger); ;
-+ scm_c_define_gsubr (s_on_event, 3, 0, 0, (void *) on_event); ;
-+ scm_c_define_gsubr (s_get_event_callback, 2, 0, 0, (void *) get_event_callback); ;
- s_mod_speed = scm_permanent_object (scm_c_define ("*mod-speed*", scm_long2num(0))); ;
- s_mod_jump = scm_permanent_object (scm_c_define ("*mod-jump*", scm_long2num(1))); ;
- s_mod_spike = scm_permanent_object (scm_c_define ("*mod-spike*", scm_long2num(2))); ;
---- trackballs-1.1.4/src/guile.h 2007-05-17 17:09:28.000000000 +0200
-+++ trackballs-1.1.4.new/src/guile.h 2011-05-18 12:46:26.197253216 +0200
-@@ -21,7 +21,6 @@
- #ifndef GUILE_H
- #define GUILE_H
-
--#include <guile/gh.h>
- #include <libguile.h>
-
- void initGuileInterface();
-diff -up trackballs-1.1.4/share/levels/fourSeasons_2.scm~ trackballs-1.1.4/share/levels/fourSeasons_2.scm
---- trackballs-1.1.4/share/levels/fourSeasons_2.scm~ 2004-02-08 21:21:36.000000000 +0100
-+++ trackballs-1.1.4/share/levels/fourSeasons_2.scm 2011-05-18 14:40:43.959255037 +0200
-@@ -23,7 +23,7 @@
-
-
- (if (> (difficulty) *easy*)
-- (begin
-+ (let ()
- (define enemy-1 (new-mr-black 198.5 175.5))
- (if (= (difficulty) *hard*) (set-modtime enemy-1 *mod-spike* -1.))
- (set-acceleration enemy-1 2.0)
-diff -up trackballs-1.1.4/share/levels/frg5.scm~ trackballs-1.1.4/share/levels/frg5.scm
---- trackballs-1.1.4/share/levels/frg5.scm~ 2006-10-18 19:59:14.000000000 +0200
-+++ trackballs-1.1.4/share/levels/frg5.scm 2011-05-18 14:47:09.175255141 +0200
-@@ -26,16 +26,11 @@
-
- (diamond 190.0 182.0)
-
-+(define speed .3)
- (cond
-- ((= (difficulty) *easy*)
-- (define speed .4)
-- )
-- ((= (difficulty) *normal*)
-- (define speed .3)
-- )
-- ((= (difficulty) *hard*)
-- (define speed .2)
-- )
-+ ((= (difficulty) *easy*) (set! speed .4))
-+ ((= (difficulty) *normal*) (set! speed .3))
-+ ((= (difficulty) *hard*) (set! speed .2))
- )
-
- (add-cyclic-platform 204 191 204 191 4.9 6.4 1. speed)
-diff -up trackballs-1.1.4/share/levels/frg9.scm~ trackballs-1.1.4/share/levels/frg9.scm
---- trackballs-1.1.4/share/levels/frg9.scm~ 2006-10-30 21:23:38.000000000 +0100
-+++ trackballs-1.1.4/share/levels/frg9.scm 2011-05-18 14:47:04.903255137 +0200
-@@ -65,16 +65,11 @@
- (add-flag 208 219 30 0 1.5)
- (add-flag 209 216 30 0 1.5)
-
-+(define speed .4)
- (cond
-- ((= (difficulty) *easy*)
-- (define speed .6)
-- )
-- ((= (difficulty) *normal*)
-- (define speed .4)
-- )
-- ((= (difficulty) *hard*)
-- (define speed .2)
-- )
-+ ((= (difficulty) *easy*) (set! speed .6))
-+ ((= (difficulty) *normal*) (set! speed .4))
-+ ((= (difficulty) *hard*) (set! speed .2))
- )
-
- (add-cyclic-platform 220 238 220 238 3.0 5.0 1. speed)
-diff -up trackballs-1.1.4/share/levels/hxtst.scm~ trackballs-1.1.4/share/levels/hxtst.scm
---- trackballs-1.1.4/share/levels/hxtst.scm~ 2003-03-29 23:59:44.000000000 +0100
-+++ trackballs-1.1.4/share/levels/hxtst.scm 2011-05-18 14:41:57.399255057 +0200
-@@ -26,7 +26,7 @@
-
- ;; This would create a forcefield and a switch turning it on/off
- (if (= (difficulty) *hard*)
-- (begin
-+ (let ()
- (define ff (forcefield 251.5 250.5 0.0
- 2.0 0.0 0.0
- 0.5 *ff-kill*))
-diff -up trackballs-1.1.4/share/levels/lv1.scm~ trackballs-1.1.4/share/levels/lv1.scm
---- trackballs-1.1.4/share/levels/lv1.scm~ 2007-05-25 16:58:49.000000000 +0200
-+++ trackballs-1.1.4/share/levels/lv1.scm 2011-05-18 14:37:40.552254989 +0200
-@@ -39,7 +39,7 @@
-
- ;; This creates a forcefield and a switch turning it on/off
- (if (= (difficulty) *hard*)
-- (begin
-+ (let ()
- (define ff (forcefield 251.5 250.5 0.0
- 2.0 0.0 0.0
- 0.5 *ff-kill*))
-diff -up trackballs-1.1.4/src/mmad.cc~ trackballs-1.1.4/src/mmad.cc
---- trackballs-1.1.4/src/mmad.cc~ 2011-05-18 12:58:04.000000000 +0200
-+++ trackballs-1.1.4/src/mmad.cc 2011-05-18 14:54:00.999255250 +0200
-@@ -38,6 +38,7 @@ char *SHARE_DIR_DEFAULT=SHARE_DIR;
- #include "hofMode.h"
- #include <SDL/SDL_image.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include <settingsMode.h>
- #include <settings.h>
- #include <setupMode.h>
-@@ -554,6 +555,9 @@ int main(int argc,char **argv) {
- char guileLoadPath[256+16];/*longest effective share directory plus"GUILE_LOAD_PATH="*/
- program_name = argv[0];
-
-+ /* Disable guile deprecated warning, unless explicitly requested */
-+ setenv("GUILE_WARN_DEPRECATED", "no", 0);
-+
- /*** Autmatic detection of SHARE_DIR ***/
- effectiveShareDir[0]=0;
- /* From environment variable */
diff --git a/games/trackballs/patches/trackballs-1.1.4-remove-old-sdl-workarounds.patch b/games/trackballs/patches/trackballs-1.1.4-remove-old-sdl-workarounds.patch
deleted file mode 100644
index 21c9a58c20..0000000000
--- a/games/trackballs/patches/trackballs-1.1.4-remove-old-sdl-workarounds.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -up trackballs-1.1.4/src/gameMode.cc~ trackballs-1.1.4/src/gameMode.cc
---- trackballs-1.1.4/src/gameMode.cc~ 2006-08-06 14:01:39.000000000 +0200
-+++ trackballs-1.1.4/src/gameMode.cc 2011-05-18 15:51:03.320256212 +0200
-@@ -26,9 +26,8 @@ using namespace std;
-
- GameMode *GameMode::current;
-
--GameMode::GameMode() { keyUpReceived=1; }
--GameMode::~GameMode() {
--}
-+GameMode::GameMode() {}
-+GameMode::~GameMode() {}
- void GameMode::activate(GameMode* gm) {
- if(current) current->deactivated();
- current = gm;
-@@ -36,7 +35,6 @@ void GameMode::activate(GameMode* gm) {
- }
- void GameMode::display(){}
- void GameMode::key(int){}
--void GameMode::keyUp(int){ keyUpReceived=1; }
- void GameMode::special(int key,int x,int y){}
- void GameMode::idle(Real td){}
- void GameMode::mouse(int state,int x,int y){}
-diff -up trackballs-1.1.4/src/gameMode.h~ trackballs-1.1.4/src/gameMode.h
---- trackballs-1.1.4/src/gameMode.h~ 2006-08-06 14:01:20.000000000 +0200
-+++ trackballs-1.1.4/src/gameMode.h 2011-05-18 15:49:50.760256145 +0200
-@@ -33,7 +33,6 @@ class GameMode {
-
- virtual void display();
- virtual void key(int);
-- virtual void keyUp(int);
- virtual void special(int,int,int);
- virtual void idle(Real dt);
- virtual void doExpensiveComputations();
-@@ -44,9 +43,6 @@ class GameMode {
-
- static void activate(GameMode*);
- static GameMode *current;
-- protected:
-- int keyUpReceived;
-- private:
- };
-
- #endif
-diff -up trackballs-1.1.4/src/mainMode.cc~ trackballs-1.1.4/src/mainMode.cc
---- trackballs-1.1.4/src/mainMode.cc~ 2007-05-25 12:23:50.000000000 +0200
-+++ trackballs-1.1.4/src/mainMode.cc 2011-05-18 15:45:44.458256059 +0200
-@@ -464,11 +464,6 @@ void MainMode::activated() {
- camFocus[1] = Game::current->map->startPosition[1] - 5;
- time = 0.0;
- flash = 0.0;
--
-- /* Fix for an apparanet bug in my SDL + Xorg combination... */
-- SDL_WM_ToggleFullScreen(screen);
-- SDL_WM_ToggleFullScreen(screen);
--
- }
- void MainMode::deactivated() { free(viewportData); viewportData=NULL; }
- void MainMode::playerLoose() { Game::current->gamer->playerLoose(); gameStatus=statusGameOver; }
-diff -up trackballs-1.1.4/src/mmad.cc~ trackballs-1.1.4/src/mmad.cc
---- trackballs-1.1.4/src/mmad.cc~ 2011-05-18 14:55:38.000000000 +0200
-+++ trackballs-1.1.4/src/mmad.cc 2011-05-18 16:11:33.817256492 +0200
-@@ -411,7 +411,6 @@ void innerMain(void *closure,int argc,ch
- /* Initialize random number generator */
- int seed=(int) getSystemTime();
- srand(seed);
-- int keyUpReceived=1;
-
- while(is_running) {
-
-@@ -469,9 +468,6 @@ void innerMain(void *closure,int argc,ch
- if(GameMode::current) GameMode::current->mouseDown(e->button,e->x,e->y);
- break;
- case SDL_KEYUP:
-- /* Prevent repeated keys */
-- keyUpReceived=1;
--
- /* Use Caps lock key to determine if mouse should be hidden+grabbed */
- if(event.key.keysym.sym == SDLK_CAPSLOCK) {
- if(SDL_GetModState() & KMOD_CAPS) {
-@@ -481,12 +477,12 @@ void innerMain(void *closure,int argc,ch
- SDL_WM_GrabInput(SDL_GRAB_ON);
- SDL_ShowCursor(SDL_DISABLE);
- }
-- } else
-- GameMode::current->keyUp(event.key.keysym.sym);
-+ }
-+ break;
- case SDL_KEYDOWN:
--
- /* Always quit if the 'q' key is pressed */
-- if(event.key.keysym.sym == 'q' && SDL_GetModState() & KMOD_CTRL) exit(0);
-+ if(event.key.keysym.sym == 'q' && SDL_GetModState() & KMOD_CTRL)
-+ exit(0);
-
- /* Change between fullscreen/windowed mode if the 'f' key
- is pressed */
-@@ -525,14 +521,13 @@ void innerMain(void *closure,int argc,ch
- ((EditMode*)GameMode::current)->askQuit();
- } else if((GameMode::current && GameMode::current == MenuMode::menuMode))
- is_running=0;
-- else { GameMode::activate(MenuMode::menuMode); while(SDL_PollEvent(&event)) {} }
--
-+ else {
-+ GameMode::activate(MenuMode::menuMode);
-+ while(SDL_PollEvent(&event)) {}
-+ }
- }
-- else if(GameMode::current) {
-- /* Prevent repeated keys */
-- if(!keyUpReceived) break;
-- keyUpReceived=0;
-
-+ else if(GameMode::current) {
- GameMode::current->key(event.key.keysym.sym);
- }
-
diff --git a/games/trackballs/trackballs.SlackBuild b/games/trackballs/trackballs.SlackBuild
index 810a670593..e48c0d7f08 100644
--- a/games/trackballs/trackballs.SlackBuild
+++ b/games/trackballs/trackballs.SlackBuild
@@ -9,8 +9,8 @@
# 20170621 bkw: fix build on -current
PRGNAM=trackballs
-VERSION=${VERSION:-1.1.4}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.3.1}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -53,37 +53,33 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Apply two patches from redhat: one to fix building and running with guile-2.0.x,
-# another to fix "Esc" behaviour. Also abs.diff, which fixes the build for
-# gcc 7 from -current.
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
-
-# Make icons honor DESTDIR (thanks to Johannes for this fix)
-sed -i 's/ $(iconsdir)/ $(DESTDIR)$(iconsdir)/g' share/icons/Makefile.in
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DCMAKE_BUILD_TYPE=Release ..
+ make
+ make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/share/man $PKG/usr/man
gzip $PKG/usr/man/man6/$PRGNAM.6
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-cp -a README AUTHORS COPYING ChangeLog FAQ TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a docs/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION/html
+cp -a ABOUT-NLS.md AUTHORS.md COPYING FAQ.md NEWS.md README.md TODO.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/usr/share/applications
diff --git a/games/trackballs/trackballs.info b/games/trackballs/trackballs.info
index c51e5bd3ef..b80e21a8e0 100644
--- a/games/trackballs/trackballs.info
+++ b/games/trackballs/trackballs.info
@@ -1,10 +1,10 @@
PRGNAM="trackballs"
-VERSION="1.1.4"
-HOMEPAGE="http://trackballs.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/trackballs/trackballs-1.1.4.tar.gz"
-MD5SUM="84e2e8bb68842a636da91673751279a0"
+VERSION="1.3.1"
+HOMEPAGE="https://trackballs.github.io"
+DOWNLOAD="https://github.com/trackballs/trackballs/archive/v1.3.1/trackballs-1.3.1.tar.gz"
+MD5SUM="838ad07e30f2a819eacf268925ace093"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="guile2.2"
MAINTAINER="B. Watson"
EMAIL="yalhcru@gmail.com"
diff --git a/games/uqm/uqm.SlackBuild b/games/uqm/uqm.SlackBuild
index 28c298ab39..e3fa4774e7 100644
--- a/games/uqm/uqm.SlackBuild
+++ b/games/uqm/uqm.SlackBuild
@@ -92,6 +92,12 @@ if [ ! -e $CWD/$PRGNAM-$CONTVER-content.uqm ]; then
exit 1
fi
+for d in src/uqm/comm/*/ ; do
+ ( cd $d
+ mv strings.h ustrings.h )
+done
+find ./src/uqm/comm -type f -name '*.c' | xargs sed -i s/strings.h/ustrings.h/
+find ./src/uqm/comm -type f -name '*.h' | xargs sed -i s/STRINGS/USTRINGS/g
build_config | sh build.sh uqm config
sed -i -e "s/-O3/$SLKCFLAGS/" -e '/LDFLAGS/s,-lz,-lz -lm,' build.vars
diff --git a/games/vegastrike/cmake/FindGTK2.cmake b/games/vegastrike/cmake/FindGTK2.cmake
new file mode 100644
index 0000000000..62f1614f8c
--- /dev/null
+++ b/games/vegastrike/cmake/FindGTK2.cmake
@@ -0,0 +1,946 @@
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindGTK2
+--------
+
+Find the GTK2 widget libraries and several of its other optional components
+like ``gtkmm``, ``glade``, and ``glademm``.
+
+Specify one or more of the following components as you call this find
+module. See example below.
+
+* ``gtk``
+* ``gtkmm``
+* ``glade``
+* ``glademm``
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+The following variables will be defined for your use
+
+``GTK2_FOUND``
+ Were all of your specified components found?
+``GTK2_INCLUDE_DIRS``
+ All include directories
+``GTK2_LIBRARIES``
+ All libraries
+``GTK2_TARGETS``
+ All imported targets
+``GTK2_DEFINITIONS``
+ Additional compiler flags
+``GTK2_VERSION``
+ The version of GTK2 found (x.y.z)
+``GTK2_MAJOR_VERSION``
+ The major version of GTK2
+``GTK2_MINOR_VERSION``
+ The minor version of GTK2
+``GTK2_PATCH_VERSION``
+ The patch version of GTK2
+
+Input Variables
+^^^^^^^^^^^^^^^
+
+Optional variables you can define prior to calling this module:
+
+``GTK2_DEBUG``
+ Enables verbose debugging of the module
+``GTK2_ADDITIONAL_SUFFIXES``
+ Allows defining additional directories to search for include files
+
+Example Usage
+^^^^^^^^^^^^^
+
+Call :command:`find_package` once. Here are some examples to pick from:
+
+Require GTK 2.6 or later:
+
+.. code-block:: cmake
+
+ find_package(GTK2 2.6 REQUIRED gtk)
+
+Require GTK 2.10 or later and Glade:
+
+.. code-block:: cmake
+
+ find_package(GTK2 2.10 REQUIRED gtk glade)
+
+Search for GTK/GTKMM 2.8 or later:
+
+.. code-block:: cmake
+
+ find_package(GTK2 2.8 COMPONENTS gtk gtkmm)
+
+Use the results:
+
+.. code-block:: cmake
+
+ if(GTK2_FOUND)
+ include_directories(${GTK2_INCLUDE_DIRS})
+ add_executable(mygui mygui.cc)
+ target_link_libraries(mygui ${GTK2_LIBRARIES})
+ endif()
+#]=======================================================================]
+
+# Version 1.6 (CMake 3.0)
+# * Create targets for each library
+# * Do not link libfreetype
+# Version 1.5 (CMake 2.8.12)
+# * 14236: Detect gthread library
+# Detect pangocairo on windows
+# Detect pangocairo with gtk module instead of with gtkmm
+# * 14259: Use vc100 libraries with VS 11
+# * 14260: Export a GTK2_DEFINITIONS variable to set /vd2 when appropriate
+# (i.e. MSVC)
+# * Use the optimized/debug syntax for _LIBRARY and _LIBRARIES variables when
+# appropriate. A new set of _RELEASE variables was also added.
+# * Remove GTK2_SKIP_MARK_AS_ADVANCED option, as now the variables are
+# marked as advanced by SelectLibraryConfigurations
+# * Detect gmodule, pangoft2 and pangoxft libraries
+# Version 1.4 (10/4/2012) (CMake 2.8.10)
+# * 12596: Missing paths for FindGTK2 on NetBSD
+# * 12049: Fixed detection of GTK include files in the lib folder on
+# multiarch systems.
+# Version 1.3 (11/9/2010) (CMake 2.8.4)
+# * 11429: Add support for detecting GTK2 built with Visual Studio 10.
+# Thanks to Vincent Levesque for the patch.
+# Version 1.2 (8/30/2010) (CMake 2.8.3)
+# * Merge patch for detecting gdk-pixbuf library (split off
+# from core GTK in 2.21). Thanks to Vincent Untz for the patch
+# and Ricardo Cruz for the heads up.
+# Version 1.1 (8/19/2010) (CMake 2.8.3)
+# * Add support for detecting GTK2 under macports (thanks to Gary Kramlich)
+# Version 1.0 (8/12/2010) (CMake 2.8.3)
+# * Add support for detecting new pangommconfig.h header file
+# (Thanks to Sune Vuorela & the Debian Project for the patch)
+# * Add support for detecting fontconfig.h header
+# * Call find_package(Freetype) since it's required
+# * Add support for allowing users to add additional library directories
+# via the GTK2_ADDITIONAL_SUFFIXES variable (kind of a future-kludge in
+# case the GTK developers change versions on any of the directories in the
+# future).
+# Version 0.8 (1/4/2010)
+# * Get module working under MacOSX fink by adding /sw/include, /sw/lib
+# to PATHS and the gobject library
+# Version 0.7 (3/22/09)
+# * Checked into CMake CVS
+# * Added versioning support
+# * Module now defaults to searching for GTK if COMPONENTS not specified.
+# * Added HKCU prior to HKLM registry key and GTKMM specific environment
+# variable as per mailing list discussion.
+# * Added lib64 to include search path and a few other search paths where GTK
+# may be installed on Unix systems.
+# * Switched to lowercase CMake commands
+# * Prefaced internal variables with _GTK2 to prevent collision
+# * Changed internal macros to functions
+# * Enhanced documentation
+# Version 0.6 (1/8/08)
+# Added GTK2_SKIP_MARK_AS_ADVANCED option
+# Version 0.5 (12/19/08)
+# Second release to cmake mailing list
+
+#=============================================================
+# _GTK2_GET_VERSION
+# Internal function to parse the version number in gtkversion.h
+# _OUT_major = Major version number
+# _OUT_minor = Minor version number
+# _OUT_micro = Micro version number
+# _gtkversion_hdr = Header file to parse
+#=============================================================
+
+include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+
+function(_GTK2_GET_VERSION _OUT_major _OUT_minor _OUT_micro _gtkversion_hdr)
+ file(STRINGS ${_gtkversion_hdr} _contents REGEX "#define GTK_M[A-Z]+_VERSION[ \t]+")
+ if(_contents)
+ string(REGEX REPLACE ".*#define GTK_MAJOR_VERSION[ \t]+\\(([0-9]+)\\).*" "\\1" ${_OUT_major} "${_contents}")
+ string(REGEX REPLACE ".*#define GTK_MINOR_VERSION[ \t]+\\(([0-9]+)\\).*" "\\1" ${_OUT_minor} "${_contents}")
+ string(REGEX REPLACE ".*#define GTK_MICRO_VERSION[ \t]+\\(([0-9]+)\\).*" "\\1" ${_OUT_micro} "${_contents}")
+
+ if(NOT ${_OUT_major} MATCHES "[0-9]+")
+ message(FATAL_ERROR "Version parsing failed for GTK2_MAJOR_VERSION!")
+ endif()
+ if(NOT ${_OUT_minor} MATCHES "[0-9]+")
+ message(FATAL_ERROR "Version parsing failed for GTK2_MINOR_VERSION!")
+ endif()
+ if(NOT ${_OUT_micro} MATCHES "[0-9]+")
+ message(FATAL_ERROR "Version parsing failed for GTK2_MICRO_VERSION!")
+ endif()
+
+ set(${_OUT_major} ${${_OUT_major}} PARENT_SCOPE)
+ set(${_OUT_minor} ${${_OUT_minor}} PARENT_SCOPE)
+ set(${_OUT_micro} ${${_OUT_micro}} PARENT_SCOPE)
+ else()
+ message(FATAL_ERROR "Include file ${_gtkversion_hdr} does not exist")
+ endif()
+endfunction()
+
+
+#=============================================================
+# _GTK2_SIGCXX_GET_VERSION
+# Internal function to parse the version number in
+# sigc++config.h
+# _OUT_major = Major version number
+# _OUT_minor = Minor version number
+# _OUT_micro = Micro version number
+# _sigcxxversion_hdr = Header file to parse
+#=============================================================
+
+function(_GTK2_SIGCXX_GET_VERSION _OUT_major _OUT_minor _OUT_micro _sigcxxversion_hdr)
+ file(STRINGS ${_sigcxxversion_hdr} _contents REGEX "#define SIGCXX_M[A-Z]+_VERSION[ \t]+")
+ if(_contents)
+ string(REGEX REPLACE ".*#define SIGCXX_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" ${_OUT_major} "${_contents}")
+ string(REGEX REPLACE ".*#define SIGCXX_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" ${_OUT_minor} "${_contents}")
+ string(REGEX REPLACE ".*#define SIGCXX_MICRO_VERSION[ \t]+([0-9]+).*" "\\1" ${_OUT_micro} "${_contents}")
+
+ if(NOT ${_OUT_major} MATCHES "[0-9]+")
+ message(FATAL_ERROR "Version parsing failed for SIGCXX_MAJOR_VERSION!")
+ endif()
+ if(NOT ${_OUT_minor} MATCHES "[0-9]+")
+ message(FATAL_ERROR "Version parsing failed for SIGCXX_MINOR_VERSION!")
+ endif()
+ if(NOT ${_OUT_micro} MATCHES "[0-9]+")
+ message(FATAL_ERROR "Version parsing failed for SIGCXX_MICRO_VERSION!")
+ endif()
+
+ set(${_OUT_major} ${${_OUT_major}} PARENT_SCOPE)
+ set(${_OUT_minor} ${${_OUT_minor}} PARENT_SCOPE)
+ set(${_OUT_micro} ${${_OUT_micro}} PARENT_SCOPE)
+ else()
+ # The header does not have the version macros; assume it is ``0.0.0``.
+ set(${_OUT_major} 0)
+ set(${_OUT_minor} 0)
+ set(${_OUT_micro} 0)
+ endif()
+endfunction()
+
+
+#=============================================================
+# _GTK2_FIND_INCLUDE_DIR
+# Internal function to find the GTK include directories
+# _var = variable to set (_INCLUDE_DIR is appended)
+# _hdr = header file to look for
+#=============================================================
+function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
+
+ if(GTK2_DEBUG)
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "_GTK2_FIND_INCLUDE_DIR( ${_var} ${_hdr} )")
+ endif()
+
+ set(_gtk_packages
+ # If these ever change, things will break.
+ ${GTK2_ADDITIONAL_SUFFIXES}
+ glibmm-2.4
+ glib-2.0
+ atk-1.0
+ atkmm-1.6
+ cairo
+ cairomm-1.0
+ gdk-pixbuf-2.0
+ gdkmm-2.4
+ giomm-2.4
+ gtk-2.0
+ gtkmm-2.4
+ libglade-2.0
+ libglademm-2.4
+ harfbuzz
+ pango-1.0
+ pangomm-1.4
+ sigc++-2.0
+ )
+
+ #
+ # NOTE: The following suffixes cause searching for header files in both of
+ # these directories:
+ # /usr/include/<pkg>
+ # /usr/lib/<pkg>/include
+ #
+
+ set(_suffixes)
+ foreach(_d ${_gtk_packages})
+ list(APPEND _suffixes ${_d})
+ list(APPEND _suffixes ${_d}/include) # for /usr/lib/gtk-2.0/include
+ endforeach()
+
+ if(GTK2_DEBUG)
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "include suffixes = ${_suffixes}")
+ endif()
+
+ if(CMAKE_LIBRARY_ARCHITECTURE)
+ set(_gtk2_arch_dir /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE})
+ if(GTK2_DEBUG)
+ message(STATUS "Adding ${_gtk2_arch_dir} to search path for multiarch support")
+ endif()
+ endif()
+ find_path(GTK2_${_var}_INCLUDE_DIR ${_hdr}
+ PATHS
+ ${_gtk2_arch_dir}
+ /usr/local/libx32
+ /usr/local/lib64
+ /usr/local/lib
+ /usr/libx32
+ /usr/lib64
+ /usr/lib
+ /opt/gnome/include
+ /opt/gnome/lib
+ /opt/openwin/include
+ /usr/openwin/lib
+ /sw/lib
+ /opt/local/lib
+ /usr/pkg/lib
+ /usr/pkg/include/glib
+ $ENV{GTKMM_BASEPATH}/include
+ $ENV{GTKMM_BASEPATH}/lib
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/include
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib
+ PATH_SUFFIXES
+ ${_suffixes}
+ )
+ mark_as_advanced(GTK2_${_var}_INCLUDE_DIR)
+
+ if(GTK2_${_var}_INCLUDE_DIR)
+ set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTK2_${_var}_INCLUDE_DIR} PARENT_SCOPE)
+ endif()
+
+endfunction()
+
+#=============================================================
+# _GTK2_FIND_LIBRARY
+# Internal function to find libraries packaged with GTK2
+# _var = library variable to create (_LIBRARY is appended)
+#=============================================================
+function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version)
+
+ if(GTK2_DEBUG)
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "_GTK2_FIND_LIBRARY( ${_var} ${_lib} ${_expand_vc} ${_append_version} )")
+ endif()
+
+ # Not GTK versions per se but the versions encoded into Windows
+ # import libraries (GtkMM 2.14.1 has a gtkmm-vc80-2_4.lib for example)
+ # Also the MSVC libraries use _ for . (this is handled below)
+ set(_versions 2.20 2.18 2.16 2.14 2.12
+ 2.10 2.8 2.6 2.4 2.2 2.0
+ 1.20 1.18 1.16 1.14 1.12
+ 1.10 1.8 1.6 1.4 1.2 1.0)
+
+ set(_library)
+ set(_library_d)
+
+ set(_library ${_lib})
+
+ if(_expand_vc AND MSVC)
+ # Add vc80/vc90/vc100 midfixes
+ if(MSVC_TOOLSET_VERSION LESS 110)
+ set(_library ${_library}-vc${MSVC_TOOLSET_VERSION})
+ else()
+ # Up to gtkmm-win 2.22.0-2 there are no vc110 libraries but vc100 can be used
+ set(_library ${_library}-vc100)
+ endif()
+ set(_library_d ${_library}-d)
+ endif()
+
+ if(GTK2_DEBUG)
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "After midfix addition = ${_library} and ${_library_d}")
+ endif()
+
+ set(_lib_list)
+ set(_libd_list)
+ if(_append_version)
+ foreach(_ver ${_versions})
+ list(APPEND _lib_list "${_library}-${_ver}")
+ list(APPEND _libd_list "${_library_d}-${_ver}")
+ endforeach()
+ else()
+ set(_lib_list ${_library})
+ set(_libd_list ${_library_d})
+ endif()
+
+ if(GTK2_DEBUG)
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "library list = ${_lib_list} and library debug list = ${_libd_list}")
+ endif()
+
+ # For some silly reason the MSVC libraries use _ instead of .
+ # in the version fields
+ if(_expand_vc AND MSVC)
+ set(_no_dots_lib_list)
+ set(_no_dots_libd_list)
+ foreach(_l ${_lib_list})
+ string(REPLACE "." "_" _no_dots_library ${_l})
+ list(APPEND _no_dots_lib_list ${_no_dots_library})
+ endforeach()
+ # And for debug
+ set(_no_dots_libsd_list)
+ foreach(_l ${_libd_list})
+ string(REPLACE "." "_" _no_dots_libraryd ${_l})
+ list(APPEND _no_dots_libd_list ${_no_dots_libraryd})
+ endforeach()
+
+ # Copy list back to original names
+ set(_lib_list ${_no_dots_lib_list})
+ set(_libd_list ${_no_dots_libd_list})
+ endif()
+
+ if(GTK2_DEBUG)
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "While searching for GTK2_${_var}_LIBRARY, our proposed library list is ${_lib_list}")
+ endif()
+
+ find_library(GTK2_${_var}_LIBRARY_RELEASE
+ NAMES ${_lib_list}
+ PATHS
+ /opt/gnome/lib
+ /usr/openwin/lib
+ $ENV{GTKMM_BASEPATH}/lib
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib
+ )
+
+ if(_expand_vc AND MSVC)
+ if(GTK2_DEBUG)
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "While searching for GTK2_${_var}_LIBRARY_DEBUG our proposed library list is ${_libd_list}")
+ endif()
+
+ find_library(GTK2_${_var}_LIBRARY_DEBUG
+ NAMES ${_libd_list}
+ PATHS
+ $ENV{GTKMM_BASEPATH}/lib
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib
+ )
+ endif()
+
+ select_library_configurations(GTK2_${_var})
+
+ set(GTK2_${_var}_LIBRARY ${GTK2_${_var}_LIBRARY} PARENT_SCOPE)
+ set(GTK2_${_var}_FOUND ${GTK2_${_var}_FOUND} PARENT_SCOPE)
+
+ if(GTK2_${_var}_FOUND)
+ set(GTK2_LIBRARIES ${GTK2_LIBRARIES} ${GTK2_${_var}_LIBRARY})
+ set(GTK2_LIBRARIES ${GTK2_LIBRARIES} PARENT_SCOPE)
+ endif()
+
+ if(GTK2_DEBUG)
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "GTK2_${_var}_LIBRARY_RELEASE = \"${GTK2_${_var}_LIBRARY_RELEASE}\"")
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "GTK2_${_var}_LIBRARY_DEBUG = \"${GTK2_${_var}_LIBRARY_DEBUG}\"")
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "GTK2_${_var}_LIBRARY = \"${GTK2_${_var}_LIBRARY}\"")
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "GTK2_${_var}_FOUND = \"${GTK2_${_var}_FOUND}\"")
+ endif()
+
+endfunction()
+
+
+function(_GTK2_ADD_TARGET_DEPENDS_INTERNAL _var _property)
+ if(GTK2_DEBUG)
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "_GTK2_ADD_TARGET_DEPENDS_INTERNAL( ${_var} ${_property} )")
+ endif()
+
+ string(TOLOWER "${_var}" _basename)
+
+ if (TARGET GTK2::${_basename})
+ foreach(_depend ${ARGN})
+ set(_valid_depends)
+ if (TARGET GTK2::${_depend})
+ list(APPEND _valid_depends GTK2::${_depend})
+ endif()
+ if (_valid_depends)
+ set_property(TARGET GTK2::${_basename} APPEND PROPERTY ${_property} "${_valid_depends}")
+ endif()
+ set(_valid_depends)
+ endforeach()
+ endif()
+endfunction()
+
+function(_GTK2_ADD_TARGET_DEPENDS _var)
+ if(GTK2_DEBUG)
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "_GTK2_ADD_TARGET_DEPENDS( ${_var} )")
+ endif()
+
+ string(TOLOWER "${_var}" _basename)
+
+ if(TARGET GTK2::${_basename})
+ get_target_property(_configs GTK2::${_basename} IMPORTED_CONFIGURATIONS)
+ _GTK2_ADD_TARGET_DEPENDS_INTERNAL(${_var} INTERFACE_LINK_LIBRARIES ${ARGN})
+ foreach(_config ${_configs})
+ _GTK2_ADD_TARGET_DEPENDS_INTERNAL(${_var} IMPORTED_LINK_INTERFACE_LIBRARIES_${_config} ${ARGN})
+ endforeach()
+ endif()
+endfunction()
+
+function(_GTK2_ADD_TARGET_INCLUDE_DIRS _var)
+ if(GTK2_DEBUG)
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "_GTK2_ADD_TARGET_INCLUDE_DIRS( ${_var} )")
+ endif()
+
+ string(TOLOWER "${_var}" _basename)
+
+ if(TARGET GTK2::${_basename})
+ foreach(_include ${ARGN})
+ set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${_include}")
+ endforeach()
+ endif()
+endfunction()
+
+#=============================================================
+# _GTK2_ADD_TARGET
+# Internal function to create targets for GTK2
+# _var = target to create
+#=============================================================
+function(_GTK2_ADD_TARGET _var)
+ if(GTK2_DEBUG)
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "_GTK2_ADD_TARGET( ${_var} )")
+ endif()
+
+ string(TOLOWER "${_var}" _basename)
+
+ cmake_parse_arguments(_${_var} "" "" "GTK2_DEPENDS;GTK2_OPTIONAL_DEPENDS;OPTIONAL_INCLUDES" ${ARGN})
+
+ if(GTK2_${_var}_FOUND)
+ if(NOT TARGET GTK2::${_basename})
+ # Do not create the target if dependencies are missing
+ foreach(_dep ${_${_var}_GTK2_DEPENDS})
+ if(NOT TARGET GTK2::${_dep})
+ return()
+ endif()
+ endforeach()
+
+ add_library(GTK2::${_basename} UNKNOWN IMPORTED)
+
+ if(GTK2_${_var}_LIBRARY_RELEASE)
+ set_property(TARGET GTK2::${_basename} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+ set_property(TARGET GTK2::${_basename} PROPERTY IMPORTED_LOCATION_RELEASE "${GTK2_${_var}_LIBRARY_RELEASE}" )
+ endif()
+
+ if(GTK2_${_var}_LIBRARY_DEBUG)
+ set_property(TARGET GTK2::${_basename} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+ set_property(TARGET GTK2::${_basename} PROPERTY IMPORTED_LOCATION_DEBUG "${GTK2_${_var}_LIBRARY_DEBUG}" )
+ endif()
+
+ if(GTK2_${_var}_INCLUDE_DIR)
+ set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${GTK2_${_var}_INCLUDE_DIR}")
+ endif()
+
+ if(GTK2_${_var}CONFIG_INCLUDE_DIR AND NOT "x${GTK2_${_var}CONFIG_INCLUDE_DIR}" STREQUAL "x${GTK2_${_var}_INCLUDE_DIR}")
+ set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${GTK2_${_var}CONFIG_INCLUDE_DIR}")
+ endif()
+
+ if(GTK2_DEFINITIONS)
+ set_property(TARGET GTK2::${_basename} PROPERTY INTERFACE_COMPILE_DEFINITIONS "${GTK2_DEFINITIONS}")
+ endif()
+
+ if(_${_var}_GTK2_DEPENDS)
+ _GTK2_ADD_TARGET_DEPENDS(${_var} ${_${_var}_GTK2_DEPENDS} ${_${_var}_GTK2_OPTIONAL_DEPENDS})
+ endif()
+
+ if(_${_var}_OPTIONAL_INCLUDES)
+ foreach(_D ${_${_var}_OPTIONAL_INCLUDES})
+ if(_D)
+ _GTK2_ADD_TARGET_INCLUDE_DIRS(${_var} ${_D})
+ endif()
+ endforeach()
+ endif()
+ endif()
+
+ set(GTK2_TARGETS ${GTK2_TARGETS} GTK2::${_basename})
+ set(GTK2_TARGETS ${GTK2_TARGETS} PARENT_SCOPE)
+
+ if(GTK2_USE_IMPORTED_TARGETS)
+ set(GTK2_${_var}_LIBRARY GTK2::${_basename} PARENT_SCOPE)
+ endif()
+
+ endif()
+endfunction()
+
+
+
+#=============================================================
+
+#
+# main()
+#
+
+set(GTK2_FOUND)
+set(GTK2_INCLUDE_DIRS)
+set(GTK2_LIBRARIES)
+set(GTK2_TARGETS)
+set(GTK2_DEFINITIONS)
+
+if(NOT GTK2_FIND_COMPONENTS)
+ # Assume they only want GTK
+ set(GTK2_FIND_COMPONENTS gtk)
+endif()
+
+#
+# If specified, enforce version number
+#
+if(GTK2_FIND_VERSION)
+ set(GTK2_FAILED_VERSION_CHECK true)
+ if(GTK2_DEBUG)
+ message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
+ "Searching for version ${GTK2_FIND_VERSION}")
+ endif()
+ _GTK2_FIND_INCLUDE_DIR(GTK gtk/gtk.h)
+ if(GTK2_GTK_INCLUDE_DIR)
+ _GTK2_GET_VERSION(GTK2_MAJOR_VERSION
+ GTK2_MINOR_VERSION
+ GTK2_PATCH_VERSION
+ ${GTK2_GTK_INCLUDE_DIR}/gtk/gtkversion.h)
+ set(GTK2_VERSION
+ ${GTK2_MAJOR_VERSION}.${GTK2_MINOR_VERSION}.${GTK2_PATCH_VERSION})
+ if(GTK2_FIND_VERSION_EXACT)
+ if(GTK2_VERSION VERSION_EQUAL GTK2_FIND_VERSION)
+ set(GTK2_FAILED_VERSION_CHECK false)
+ endif()
+ else()
+ if(GTK2_VERSION VERSION_EQUAL GTK2_FIND_VERSION OR
+ GTK2_VERSION VERSION_GREATER GTK2_FIND_VERSION)
+ set(GTK2_FAILED_VERSION_CHECK false)
+ endif()
+ endif()
+ else()
+ # If we can't find the GTK include dir, we can't do version checking
+ if(GTK2_FIND_REQUIRED AND NOT GTK2_FIND_QUIETLY)
+ message(FATAL_ERROR "Could not find GTK2 include directory")
+ endif()
+ return()
+ endif()
+
+ if(GTK2_FAILED_VERSION_CHECK)
+ if(GTK2_FIND_REQUIRED AND NOT GTK2_FIND_QUIETLY)
+ if(GTK2_FIND_VERSION_EXACT)
+ message(FATAL_ERROR "GTK2 version check failed. Version ${GTK2_VERSION} was found, version ${GTK2_FIND_VERSION} is needed exactly.")
+ else()
+ message(FATAL_ERROR "GTK2 version check failed. Version ${GTK2_VERSION} was found, at least version ${GTK2_FIND_VERSION} is required")
+ endif()
+ endif()
+
+ # If the version check fails, exit out of the module here
+ return()
+ endif()
+endif()
+
+#
+# On MSVC, according to https://wiki.gnome.org/gtkmm/MSWindows, the /vd2 flag needs to be
+# passed to the compiler in order to use gtkmm
+#
+if(MSVC)
+ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
+ if(_GTK2_component STREQUAL "gtkmm")
+ set(GTK2_DEFINITIONS "/vd2")
+ elseif(_GTK2_component STREQUAL "glademm")
+ set(GTK2_DEFINITIONS "/vd2")
+ endif()
+ endforeach()
+endif()
+
+#
+# Find all components
+#
+
+find_package(Freetype QUIET)
+if(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
+ list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
+endif()
+
+foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
+ if(_GTK2_component STREQUAL "gtk")
+ # Left for compatibility with previous versions.
+ _GTK2_FIND_INCLUDE_DIR(FONTCONFIG fontconfig/fontconfig.h)
+ _GTK2_FIND_INCLUDE_DIR(X11 X11/Xlib.h)
+
+ _GTK2_FIND_INCLUDE_DIR(GLIB glib.h)
+ _GTK2_FIND_INCLUDE_DIR(GLIBCONFIG glibconfig.h)
+ _GTK2_FIND_LIBRARY (GLIB glib false true)
+ _GTK2_ADD_TARGET (GLIB)
+
+ _GTK2_FIND_INCLUDE_DIR(GOBJECT glib-object.h)
+ _GTK2_FIND_LIBRARY (GOBJECT gobject false true)
+ _GTK2_ADD_TARGET (GOBJECT GTK2_DEPENDS glib)
+
+ _GTK2_FIND_INCLUDE_DIR(ATK atk/atk.h)
+ _GTK2_FIND_LIBRARY (ATK atk false true)
+ _GTK2_ADD_TARGET (ATK GTK2_DEPENDS gobject glib)
+
+ _GTK2_FIND_LIBRARY (GIO gio false true)
+ _GTK2_ADD_TARGET (GIO GTK2_DEPENDS gobject glib)
+
+ _GTK2_FIND_LIBRARY (GTHREAD gthread false true)
+ _GTK2_ADD_TARGET (GTHREAD GTK2_DEPENDS glib)
+
+ _GTK2_FIND_LIBRARY (GMODULE gmodule false true)
+ _GTK2_ADD_TARGET (GMODULE GTK2_DEPENDS glib)
+
+ _GTK2_FIND_INCLUDE_DIR(GDK_PIXBUF gdk-pixbuf/gdk-pixbuf.h)
+ _GTK2_FIND_LIBRARY (GDK_PIXBUF gdk_pixbuf false true)
+ _GTK2_ADD_TARGET (GDK_PIXBUF GTK2_DEPENDS gobject glib)
+
+ _GTK2_FIND_INCLUDE_DIR(CAIRO cairo.h)
+ _GTK2_FIND_LIBRARY (CAIRO cairo false false)
+ _GTK2_ADD_TARGET (CAIRO)
+
+ _GTK2_FIND_INCLUDE_DIR(HARFBUZZ hb.h)
+ _GTK2_FIND_LIBRARY (HARFBUZZ harfbuzz false false)
+ _GTK2_ADD_TARGET (HARFBUZZ)
+
+ _GTK2_FIND_INCLUDE_DIR(PANGO pango/pango.h)
+ _GTK2_FIND_LIBRARY (PANGO pango false true)
+ _GTK2_ADD_TARGET (PANGO GTK2_DEPENDS gobject glib
+ GTK2_OPTIONAL_DEPENDS harfbuzz)
+
+ _GTK2_FIND_LIBRARY (PANGOCAIRO pangocairo false true)
+ _GTK2_ADD_TARGET (PANGOCAIRO GTK2_DEPENDS pango cairo gobject glib)
+
+ _GTK2_FIND_LIBRARY (PANGOFT2 pangoft2 false true)
+ _GTK2_ADD_TARGET (PANGOFT2 GTK2_DEPENDS pango gobject glib
+ OPTIONAL_INCLUDES ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}
+ ${GTK2_FONTCONFIG_INCLUDE_DIR}
+ ${GTK2_X11_INCLUDE_DIR})
+
+ _GTK2_FIND_LIBRARY (PANGOXFT pangoxft false true)
+ _GTK2_ADD_TARGET (PANGOXFT GTK2_DEPENDS pangoft2 pango gobject glib
+ OPTIONAL_INCLUDES ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}
+ ${GTK2_FONTCONFIG_INCLUDE_DIR}
+ ${GTK2_X11_INCLUDE_DIR})
+
+ _GTK2_FIND_INCLUDE_DIR(GDK gdk/gdk.h)
+ _GTK2_FIND_INCLUDE_DIR(GDKCONFIG gdkconfig.h)
+ if(UNIX)
+ if(APPLE)
+ _GTK2_FIND_LIBRARY (GDK gdk-quartz false true)
+ endif()
+ _GTK2_FIND_LIBRARY (GDK gdk-x11 false true)
+ else()
+ _GTK2_FIND_LIBRARY (GDK gdk-win32 false true)
+ endif()
+ _GTK2_ADD_TARGET (GDK GTK2_DEPENDS pango gdk_pixbuf gobject glib
+ GTK2_OPTIONAL_DEPENDS pangocairo cairo)
+
+ _GTK2_FIND_INCLUDE_DIR(GTK gtk/gtk.h)
+ if(UNIX)
+ if(APPLE)
+ _GTK2_FIND_LIBRARY (GTK gtk-quartz false true)
+ endif()
+ _GTK2_FIND_LIBRARY (GTK gtk-x11 false true)
+ else()
+ _GTK2_FIND_LIBRARY (GTK gtk-win32 false true)
+ endif()
+ _GTK2_ADD_TARGET (GTK GTK2_DEPENDS gdk atk pangoft2 pango gdk_pixbuf gthread gobject glib
+ GTK2_OPTIONAL_DEPENDS gio pangocairo cairo)
+
+ elseif(_GTK2_component STREQUAL "gtkmm")
+
+ _GTK2_FIND_INCLUDE_DIR(SIGC++ sigc++/sigc++.h)
+ _GTK2_FIND_INCLUDE_DIR(SIGC++CONFIG sigc++config.h)
+ _GTK2_FIND_LIBRARY (SIGC++ sigc true true)
+ _GTK2_ADD_TARGET (SIGC++)
+ # Since sigc++ 2.5.1 c++11 support is required
+ if(GTK2_SIGC++CONFIG_INCLUDE_DIR)
+ _GTK2_SIGCXX_GET_VERSION(GTK2_SIGC++_VERSION_MAJOR
+ GTK2_SIGC++_VERSION_MINOR
+ GTK2_SIGC++_VERSION_MICRO
+ ${GTK2_SIGC++CONFIG_INCLUDE_DIR}/sigc++config.h)
+ if(NOT ${GTK2_SIGC++_VERSION_MAJOR}.${GTK2_SIGC++_VERSION_MINOR}.${GTK2_SIGC++_VERSION_MICRO} VERSION_LESS 2.5.1)
+ # These are the features needed by clients in order to include the
+ # project headers:
+ set_property(TARGET GTK2::sigc++
+ PROPERTY INTERFACE_COMPILE_FEATURES cxx_alias_templates
+ cxx_auto_type
+ cxx_decltype
+ cxx_deleted_functions
+ cxx_noexcept
+ cxx_nullptr
+ cxx_right_angle_brackets
+ cxx_rvalue_references
+ cxx_variadic_templates)
+ endif()
+ endif()
+
+ _GTK2_FIND_INCLUDE_DIR(GLIBMM glibmm.h)
+ _GTK2_FIND_INCLUDE_DIR(GLIBMMCONFIG glibmmconfig.h)
+ _GTK2_FIND_LIBRARY (GLIBMM glibmm true true)
+ _GTK2_ADD_TARGET (GLIBMM GTK2_DEPENDS gobject sigc++ glib)
+
+ _GTK2_FIND_INCLUDE_DIR(GIOMM giomm.h)
+ _GTK2_FIND_INCLUDE_DIR(GIOMMCONFIG giommconfig.h)
+ _GTK2_FIND_LIBRARY (GIOMM giomm true true)
+ _GTK2_ADD_TARGET (GIOMM GTK2_DEPENDS gio glibmm gobject sigc++ glib)
+
+ _GTK2_FIND_INCLUDE_DIR(ATKMM atkmm.h)
+ _GTK2_FIND_LIBRARY (ATKMM atkmm true true)
+ _GTK2_ADD_TARGET (ATKMM GTK2_DEPENDS atk glibmm gobject sigc++ glib)
+
+ _GTK2_FIND_INCLUDE_DIR(CAIROMM cairomm/cairomm.h)
+ _GTK2_FIND_INCLUDE_DIR(CAIROMMCONFIG cairommconfig.h)
+ _GTK2_FIND_LIBRARY (CAIROMM cairomm true true)
+ _GTK2_ADD_TARGET (CAIROMM GTK2_DEPENDS cairo sigc++
+ OPTIONAL_INCLUDES ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}
+ ${GTK2_FONTCONFIG_INCLUDE_DIR}
+ ${GTK2_X11_INCLUDE_DIR})
+
+ _GTK2_FIND_INCLUDE_DIR(PANGOMM pangomm.h)
+ _GTK2_FIND_INCLUDE_DIR(PANGOMMCONFIG pangommconfig.h)
+ _GTK2_FIND_LIBRARY (PANGOMM pangomm true true)
+ _GTK2_ADD_TARGET (PANGOMM GTK2_DEPENDS glibmm sigc++ pango gobject glib
+ GTK2_OPTIONAL_DEPENDS cairomm pangocairo cairo
+ OPTIONAL_INCLUDES ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}
+ ${GTK2_FONTCONFIG_INCLUDE_DIR}
+ ${GTK2_X11_INCLUDE_DIR})
+
+ _GTK2_FIND_INCLUDE_DIR(GDKMM gdkmm.h)
+ _GTK2_FIND_INCLUDE_DIR(GDKMMCONFIG gdkmmconfig.h)
+ _GTK2_FIND_LIBRARY (GDKMM gdkmm true true)
+ _GTK2_ADD_TARGET (GDKMM GTK2_DEPENDS pangomm gtk glibmm sigc++ gdk atk pangoft2 gdk_pixbuf pango gobject glib
+ GTK2_OPTIONAL_DEPENDS giomm cairomm gio pangocairo cairo
+ OPTIONAL_INCLUDES ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}
+ ${GTK2_FONTCONFIG_INCLUDE_DIR}
+ ${GTK2_X11_INCLUDE_DIR})
+
+ _GTK2_FIND_INCLUDE_DIR(GTKMM gtkmm.h)
+ _GTK2_FIND_INCLUDE_DIR(GTKMMCONFIG gtkmmconfig.h)
+ _GTK2_FIND_LIBRARY (GTKMM gtkmm true true)
+ _GTK2_ADD_TARGET (GTKMM GTK2_DEPENDS atkmm gdkmm pangomm gtk glibmm sigc++ gdk atk pangoft2 gdk_pixbuf pango gthread gobject glib
+ GTK2_OPTIONAL_DEPENDS giomm cairomm gio pangocairo cairo
+ OPTIONAL_INCLUDES ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}
+ ${GTK2_FONTCONFIG_INCLUDE_DIR}
+ ${GTK2_X11_INCLUDE_DIR})
+
+ elseif(_GTK2_component STREQUAL "glade")
+
+ _GTK2_FIND_INCLUDE_DIR(GLADE glade/glade.h)
+ _GTK2_FIND_LIBRARY (GLADE glade false true)
+ _GTK2_ADD_TARGET (GLADE GTK2_DEPENDS gtk gdk atk gio pangoft2 gdk_pixbuf pango gobject glib
+ GTK2_OPTIONAL_DEPENDS pangocairo cairo
+ OPTIONAL_INCLUDES ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}
+ ${GTK2_FONTCONFIG_INCLUDE_DIR}
+ ${GTK2_X11_INCLUDE_DIR})
+
+ elseif(_GTK2_component STREQUAL "glademm")
+
+ _GTK2_FIND_INCLUDE_DIR(GLADEMM libglademm.h)
+ _GTK2_FIND_INCLUDE_DIR(GLADEMMCONFIG libglademmconfig.h)
+ _GTK2_FIND_LIBRARY (GLADEMM glademm true true)
+ _GTK2_ADD_TARGET (GLADEMM GTK2_DEPENDS gtkmm glade atkmm gdkmm giomm pangomm glibmm sigc++ gtk gdk atk pangoft2 gdk_pixbuf pango gthread gobject glib
+ GTK2_OPTIONAL_DEPENDS giomm cairomm gio pangocairo cairo
+ OPTIONAL_INCLUDES ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}
+ ${GTK2_FONTCONFIG_INCLUDE_DIR}
+ ${GTK2_X11_INCLUDE_DIR})
+
+ else()
+ message(FATAL_ERROR "Unknown GTK2 component ${_component}")
+ endif()
+endforeach()
+
+#
+# Solve for the GTK2 version if we haven't already
+#
+if(NOT GTK2_FIND_VERSION AND GTK2_GTK_INCLUDE_DIR)
+ _GTK2_GET_VERSION(GTK2_MAJOR_VERSION
+ GTK2_MINOR_VERSION
+ GTK2_PATCH_VERSION
+ ${GTK2_GTK_INCLUDE_DIR}/gtk/gtkversion.h)
+ set(GTK2_VERSION ${GTK2_MAJOR_VERSION}.${GTK2_MINOR_VERSION}.${GTK2_PATCH_VERSION})
+endif()
+
+#
+# Try to enforce components
+#
+
+set(_GTK2_did_we_find_everything true) # This gets set to GTK2_FOUND
+
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+
+foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
+ string(TOUPPER ${_GTK2_component} _COMPONENT_UPPER)
+
+ set(GTK2_${_COMPONENT_UPPER}_FIND_QUIETLY ${GTK2_FIND_QUIETLY})
+
+ set(FPHSA_NAME_MISMATCHED 1)
+ if(_GTK2_component STREQUAL "gtk")
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "Some or all of the gtk libraries were not found."
+ GTK2_GTK_LIBRARY
+ GTK2_GTK_INCLUDE_DIR
+
+ GTK2_GDK_INCLUDE_DIR
+ GTK2_GDKCONFIG_INCLUDE_DIR
+ GTK2_GDK_LIBRARY
+
+ GTK2_GLIB_INCLUDE_DIR
+ GTK2_GLIBCONFIG_INCLUDE_DIR
+ GTK2_GLIB_LIBRARY
+ )
+ elseif(_GTK2_component STREQUAL "gtkmm")
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "Some or all of the gtkmm libraries were not found."
+ GTK2_GTKMM_LIBRARY
+ GTK2_GTKMM_INCLUDE_DIR
+ GTK2_GTKMMCONFIG_INCLUDE_DIR
+
+ GTK2_GDKMM_INCLUDE_DIR
+ GTK2_GDKMMCONFIG_INCLUDE_DIR
+ GTK2_GDKMM_LIBRARY
+
+ GTK2_GLIBMM_INCLUDE_DIR
+ GTK2_GLIBMMCONFIG_INCLUDE_DIR
+ GTK2_GLIBMM_LIBRARY
+
+ FREETYPE_INCLUDE_DIR_ft2build
+ FREETYPE_INCLUDE_DIR_freetype2
+ )
+ elseif(_GTK2_component STREQUAL "glade")
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "The glade library was not found."
+ GTK2_GLADE_LIBRARY
+ GTK2_GLADE_INCLUDE_DIR
+ )
+ elseif(_GTK2_component STREQUAL "glademm")
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "The glademm library was not found."
+ GTK2_GLADEMM_LIBRARY
+ GTK2_GLADEMM_INCLUDE_DIR
+ GTK2_GLADEMMCONFIG_INCLUDE_DIR
+ )
+ endif()
+ unset(FPHSA_NAME_MISMATCHED)
+
+ if(NOT GTK2_${_COMPONENT_UPPER}_FOUND)
+ set(_GTK2_did_we_find_everything false)
+ endif()
+endforeach()
+
+if(GTK2_USE_IMPORTED_TARGETS)
+ set(GTK2_LIBRARIES ${GTK2_TARGETS})
+endif()
+
+
+if(_GTK2_did_we_find_everything AND NOT GTK2_VERSION_CHECK_FAILED)
+ set(GTK2_FOUND true)
+else()
+ # Unset our variables.
+ set(GTK2_FOUND false)
+ set(GTK2_VERSION)
+ set(GTK2_VERSION_MAJOR)
+ set(GTK2_VERSION_MINOR)
+ set(GTK2_VERSION_PATCH)
+ set(GTK2_INCLUDE_DIRS)
+ set(GTK2_LIBRARIES)
+ set(GTK2_TARGETS)
+ set(GTK2_DEFINITIONS)
+endif()
+
+if(GTK2_INCLUDE_DIRS)
+ list(REMOVE_DUPLICATES GTK2_INCLUDE_DIRS)
+endif()
diff --git a/games/vegastrike/cmake/FindPackageHandleStandardArgs.cmake b/games/vegastrike/cmake/FindPackageHandleStandardArgs.cmake
new file mode 100644
index 0000000000..4fb08259a0
--- /dev/null
+++ b/games/vegastrike/cmake/FindPackageHandleStandardArgs.cmake
@@ -0,0 +1,466 @@
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindPackageHandleStandardArgs
+-----------------------------
+
+This module provides a function intended to be used in :ref:`Find Modules`
+implementing :command:`find_package(<PackageName>)` calls. It handles the
+``REQUIRED``, ``QUIET`` and version-related arguments of ``find_package``.
+It also sets the ``<PackageName>_FOUND`` variable. The package is
+considered found if all variables listed contain valid results, e.g.
+valid filepaths.
+
+.. command:: find_package_handle_standard_args
+
+ There are two signatures::
+
+ find_package_handle_standard_args(<PackageName>
+ (DEFAULT_MSG|<custom-failure-message>)
+ <required-var>...
+ )
+
+ find_package_handle_standard_args(<PackageName>
+ [FOUND_VAR <result-var>]
+ [REQUIRED_VARS <required-var>...]
+ [VERSION_VAR <version-var>]
+ [HANDLE_COMPONENTS]
+ [CONFIG_MODE]
+ [NAME_MISMATCHED]
+ [REASON_FAILURE_MESSAGE <reason-failure-message>]
+ [FAIL_MESSAGE <custom-failure-message>]
+ )
+
+ The ``<PackageName>_FOUND`` variable will be set to ``TRUE`` if all
+ the variables ``<required-var>...`` are valid and any optional
+ constraints are satisfied, and ``FALSE`` otherwise. A success or
+ failure message may be displayed based on the results and on
+ whether the ``REQUIRED`` and/or ``QUIET`` option was given to
+ the :command:`find_package` call.
+
+ The options are:
+
+ ``(DEFAULT_MSG|<custom-failure-message>)``
+ In the simple signature this specifies the failure message.
+ Use ``DEFAULT_MSG`` to ask for a default message to be computed
+ (recommended). Not valid in the full signature.
+
+ ``FOUND_VAR <result-var>``
+ Obsolete. Specifies either ``<PackageName>_FOUND`` or
+ ``<PACKAGENAME>_FOUND`` as the result variable. This exists only
+ for compatibility with older versions of CMake and is now ignored.
+ Result variables of both names are always set for compatibility.
+
+ ``REQUIRED_VARS <required-var>...``
+ Specify the variables which are required for this package.
+ These may be named in the generated failure message asking the
+ user to set the missing variable values. Therefore these should
+ typically be cache entries such as ``FOO_LIBRARY`` and not output
+ variables like ``FOO_LIBRARIES``. This option is mandatory if
+ ``HANDLE_COMPONENTS`` is not specified.
+
+ ``VERSION_VAR <version-var>``
+ Specify the name of a variable that holds the version of the package
+ that has been found. This version will be checked against the
+ (potentially) specified required version given to the
+ :command:`find_package` call, including its ``EXACT`` option.
+ The default messages include information about the required
+ version and the version which has been actually found, both
+ if the version is ok or not.
+
+ ``HANDLE_COMPONENTS``
+ Enable handling of package components. In this case, the command
+ will report which components have been found and which are missing,
+ and the ``<PackageName>_FOUND`` variable will be set to ``FALSE``
+ if any of the required components (i.e. not the ones listed after
+ the ``OPTIONAL_COMPONENTS`` option of :command:`find_package`) are
+ missing.
+
+ ``CONFIG_MODE``
+ Specify that the calling find module is a wrapper around a
+ call to ``find_package(<PackageName> NO_MODULE)``. This implies
+ a ``VERSION_VAR`` value of ``<PackageName>_VERSION``. The command
+ will automatically check whether the package configuration file
+ was found.
+
+ ``REASON_FAILURE_MESSAGE <reason-failure-message>``
+ Specify a custom message of the reason for the failure which will be
+ appended to the default generated message.
+
+ ``FAIL_MESSAGE <custom-failure-message>``
+ Specify a custom failure message instead of using the default
+ generated message. Not recommended.
+
+ ``NAME_MISMATCHED``
+ Indicate that the ``<PackageName>`` does not match
+ ``${CMAKE_FIND_PACKAGE_NAME}``. This is usually a mistake and raises a
+ warning, but it may be intentional for usage of the command for components
+ of a larger package.
+
+Example for the simple signature:
+
+.. code-block:: cmake
+
+ find_package_handle_standard_args(LibXml2 DEFAULT_MSG
+ LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR)
+
+The ``LibXml2`` package is considered to be found if both
+``LIBXML2_LIBRARY`` and ``LIBXML2_INCLUDE_DIR`` are valid.
+Then also ``LibXml2_FOUND`` is set to ``TRUE``. If it is not found
+and ``REQUIRED`` was used, it fails with a
+:command:`message(FATAL_ERROR)`, independent whether ``QUIET`` was
+used or not. If it is found, success will be reported, including
+the content of the first ``<required-var>``. On repeated CMake runs,
+the same message will not be printed again.
+
+.. note::
+
+ If ``<PackageName>`` does not match ``CMAKE_FIND_PACKAGE_NAME`` for the
+ calling module, a warning that there is a mismatch is given. The
+ ``FPHSA_NAME_MISMATCHED`` variable may be set to bypass the warning if using
+ the old signature and the ``NAME_MISMATCHED`` argument using the new
+ signature. To avoid forcing the caller to require newer versions of CMake for
+ usage, the variable's value will be used if defined when the
+ ``NAME_MISMATCHED`` argument is not passed for the new signature (but using
+ both is an error)..
+
+Example for the full signature:
+
+.. code-block:: cmake
+
+ find_package_handle_standard_args(LibArchive
+ REQUIRED_VARS LibArchive_LIBRARY LibArchive_INCLUDE_DIR
+ VERSION_VAR LibArchive_VERSION)
+
+In this case, the ``LibArchive`` package is considered to be found if
+both ``LibArchive_LIBRARY`` and ``LibArchive_INCLUDE_DIR`` are valid.
+Also the version of ``LibArchive`` will be checked by using the version
+contained in ``LibArchive_VERSION``. Since no ``FAIL_MESSAGE`` is given,
+the default messages will be printed.
+
+Another example for the full signature:
+
+.. code-block:: cmake
+
+ find_package(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4)
+ find_package_handle_standard_args(Automoc4 CONFIG_MODE)
+
+In this case, a ``FindAutmoc4.cmake`` module wraps a call to
+``find_package(Automoc4 NO_MODULE)`` and adds an additional search
+directory for ``automoc4``. Then the call to
+``find_package_handle_standard_args`` produces a proper success/failure
+message.
+#]=======================================================================]
+
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake)
+
+# internal helper macro
+macro(_FPHSA_FAILURE_MESSAGE _msg)
+ set (__msg "${_msg}")
+ if (FPHSA_REASON_FAILURE_MESSAGE)
+ string(APPEND __msg "\n Reason given by package: ${FPHSA_REASON_FAILURE_MESSAGE}\n")
+ endif()
+ if (${_NAME}_FIND_REQUIRED)
+ message(FATAL_ERROR "${__msg}")
+ else ()
+ if (NOT ${_NAME}_FIND_QUIETLY)
+ message(STATUS "${__msg}")
+ endif ()
+ endif ()
+endmacro()
+
+
+# internal helper macro to generate the failure message when used in CONFIG_MODE:
+macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
+ # <PackageName>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
+ if(${_NAME}_CONFIG)
+ _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing:${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
+ else()
+ # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
+ # List them all in the error message:
+ if(${_NAME}_CONSIDERED_CONFIGS)
+ set(configsText "")
+ list(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
+ math(EXPR configsCount "${configsCount} - 1")
+ foreach(currentConfigIndex RANGE ${configsCount})
+ list(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
+ list(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
+ string(APPEND configsText "\n ${filename} (version ${version})")
+ endforeach()
+ if (${_NAME}_NOT_FOUND_MESSAGE)
+ if (FPHSA_REASON_FAILURE_MESSAGE)
+ string(PREPEND FPHSA_REASON_FAILURE_MESSAGE "${${_NAME}_NOT_FOUND_MESSAGE}\n ")
+ else()
+ set(FPHSA_REASON_FAILURE_MESSAGE "${${_NAME}_NOT_FOUND_MESSAGE}")
+ endif()
+ else()
+ string(APPEND configsText "\n")
+ endif()
+ _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:${configsText}")
+
+ else()
+ # Simple case: No Config-file was found at all:
+ _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
+ endif()
+ endif()
+endmacro()
+
+
+function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
+
+ # Set up the arguments for `cmake_parse_arguments`.
+ set(options CONFIG_MODE HANDLE_COMPONENTS NAME_MISMATCHED)
+ set(oneValueArgs FAIL_MESSAGE REASON_FAILURE_MESSAGE VERSION_VAR FOUND_VAR)
+ set(multiValueArgs REQUIRED_VARS)
+
+ # Check whether we are in 'simple' or 'extended' mode:
+ set(_KEYWORDS_FOR_EXTENDED_MODE ${options} ${oneValueArgs} ${multiValueArgs} )
+ list(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
+
+ unset(FPHSA_NAME_MISMATCHED_override)
+ if (DEFINED FPHSA_NAME_MISMATCHED)
+ # If the variable NAME_MISMATCHED variable is set, error if it is passed as
+ # an argument. The former is for old signatures, the latter is for new
+ # signatures.
+ list(FIND ARGN "NAME_MISMATCHED" name_mismatched_idx)
+ if (NOT name_mismatched_idx EQUAL "-1")
+ message(FATAL_ERROR
+ "The `NAME_MISMATCHED` argument may only be specified by the argument or "
+ "the variable, not both.")
+ endif ()
+
+ # But use the variable if it is not an argument to avoid forcing minimum
+ # CMake version bumps for calling modules.
+ set(FPHSA_NAME_MISMATCHED_override "${FPHSA_NAME_MISMATCHED}")
+ endif ()
+
+ if(${INDEX} EQUAL -1)
+ set(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
+ set(FPHSA_REQUIRED_VARS ${ARGN})
+ set(FPHSA_VERSION_VAR)
+ else()
+ cmake_parse_arguments(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}" ${_FIRST_ARG} ${ARGN})
+
+ if(FPHSA_UNPARSED_ARGUMENTS)
+ message(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
+ endif()
+
+ if(NOT FPHSA_FAIL_MESSAGE)
+ set(FPHSA_FAIL_MESSAGE "DEFAULT_MSG")
+ endif()
+
+ # In config-mode, we rely on the variable <PackageName>_CONFIG, which is set by find_package()
+ # when it successfully found the config-file, including version checking:
+ if(FPHSA_CONFIG_MODE)
+ list(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
+ list(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
+ set(FPHSA_VERSION_VAR ${_NAME}_VERSION)
+ endif()
+
+ if(NOT FPHSA_REQUIRED_VARS AND NOT FPHSA_HANDLE_COMPONENTS)
+ message(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
+ endif()
+ endif()
+
+ if (DEFINED FPHSA_NAME_MISMATCHED_override)
+ set(FPHSA_NAME_MISMATCHED "${FPHSA_NAME_MISMATCHED_override}")
+ endif ()
+
+ if (DEFINED CMAKE_FIND_PACKAGE_NAME
+ AND NOT FPHSA_NAME_MISMATCHED
+ AND NOT _NAME STREQUAL CMAKE_FIND_PACKAGE_NAME)
+ message(AUTHOR_WARNING
+ "The package name passed to `find_package_handle_standard_args` "
+ "(${_NAME}) does not match the name of the calling package "
+ "(${CMAKE_FIND_PACKAGE_NAME}). This can lead to problems in calling "
+ "code that expects `find_package` result variables (e.g., `_FOUND`) "
+ "to follow a certain pattern.")
+ endif ()
+
+# now that we collected all arguments, process them
+
+ if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")
+ set(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
+ endif()
+
+ if (FPHSA_REQUIRED_VARS)
+ list(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
+ endif()
+
+ string(TOUPPER ${_NAME} _NAME_UPPER)
+ string(TOLOWER ${_NAME} _NAME_LOWER)
+
+ if(FPHSA_FOUND_VAR)
+ set(_FOUND_VAR_UPPER ${_NAME_UPPER}_FOUND)
+ set(_FOUND_VAR_MIXED ${_NAME}_FOUND)
+ if(FPHSA_FOUND_VAR STREQUAL _FOUND_VAR_MIXED OR FPHSA_FOUND_VAR STREQUAL _FOUND_VAR_UPPER)
+ set(_FOUND_VAR ${FPHSA_FOUND_VAR})
+ else()
+ message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_FOUND_VAR_MIXED}\" and \"${_FOUND_VAR_UPPER}\" are valid names.")
+ endif()
+ else()
+ set(_FOUND_VAR ${_NAME_UPPER}_FOUND)
+ endif()
+
+ # collect all variables which were not found, so they can be printed, so the
+ # user knows better what went wrong (#6375)
+ set(MISSING_VARS "")
+ set(DETAILS "")
+ # check if all passed variables are valid
+ set(FPHSA_FOUND_${_NAME} TRUE)
+ foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
+ if(NOT ${_CURRENT_VAR})
+ set(FPHSA_FOUND_${_NAME} FALSE)
+ string(APPEND MISSING_VARS " ${_CURRENT_VAR}")
+ else()
+ string(APPEND DETAILS "[${${_CURRENT_VAR}}]")
+ endif()
+ endforeach()
+ if(FPHSA_FOUND_${_NAME})
+ set(${_NAME}_FOUND TRUE)
+ set(${_NAME_UPPER}_FOUND TRUE)
+ else()
+ set(${_NAME}_FOUND FALSE)
+ set(${_NAME_UPPER}_FOUND FALSE)
+ endif()
+
+ # component handling
+ unset(FOUND_COMPONENTS_MSG)
+ unset(MISSING_COMPONENTS_MSG)
+
+ if(FPHSA_HANDLE_COMPONENTS)
+ foreach(comp ${${_NAME}_FIND_COMPONENTS})
+ if(${_NAME}_${comp}_FOUND)
+
+ if(NOT DEFINED FOUND_COMPONENTS_MSG)
+ set(FOUND_COMPONENTS_MSG "found components:")
+ endif()
+ string(APPEND FOUND_COMPONENTS_MSG " ${comp}")
+
+ else()
+
+ if(NOT DEFINED MISSING_COMPONENTS_MSG)
+ set(MISSING_COMPONENTS_MSG "missing components:")
+ endif()
+ string(APPEND MISSING_COMPONENTS_MSG " ${comp}")
+
+ if(${_NAME}_FIND_REQUIRED_${comp})
+ set(${_NAME}_FOUND FALSE)
+ string(APPEND MISSING_VARS " ${comp}")
+ endif()
+
+ endif()
+ endforeach()
+ set(COMPONENT_MSG "${FOUND_COMPONENTS_MSG} ${MISSING_COMPONENTS_MSG}")
+ string(APPEND DETAILS "[c${COMPONENT_MSG}]")
+ endif()
+
+ # version handling:
+ set(VERSION_MSG "")
+ set(VERSION_OK TRUE)
+
+ # check with DEFINED here as the requested or found version may be "0"
+ if (DEFINED ${_NAME}_FIND_VERSION)
+ if(DEFINED ${FPHSA_VERSION_VAR})
+ set(_FOUND_VERSION ${${FPHSA_VERSION_VAR}})
+
+ if(${_NAME}_FIND_VERSION_EXACT) # exact version required
+ # count the dots in the version string
+ string(REGEX REPLACE "[^.]" "" _VERSION_DOTS "${_FOUND_VERSION}")
+ # add one dot because there is one dot more than there are components
+ string(LENGTH "${_VERSION_DOTS}." _VERSION_DOTS)
+ if (_VERSION_DOTS GREATER ${_NAME}_FIND_VERSION_COUNT)
+ # Because of the C++ implementation of find_package() ${_NAME}_FIND_VERSION_COUNT
+ # is at most 4 here. Therefore a simple lookup table is used.
+ if (${_NAME}_FIND_VERSION_COUNT EQUAL 1)
+ set(_VERSION_REGEX "[^.]*")
+ elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 2)
+ set(_VERSION_REGEX "[^.]*\\.[^.]*")
+ elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 3)
+ set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*")
+ else ()
+ set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*\\.[^.]*")
+ endif ()
+ string(REGEX REPLACE "^(${_VERSION_REGEX})\\..*" "\\1" _VERSION_HEAD "${_FOUND_VERSION}")
+ unset(_VERSION_REGEX)
+ if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _VERSION_HEAD)
+ set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
+ set(VERSION_OK FALSE)
+ else ()
+ set(VERSION_MSG "(found suitable exact version \"${_FOUND_VERSION}\")")
+ endif ()
+ unset(_VERSION_HEAD)
+ else ()
+ if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _FOUND_VERSION)
+ set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
+ set(VERSION_OK FALSE)
+ else ()
+ set(VERSION_MSG "(found suitable exact version \"${_FOUND_VERSION}\")")
+ endif ()
+ endif ()
+ unset(_VERSION_DOTS)
+
+ else() # minimum version specified:
+ if (${_NAME}_FIND_VERSION VERSION_GREATER _FOUND_VERSION)
+ set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
+ set(VERSION_OK FALSE)
+ else ()
+ set(VERSION_MSG "(found suitable version \"${_FOUND_VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")")
+ endif ()
+ endif()
+
+ else()
+
+ # if the package was not found, but a version was given, add that to the output:
+ if(${_NAME}_FIND_VERSION_EXACT)
+ set(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
+ else()
+ set(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
+ endif()
+
+ endif()
+ else ()
+ # Check with DEFINED as the found version may be 0.
+ if(DEFINED ${FPHSA_VERSION_VAR})
+ set(VERSION_MSG "(found version \"${${FPHSA_VERSION_VAR}}\")")
+ endif()
+ endif ()
+
+ if(VERSION_OK)
+ string(APPEND DETAILS "[v${${FPHSA_VERSION_VAR}}(${${_NAME}_FIND_VERSION})]")
+ else()
+ set(${_NAME}_FOUND FALSE)
+ endif()
+
+
+ # print the result:
+ if (${_NAME}_FOUND)
+ FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}")
+ else ()
+
+ if(FPHSA_CONFIG_MODE)
+ _FPHSA_HANDLE_FAILURE_CONFIG_MODE()
+ else()
+ if(NOT VERSION_OK)
+ set(RESULT_MSG)
+ if (_FIRST_REQUIRED_VAR)
+ string (APPEND RESULT_MSG "found ${${_FIRST_REQUIRED_VAR}}")
+ endif()
+ if (COMPONENT_MSG)
+ if (RESULT_MSG)
+ string (APPEND RESULT_MSG ", ")
+ endif()
+ string (APPEND RESULT_MSG "${FOUND_COMPONENTS_MSG}")
+ endif()
+ _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (${RESULT_MSG})")
+ else()
+ _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing:${MISSING_VARS}) ${VERSION_MSG}")
+ endif()
+ endif()
+
+ endif ()
+
+ set(${_NAME}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
+ set(${_NAME_UPPER}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
+endfunction()
diff --git a/games/vegastrike/cmake/FindPackageMessage.cmake b/games/vegastrike/cmake/FindPackageMessage.cmake
new file mode 100644
index 0000000000..0628b98169
--- /dev/null
+++ b/games/vegastrike/cmake/FindPackageMessage.cmake
@@ -0,0 +1,48 @@
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindPackageMessage
+------------------
+
+.. code-block:: cmake
+
+ find_package_message(<name> "message for user" "find result details")
+
+This function is intended to be used in FindXXX.cmake modules files.
+It will print a message once for each unique find result. This is
+useful for telling the user where a package was found. The first
+argument specifies the name (XXX) of the package. The second argument
+specifies the message to display. The third argument lists details
+about the find result so that if they change the message will be
+displayed again. The macro also obeys the QUIET argument to the
+find_package command.
+
+Example:
+
+.. code-block:: cmake
+
+ if(X11_FOUND)
+ find_package_message(X11 "Found X11: ${X11_X11_LIB}"
+ "[${X11_X11_LIB}][${X11_INCLUDE_DIR}]")
+ else()
+ ...
+ endif()
+#]=======================================================================]
+
+function(find_package_message pkg msg details)
+ # Avoid printing a message repeatedly for the same find result.
+ if(NOT ${pkg}_FIND_QUIETLY)
+ string(REPLACE "\n" "" details "${details}")
+ set(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg})
+ if(NOT "${details}" STREQUAL "${${DETAILS_VAR}}")
+ # The message has not yet been printed.
+ message(STATUS "${msg}")
+
+ # Save the find details in the cache to avoid printing the same
+ # message again.
+ set("${DETAILS_VAR}" "${details}"
+ CACHE INTERNAL "Details about finding ${pkg}")
+ endif()
+ endif()
+endfunction()
diff --git a/games/vegastrike/cmake/SelectLibraryConfigurations.cmake b/games/vegastrike/cmake/SelectLibraryConfigurations.cmake
new file mode 100644
index 0000000000..4c0e9a8c0a
--- /dev/null
+++ b/games/vegastrike/cmake/SelectLibraryConfigurations.cmake
@@ -0,0 +1,80 @@
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+SelectLibraryConfigurations
+---------------------------
+
+.. code-block:: cmake
+
+ select_library_configurations(basename)
+
+This macro takes a library base name as an argument, and will choose
+good values for the variables
+
+::
+
+ basename_LIBRARY
+ basename_LIBRARIES
+ basename_LIBRARY_DEBUG
+ basename_LIBRARY_RELEASE
+
+depending on what has been found and set.
+
+If only ``basename_LIBRARY_RELEASE`` is defined, ``basename_LIBRARY`` will
+be set to the release value, and ``basename_LIBRARY_DEBUG`` will be set
+to ``basename_LIBRARY_DEBUG-NOTFOUND``. If only ``basename_LIBRARY_DEBUG``
+is defined, then ``basename_LIBRARY`` will take the debug value, and
+``basename_LIBRARY_RELEASE`` will be set to ``basename_LIBRARY_RELEASE-NOTFOUND``.
+
+If the generator supports configuration types, then ``basename_LIBRARY``
+and ``basename_LIBRARIES`` will be set with debug and optimized flags
+specifying the library to be used for the given configuration. If no
+build type has been set or the generator in use does not support
+configuration types, then ``basename_LIBRARY`` and ``basename_LIBRARIES``
+will take only the release value, or the debug value if the release one
+is not set.
+#]=======================================================================]
+
+# This macro was adapted from the FindQt4 CMake module and is maintained by Will
+# Dicharry <wdicharry@stellarscience.com>.
+
+macro(select_library_configurations basename)
+ if(NOT ${basename}_LIBRARY_RELEASE)
+ set(${basename}_LIBRARY_RELEASE "${basename}_LIBRARY_RELEASE-NOTFOUND" CACHE FILEPATH "Path to a library.")
+ endif()
+ if(NOT ${basename}_LIBRARY_DEBUG)
+ set(${basename}_LIBRARY_DEBUG "${basename}_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "Path to a library.")
+ endif()
+
+ get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+ if( ${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE AND
+ NOT ${basename}_LIBRARY_DEBUG STREQUAL ${basename}_LIBRARY_RELEASE AND
+ ( _isMultiConfig OR CMAKE_BUILD_TYPE ) )
+ # if the generator is multi-config or if CMAKE_BUILD_TYPE is set for
+ # single-config generators, set optimized and debug libraries
+ set( ${basename}_LIBRARY "" )
+ foreach( _libname IN LISTS ${basename}_LIBRARY_RELEASE )
+ list( APPEND ${basename}_LIBRARY optimized "${_libname}" )
+ endforeach()
+ foreach( _libname IN LISTS ${basename}_LIBRARY_DEBUG )
+ list( APPEND ${basename}_LIBRARY debug "${_libname}" )
+ endforeach()
+ elseif( ${basename}_LIBRARY_RELEASE )
+ set( ${basename}_LIBRARY ${${basename}_LIBRARY_RELEASE} )
+ elseif( ${basename}_LIBRARY_DEBUG )
+ set( ${basename}_LIBRARY ${${basename}_LIBRARY_DEBUG} )
+ else()
+ set( ${basename}_LIBRARY "${basename}_LIBRARY-NOTFOUND")
+ endif()
+
+ set( ${basename}_LIBRARIES "${${basename}_LIBRARY}" )
+
+ if( ${basename}_LIBRARY )
+ set( ${basename}_FOUND TRUE )
+ endif()
+
+ mark_as_advanced( ${basename}_LIBRARY_RELEASE
+ ${basename}_LIBRARY_DEBUG
+ )
+endmacro()
diff --git a/games/vegastrike/patches/patch-0.5.1.r1_1 b/games/vegastrike/patches/patch-0.5.1.r1_1
new file mode 100644
index 0000000000..8f6d622177
--- /dev/null
+++ b/games/vegastrike/patches/patch-0.5.1.r1_1
@@ -0,0 +1,760 @@
+diff -ruN ./CMakeLists.txt ../b/CMakeLists.txt
+--- ./CMakeLists.txt 2012-03-26 02:50:49.000000000 +0200
++++ ../b/CMakeLists.txt 2020-09-02 22:37:20.707393347 +0200
+@@ -10,7 +10,7 @@
+
+ project (vsUTCS)
+
+-
++include(GNUInstallDirs)
+
+ include_directories(${vsUTCS_SOURCE_DIR}/src
+ ${vsUTCS_SOURCE_DIR}/src/cmd
+@@ -685,14 +685,42 @@
+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${vsUTCS_SOURCE_DIR})
+
+
+-find_package(PythonLibs REQUIRED)
+-IF(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
+- SET(TST_INCLUDES ${PYTHON_INCLUDE_PATH})
++#find_package(PythonLibs REQUIRED)
++#IF(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
++# SET(TST_INCLUDES ${PYTHON_INCLUDE_PATH})
++# SET(TST_LIBS ${PYTHON_LIBRARIES})
++# SET(HAVE_PYTHON 1)
++#ELSE(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
++# message(FATAL_ERROR "Can't find python")
++#ENDIF(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
++
++# Python 3 has a SASL compatibility issue which causes an error
++# on some installations that prefer Python 3
++# -- Python 2.7 is default for now
++OPTION(USE_PYTHON_3 "Use Python 3 instead of Python 2.7 (default is 2.7)" OFF)
++IF (USE_PYTHON_3)
++ # We want at least Python 3.4, but we prefer newer versions
++ SET(Python_ADDITIONAL_VERSIONS 3.8 3.7 3.6 3.5 3.4)
++ELSE (USE_PYTHON_3)
++ SET(Python_ADDITIONAL_VERSIONS 2.7)
++ENDIF (USE_PYTHON_3)
++# If we don't unset cache variables
++# ccmake won't pick up changes to the USE_PYTHON_3 option
++UNSET(PYTHON_INCLUDE_DIR CACHE)
++UNSET(PYTHON_LIBRARY CACHE)
++# The python version we want is set via Python_ADDITIONAL_VERSIONS
++MESSAGE("++ Python release(s) searched for : ${Python_ADDITIONAL_VERSIONS}")
++FIND_PACKAGE(PythonLibs REQUIRED)
++MESSAGE("++ Python library : ${PYTHON_LIBRARY} (${PYTHONLIBS_VERSION_STRING})")
++MESSAGE("++ Python include dir : ${PYTHON_INCLUDE_DIR}")
++IF (PYTHONLIBS_FOUND OR PYTHON_LIBRARIES AND PYTHON_INCLUDE_DIRS)
++ SET(TST_INCLUDES ${PYTHON_INCLUDE_DIRS})
+ SET(TST_LIBS ${PYTHON_LIBRARIES})
+ SET(HAVE_PYTHON 1)
+-ELSE(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
+- message(FATAL_ERROR "Can't find python")
+-ENDIF(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
++ELSE (PYTHONLIBS_FOUND OR PYTHON_LIBRARIES AND PYTHON_INCLUDE_DIRS)
++ MESSAGE(FATAL_ERROR "Can't find python")
++ENDIF (PYTHONLIBS_FOUND OR PYTHON_LIBRARIES AND PYTHON_INCLUDE_DIRS)
++
+
+ # Find Boost with boost_python library
+ OPTION(USE_SYSTEM_BOOST "Use system boost" OFF)
+@@ -828,33 +856,33 @@
+
+ #Find FFMpeg
+
+-find_package(FFMPEG)
+-IF(FFMPEG_FOUND)
+- SET(TST_INCLUDES ${TST_INCLUDES} ${FFMPEG_INCLUDE_DIRS})
+- SET(TST_LIBS ${TST_LIBS} ${FFMPEG_LIBRARIES})
+- add_definitions(${FFMPEG_DEFINITIONS})
+- SET(HAVE_FFMPEG 1 )
+- IF(swscale1_FOUND)
+- message("++ FFmpeg's libswscale found.")
+- ELSE(swscale1_FOUND)
+- message("-- FFMpeg's libswscale not found... depending on your ffmpeg version, VS might not build.")
+- ENDIF(swscale1_FOUND)
+-ELSE(FFMPEG_FOUND)
+- message("-- FFMPEG Not Found")
+-ENDIF(FFMPEG_FOUND)
++#find_package(FFMPEG)
++#IF(FFMPEG_FOUND)
++# SET(TST_INCLUDES ${TST_INCLUDES} ${FFMPEG_INCLUDE_DIRS})
++# SET(TST_LIBS ${TST_LIBS} ${FFMPEG_LIBRARIES})
++# add_definitions(${FFMPEG_DEFINITIONS})
++# SET(HAVE_FFMPEG 1 )
++# IF(swscale1_FOUND)
++# message("++ FFmpeg's libswscale found.")
++# ELSE(swscale1_FOUND)
++# message("-- FFMpeg's libswscale not found... depending on your ffmpeg version, VS might not build.")
++# ENDIF(swscale1_FOUND)
++#ELSE(FFMPEG_FOUND)
++# message("-- FFMPEG Not Found")
++#ENDIF(FFMPEG_FOUND)
+
+ #Find Ogre
+
+-find_package(OGRE)
+-IF(OGRE_FOUND)
+- SET(TST_INCLUDES ${TST_INCLUDES} ${OGRE_INCLUDE_DIR})
+- SET(TST_LIBS ${TST_LIBS} ${OGRE_LIBRARY})
+- add_definitions(${OGRE_DEFINITIONS})
+- SET(HAVE_OGRE 1)
+- message("++ Found Ogre: ${OGRE_VERSION}")
+-ELSE(OGRE_FOUND)
+- message("-- Ogre Not Found: compiling without")
+-ENDIF(OGRE_FOUND)
++#find_package(OGRE)
++#IF(OGRE_FOUND)
++# SET(TST_INCLUDES ${TST_INCLUDES} ${OGRE_INCLUDE_DIR})
++# SET(TST_LIBS ${TST_LIBS} ${OGRE_LIBRARY})
++# add_definitions(${OGRE_DEFINITIONS})
++# SET(HAVE_OGRE 1)
++# message("++ Found Ogre: ${OGRE_VERSION}")
++#ELSE(OGRE_FOUND)
++# message("-- Ogre Not Found: compiling without")
++#ENDIF(OGRE_FOUND)
+
+ IF(NOT BEOS)
+ FIND_LIBRARY(UTIL_LIB util)
+@@ -977,12 +1005,12 @@
+ HAVE_AVFORMAT_H
+ HAVE_AVCODEC_H
+ HAVE_AVIO_H
+- HAVE_FFMPEG_SWSCALE_H
++# HAVE_FFMPEG_SWSCALE_H
+ CMAKE_BACKWARDS_COMPATIBILITY
+- FFMPEG_INCLUDE_DIR
+- FFMPEG_FOUND
+- FFMPEG_LIBRARIES
+- FFMPEG_DEFINITIONS
++# FFMPEG_INCLUDE_DIR
++# FFMPEG_FOUND
++# FFMPEG_LIBRARIES
++# FFMPEG_DEFINITIONS
+ GTK2_ATK_INCLUDE_DIR
+ GTK2_ATK_LIBRARY
+ GTK2_CAIRO_INCLUDE_DIR
+diff -ruN ./objconv/basemaker/base_maker_texture.cpp ../b/objconv/basemaker/base_maker_texture.cpp
+--- ./objconv/basemaker/base_maker_texture.cpp 2010-03-10 03:56:23.000000000 +0100
++++ ../b/objconv/basemaker/base_maker_texture.cpp 2020-09-02 15:08:07.760351554 +0200
+@@ -6,9 +6,12 @@
+ #define XMD_H
+ #define HAVE_BOOLEAN
+ #endif
++
+ extern "C" {
+ //YUCK it doesn't even have extern c in the headers!
+ #include <jpeglib.h>
++#include <string.h>
++
+ }
+
+ #define strip_16 true
+diff -ruN ./objconv/mesher/to_OgreMesh.cpp ../b/objconv/mesher/to_OgreMesh.cpp
+--- ./objconv/mesher/to_OgreMesh.cpp 2011-06-02 01:47:36.000000000 +0200
++++ ../b/objconv/mesher/to_OgreMesh.cpp 2020-09-02 15:08:07.762351529 +0200
+@@ -1078,10 +1078,15 @@
+ Ogre::VertexDeclaration *newDcl =
+ data->vertexDeclaration->getAutoOrganisedDeclaration(
+ mesh->hasSkeleton() );
+-#else
++#elif (OGRE_VERSION_MAJOR == 1) && (OGRE_VERSION_MINOR < 8)
+ Ogre::VertexDeclaration *newDcl =
+ data->vertexDeclaration->getAutoOrganisedDeclaration(
+ mesh->hasSkeleton(), mesh->hasVertexAnimation() || (mesh->getPoseCount() > 0) );
++#else
++ Ogre::VertexDeclaration *newDcl =
++ data->vertexDeclaration->getAutoOrganisedDeclaration(
++ mesh->hasSkeleton(), mesh->hasVertexAnimation() || (mesh->getPoseCount() > 0),
++ mesh->getSharedVertexDataAnimationIncludesNormals()); // what about Pose objects?
+ #endif
+ if ( *newDcl != *(data->vertexDeclaration) ) {
+ //Usages don't matter here since we're onlly exporting
+@@ -1109,35 +1114,35 @@
+ }
+ }
+
+-void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance )
+-{
+- struct outputContext *ctxt = (struct outputContext*) outputcontext;
+- MeshPtr newMesh = ctxt->top;
+- if ( force || (newMesh->getNumLodLevels() <= 1) ) {
+- if (newMesh->getNumLodLevels() <= 1)
+- newMesh->removeLodLevels();
+- const Ogre::ProgressiveMesh::VertexReductionQuota quota = Ogre::ProgressiveMesh::VRQ_PROPORTIONAL;
+- const Real reduction = Real( 1-reductionFactor );
+-
+- Real currDist = refDistance;
+-
+- #if (OGRE_VERSION >= 0x010700)
+- Ogre::Mesh::LodValueList distanceList;
+-
+- // pixel area is squared length, and length is proportional to triangle count
+- const Real distFactor = reductionFactor * reductionFactor;
+- newMesh->setLodStrategy(Ogre::LodStrategyManager::getSingletonPtr()->
+- getStrategy( "PixelCount" ) );
+- #else
+- Ogre::Mesh::LodDistanceList distanceList;
+- const Real distFactor = ( (reduction > 0.00001) ? 1/reduction : 1 );
+- #endif
+-
+- for (int iLod = 0; iLod < numLod; ++iLod, currDist *= distFactor)
+- distanceList.push_back( currDist );
+- newMesh->generateLodLevels( distanceList, quota, reduction );
+- }
+-}
++//void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance )
++//{
++// struct outputContext *ctxt = (struct outputContext*) outputcontext;
++// MeshPtr newMesh = ctxt->top;
++// if ( force || (newMesh->getNumLodLevels() <= 1) ) {
++// if (newMesh->getNumLodLevels() <= 1)
++// newMesh->removeLodLevels();
++// const Ogre::ProgressiveMesh::VertexReductionQuota quota = Ogre::ProgressiveMesh::VRQ_PROPORTIONAL;
++// const Real reduction = Real( 1-reductionFactor );
++//
++// Real currDist = refDistance;
++//
++// #if (OGRE_VERSION >= 0x010700)
++// Ogre::Mesh::LodValueList distanceList;
++//
++// // pixel area is squared length, and length is proportional to triangle count
++// const Real distFactor = reductionFactor * reductionFactor;
++// newMesh->setLodStrategy(Ogre::LodStrategyManager::getSingletonPtr()->
++// getStrategy( "PixelCount" ) );
++// #else
++// Ogre::Mesh::LodDistanceList distanceList;
++// const Real distFactor = ( (reduction > 0.00001) ? 1/reduction : 1 );
++// #endif
++//
++// for (int iLod = 0; iLod < numLod; ++iLod, currDist *= distFactor)
++// distanceList.push_back( currDist );
++// newMesh->generateLodLevels( distanceList, quota, reduction );
++// }
++//}
+
+ void DoneMeshes( void *outputcontext )
+ {
+diff -ruN ./objconv/mesher/to_OgreMesh.h ../b/objconv/mesher/to_OgreMesh.h
+--- ./objconv/mesher/to_OgreMesh.h 2010-02-25 16:22:25.000000000 +0100
++++ ../b/objconv/mesher/to_OgreMesh.h 2020-09-02 15:08:07.763351517 +0200
+@@ -20,7 +20,7 @@
+ float RadialSize( void *outputcontext ); //returns the size of the resulting mesh (it's maximum distance from 0,0,0). Useful for LODding.
+
+ void Optimize( void *outputcontext ); //a good idea - reorganizes internal buffers so that the output mesh is more efficient
+-void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance ); //autogenerates LOD levels - if force==true, will discard current LOD data
++//void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance ); //autogenerates LOD levels - if force==true, will discard current LOD data
+ void AutoEdgeList( void *outputcontext ); //a good idea - prepares the mesh for stencil shadows
+ void AutoTangents( void *outputcontext ); //prepares the mesh for normal mapping (only needed if the material uses normal mapping)
+ }
+diff -ruN ./setup/src/c/setup.cpp ../b/setup/src/c/setup.cpp
+--- ./setup/src/c/setup.cpp 2011-03-15 01:28:47.000000000 +0100
++++ ../b/setup/src/c/setup.cpp 2020-09-02 15:08:07.764351504 +0200
+@@ -110,10 +110,22 @@
+ return 1;
+ }
+ }
+-
++
+ #ifdef DATA_DIR
+ data_paths.push_back( DATA_DIR );
+ #endif
++ /* whatever the plan was, it does not work on Linux - at least
++ * not at this stage. Hence, use fixed absolute paths to
++ * find data directory
++ */
++ data_paths.push_back( "/usr/share/games/vegastrike/data");
++ data_paths.push_back( "/usr/share/vegastrike/data");
++ data_paths.push_back( "/usr/games/vegastrike/data");
++ data_paths.push_back( "/usr/local/share/games/vegastrike/data");
++ data_paths.push_back( "/usr/local/share/vegastrike/data");
++ data_paths.push_back( "/usr/local/games/vegastrike/data");
++ data_paths.push_back( "/opt/vegastrike/data");
++
+ data_paths.push_back( origpath );
+ data_paths.push_back( string( origpath )+"/.." );
+ data_paths.push_back( string( origpath )+"/../data4.x" );
+@@ -133,22 +145,7 @@
+ data_paths.push_back( "../Resources" );
+ data_paths.push_back( "../Resources/data" );
+ data_paths.push_back( "../Resources/data4.x" );
+-/*
+- * data_paths.push_back( "/usr/share/local/vegastrike/data");
+- * data_paths.push_back( "/usr/local/share/vegastrike/data");
+- * data_paths.push_back( "/usr/local/vegastrike/data");
+- * data_paths.push_back( "/usr/share/vegastrike/data");
+- * data_paths.push_back( "/usr/local/games/vegastrike/data");
+- * data_paths.push_back( "/usr/games/vegastrike/data");
+- * data_paths.push_back( "/opt/share/vegastrike/data");
+- * data_paths.push_back( "/usr/share/local/vegastrike/data4.x");
+- * data_paths.push_back( "/usr/local/share/vegastrike/data4.x");
+- * data_paths.push_back( "/usr/local/vegastrike/data4.x");
+- * data_paths.push_back( "/usr/share/vegastrike/data4.x");
+- * data_paths.push_back( "/usr/local/games/vegastrike/data4.x");
+- * data_paths.push_back( "/usr/games/vegastrike/data4.x");
+- * data_paths.push_back( "/opt/share/vegastrike/data4.x");
+- */
++
+ //Win32 data should be "."
+ char tmppath[16384];
+ for (vector< string >::iterator vsit = data_paths.begin(); vsit != data_paths.end(); vsit++) {
+diff -ruN ./setup/src/include/central.cpp ../b/setup/src/include/central.cpp
+--- ./setup/src/include/central.cpp 2004-10-25 04:27:13.000000000 +0200
++++ ../b/setup/src/include/central.cpp 2020-09-03 02:22:34.948442084 +0200
+@@ -20,6 +20,8 @@
+ struct group GROUPS;
+ struct global_settings CONFIG;
+
++static char EMPTY_STR[] = "";
++
+ // Primary initialization function. Sets everything up and takes care of the program
+ void Start(int * argc, char ***argv) {
+ LoadMainConfig();
+@@ -65,7 +67,7 @@
+ if (CUR->name == NULL) { continue; }
+ if (strcmp(CUR->name, group) == 0) { return CUR->setting; }
+ } while ((CUR = CUR->next) > 0);
+- return '\0';
++ return EMPTY_STR;
+ }
+
+ struct catagory *GetCatStruct(char *name) {
+diff -ruN ./src/cmd/music.cpp ../b/src/cmd/music.cpp
+--- ./src/cmd/music.cpp 2012-03-19 09:20:14.000000000 +0100
++++ ../b/src/cmd/music.cpp 2020-09-02 15:08:07.765351492 +0200
+@@ -448,7 +448,9 @@
+ if (foundcache) {
+ *me->music_load_info = wherecache->second;
+ me->freeWav = false;
+- }
++ } else if ( ! AUDLoadSoundFile(songname, me->music_load_info, true)) {
++ VSFileSystem::vs_dprintf(1, "Failed to load music file \"%s\"", songname);
++ }
+ }
+ if (me->freeWav && docacheme) {
+ me->freeWav = false;
+diff -ruN ./src/cmd/unit.cpp ../b/src/cmd/unit.cpp
+--- ./src/cmd/unit.cpp 2012-03-19 09:20:14.000000000 +0100
++++ ../b/src/cmd/unit.cpp 2020-09-02 15:56:51.644797969 +0200
+@@ -80,6 +80,7 @@
+ template < class UnitType >GameUnit< UnitType >::GameUnit( int ) : sparkle_accum( 0 )
+ , phalos( new HaloSystem() )
+ {
++ VSFileSystem::vs_dprintf(3, "Unit created by Constructor: template < class UnitType >GameUnit< UnitType >::GameUnit( int ) : sparkle_accum( 0 ), phalos( new HaloSystem() )\n");
+ this->Unit::Init();
+ }
+
+@@ -99,6 +100,14 @@
+ , phalos( new HaloSystem() )
+ {
+ Unit::Init( filename, SubU, faction, unitModifications, flightgrp, fg_subnumber, netxml );
++
++ std::string fn = string(filename);
++ std::string str_faction = string(FactionUtil::GetFaction(faction));
++ std::string objtype = UniverseUtil::LookupUnitStat( fn, str_faction, "Object_Type");
++ if (objtype.compare("Vessel") == 0) {
++ VSFileSystem::vs_dprintf(3, "Recomputing upgrades for (units.csv) Object_Type: %s\n", objtype.c_str());
++ UnitUtil::RecomputeUnitUpgrades(this);
++ }
+ }
+
+ template < class UnitType >GameUnit< UnitType >::~GameUnit()
+diff -ruN ./src/cmd/unit_collide.h ../b/src/cmd/unit_collide.h
+--- ./src/cmd/unit_collide.h 2012-03-19 09:20:14.000000000 +0100
++++ ../b/src/cmd/unit_collide.h 2020-09-02 21:27:47.524565312 +0200
+@@ -94,9 +94,9 @@
+ {
+ if ( !hugeobjects.empty() )
+ hugeobjects.clear();
+- if ( this->active_huge.size() )
++ if ( this->active_huge->size() )
+ ha.clear();
+- if ( this->accum_huge.size() )
++ if ( this->accum_huge->size() )
+ hb.clear();
+ acc_huge.clear();
+ act_huge.clear();
+diff -ruN ./src/cmd/unit_generic.cpp ../b/src/cmd/unit_generic.cpp
+--- ./src/cmd/unit_generic.cpp 2012-03-19 09:20:14.000000000 +0100
++++ ../b/src/cmd/unit_generic.cpp 2020-09-02 21:47:36.695698627 +0200
+@@ -630,13 +630,13 @@
+ jump.drive = -1;
+ }
+
+-float copysign( float x, float y )
+-{
+- if (y > 0)
+- return x;
+- else
+- return -x;
+-}
++//float copysign( float x, float y )
++//{
++// if (y > 0)
++// return x;
++// else
++// return -x;
++//}
+
+ float rand01()
+ {
+@@ -4903,16 +4903,26 @@
+
+ static const string LOAD_FAILED = "LOAD_FAILED";
+
++//const Unit * makeFinalBlankUpgrade( string name, int faction )
++//{
++// char *unitdir = GetUnitDir( name.c_str() );
++// string limiternam = name;
++// if (unitdir != name)
++// limiternam = string( unitdir )+string( ".blank" );
++// free( unitdir );
++// const Unit *lim = UnitConstCache::getCachedConst( StringIntKey( limiternam, faction ) );
++// if (!lim)
++// lim = UnitConstCache::setCachedConst( StringIntKey( limiternam, faction ), makeBlankUpgrade( limiternam, faction ) );
++// if (lim->name == LOAD_FAILED)
++// lim = NULL;
++// return lim;
++//}
++
+ const Unit * makeFinalBlankUpgrade( string name, int faction )
+ {
+- char *unitdir = GetUnitDir( name.c_str() );
+- string limiternam = name;
+- if (unitdir != name)
+- limiternam = string( unitdir )+string( ".blank" );
+- free( unitdir );
+- const Unit *lim = UnitConstCache::getCachedConst( StringIntKey( limiternam, faction ) );
++ const Unit *lim = UnitConstCache::getCachedConst( StringIntKey( name, faction ) );
+ if (!lim)
+- lim = UnitConstCache::setCachedConst( StringIntKey( limiternam, faction ), makeBlankUpgrade( limiternam, faction ) );
++ lim = UnitConstCache::setCachedConst( StringIntKey( name, faction ), makeBlankUpgrade( name, faction ) );
+ if (lim->name == LOAD_FAILED)
+ lim = NULL;
+ return lim;
+@@ -6387,21 +6397,48 @@
+ int tmpammo = mounts[jmod].ammo;
+ if (mounts[jmod].ammo != -1 && up->mounts[i].ammo != -1) {
+ tmpammo += up->mounts[i].ammo;
+- if (templ) {
+- if (templ->GetNumMounts() > jmod) {
+- if (templ->mounts[jmod].volume != -1) {
+- if (templ->mounts[jmod].volume < mounts[jmod].type->volume*tmpammo) {
+- tmpammo =
+- (int) floor( .125
+- +( (0
+- +templ->mounts[jmod].volume)
+- /mounts[jmod].type->volume ) );
++ if (ismissiletype) {
++ if (templ) {
++ if (templ->GetNumMounts() > jmod) {
++ if (templ->mounts[jmod].volume != -1) {
++ if (templ->mounts[jmod].volume < mounts[jmod].type->volume*tmpammo) {
++ tmpammo =
++ (int) floor( .125
++ +( (0
++ +templ->mounts[jmod].volume)
++ /mounts[jmod].type->volume ) );
++ }
+ }
+ }
+ }
++ if (tmpammo*mounts[jmod].type->volume > mounts[jmod].volume)
++ tmpammo = (int) floor( .125+( (0+mounts[jmod].volume)/mounts[jmod].type->volume ) );
++ } else {
++ std::string ammoname = up->name.get();
++ std::size_t ammopos = ammoname.find("_ammo");
++ std::string weaponname = ammoname.substr(0, ammopos);
++
++ /* Do NOT delete this Unit because it will be either fetched
++ * from a cache or - if it has to be created - it will
++ * be automatically put in a cache.
++ * Deletion will corrupt the cache!
++ */
++ const Unit * weapon = getUnitFromUpgradeName(weaponname);
++
++ if (weapon == NULL || weapon->name == LOAD_FAILED) {
++ // this should not happen
++ VSFileSystem::vs_dprintf(1, "UpgradeMount(): FAILED to obtain weapon: %s\n", weaponname.c_str());
++ cancompletefully = false;
++ break;
++ }
++
++ int maxammo = weapon->mounts[0].ammo;
++
++ if (tmpammo > maxammo) {
++ tmpammo = maxammo;
++ }
+ }
+- if (tmpammo*mounts[jmod].type->volume > mounts[jmod].volume)
+- tmpammo = (int) floor( .125+( (0+mounts[jmod].volume)/mounts[jmod].type->volume ) );
++
+ if (tmpammo > mounts[jmod].ammo) {
+ cancompletefully = true;
+ if (touchme)
+diff -ruN ./src/cmd/unit_jump.h ../b/src/cmd/unit_jump.h
+--- ./src/cmd/unit_jump.h 2012-03-19 09:20:14.000000000 +0100
++++ ../b/src/cmd/unit_jump.h 2020-09-02 15:08:07.766351479 +0200
+@@ -108,7 +108,7 @@
+ (tester = *i) != NULL; ++i)
+ if (tester->isUnit() == UNITPTR && tester != this)
+ if ( ( this->LocalPosition()-tester->LocalPosition() ).Magnitude() < this->rSize()+tester->rSize() )
+- SetCurPosition( this->LocalPosition()+this->cumulative_transformation_matrix.getR()
++ this->SetCurPosition( this->LocalPosition()+this->cumulative_transformation_matrix.getR()
+ *( 4*( this->rSize()+tester->rSize() ) ) );
+ DealPossibleJumpDamage( this );
+ static int jumparrive = AUDCreateSound( vs_config->getVariable( "unitaudio", "jumparrive", "sfx43.wav" ), false );
+diff -ruN ./src/cmd/unit_physics.h ../b/src/cmd/unit_physics.h
+--- ./src/cmd/unit_physics.h 2012-03-19 09:20:14.000000000 +0100
++++ ../b/src/cmd/unit_physics.h 2020-09-03 00:27:15.498947107 +0200
+@@ -41,7 +41,7 @@
+ #include "networking/lowlevel/vsnet_clientstate.h"
+ #include "networking/netclient.h"
+
+-extern float copysign( float x, float y );
++//extern float copysign( float x, float y );
+
+ extern unsigned int apply_float_to_unsigned_int( float tmp ); //short fix
+
+diff -ruN ./src/gfx/cockpit_xml.cpp ../b/src/gfx/cockpit_xml.cpp
+--- ./src/gfx/cockpit_xml.cpp 2010-12-15 09:53:40.000000000 +0100
++++ ../b/src/gfx/cockpit_xml.cpp 2020-09-03 00:14:13.810719555 +0200
+@@ -315,7 +315,7 @@
+ for (counter = 0; counter < 4; ++counter)
+ if (!replaced[counter]) {
+ delete Pit[counter];
+- Pit[counter] = false;
++ Pit[counter] = NULL;
+ }
+ break;
+ case UnitImages< void >::SHIELD4:
+diff -ruN ./src/gfx/quadsquare.cpp ../b/src/gfx/quadsquare.cpp
+--- ./src/gfx/quadsquare.cpp 2010-03-10 06:27:01.000000000 +0100
++++ ../b/src/gfx/quadsquare.cpp 2020-09-02 15:08:07.767351467 +0200
+@@ -13,9 +13,9 @@
+ #include <float.h>
+ #include <math.h>
+ #include <assert.h>
+-#include "quadsquare.h"
+ #include "gfxlib.h"
+ #include "aux_texture.h"
++#include "quadsquare.h"
+ using std::vector;
+
+ unsigned int*quadsquare::VertexAllocated;
+diff -ruN ./src/gui/text_area.cpp ../b/src/gui/text_area.cpp
+--- ./src/gui/text_area.cpp 2010-02-25 15:26:53.000000000 +0100
++++ ../b/src/gui/text_area.cpp 2020-09-03 00:05:06.687559535 +0200
+@@ -32,6 +32,8 @@
+ * };
+ */
+
++static char EMPTY_STR[] = "";
++
+ TextArea::~TextArea() {}
+
+ TextArea::TextArea()
+@@ -316,7 +318,7 @@
+ {
+ TextAreaItem *search;
+ search = ItemList->FindCount( cur_selected, 0 );
+- if (search == 0) return '\0';
++ if (search == 0) return EMPTY_STR;
+ if (type == 1) return search->name;
+
+ else return search->description;
+diff -ruN ./src/networking/lowlevel/packetmem.cpp ../b/src/networking/lowlevel/packetmem.cpp
+--- ./src/networking/lowlevel/packetmem.cpp 2008-03-31 10:20:19.000000000 +0200
++++ ../b/src/networking/lowlevel/packetmem.cpp 2020-09-02 15:08:07.768351454 +0200
+@@ -102,7 +102,7 @@
+ }
+ else
+ {
+- _buffer.reset( 0 );
++ _buffer.reset();
+ _len = 0;
+ }
+ }
+diff -ruN ./src/physics.h ../b/src/physics.h
+--- ./src/physics.h 2011-02-12 04:19:03.000000000 +0100
++++ ../b/src/physics.h 2020-09-02 21:32:31.049020768 +0200
+@@ -27,7 +27,7 @@
+ static const float oocc = (float) 0.0000000000000000111265005605; //1/c^2
+ static const float c = (float) 299792458.0;
+ static const float co10 = (float) 29979245.8;
+-float copysign( float x, float y );
++//float copysign( float x, float y );
+
+ struct Force
+ {
+diff -ruN ./src/pk3.cpp ../b/src/pk3.cpp
+--- ./src/pk3.cpp 2012-03-19 09:20:14.000000000 +0100
++++ ../b/src/pk3.cpp 2020-09-02 23:06:42.933362491 +0200
+@@ -356,7 +356,7 @@
+ }
+ //if the file isn't in the archive
+ if (index == -1)
+- return false;
++ return NULL;
+ int flength = GetFileLen( index );
+
+ buffer = new char[flength];
+diff -ruN ./src/python/python_compile.h ../b/src/python/python_compile.h
+--- ./src/python/python_compile.h 2010-02-25 16:44:43.000000000 +0100
++++ ../b/src/python/python_compile.h 2020-09-02 21:07:32.272758050 +0200
+@@ -10,6 +10,7 @@
+ #include "hashtable.h"
+ #include <string>
+ #include <compile.h>
++#include <boost/version.hpp>
+
+ extern Hashtable< std::string, PyCodeObject, 1023 >compiled_python;
+
+@@ -40,8 +41,11 @@
+ switch (type)
+ {
+ case MYSTRING:
++#if BOOST_VERSION <= 104500
+ return PyString_FromString( objects.c_str() );
+-
++#else
++ return PyUnicode_FromString( objects.c_str() );
++#endif
+ case MYLONG:
+ return PyLong_FromLong( objecti );
+
+diff -ruN ./src/ship_commands.cpp ../b/src/ship_commands.cpp
+--- ./src/ship_commands.cpp 2012-03-19 09:20:14.000000000 +0100
++++ ../b/src/ship_commands.cpp 2020-09-03 00:11:42.010617317 +0200
+@@ -5,14 +5,14 @@
+ #include "universe_util.h"
+ #include "gldrv/winsys.h"
+
+-static inline float fmin( float a, float b )
+-{
+- return (a < b) ? a : b;
+-}
+-static inline float fmax( float a, float b )
+-{
+- return (a > b) ? a : b;
+-}
++//static inline float fmin( float a, float b )
++//{
++// return (a < b) ? a : b;
++//}
++//static inline float fmax( float a, float b )
++//{
++// return (a > b) ? a : b;
++//}
+
+ class ShipCommands
+ {
+diff -ruN ./src/vsfilesystem.cpp ../b/src/vsfilesystem.cpp
+--- ./src/vsfilesystem.cpp 2012-03-19 09:20:14.000000000 +0100
++++ ../b/src/vsfilesystem.cpp 2020-09-02 16:02:24.060642199 +0200
+@@ -460,13 +460,15 @@
+
+ int vs_fprintf( FILE *fp, const char *format, ... )
+ {
++ int ret = 0;
+ if (!use_volumes) {
+ va_list ap;
+ va_start( ap, format );
+
+- return vfprintf( fp, format, ap );
+- } else {}
+- return 0;
++ ret = vfprintf( fp, format, ap );
++ va_end(ap);
++ }
++ return ret;
+ }
+
+ void vs_dprintf( char level, const char *format, ... )
+@@ -475,19 +477,22 @@
+ va_list ap;
+ va_start( ap, format );
+ vfprintf( stderr, format, ap );
++ va_end(ap);
+ }
+ }
+
+ #if 0
+ int vs_fscanf( FILE *fp, const char *format, ... )
+ {
++ int ret = 0;
+ if (!use_volumes) {
+ va_list arglist;
+ va_start( arglist, format );
+ //return _input(fp,(unsigned char*)format,arglist);
+- return vfscanf( fp, format, arglist );
+- } else {}
+- return 0;
++ ret = vfscanf( fp, format, arglist );
++ va_end(arglist);
++ }
++ return ret;
+ }
+ #endif
+
+@@ -563,6 +568,18 @@
+ data_paths.push_back( DATA_DIR );
+ #endif
+ if ( !vegastrike_cwd.empty() ) {
++ /* whatever the plan was, it does not work on Linux - at least
++ * not at this stage. Hence, use fixed absolute paths to
++ * find data directory
++ */
++ data_paths.push_back( "/usr/share/games/vegastrike/data");
++ data_paths.push_back( "/usr/share/vegastrike/data");
++ data_paths.push_back( "/usr/games/vegastrike/data");
++ data_paths.push_back( "/usr/local/share/games/vegastrike/data");
++ data_paths.push_back( "/usr/local/share/vegastrike/data");
++ data_paths.push_back( "/usr/local/games/vegastrike/data");
++ data_paths.push_back( "/opt/vegastrike/data");
++
+ data_paths.push_back( vegastrike_cwd );
+ data_paths.push_back( vegastrike_cwd+"/.." );
+ data_paths.push_back( vegastrike_cwd+"/../data4.x" );
+@@ -1713,16 +1730,18 @@
+
+ int VSFile::Fprintf( const char *format, ... )
+ {
++ int ret = 0;
+ if (!UseVolumes[alt_type] || this->volume_type == VSFSNone) {
+ va_list ap;
+ va_start( ap, format );
+
+- return vfprintf( this->fp, format, ap );
++ ret = vfprintf( this->fp, format, ap );
++ va_end(ap);
+ } else {
+ cerr<<"!!! ERROR : Writing is not supported within resource/volume files"<<endl;
+ VSExit( 1 );
+ }
+- return 0;
++ return ret;
+ }
+
+ #if 0
+@@ -1742,18 +1761,17 @@
+ if (!UseVolumes[alt_type] || this->volume_type == VSFSNone) {
+ //return _input(fp,(unsigned char*)format,arglist);
+ ret = vfscanf( this->fp, newformat, arglist );
+- va_end( arglist );
+ } else {
+ if (q_volume_format == vfmtVSR) {} else if (q_volume_format == vfmtPK3) {
+ //If the file has not been extracted yet we do now
+ checkExtracted();
+ ret = vsscanf( pk3_extracted_file+offset, newformat, arglist );
+ readbytes = GetReadBytes( newformat, arglist );
+- va_end( arglist );
+ cerr<<" SSCANF : Read "<<readbytes<<" bytes"<<endl;
+ this->offset += readbytes;
+ }
+ }
++ va_end( arglist );
+ delete[] newformat;
+ return ret;
+ }
diff --git a/games/vegastrike/patches/patch-0.5.1.r1_2 b/games/vegastrike/patches/patch-0.5.1.r1_2
deleted file mode 100644
index 7780674c0c..0000000000
--- a/games/vegastrike/patches/patch-0.5.1.r1_2
+++ /dev/null
@@ -1,616 +0,0 @@
-diff -ruN ./CMakeLists.txt ../c/CMakeLists.txt
---- ./CMakeLists.txt 2012-03-26 02:50:49.000000000 +0200
-+++ ../c/CMakeLists.txt 2020-09-03 16:25:55.870086658 +0200
-@@ -10,7 +10,7 @@
-
- project (vsUTCS)
-
--
-+include(GNUInstallDirs)
-
- include_directories(${vsUTCS_SOURCE_DIR}/src
- ${vsUTCS_SOURCE_DIR}/src/cmd
-@@ -828,33 +828,33 @@
-
- #Find FFMpeg
-
--find_package(FFMPEG)
--IF(FFMPEG_FOUND)
-- SET(TST_INCLUDES ${TST_INCLUDES} ${FFMPEG_INCLUDE_DIRS})
-- SET(TST_LIBS ${TST_LIBS} ${FFMPEG_LIBRARIES})
-- add_definitions(${FFMPEG_DEFINITIONS})
-- SET(HAVE_FFMPEG 1 )
-- IF(swscale1_FOUND)
-- message("++ FFmpeg's libswscale found.")
-- ELSE(swscale1_FOUND)
-- message("-- FFMpeg's libswscale not found... depending on your ffmpeg version, VS might not build.")
-- ENDIF(swscale1_FOUND)
--ELSE(FFMPEG_FOUND)
-- message("-- FFMPEG Not Found")
--ENDIF(FFMPEG_FOUND)
-+#find_package(FFMPEG)
-+#IF(FFMPEG_FOUND)
-+# SET(TST_INCLUDES ${TST_INCLUDES} ${FFMPEG_INCLUDE_DIRS})
-+# SET(TST_LIBS ${TST_LIBS} ${FFMPEG_LIBRARIES})
-+# add_definitions(${FFMPEG_DEFINITIONS})
-+# SET(HAVE_FFMPEG 1 )
-+# IF(swscale1_FOUND)
-+# message("++ FFmpeg's libswscale found.")
-+# ELSE(swscale1_FOUND)
-+# message("-- FFMpeg's libswscale not found... depending on your ffmpeg version, VS might not build.")
-+# ENDIF(swscale1_FOUND)
-+#ELSE(FFMPEG_FOUND)
-+# message("-- FFMPEG Not Found")
-+#ENDIF(FFMPEG_FOUND)
-
- #Find Ogre
-
--find_package(OGRE)
--IF(OGRE_FOUND)
-- SET(TST_INCLUDES ${TST_INCLUDES} ${OGRE_INCLUDE_DIR})
-- SET(TST_LIBS ${TST_LIBS} ${OGRE_LIBRARY})
-- add_definitions(${OGRE_DEFINITIONS})
-- SET(HAVE_OGRE 1)
-- message("++ Found Ogre: ${OGRE_VERSION}")
--ELSE(OGRE_FOUND)
-- message("-- Ogre Not Found: compiling without")
--ENDIF(OGRE_FOUND)
-+#find_package(OGRE)
-+#IF(OGRE_FOUND)
-+# SET(TST_INCLUDES ${TST_INCLUDES} ${OGRE_INCLUDE_DIR})
-+# SET(TST_LIBS ${TST_LIBS} ${OGRE_LIBRARY})
-+# add_definitions(${OGRE_DEFINITIONS})
-+# SET(HAVE_OGRE 1)
-+# message("++ Found Ogre: ${OGRE_VERSION}")
-+#ELSE(OGRE_FOUND)
-+# message("-- Ogre Not Found: compiling without")
-+#ENDIF(OGRE_FOUND)
-
- IF(NOT BEOS)
- FIND_LIBRARY(UTIL_LIB util)
-@@ -977,12 +977,12 @@
- HAVE_AVFORMAT_H
- HAVE_AVCODEC_H
- HAVE_AVIO_H
-- HAVE_FFMPEG_SWSCALE_H
-+# HAVE_FFMPEG_SWSCALE_H
- CMAKE_BACKWARDS_COMPATIBILITY
-- FFMPEG_INCLUDE_DIR
-- FFMPEG_FOUND
-- FFMPEG_LIBRARIES
-- FFMPEG_DEFINITIONS
-+# FFMPEG_INCLUDE_DIR
-+# FFMPEG_FOUND
-+# FFMPEG_LIBRARIES
-+# FFMPEG_DEFINITIONS
- GTK2_ATK_INCLUDE_DIR
- GTK2_ATK_LIBRARY
- GTK2_CAIRO_INCLUDE_DIR
-diff -ruN ./objconv/basemaker/base_maker_texture.cpp ../c/objconv/basemaker/base_maker_texture.cpp
---- ./objconv/basemaker/base_maker_texture.cpp 2010-03-10 03:56:23.000000000 +0100
-+++ ../c/objconv/basemaker/base_maker_texture.cpp 2020-09-03 16:25:55.871086646 +0200
-@@ -6,9 +6,12 @@
- #define XMD_H
- #define HAVE_BOOLEAN
- #endif
-+
- extern "C" {
- //YUCK it doesn't even have extern c in the headers!
- #include <jpeglib.h>
-+#include <string.h>
-+
- }
-
- #define strip_16 true
-diff -ruN ./objconv/mesher/to_OgreMesh.cpp ../c/objconv/mesher/to_OgreMesh.cpp
---- ./objconv/mesher/to_OgreMesh.cpp 2011-06-02 01:47:36.000000000 +0200
-+++ ../c/objconv/mesher/to_OgreMesh.cpp 2020-09-03 16:25:55.872086633 +0200
-@@ -1078,10 +1078,15 @@
- Ogre::VertexDeclaration *newDcl =
- data->vertexDeclaration->getAutoOrganisedDeclaration(
- mesh->hasSkeleton() );
--#else
-+#elif (OGRE_VERSION_MAJOR == 1) && (OGRE_VERSION_MINOR < 8)
- Ogre::VertexDeclaration *newDcl =
- data->vertexDeclaration->getAutoOrganisedDeclaration(
- mesh->hasSkeleton(), mesh->hasVertexAnimation() || (mesh->getPoseCount() > 0) );
-+#else
-+ Ogre::VertexDeclaration *newDcl =
-+ data->vertexDeclaration->getAutoOrganisedDeclaration(
-+ mesh->hasSkeleton(), mesh->hasVertexAnimation() || (mesh->getPoseCount() > 0),
-+ mesh->getSharedVertexDataAnimationIncludesNormals()); // what about Pose objects?
- #endif
- if ( *newDcl != *(data->vertexDeclaration) ) {
- //Usages don't matter here since we're onlly exporting
-@@ -1109,35 +1114,35 @@
- }
- }
-
--void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance )
--{
-- struct outputContext *ctxt = (struct outputContext*) outputcontext;
-- MeshPtr newMesh = ctxt->top;
-- if ( force || (newMesh->getNumLodLevels() <= 1) ) {
-- if (newMesh->getNumLodLevels() <= 1)
-- newMesh->removeLodLevels();
-- const Ogre::ProgressiveMesh::VertexReductionQuota quota = Ogre::ProgressiveMesh::VRQ_PROPORTIONAL;
-- const Real reduction = Real( 1-reductionFactor );
--
-- Real currDist = refDistance;
--
-- #if (OGRE_VERSION >= 0x010700)
-- Ogre::Mesh::LodValueList distanceList;
--
-- // pixel area is squared length, and length is proportional to triangle count
-- const Real distFactor = reductionFactor * reductionFactor;
-- newMesh->setLodStrategy(Ogre::LodStrategyManager::getSingletonPtr()->
-- getStrategy( "PixelCount" ) );
-- #else
-- Ogre::Mesh::LodDistanceList distanceList;
-- const Real distFactor = ( (reduction > 0.00001) ? 1/reduction : 1 );
-- #endif
--
-- for (int iLod = 0; iLod < numLod; ++iLod, currDist *= distFactor)
-- distanceList.push_back( currDist );
-- newMesh->generateLodLevels( distanceList, quota, reduction );
-- }
--}
-+//void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance )
-+//{
-+// struct outputContext *ctxt = (struct outputContext*) outputcontext;
-+// MeshPtr newMesh = ctxt->top;
-+// if ( force || (newMesh->getNumLodLevels() <= 1) ) {
-+// if (newMesh->getNumLodLevels() <= 1)
-+// newMesh->removeLodLevels();
-+// const Ogre::ProgressiveMesh::VertexReductionQuota quota = Ogre::ProgressiveMesh::VRQ_PROPORTIONAL;
-+// const Real reduction = Real( 1-reductionFactor );
-+//
-+// Real currDist = refDistance;
-+//
-+// #if (OGRE_VERSION >= 0x010700)
-+// Ogre::Mesh::LodValueList distanceList;
-+//
-+// // pixel area is squared length, and length is proportional to triangle count
-+// const Real distFactor = reductionFactor * reductionFactor;
-+// newMesh->setLodStrategy(Ogre::LodStrategyManager::getSingletonPtr()->
-+// getStrategy( "PixelCount" ) );
-+// #else
-+// Ogre::Mesh::LodDistanceList distanceList;
-+// const Real distFactor = ( (reduction > 0.00001) ? 1/reduction : 1 );
-+// #endif
-+//
-+// for (int iLod = 0; iLod < numLod; ++iLod, currDist *= distFactor)
-+// distanceList.push_back( currDist );
-+// newMesh->generateLodLevels( distanceList, quota, reduction );
-+// }
-+//}
-
- void DoneMeshes( void *outputcontext )
- {
-diff -ruN ./objconv/mesher/to_OgreMesh.h ../c/objconv/mesher/to_OgreMesh.h
---- ./objconv/mesher/to_OgreMesh.h 2010-02-25 16:22:25.000000000 +0100
-+++ ../c/objconv/mesher/to_OgreMesh.h 2020-09-03 16:25:55.873086621 +0200
-@@ -20,7 +20,7 @@
- float RadialSize( void *outputcontext ); //returns the size of the resulting mesh (it's maximum distance from 0,0,0). Useful for LODding.
-
- void Optimize( void *outputcontext ); //a good idea - reorganizes internal buffers so that the output mesh is more efficient
--void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance ); //autogenerates LOD levels - if force==true, will discard current LOD data
-+//void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance ); //autogenerates LOD levels - if force==true, will discard current LOD data
- void AutoEdgeList( void *outputcontext ); //a good idea - prepares the mesh for stencil shadows
- void AutoTangents( void *outputcontext ); //prepares the mesh for normal mapping (only needed if the material uses normal mapping)
- }
-diff -ruN ./setup/src/c/setup.cpp ../c/setup/src/c/setup.cpp
---- ./setup/src/c/setup.cpp 2011-03-15 01:28:47.000000000 +0100
-+++ ../c/setup/src/c/setup.cpp 2020-09-03 16:25:55.873086621 +0200
-@@ -110,10 +110,22 @@
- return 1;
- }
- }
--
-+
- #ifdef DATA_DIR
- data_paths.push_back( DATA_DIR );
- #endif
-+ /* whatever the plan was, it does not work on Linux - at least
-+ * not at this stage. Hence, use fixed absolute paths to
-+ * find data directory
-+ */
-+ data_paths.push_back( "/usr/share/games/vegastrike/data");
-+ data_paths.push_back( "/usr/share/vegastrike/data");
-+ data_paths.push_back( "/usr/games/vegastrike/data");
-+ data_paths.push_back( "/usr/local/share/games/vegastrike/data");
-+ data_paths.push_back( "/usr/local/share/vegastrike/data");
-+ data_paths.push_back( "/usr/local/games/vegastrike/data");
-+ data_paths.push_back( "/opt/vegastrike/data");
-+
- data_paths.push_back( origpath );
- data_paths.push_back( string( origpath )+"/.." );
- data_paths.push_back( string( origpath )+"/../data4.x" );
-@@ -133,22 +145,7 @@
- data_paths.push_back( "../Resources" );
- data_paths.push_back( "../Resources/data" );
- data_paths.push_back( "../Resources/data4.x" );
--/*
-- * data_paths.push_back( "/usr/share/local/vegastrike/data");
-- * data_paths.push_back( "/usr/local/share/vegastrike/data");
-- * data_paths.push_back( "/usr/local/vegastrike/data");
-- * data_paths.push_back( "/usr/share/vegastrike/data");
-- * data_paths.push_back( "/usr/local/games/vegastrike/data");
-- * data_paths.push_back( "/usr/games/vegastrike/data");
-- * data_paths.push_back( "/opt/share/vegastrike/data");
-- * data_paths.push_back( "/usr/share/local/vegastrike/data4.x");
-- * data_paths.push_back( "/usr/local/share/vegastrike/data4.x");
-- * data_paths.push_back( "/usr/local/vegastrike/data4.x");
-- * data_paths.push_back( "/usr/share/vegastrike/data4.x");
-- * data_paths.push_back( "/usr/local/games/vegastrike/data4.x");
-- * data_paths.push_back( "/usr/games/vegastrike/data4.x");
-- * data_paths.push_back( "/opt/share/vegastrike/data4.x");
-- */
-+
- //Win32 data should be "."
- char tmppath[16384];
- for (vector< string >::iterator vsit = data_paths.begin(); vsit != data_paths.end(); vsit++) {
-diff -ruN ./setup/src/include/central.cpp ../c/setup/src/include/central.cpp
---- ./setup/src/include/central.cpp 2004-10-25 04:27:13.000000000 +0200
-+++ ../c/setup/src/include/central.cpp 2020-09-03 17:45:35.786329482 +0200
-@@ -20,6 +20,8 @@
- struct group GROUPS;
- struct global_settings CONFIG;
-
-+static char EMPTY_STR[] = "";
-+
- // Primary initialization function. Sets everything up and takes care of the program
- void Start(int * argc, char ***argv) {
- LoadMainConfig();
-@@ -65,7 +67,7 @@
- if (CUR->name == NULL) { continue; }
- if (strcmp(CUR->name, group) == 0) { return CUR->setting; }
- } while ((CUR = CUR->next) > 0);
-- return '\0';
-+ return EMPTY_STR;
- }
-
- struct catagory *GetCatStruct(char *name) {
-diff -ruN ./src/cmd/music.cpp ../c/src/cmd/music.cpp
---- ./src/cmd/music.cpp 2012-03-19 09:20:14.000000000 +0100
-+++ ../c/src/cmd/music.cpp 2020-09-03 16:25:55.874086608 +0200
-@@ -448,7 +448,9 @@
- if (foundcache) {
- *me->music_load_info = wherecache->second;
- me->freeWav = false;
-- }
-+ } else if ( ! AUDLoadSoundFile(songname, me->music_load_info, true)) {
-+ VSFileSystem::vs_dprintf(1, "Failed to load music file \"%s\"", songname);
-+ }
- }
- if (me->freeWav && docacheme) {
- me->freeWav = false;
-diff -ruN ./src/cmd/unit.cpp ../c/src/cmd/unit.cpp
---- ./src/cmd/unit.cpp 2012-03-19 09:20:14.000000000 +0100
-+++ ../c/src/cmd/unit.cpp 2020-09-03 16:25:55.875086596 +0200
-@@ -80,6 +80,7 @@
- template < class UnitType >GameUnit< UnitType >::GameUnit( int ) : sparkle_accum( 0 )
- , phalos( new HaloSystem() )
- {
-+ VSFileSystem::vs_dprintf(3, "Unit created by Constructor: template < class UnitType >GameUnit< UnitType >::GameUnit( int ) : sparkle_accum( 0 ), phalos( new HaloSystem() )\n");
- this->Unit::Init();
- }
-
-@@ -99,6 +100,14 @@
- , phalos( new HaloSystem() )
- {
- Unit::Init( filename, SubU, faction, unitModifications, flightgrp, fg_subnumber, netxml );
-+
-+ std::string fn = string(filename);
-+ std::string str_faction = string(FactionUtil::GetFaction(faction));
-+ std::string objtype = UniverseUtil::LookupUnitStat( fn, str_faction, "Object_Type");
-+ if (objtype.compare("Vessel") == 0) {
-+ VSFileSystem::vs_dprintf(3, "Recomputing upgrades for (units.csv) Object_Type: %s\n", objtype.c_str());
-+ UnitUtil::RecomputeUnitUpgrades(this);
-+ }
- }
-
- template < class UnitType >GameUnit< UnitType >::~GameUnit()
-diff -ruN ./src/cmd/unit_collide.h ../c/src/cmd/unit_collide.h
---- ./src/cmd/unit_collide.h 2012-03-19 09:20:14.000000000 +0100
-+++ ../c/src/cmd/unit_collide.h 2020-09-03 17:34:09.178913256 +0200
-@@ -94,9 +94,9 @@
- {
- if ( !hugeobjects.empty() )
- hugeobjects.clear();
-- if ( this->active_huge.size() )
-+ if ( this->active_huge->size() )
- ha.clear();
-- if ( this->accum_huge.size() )
-+ if ( this->accum_huge->size() )
- hb.clear();
- acc_huge.clear();
- act_huge.clear();
-diff -ruN ./src/cmd/unit_generic.cpp ../c/src/cmd/unit_generic.cpp
---- ./src/cmd/unit_generic.cpp 2012-03-19 09:20:14.000000000 +0100
-+++ ../c/src/cmd/unit_generic.cpp 2020-09-03 16:25:55.879086546 +0200
-@@ -4903,16 +4903,26 @@
-
- static const string LOAD_FAILED = "LOAD_FAILED";
-
-+//const Unit * makeFinalBlankUpgrade( string name, int faction )
-+//{
-+// char *unitdir = GetUnitDir( name.c_str() );
-+// string limiternam = name;
-+// if (unitdir != name)
-+// limiternam = string( unitdir )+string( ".blank" );
-+// free( unitdir );
-+// const Unit *lim = UnitConstCache::getCachedConst( StringIntKey( limiternam, faction ) );
-+// if (!lim)
-+// lim = UnitConstCache::setCachedConst( StringIntKey( limiternam, faction ), makeBlankUpgrade( limiternam, faction ) );
-+// if (lim->name == LOAD_FAILED)
-+// lim = NULL;
-+// return lim;
-+//}
-+
- const Unit * makeFinalBlankUpgrade( string name, int faction )
- {
-- char *unitdir = GetUnitDir( name.c_str() );
-- string limiternam = name;
-- if (unitdir != name)
-- limiternam = string( unitdir )+string( ".blank" );
-- free( unitdir );
-- const Unit *lim = UnitConstCache::getCachedConst( StringIntKey( limiternam, faction ) );
-+ const Unit *lim = UnitConstCache::getCachedConst( StringIntKey( name, faction ) );
- if (!lim)
-- lim = UnitConstCache::setCachedConst( StringIntKey( limiternam, faction ), makeBlankUpgrade( limiternam, faction ) );
-+ lim = UnitConstCache::setCachedConst( StringIntKey( name, faction ), makeBlankUpgrade( name, faction ) );
- if (lim->name == LOAD_FAILED)
- lim = NULL;
- return lim;
-@@ -6387,21 +6397,48 @@
- int tmpammo = mounts[jmod].ammo;
- if (mounts[jmod].ammo != -1 && up->mounts[i].ammo != -1) {
- tmpammo += up->mounts[i].ammo;
-- if (templ) {
-- if (templ->GetNumMounts() > jmod) {
-- if (templ->mounts[jmod].volume != -1) {
-- if (templ->mounts[jmod].volume < mounts[jmod].type->volume*tmpammo) {
-- tmpammo =
-- (int) floor( .125
-- +( (0
-- +templ->mounts[jmod].volume)
-- /mounts[jmod].type->volume ) );
-+ if (ismissiletype) {
-+ if (templ) {
-+ if (templ->GetNumMounts() > jmod) {
-+ if (templ->mounts[jmod].volume != -1) {
-+ if (templ->mounts[jmod].volume < mounts[jmod].type->volume*tmpammo) {
-+ tmpammo =
-+ (int) floor( .125
-+ +( (0
-+ +templ->mounts[jmod].volume)
-+ /mounts[jmod].type->volume ) );
-+ }
- }
- }
- }
-+ if (tmpammo*mounts[jmod].type->volume > mounts[jmod].volume)
-+ tmpammo = (int) floor( .125+( (0+mounts[jmod].volume)/mounts[jmod].type->volume ) );
-+ } else {
-+ std::string ammoname = up->name.get();
-+ std::size_t ammopos = ammoname.find("_ammo");
-+ std::string weaponname = ammoname.substr(0, ammopos);
-+
-+ /* Do NOT delete this Unit because it will be either fetched
-+ * from a cache or - if it has to be created - it will
-+ * be automatically put in a cache.
-+ * Deletion will corrupt the cache!
-+ */
-+ const Unit * weapon = getUnitFromUpgradeName(weaponname);
-+
-+ if (weapon == NULL || weapon->name == LOAD_FAILED) {
-+ // this should not happen
-+ VSFileSystem::vs_dprintf(1, "UpgradeMount(): FAILED to obtain weapon: %s\n", weaponname.c_str());
-+ cancompletefully = false;
-+ break;
-+ }
-+
-+ int maxammo = weapon->mounts[0].ammo;
-+
-+ if (tmpammo > maxammo) {
-+ tmpammo = maxammo;
-+ }
- }
-- if (tmpammo*mounts[jmod].type->volume > mounts[jmod].volume)
-- tmpammo = (int) floor( .125+( (0+mounts[jmod].volume)/mounts[jmod].type->volume ) );
-+
- if (tmpammo > mounts[jmod].ammo) {
- cancompletefully = true;
- if (touchme)
-diff -ruN ./src/cmd/unit_jump.h ../c/src/cmd/unit_jump.h
---- ./src/cmd/unit_jump.h 2012-03-19 09:20:14.000000000 +0100
-+++ ../c/src/cmd/unit_jump.h 2020-09-03 16:25:55.880086533 +0200
-@@ -108,7 +108,7 @@
- (tester = *i) != NULL; ++i)
- if (tester->isUnit() == UNITPTR && tester != this)
- if ( ( this->LocalPosition()-tester->LocalPosition() ).Magnitude() < this->rSize()+tester->rSize() )
-- SetCurPosition( this->LocalPosition()+this->cumulative_transformation_matrix.getR()
-+ this->SetCurPosition( this->LocalPosition()+this->cumulative_transformation_matrix.getR()
- *( 4*( this->rSize()+tester->rSize() ) ) );
- DealPossibleJumpDamage( this );
- static int jumparrive = AUDCreateSound( vs_config->getVariable( "unitaudio", "jumparrive", "sfx43.wav" ), false );
-diff -ruN ./src/gfx/cockpit_xml.cpp ../c/src/gfx/cockpit_xml.cpp
---- ./src/gfx/cockpit_xml.cpp 2010-12-15 09:53:40.000000000 +0100
-+++ ../c/src/gfx/cockpit_xml.cpp 2020-09-03 16:30:00.313030701 +0200
-@@ -315,7 +315,7 @@
- for (counter = 0; counter < 4; ++counter)
- if (!replaced[counter]) {
- delete Pit[counter];
-- Pit[counter] = false;
-+ Pit[counter] = NULL;
- }
- break;
- case UnitImages< void >::SHIELD4:
-diff -ruN ./src/gfx/quadsquare.cpp ../c/src/gfx/quadsquare.cpp
---- ./src/gfx/quadsquare.cpp 2010-03-10 06:27:01.000000000 +0100
-+++ ../c/src/gfx/quadsquare.cpp 2020-09-03 16:25:55.881086521 +0200
-@@ -13,9 +13,9 @@
- #include <float.h>
- #include <math.h>
- #include <assert.h>
--#include "quadsquare.h"
- #include "gfxlib.h"
- #include "aux_texture.h"
-+#include "quadsquare.h"
- using std::vector;
-
- unsigned int*quadsquare::VertexAllocated;
-diff -ruN ./src/gui/text_area.cpp ../c/src/gui/text_area.cpp
---- ./src/gui/text_area.cpp 2010-02-25 15:26:53.000000000 +0100
-+++ ../c/src/gui/text_area.cpp 2020-09-03 17:46:51.883378138 +0200
-@@ -32,6 +32,8 @@
- * };
- */
-
-+static char EMPTY_STR[] = "";
-+
- TextArea::~TextArea() {}
-
- TextArea::TextArea()
-@@ -316,7 +318,7 @@
- {
- TextAreaItem *search;
- search = ItemList->FindCount( cur_selected, 0 );
-- if (search == 0) return '\0';
-+ if (search == 0) return EMPTY_STR;
- if (type == 1) return search->name;
-
- else return search->description;
-diff -ruN ./src/networking/lowlevel/packetmem.cpp ../c/src/networking/lowlevel/packetmem.cpp
---- ./src/networking/lowlevel/packetmem.cpp 2008-03-31 10:20:19.000000000 +0200
-+++ ../c/src/networking/lowlevel/packetmem.cpp 2020-09-03 16:25:55.881086521 +0200
-@@ -102,7 +102,7 @@
- }
- else
- {
-- _buffer.reset( 0 );
-+ _buffer.reset();
- _len = 0;
- }
- }
-diff -ruN ./src/pk3.cpp ../c/src/pk3.cpp
---- ./src/pk3.cpp 2012-03-19 09:20:14.000000000 +0100
-+++ ../c/src/pk3.cpp 2020-09-03 16:31:12.819124250 +0200
-@@ -356,7 +356,7 @@
- }
- //if the file isn't in the archive
- if (index == -1)
-- return false;
-+ return NULL;
- int flength = GetFileLen( index );
-
- buffer = new char[flength];
-diff -ruN ./src/vsfilesystem.cpp ../c/src/vsfilesystem.cpp
---- ./src/vsfilesystem.cpp 2012-03-19 09:20:14.000000000 +0100
-+++ ../c/src/vsfilesystem.cpp 2020-09-03 16:25:55.882086508 +0200
-@@ -460,13 +460,15 @@
-
- int vs_fprintf( FILE *fp, const char *format, ... )
- {
-+ int ret = 0;
- if (!use_volumes) {
- va_list ap;
- va_start( ap, format );
-
-- return vfprintf( fp, format, ap );
-- } else {}
-- return 0;
-+ ret = vfprintf( fp, format, ap );
-+ va_end(ap);
-+ }
-+ return ret;
- }
-
- void vs_dprintf( char level, const char *format, ... )
-@@ -475,19 +477,22 @@
- va_list ap;
- va_start( ap, format );
- vfprintf( stderr, format, ap );
-+ va_end(ap);
- }
- }
-
- #if 0
- int vs_fscanf( FILE *fp, const char *format, ... )
- {
-+ int ret = 0;
- if (!use_volumes) {
- va_list arglist;
- va_start( arglist, format );
- //return _input(fp,(unsigned char*)format,arglist);
-- return vfscanf( fp, format, arglist );
-- } else {}
-- return 0;
-+ ret = vfscanf( fp, format, arglist );
-+ va_end(arglist);
-+ }
-+ return ret;
- }
- #endif
-
-@@ -563,6 +568,18 @@
- data_paths.push_back( DATA_DIR );
- #endif
- if ( !vegastrike_cwd.empty() ) {
-+ /* whatever the plan was, it does not work on Linux - at least
-+ * not at this stage. Hence, use fixed absolute paths to
-+ * find data directory
-+ */
-+ data_paths.push_back( "/usr/share/games/vegastrike/data");
-+ data_paths.push_back( "/usr/share/vegastrike/data");
-+ data_paths.push_back( "/usr/games/vegastrike/data");
-+ data_paths.push_back( "/usr/local/share/games/vegastrike/data");
-+ data_paths.push_back( "/usr/local/share/vegastrike/data");
-+ data_paths.push_back( "/usr/local/games/vegastrike/data");
-+ data_paths.push_back( "/opt/vegastrike/data");
-+
- data_paths.push_back( vegastrike_cwd );
- data_paths.push_back( vegastrike_cwd+"/.." );
- data_paths.push_back( vegastrike_cwd+"/../data4.x" );
-@@ -1713,16 +1730,18 @@
-
- int VSFile::Fprintf( const char *format, ... )
- {
-+ int ret = 0;
- if (!UseVolumes[alt_type] || this->volume_type == VSFSNone) {
- va_list ap;
- va_start( ap, format );
-
-- return vfprintf( this->fp, format, ap );
-+ ret = vfprintf( this->fp, format, ap );
-+ va_end(ap);
- } else {
- cerr<<"!!! ERROR : Writing is not supported within resource/volume files"<<endl;
- VSExit( 1 );
- }
-- return 0;
-+ return ret;
- }
-
- #if 0
-@@ -1742,18 +1761,17 @@
- if (!UseVolumes[alt_type] || this->volume_type == VSFSNone) {
- //return _input(fp,(unsigned char*)format,arglist);
- ret = vfscanf( this->fp, newformat, arglist );
-- va_end( arglist );
- } else {
- if (q_volume_format == vfmtVSR) {} else if (q_volume_format == vfmtPK3) {
- //If the file has not been extracted yet we do now
- checkExtracted();
- ret = vsscanf( pk3_extracted_file+offset, newformat, arglist );
- readbytes = GetReadBytes( newformat, arglist );
-- va_end( arglist );
- cerr<<" SSCANF : Read "<<readbytes<<" bytes"<<endl;
- this->offset += readbytes;
- }
- }
-+ va_end( arglist );
- delete[] newformat;
- return ret;
- }
diff --git a/games/vegastrike/patches/patch_partsfix-0.5.1.r1_2 b/games/vegastrike/patches/patch_partsfix-0.5.1.r1_1
index 563de8f15c..563de8f15c 100644
--- a/games/vegastrike/patches/patch_partsfix-0.5.1.r1_2
+++ b/games/vegastrike/patches/patch_partsfix-0.5.1.r1_1
diff --git a/games/vegastrike/vegastrike.SlackBuild b/games/vegastrike/vegastrike.SlackBuild
index 4b004e3532..0cca9fa7c0 100644
--- a/games/vegastrike/vegastrike.SlackBuild
+++ b/games/vegastrike/vegastrike.SlackBuild
@@ -45,7 +45,7 @@ PRGSPEECHNAME=${PRGSPEECHNAME:-$PRGNAM-speech-*}
PRGSPEECHNAME=${PRGSPEECHNAME%$PRGSPEECHSUF}
VERSION=${VERSION:-0.5.1.r1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -85,6 +85,9 @@ tar xvf $CWD/$PRGSRCNAME$PRGSRCSUF
cd $PRGSRCNAME
+#cp "$CWD/FindGTK2.cmake" "$CWD/SelectLibraryConfigurations.cmake" "$CWD/FindPackageHandleStandardArgs.cmake" "$CWD/FindPackageMessage.cmake" .
+cp "$CWD/cmake"/*.cmake .
+
declare patchdir="$CWD/patches"
patch -p0 < "$patchdir/patch-${VERSION}_$BUILD"
@@ -114,6 +117,8 @@ cmake \
-DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
-DCMAKE_SYSTEM_PROCESSOR=$ARCH \
-DDISABLE_SERVER=${DISABLE_SERVER:-ON} \
+ -DUSE_SYSTEM_BOOST=${USE_SYSTEM_BOOST:-ON} \
+ -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD:-11} \
..
make
diff --git a/games/warmux/patches/return-null.patch b/games/warmux/patches/return-null.patch
new file mode 100644
index 0000000000..851dfcbd16
--- /dev/null
+++ b/games/warmux/patches/return-null.patch
@@ -0,0 +1,11 @@
+--- src/interface/weapon_menu.cpp.orig 2016-05-09 15:22:36.895266463 +0200
++++ src/interface/weapon_menu.cpp 2016-05-09 15:21:38.518476191 +0200
+@@ -391,7 +391,7 @@
+ Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
+ {
+ if (!show)
+- return false;
++ return NULL;
+ const std::vector<PolygonItem *>& items = poly->GetItem();
+ WeaponMenuItem * tmp;
+ Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);
diff --git a/games/warmux/warmux.SlackBuild b/games/warmux/warmux.SlackBuild
index 20cd3cd3a5..1c6d7ff6c7 100644
--- a/games/warmux/warmux.SlackBuild
+++ b/games/warmux/warmux.SlackBuild
@@ -80,6 +80,9 @@ patch -p1 < $CWD/patches/include-zlib.patch
sed -i "s|SDLNet_Read32(buffer)|SDLNet_Read32(const_cast<char*>(buffer))|" \
lib/warmux/action/action.cpp
+# Fix for gcc-6.x
+patch -p0 < $CWD/patches/return-null.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -90,7 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--program-prefix="" \
--program-suffix="" \
- --enable-fribidi \
+ --disable-fribidi \
--enable-servers \
--build=$ARCH-slackware-linux
diff --git a/games/widelands/widelands-gcc47.patch b/games/widelands/widelands-gcc47.patch
deleted file mode 100644
index 9ea19c3571..0000000000
--- a/games/widelands/widelands-gcc47.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'src/main.cc'
---- src/main.cc 2012-02-15 21:25:34 +0000
-+++ src/main.cc 2012-05-02 07:43:01 +0000
-@@ -28,6 +28,7 @@
- #include <iostream>
- #include <stdexcept>
- #include <typeinfo>
-+#include <unistd.h>
-
- #include <SDL_main.h>
-
-
diff --git a/games/widelands/widelands.SlackBuild b/games/widelands/widelands.SlackBuild
index 793f7a1215..8482c99d6d 100644
--- a/games/widelands/widelands.SlackBuild
+++ b/games/widelands/widelands.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=widelands
-VERSION=${VERSION:-build19}
+VERSION=${VERSION:-20170618}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -59,9 +59,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION-src
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.bz2
-cd $PRGNAM-$VERSION-src
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,9 +69,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Fix compiling with gcc 4.7
-patch -p0 -i $CWD/widelands-gcc47.patch
-
mkdir -p build1
cd build1
cmake \
@@ -98,7 +95,6 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
mv $PKG/usr/{VERSION,ChangeLog,CREDITS,COPYING} $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a WL_RELEASE $PKG/usr/doc/$PRGNAM-$VERSION/
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/games/widelands/widelands.info b/games/widelands/widelands.info
index a98f31a43a..2d69dba9b4 100644
--- a/games/widelands/widelands.info
+++ b/games/widelands/widelands.info
@@ -1,8 +1,8 @@
PRGNAM="widelands"
-VERSION="build19"
+VERSION="20170618"
HOMEPAGE="http://www.widelands.org"
-DOWNLOAD="https://launchpad.net/widelands/build19/build19/+download/widelands-build19-src.tar.bz2"
-MD5SUM="0ef7ccf021b8001056739f755500366d"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/widelands-20170618.tar.bz2"
+MD5SUM="a293822f26386c16a66d4801716e0740"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="SDL2_image SDL2_mixer SDL2_net SDL2_ttf lua"
diff --git a/games/xmoto/xmoto.SlackBuild b/games/xmoto/xmoto.SlackBuild
index 539df636d7..7dc9f71b37 100644
--- a/games/xmoto/xmoto.SlackBuild
+++ b/games/xmoto/xmoto.SlackBuild
@@ -52,7 +52,7 @@ find -L . \
patch -p1 < $CWD/gcc-4.7.patch
CFLAGS="$SLKCFLAGS -DdDOUBLE" \
-CXXFLAGS="$SLKCFLAGS -DdDOUBLE" \
+CXXFLAGS="$SLKCFLAGS -DdDOUBLE -fpermissive" \
LDFLAGS="-ldl" \
./configure \
--prefix=/usr \
diff --git a/games/xu4/gcc7.patch b/games/xu4/gcc7.patch
new file mode 100644
index 0000000000..29f2cceee4
--- /dev/null
+++ b/games/xu4/gcc7.patch
@@ -0,0 +1,90 @@
+--- xu4-20130612_svn/src/image_sdl.cpp.orig 2017-07-07 05:16:49.443617174 +0700
++++ xu4-20130612_svn/src/image_sdl.cpp 2017-07-07 05:25:40.763657058 +0700
+@@ -349,7 +349,7 @@
+ unsigned int y_finish = std::min(int(bottom), oy + span + 1);
+ for (y = y_start; y < y_finish; ++y) {
+
+- int divisor = 1 + span * 2 - abs(ox - x) - abs(oy - y);
++ int divisor = 1 + span * 2 - std::abs((long int) (ox - x)) - std::abs((long int) (oy - y));
+
+ unsigned int r, g, b, a;
+ getPixel(x, y, r, g, b, a);
+--- xu4-20130612_svn/src/map.cpp.orig 2017-07-07 05:26:04.108658810 +0700
++++ xu4-20130612_svn/src/map.cpp 2017-07-07 05:28:17.857668850 +0700
+@@ -123,14 +123,14 @@
+ if (map && map->border_behavior == Map::BORDER_WRAP) {
+ MapCoords me = *this;
+
+- if (abs(me.x - c.x) > abs(me.x + map->width - c.x))
++ if (std::abs((long int) (me.x - c.x)) > std::abs((long int) (me.x + map->width - c.x)))
+ me.x += map->width;
+- else if (abs(me.x - c.x) > abs(me.x - map->width - c.x))
++ else if (std::abs((long int) (me.x - c.x)) > std::abs((long int) (me.x - map->width - c.x)))
+ me.x -= map->width;
+
+- if (abs(me.y - c.y) > abs(me.y + map->width - c.y))
++ if (std::abs((long int) (me.y - c.y)) > std::abs((long int) (me.y + map->width - c.y)))
+ me.y += map->height;
+- else if (abs(me.y - c.y) > abs(me.y - map->width - c.y))
++ else if (std::abs((long int) (me.y - c.y)) > std::abs((long int) (me.y - map->width - c.y)))
+ me.y -= map->height;
+
+ dx = me.x - c.x;
+--- xu4-20130612_svn/src/person.cpp.orig 2017-07-07 05:28:34.604670107 +0700
++++ xu4-20130612_svn/src/person.cpp 2017-07-07 05:29:29.432674223 +0700
+@@ -221,7 +221,7 @@
+ eventHandler->pushController(&getPlayerCtrl);
+ int player = getPlayerCtrl.waitFor();
+ if (player != -1) {
+- string player_str = to_string(player+1);
++ string player_str = to_string((long int) player+1);
+ script->setVar(script->getInputName(), player_str);
+ }
+ else script->unsetVar(script->getInputName());
+--- xu4-20130612_svn/src/script.cpp.orig 2017-07-07 05:29:46.242675485 +0700
++++ xu4-20130612_svn/src/script.cpp 2017-07-07 05:31:00.015681023 +0700
+@@ -44,7 +44,7 @@
+
+ Script::Variable::Variable(const int &v) : set(true) {
+ i_val = v;
+- s_val = to_string(v);
++ s_val = to_string((long int) v);
+ }
+
+ int& Script::Variable::getInt() { return i_val; }
+@@ -503,7 +503,7 @@
+ }
+ // Get the current iterator for our loop
+ else if (item == "iterator")
+- prop = to_string(this->iterator);
++ prop = to_string((long int) this->iterator);
+ else if ((pos = item.find("show_inventory:")) < item.length()) {
+ pos = item.find(":");
+ string itemScript = item.substr(pos+1);
+@@ -611,7 +611,7 @@
+ if (content.empty())
+ errorWarning("Error: empty math() function");
+
+- prop = to_string(mathValue(content));
++ prop = to_string((long int) mathValue(content));
+ }
+
+ /**
+@@ -643,7 +643,7 @@
+
+ /* generate a random number */
+ else if (funcName == "random")
+- prop = to_string(xu4_random((int)strtol(content.c_str(), NULL, 10)));
++ prop = to_string((long int) xu4_random((int)strtol(content.c_str(), NULL, 10)));
+
+ /* replaced with "true" if content is empty, or "false" if not */
+ else if (funcName == "isempty") {
+@@ -1391,7 +1391,7 @@
+ string children_results;
+
+ mathParseChildren(current, &children_results);
+- *result = to_string(mathValue(children_results));
++ *result = to_string((long int) mathValue(children_results));
+ }
+ }
+ }
diff --git a/games/xu4/xu4.SlackBuild b/games/xu4/xu4.SlackBuild
index d4439ca2cc..08a91827bf 100644
--- a/games/xu4/xu4.SlackBuild
+++ b/games/xu4/xu4.SlackBuild
@@ -73,6 +73,9 @@ sed -i -e '/border\.png/s,^,//,' src/imagemgr.cpp
# validate the game's XML files. So:
sed -i '/#define *DEFAULT_VALIDATE_XML/s,1,0,' src/settings.h
+# Patch for GCC 7
+patch -p1 < $CWD/gcc7.patch
+
# The -DNPERF stops u4 from creating a debug/ in the current dir.
make -C src DEBUGCXXFLAGS="-DNPERF $SLKCFLAGS" prefix=/usr libdir=$PKGLIBDIR
make -C src install prefix=$PKG/usr libdir=$PKGLIBDIR
diff --git a/games/xye/xye.SlackBuild b/games/xye/xye.SlackBuild
index 8487aecd40..fbe4eba763 100644
--- a/games/xye/xye.SlackBuild
+++ b/games/xye/xye.SlackBuild
@@ -72,7 +72,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing" \
./configure \
--prefix=/usr \
--bindir=/usr/bin \
diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild
index bbe278050d..36d4d0f370 100644
--- a/gis/gdal/gdal.SlackBuild
+++ b/gis/gdal/gdal.SlackBuild
@@ -112,6 +112,8 @@ else
WITHLIST+=" --with-jpeg=/usr/lib${LIBDIRSUFFIX}"
fi
+# The CPPFLAGS are for the newer mariadb (thanks pprkut!)
+CPPFLAGS="-I/usr/include/mysql/server" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/gis/libLAS/Use_LIBLAS_BIG_ENDIAN.patch b/gis/libLAS/Use_LIBLAS_BIG_ENDIAN.patch
new file mode 100644
index 0000000000..fc7dee623e
--- /dev/null
+++ b/gis/libLAS/Use_LIBLAS_BIG_ENDIAN.patch
@@ -0,0 +1,40 @@
+From af431abce95076b59f4eb7c6ef0930ca57c8a063 Mon Sep 17 00:00:00 2001
+From: Piotr Dobrowolski <dobrypd@gmail.com>
+Date: Thu, 25 Apr 2019 15:33:28 +0200
+Subject: [PATCH] Use LIBLAS_BIG_ENDIAN instead of BOOST_BIG_ENDIAN (#166)
+
+Fixes #165
+---
+ include/liblas/detail/binary.hpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/include/liblas/detail/binary.hpp b/include/liblas/detail/binary.hpp
+index 3dd8a6fc..8f0b3d47 100644
+--- a/include/liblas/detail/binary.hpp
++++ b/include/liblas/detail/binary.hpp
+@@ -17,6 +17,8 @@
+ #ifndef LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+ #define LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+
++#include <liblas/detail/endian.hpp>
++
+ #include <cassert>
+ #include <climits>
+ #include <cstring>
+@@ -25,7 +27,6 @@
+
+ #include <boost/config.hpp>
+ #include <boost/static_assert.hpp>
+-#include <boost/detail/endian.hpp>
+ #include <boost/type_traits/is_signed.hpp>
+
+ #if CHAR_BIT != 8
+@@ -43,7 +44,7 @@ namespace detail { namespace binary {
+ struct big_endian_tag {};
+ struct little_endian_tag {};
+
+-#ifdef BOOST_BIG_ENDIAN
++#ifdef LIBLAS_BIG_ENDIAN
+ typedef big_endian_tag native_endian_tag;
+ #else
+ typedef little_endian_tag native_endian_tag;
diff --git a/gis/libLAS/boost-1.73.patch b/gis/libLAS/boost-1.73.patch
new file mode 100644
index 0000000000..818c15ef3b
--- /dev/null
+++ b/gis/libLAS/boost-1.73.patch
@@ -0,0 +1,36 @@
+Qualify placeholders
+Matteo Bernardini <ponce@slackbuilds.org>
+
+diff -Naur libLAS-1.8.1.orig/src/c_api.cpp libLAS-1.8.1/src/c_api.cpp
+--- libLAS-1.8.1.orig/src/c_api.cpp 2016-08-22 15:06:34.000000000 +0200
++++ libLAS-1.8.1/src/c_api.cpp 2020-08-04 14:54:22.311996000 +0200
+@@ -498,7 +498,7 @@
+
+ transforms.erase( std::remove_if( transforms.begin(),
+ transforms.end(),
+- boost::bind( &IsReprojectionTransform, _1 ) ),
++ boost::bind( &IsReprojectionTransform, boost::placeholders::_1 ) ),
+ transforms.end());
+
+ liblas::TransformPtr srs_transform = liblas::TransformPtr(new liblas::ReprojectionTransform(in_ref, *out_ref, &h));
+@@ -1840,7 +1840,7 @@
+
+ transforms.erase( std::remove_if( transforms.begin(),
+ transforms.end(),
+- boost::bind( &IsReprojectionTransform, _1 ) ),
++ boost::bind( &IsReprojectionTransform, boost::placeholders::_1 ) ),
+ transforms.end());
+
+ liblas::TransformPtr srs_transform = liblas::TransformPtr(new liblas::ReprojectionTransform(in_ref, *out_ref, &h));
+diff -Naur libLAS-1.8.1.orig/src/header.cpp libLAS-1.8.1/src/header.cpp
+--- libLAS-1.8.1.orig/src/header.cpp 2016-08-22 15:06:34.000000000 +0200
++++ libLAS-1.8.1/src/header.cpp 2020-08-04 14:53:36.599996000 +0200
+@@ -610,7 +610,7 @@
+
+ m_vlrs.erase( std::remove_if( m_vlrs.begin(),
+ m_vlrs.end(),
+- boost::bind( &SameVLRs, name, id, _1 ) ),
++ boost::bind( &SameVLRs, name, id, boost::placeholders::_1 ) ),
+ m_vlrs.end());
+
+ m_recordsCount = static_cast<uint32_t>(m_vlrs.size());
diff --git a/gis/libLAS/libLAS.SlackBuild b/gis/libLAS/libLAS.SlackBuild
index 706f11fa16..54a3e849ae 100644
--- a/gis/libLAS/libLAS.SlackBuild
+++ b/gis/libLAS/libLAS.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/Use_LIBLAS_BIG_ENDIAN.patch
+patch -p1 < $CWD/boost-1.73.patch
+
mkdir -p build
cd build
cmake \
diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild
index 15d2553188..0ebcd0d654 100644
--- a/graphics/Blender/Blender.SlackBuild
+++ b/graphics/Blender/Blender.SlackBuild
@@ -115,6 +115,7 @@ cd build
-DWITH_SDL_DYNLOAD:BOOL=ON \
-DCMAKE_BUILD_TYPE=Release \
$cuda \
+ -DCMAKE_EXE_LINKER_FLAGS:STRING="-lboost_locale"
make
make install DESTDIR=$PKG
diff --git a/graphics/GraphicsMagick/README b/graphics/GraphicsMagick/README
index 6591c88ff2..a6f8945cd3 100644
--- a/graphics/GraphicsMagick/README
+++ b/graphics/GraphicsMagick/README
@@ -14,6 +14,9 @@ to 1.3.30 has been tested and seems to work, but I make no guarantees.
This build includes PerlMagick (the Perl language bindings for
GraphicsMagick) and TclMagick (Tcl bindings). If you really need to,
you can disable these via PERL=no and/or TCL=no in the environment.
+*WARNING*
+be advised that the tests that run during the build of PerlMagick need
+TMP=/tmp or they will fail.
Starting with 1.3.30, GraphicsMagick is built with OpenMP support, which
allows it to take better advantage of multiple cores. If you experience
diff --git a/graphics/darktable/darktable.SlackBuild b/graphics/darktable/darktable.SlackBuild
index 5a2f374bbe..54d82d5d13 100644
--- a/graphics/darktable/darktable.SlackBuild
+++ b/graphics/darktable/darktable.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=darktable
-VERSION=${VERSION:-2.4.4}
+VERSION=${VERSION:-3.0.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -68,6 +68,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# If you want to use llvm instead of gcc uncomment the following two lines
+#export CC=clang
+#export CXX=clang++
+
mkdir -p build
cd build
cmake \
diff --git a/graphics/darktable/darktable.info b/graphics/darktable/darktable.info
index e53831c9ec..3c297b695e 100644
--- a/graphics/darktable/darktable.info
+++ b/graphics/darktable/darktable.info
@@ -1,8 +1,8 @@
PRGNAM="darktable"
-VERSION="2.4.4"
+VERSION="3.0.2"
HOMEPAGE="https://www.darktable.org/"
-DOWNLOAD="https://github.com/darktable-org/darktable/releases/download/release-2.4.4/darktable-2.4.4.tar.xz"
-MD5SUM="32e4b9e75758b5d3fc803b857fd101ff"
+DOWNLOAD="https://github.com/darktable-org/darktable/releases/download/release-3.0.2/darktable-3.0.2.tar.xz"
+MD5SUM="d009478d6fb3a810b30443625777387d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="json-glib lensfun pugixml"
diff --git a/graphics/enblend-enfuse/enblend-enfuse.SlackBuild b/graphics/enblend-enfuse/enblend-enfuse.SlackBuild
index 26381c3f52..7d16524301 100644
--- a/graphics/enblend-enfuse/enblend-enfuse.SlackBuild
+++ b/graphics/enblend-enfuse/enblend-enfuse.SlackBuild
@@ -70,6 +70,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i '/^#include <vector>$/a #include <limits>' src/minimizer.h
+
CXXFLAGS="$SLKCFLAGS" \
CFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/graphics/flameshot/flameshot.SlackBuild b/graphics/flameshot/flameshot.SlackBuild
index 0e8f69f2af..b6e99b90e4 100644
--- a/graphics/flameshot/flameshot.SlackBuild
+++ b/graphics/flameshot/flameshot.SlackBuild
@@ -70,6 +70,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+patch -p1 < $CWD/qpainter.patch
+
qmake-qt5 -recursive flameshot.pro \
PREFIX=/usr \
CONFIG+=packaging \
diff --git a/graphics/flameshot/qpainter.patch b/graphics/flameshot/qpainter.patch
new file mode 100644
index 0000000000..f6b2ea457c
--- /dev/null
+++ b/graphics/flameshot/qpainter.patch
@@ -0,0 +1,22 @@
+diff -ru a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp
+--- a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp 2020-05-29 22:47:56.183333313 +0300
++++ b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp 2020-05-29 22:52:19.147998709 +0300
+@@ -24,6 +24,7 @@
+ #include <cmath>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLineF>
+ #include <QDragEnterEvent>
+ #include <QMimeData>
+diff -ru a/src/tools/arrow/arrowtool.h b/src/tools/arrow/arrowtool.h
+--- a/src/tools/arrow/arrowtool.h 2020-05-29 22:47:56.184333329 +0300
++++ b/src/tools/arrow/arrowtool.h 2020-05-29 22:48:25.688787364 +0300
+@@ -19,6 +19,7 @@
+
+ #include "src/tools/abstracttwopointtool.h"
+ #include <QPainter>
++#include <QPainterPath>
+
+ class ArrowTool : public AbstractTwoPointTool {
+ Q_OBJECT
diff --git a/graphics/gimagereader/cmake.patch b/graphics/gimagereader/cmake.patch
new file mode 100644
index 0000000000..21a5bbe9ce
--- /dev/null
+++ b/graphics/gimagereader/cmake.patch
@@ -0,0 +1,10 @@
+--- ./CMakeLists.txt.orig 2019-07-28 21:59:40.000000000 +0100
++++ ./CMakeLists.txt 2020-04-29 15:11:24.513815159 +0100
+@@ -1,4 +1,7 @@
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
++IF(${CMAKE_VERSION} VERSION_GREATER "3.17.0")
++CMAKE_POLICY(SET CMP0100 NEW)
++ENDIF()
+ LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ INCLUDE(GSettings)
+ SET(ENV{LC_ALL} "C")
diff --git a/graphics/gimagereader/gimagereader.SlackBuild b/graphics/gimagereader/gimagereader.SlackBuild
index 34b703f8c6..d98d09aa45 100644
--- a/graphics/gimagereader/gimagereader.SlackBuild
+++ b/graphics/gimagereader/gimagereader.SlackBuild
@@ -69,6 +69,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/cmake.patch
+
# Path where manual will be installed
sed -i 's,"share/doc/gimagereader","doc/'$PRGNAM-$VERSION'",' CMakeLists.txt
diff --git a/graphics/gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild b/graphics/gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild
index 56c01eca00..1220882efe 100644
--- a/graphics/gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild
+++ b/graphics/gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild
@@ -27,13 +27,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gimp-plugin-bimp
-VERSION=${VERSION:-1.18}
+VERSION=${VERSION:-2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/graphics/gimp-plugin-bimp/gimp-plugin-bimp.info b/graphics/gimp-plugin-bimp/gimp-plugin-bimp.info
index a5fe846b01..1d0d937019 100644
--- a/graphics/gimp-plugin-bimp/gimp-plugin-bimp.info
+++ b/graphics/gimp-plugin-bimp/gimp-plugin-bimp.info
@@ -1,8 +1,8 @@
PRGNAM="gimp-plugin-bimp"
-VERSION="1.18"
+VERSION="2.0"
HOMEPAGE="https://github.com/alessandrofrancesconi/gimp-plugin-bimp"
-DOWNLOAD="https://github.com/alessandrofrancesconi/gimp-plugin-bimp/archive/v1.18/gimp-plugin-bimp-1.18.tar.gz"
-MD5SUM="84b748a4f1fa0bd67da12a77b65b4611"
+DOWNLOAD="https://github.com/alessandrofrancesconi/gimp-plugin-bimp/archive/v2.0/gimp-plugin-bimp-2.0.tar.gz"
+MD5SUM="715a543f158fa9dd7a4f46dd2f28bb89"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/graphics/goocanvas/goocanvas.SlackBuild b/graphics/goocanvas/goocanvas.SlackBuild
index 1987660272..d20f708333 100644
--- a/graphics/goocanvas/goocanvas.SlackBuild
+++ b/graphics/goocanvas/goocanvas.SlackBuild
@@ -68,6 +68,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+export LDFLAGS="-ldl -lm"
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/graphics/gpaint/gpaint.SlackBuild b/graphics/gpaint/gpaint.SlackBuild
index a1c3993328..0c3b7861ba 100644
--- a/graphics/gpaint/gpaint.SlackBuild
+++ b/graphics/gpaint/gpaint.SlackBuild
@@ -84,6 +84,7 @@ patch -p1 -i $CWD/patches/24_fix_crash_on_failed_write.patch
patch -p1 -i $CWD/patches/25_fix_color_selection.patch
patch -p1 -i $CWD/patches/26_fix_toolbar.patch
+LIBS="-lm" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/graphics/graphite2/README b/graphics/graphite2/README
deleted file mode 100644
index 8084db6fb0..0000000000
--- a/graphics/graphite2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Graphite is a system that can be used to create "smart fonts" capable
-of displaying writing systems with various complex behaviors. A smart
-font contains not only letter shapes but also additional instructions
-indicating how to combine and position the letters in complex ways.
-
-Graphite was primarily developed to provide the flexibility needed for
-minority languages which often need to be written according to slightly
-different rules than well-known languages that use the same script.
diff --git a/graphics/graphite2/graphite2.SlackBuild b/graphics/graphite2/graphite2.SlackBuild
deleted file mode 100644
index ed4a1ef360..0000000000
--- a/graphics/graphite2/graphite2.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for graphite2
-
-# Copyright 2015-2018 Hunter Sezen California, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=graphite2
-VERSION=${VERSION:-1.3.13}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DCMAKE_BUILD_TYPE=Release \
- -Wno-dev ..
- make
- make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
- grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog LICENSE README.md Todo.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/graphite2/graphite2.info b/graphics/graphite2/graphite2.info
deleted file mode 100644
index b627fa40a6..0000000000
--- a/graphics/graphite2/graphite2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="graphite2"
-VERSION="1.3.13"
-HOMEPAGE="http://graphite.sil.org/"
-DOWNLOAD="https://github.com/silnrsi/graphite/releases/download/1.3.13/graphite2-1.3.13.tgz"
-MD5SUM="29616d4f9651706036ca25c111508272"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
diff --git a/graphics/graphite2/slack-desc b/graphics/graphite2/slack-desc
deleted file mode 100644
index fb3e6e8418..0000000000
--- a/graphics/graphite2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-graphite2: graphite2 (rendering engine for graphite fonts)
-graphite2:
-graphite2: Graphite is a system that can be used to create "smart fonts" capable
-graphite2: of displaying writing systems with various complex behaviors. A smart
-graphite2: font contains not only letter shapes but also additional instructions
-graphite2: indicating how to combine and position the letters in complex ways.
-graphite2:
-graphite2: Homepage: http://graphite.sil.org/
-graphite2:
-graphite2:
-graphite2:
diff --git a/graphics/graphviz/graphviz.SlackBuild b/graphics/graphviz/graphviz.SlackBuild
index 5593f2ecf0..7909f5b0ad 100644
--- a/graphics/graphviz/graphviz.SlackBuild
+++ b/graphics/graphviz/graphviz.SlackBuild
@@ -89,6 +89,7 @@ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
--mandir=/usr/man \
--disable-static \
--enable-ocaml=no \
+ --enable-php=no \
--build=$ARCH-slackware-linux
make
diff --git a/graphics/inkscape/README b/graphics/inkscape/README
index 1d9e9dd712..fede57c765 100644
--- a/graphics/inkscape/README
+++ b/graphics/inkscape/README
@@ -4,8 +4,6 @@ standard Scalable Vector Graphics (SVG) file format. Supported SVG
features include shapes, paths, text, markers, clones, alpha blending,
transforms, gradients, patterns, and grouping. Inkscape also supports
Creative Commons meta-data, node editing, layers, complex path
-operations, bitmap tracing, text-on-path, flowed text, direct XML
-editing, and more. It imports formats such as JPEG, PNG, TIFF, and
-others and exports PNG as well as multiple vector-based formats.
-
-Optional dependency: potrace (for bitmap tracing functionality).
++operations, bitmap tracing, text-on-path, flowed text, direct XML
++editing, and more. It imports formats such as JPEG, PNG, TIFF, and
++others and exports PNG as well as multiple vector-based formats.
diff --git a/graphics/inkscape/fix_atomic_rel_error.patch b/graphics/inkscape/fix_atomic_rel_error.patch
new file mode 100644
index 0000000000..b298550c5c
--- /dev/null
+++ b/graphics/inkscape/fix_atomic_rel_error.patch
@@ -0,0 +1,10 @@
+--- a/src/ui/tool/node.cpp 2020-05-01 15:18:52.000000000 +0200
++++ b/src/ui/tool/node.cpp 2020-08-18 01:25:05.266412299 +0200
+@@ -7,6 +7,7 @@
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
++#include <atomic>
+ #include <iostream>
+ #include <stdexcept>
+ #include <boost/utility.hpp>
diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild
index 4471bf3c1b..c658c9b69e 100644
--- a/graphics/inkscape/inkscape.SlackBuild
+++ b/graphics/inkscape/inkscape.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=inkscape
-VERSION=${VERSION:-0.92.4}
+VERSION=${VERSION:-1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,31 +69,53 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-./autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -std=c++11" \
-./configure \
- --enable-strict-build=no \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+# https://bugs.gentoo.org/737596
+patch -p1 < $CWD/fix_atomic_rel_error.patch
+
+# strip invalid tag
+sed -i /url/d org.inkscape.Inkscape.appdata.xml.in
+
+# https://bugs.launchpad.net/inkscape/+bug/314381
+# a couple of files have executable bits set,
+# despite not being executable
+find . -name '*.cpp' | xargs chmod -x
+find . -name '*.h' | xargs chmod -x
+# Fix end of line encodings
+dos2unix -k -q share/extensions/*.py
+
+mkdir -p build
+cd build
+ # imagemagick >= 7.x is unsupported yet, so use GraphicsMagick
+ cmake \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
+ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \
+ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
+ -DINCLUDE_INSTALL_DIR=/usr/include \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DSHARE_INSTALL_PREFIX=/usr/share \
+ -DBUILD_SHARED_LIBS:BOOL=OFF \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DWITH_GRAPHICS_MAGICK:BOOL=ON \
+ -DWITH_IMAGE_MAGICK:BOOL=OFF \
+ ..
+ make
+ make install DESTDIR=$PKG
+cd ..
+
+mv $PKG/usr/share/man $PKG/usr/man
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS COPYING* INSTALL NEWS README TRANSLATORS doc/* \
+ AUTHORS COPYING* README* TRANSLATORS LICENSES *.md doc/* \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
find $PKG/usr/doc -name "Makefile*" -exec rm {} \;
diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info
index 39fe0759fd..e68dec480d 100644
--- a/graphics/inkscape/inkscape.info
+++ b/graphics/inkscape/inkscape.info
@@ -1,10 +1,10 @@
PRGNAM="inkscape"
-VERSION="0.92.4"
+VERSION="1.0"
HOMEPAGE="http://www.inkscape.org/"
-DOWNLOAD="https://inkscape.org/gallery/item/13330/inkscape-0.92.4.tar.bz2"
-MD5SUM="ac30f6d5747fd9c620c00dad500f414f"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/inkscape-1.0.tar.xz"
+MD5SUM="9d4e1609576245bbb8dc184ee0b419ac"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="lxml numpy"
+REQUIRES="GraphicsMagick gdl dos2unix double-conversion lxml numpy potrace"
MAINTAINER="Fernando Lopez Jr."
EMAIL="fernando.lopezjr@gmail.com"
diff --git a/graphics/k3d/README b/graphics/k3d/README
index b156272092..73741ac528 100644
--- a/graphics/k3d/README
+++ b/graphics/k3d/README
@@ -7,7 +7,6 @@ patches, curves and animation.
Optional dependencies:
-graphviz
gtksourceview
libgnome
OpenCASCADE
diff --git a/graphics/k3d/gcc7.patch b/graphics/k3d/gcc7.patch
new file mode 100644
index 0000000000..887eeb8bd3
--- /dev/null
+++ b/graphics/k3d/gcc7.patch
@@ -0,0 +1,23 @@
+From d9786540a205bec0b381f339497d7c2cce00376b Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Wed, 1 Feb 2017 02:07:28 +0000
+Subject: [PATCH] Add required header for ostream operations
+
+This file uses std::ostream::operator<<(double) without including
+<ostream> and so fails to compile using GCC 7.
+---
+ k3dsdk/measurement.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/k3dsdk/measurement.h b/k3dsdk/measurement.h
+index 9edf7aef..67df5aa0 100644
+--- a/k3dsdk/measurement.h
++++ b/k3dsdk/measurement.h
+@@ -27,6 +27,7 @@
+
+ #include <cassert>
+ #include <iosfwd>
++#include <ostream>
+ #include <map>
+ #include <string>
+ #include <typeinfo>
diff --git a/graphics/k3d/k3d.SlackBuild b/graphics/k3d/k3d.SlackBuild
index 7b6cea7db5..1dc959a907 100644
--- a/graphics/k3d/k3d.SlackBuild
+++ b/graphics/k3d/k3d.SlackBuild
@@ -73,6 +73,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# From upstream
+patch -p1 < $CWD/gcc7.patch
+
# Fix man install directory.
sed -i "s|share/man|man|" share/man/CMakeLists.txt
diff --git a/graphics/k3d/k3d.info b/graphics/k3d/k3d.info
index 598878a4fa..9fe29db7ef 100644
--- a/graphics/k3d/k3d.info
+++ b/graphics/k3d/k3d.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/K-3D/k3d/archive/k3d-0.8.0.6/k3d-k3d-0.8.0.6.tar.gz
MD5SUM="129e051a1e724c14139808c25cd170f0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="gtkglext ftgl"
+REQUIRES="graphviz gtkglext ftgl"
MAINTAINER="David Spencer"
EMAIL="baildon.research@googlemail.com"
diff --git a/graphics/kuickshow/kuickshow.SlackBuild b/graphics/kuickshow/kuickshow.SlackBuild
index 6a82e2deba..e11058c674 100644
--- a/graphics/kuickshow/kuickshow.SlackBuild
+++ b/graphics/kuickshow/kuickshow.SlackBuild
@@ -71,6 +71,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+export CC=clang
+export CXX=clang++
+
mkdir -p build
cd build
cmake \
@@ -86,6 +89,11 @@ cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/doc $PKG/usr/doc/$PRGNAM-$VERSION
+cp AUTHORS BUGS COPYING ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/graphics/librecad/librecad.SlackBuild b/graphics/librecad/librecad.SlackBuild
index 86f34f6a96..ae53584bd9 100644
--- a/graphics/librecad/librecad.SlackBuild
+++ b/graphics/librecad/librecad.SlackBuild
@@ -26,9 +26,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=librecad
-ORIGNAME=LibreCAD
-VERSION=${VERSION:-2.2.0rc1}
-SRCVER=${SRCVER:-2.2.0-rc1}
+SRCNAM=LibreCAD
+VERSION=${VERSION:-20200611_9f2c32d}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -64,9 +63,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $ORIGNAME-$SRCVER
-tar xvf $CWD/$ORIGNAME-$SRCVER.tar.gz
-cd $ORIGNAME-$SRCVER
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+cd $SRCNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/graphics/librecad/librecad.info b/graphics/librecad/librecad.info
index 9a6d6c875e..978b3d5604 100644
--- a/graphics/librecad/librecad.info
+++ b/graphics/librecad/librecad.info
@@ -1,8 +1,8 @@
PRGNAM="librecad"
-VERSION="2.2.0rc1"
+VERSION="20200611_9f2c32d"
HOMEPAGE="https://librecad.org"
-DOWNLOAD="https://github.com/LibreCAD/LibreCAD/archive/2.2.0-rc1/LibreCAD-2.2.0-rc1.tar.gz"
-MD5SUM="647891c77aab2f5287dd5c6b1d174738"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/LibreCAD-20200611_9f2c32d.tar.xz"
+MD5SUM="24737593e72f5360373c89cfc2ac6e77"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="muParser qt5"
diff --git a/graphics/mypaint/mypaint.SlackBuild b/graphics/mypaint/mypaint.SlackBuild
index 089622dfa1..12fb75d6bb 100644
--- a/graphics/mypaint/mypaint.SlackBuild
+++ b/graphics/mypaint/mypaint.SlackBuild
@@ -12,13 +12,13 @@
# without any warranty.
PRGNAM=mypaint
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.2.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -29,8 +29,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/graphics/mypaint/mypaint.info b/graphics/mypaint/mypaint.info
index a17cd09e13..588da4bfbd 100644
--- a/graphics/mypaint/mypaint.info
+++ b/graphics/mypaint/mypaint.info
@@ -1,10 +1,10 @@
PRGNAM="mypaint"
-VERSION="1.2.0"
+VERSION="1.2.1"
HOMEPAGE="http://mypaint.org/"
-DOWNLOAD="https://github.com/mypaint/mypaint/releases/download/v1.2.0/mypaint-1.2.0.tar.xz"
-MD5SUM="c7c2cfac8e1eec5549e58567ec68daac"
+DOWNLOAD="https://github.com/mypaint/mypaint/releases/download/v1.2.1/mypaint-1.2.1.tar.xz"
+MD5SUM="ac08c3135929f5641488fbbb9746fe41"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="numpy"
+REQUIRES="json-c numpy"
MAINTAINER="Klaatu"
EMAIL="klaatu@member.fsf.org"
diff --git a/graphics/nomacs/nomacs.SlackBuild b/graphics/nomacs/nomacs.SlackBuild
index 8eaa6158ae..a14290c65d 100644
--- a/graphics/nomacs/nomacs.SlackBuild
+++ b/graphics/nomacs/nomacs.SlackBuild
@@ -75,6 +75,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i '/^#include <QPainter>$/a #include <QPainterPath>' \
+ ImageLounge/plugins/PageExtractionPlugin/src/DkPageSegmentation.cpp
+
cd ImageLounge
# Fix man pages and plugins installation path
diff --git a/graphics/opencollada/opencollada.SlackBuild b/graphics/opencollada/opencollada.SlackBuild
index 3bd2b9f561..1ccfdc1d02 100644
--- a/graphics/opencollada/opencollada.SlackBuild
+++ b/graphics/opencollada/opencollada.SlackBuild
@@ -70,6 +70,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# https://github.com/KhronosGroup/OpenCOLLADA/issues/570
+patch -p1 < $CWD/pcre.patch
+
mkdir -p build
cd build
cmake ../ \
diff --git a/graphics/opencollada/pcre.patch b/graphics/opencollada/pcre.patch
new file mode 100644
index 0000000000..fe8c01a5b0
--- /dev/null
+++ b/graphics/opencollada/pcre.patch
@@ -0,0 +1,13 @@
+diff -Naur OpenCOLLADA-1.6.62.orig/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h OpenCOLLADA-1.6.62/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
+--- OpenCOLLADA-1.6.62.orig/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h 2018-01-13 01:23:52.000000000 +0100
++++ OpenCOLLADA-1.6.62/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h 2018-07-08 08:40:38.764948000 +0200
+@@ -13,8 +13,7 @@
+
+ #include "COLLADABUPrerequisites.h"
+
+-struct real_pcre;
+-typedef struct real_pcre pcre;
++#include "pcre.h"
+
+
+ namespace COLLADABU
diff --git a/graphics/opencolorio/opencolorio.SlackBuild b/graphics/opencolorio/opencolorio.SlackBuild
index 81d3e34869..1f4766e8af 100644
--- a/graphics/opencolorio/opencolorio.SlackBuild
+++ b/graphics/opencolorio/opencolorio.SlackBuild
@@ -82,7 +82,7 @@ for v in $PYTHON_VERSIONS ; do
cd build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=deprecated-declarations -Wno-error=cast-function-type" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DPYTHON=python$v \
diff --git a/graphics/photoprint/photoprint.SlackBuild b/graphics/photoprint/photoprint.SlackBuild
index 387d6db429..565187bded 100644
--- a/graphics/photoprint/photoprint.SlackBuild
+++ b/graphics/photoprint/photoprint.SlackBuild
@@ -63,8 +63,6 @@ rm -rf $PRGNAM-$SRCVERSION
tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
cd $PRGNAM-$SRCVERSION
-find . -name "*.cpp" | xargs sed -i 's%glib/.*.h%glib.h%g'
-
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -72,6 +70,24 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# sed magic thanks to archlinux
+sed -i 's|^#include <glib/[^>]*>|#include <glib.h>|' \
+ gp_cppsupport/gprintersettings.cpp \
+ gp_cppsupport/gprinter.cpp \
+ pixbufthumbnail/egg-pixbuf-thumbnail.c
+# netpbm-typedef collides with std::tuple
+for __file in imagesource/*.{h,cpp}; do
+ sed -i \
+ -e 's|^\(using namespace std;\)|// \1|' \
+ -e 's|<<[[:blank:]]*\(endl[[:blank:];]*\)|<< std::\1|g' \
+ -e 's|^[^#]\([[:blank:]]\)*\([io]*fstream[[:blank:]]\)|\1std::\2|g' \
+ -e 's#\([[:blank:]|&~^,()=+-]\)\(ios::\)#\1std::\2#g' \
+ $__file
+done
+sed -i '116s|false|NULL|' effects/ppeffect.cpp
+# limit use of 'g_type_init()' to GLIB<2.35 (deprecated use)
+sed -i 's/^\([[:blank:]]*g_type_init();[[:blank:]]*\)$/#if !GLIB_CHECK_VERSION(2,35,0)\n\1\n#endif/' photoprint.cpp
+
LDFLAGS="-lX11" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/graphics/povray/povray.SlackBuild b/graphics/povray/povray.SlackBuild
index b6372da8c2..9cd52fcf77 100644
--- a/graphics/povray/povray.SlackBuild
+++ b/graphics/povray/povray.SlackBuild
@@ -26,8 +26,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=povray
-VERSION=${VERSION:-3.7.0.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.7.0.8}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
DOCDIR=${DOCDIR:-/usr/doc}
MANDIR=${MANDIR:-/usr/man}
@@ -70,11 +70,7 @@ set -e
rm -rf $TMP/$PRGNAM-$VERSION $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-if [ -f $CWD/v$VERSION.tar.?z* ]; then
- tar xvf $CWD/v$VERSION.tar.?z*
-else
- tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-fi
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/graphics/povray/povray.info b/graphics/povray/povray.info
index 5f8c0b00f8..c65b13c685 100644
--- a/graphics/povray/povray.info
+++ b/graphics/povray/povray.info
@@ -1,8 +1,8 @@
PRGNAM="povray"
-VERSION="3.7.0.0"
+VERSION="3.7.0.8"
HOMEPAGE="http://www.povray.org/"
-DOWNLOAD="https://github.com/POV-Ray/povray/archive/v3.7.0.0.tar.gz"
-MD5SUM="c6866a3d71e38754f24b11da6c996b8e"
+DOWNLOAD="https://github.com/POV-Ray/povray/archive/v3.7.0.8/povray-3.7.0.8.tar.gz"
+MD5SUM="ec56b6a59e383e85369850841f910cff"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/graphics/rawstudio/rawstudio.SlackBuild b/graphics/rawstudio/rawstudio.SlackBuild
index 30ec653dcb..7a928498aa 100644
--- a/graphics/rawstudio/rawstudio.SlackBuild
+++ b/graphics/rawstudio/rawstudio.SlackBuild
@@ -89,7 +89,7 @@ patch -p1 < $CWD/patches/lensfun03.patch
patch -p1 < $CWD/patches/libpng15.patch
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/graphics/rawtherapee/rawtherapee.SlackBuild b/graphics/rawtherapee/rawtherapee.SlackBuild
index 2638650503..13101b5bda 100644
--- a/graphics/rawtherapee/rawtherapee.SlackBuild
+++ b/graphics/rawtherapee/rawtherapee.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=rawtherapee
-VERSION=${VERSION:-5.4}
+VERSION=${VERSION:-5.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/graphics/rawtherapee/rawtherapee.info b/graphics/rawtherapee/rawtherapee.info
index c904bf1dc5..7fccd9253d 100644
--- a/graphics/rawtherapee/rawtherapee.info
+++ b/graphics/rawtherapee/rawtherapee.info
@@ -1,8 +1,8 @@
PRGNAM="rawtherapee"
-VERSION="5.4"
+VERSION="5.8"
HOMEPAGE="http://rawtherapee.com/"
-DOWNLOAD="http://rawtherapee.com/shared/source/rawtherapee-5.4.tar.xz"
-MD5SUM="07bbb401dee4abaa3e38b4e1f3e498ce"
+DOWNLOAD="http://rawtherapee.com/shared/source/rawtherapee-5.8.tar.xz"
+MD5SUM="7c4b2d8246664d84d5061e4c7271d3af"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lensfun libiptcdata"
diff --git a/graphics/scantailor-advanced/scantailor-advanced.SlackBuild b/graphics/scantailor-advanced/scantailor-advanced.SlackBuild
index 9a07e6a768..a726ce6261 100644
--- a/graphics/scantailor-advanced/scantailor-advanced.SlackBuild
+++ b/graphics/scantailor-advanced/scantailor-advanced.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=scantailor-advanced
-VERSION=${VERSION:-1.0.16}
+VERSION=${VERSION:-20200531_3d1e74e}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -75,14 +75,13 @@ sed -i \
-e 's/^set(CMAKE_CXX_STANDARD 17)$/set(CMAKE_CXX_STANDARD 14)/' \
CMakeLists.txt
-sed -i 's/>Deksew:</>Deskew:</' \
- translations/scantailor_*.ts ui/SettingsDialog.ui
+sed -i '/^#include <memory>$/a #include <vector>' src/core/filters/page_layout/Settings.h
mkdir -p build
cd build
cmake -G "Unix Makefiles" \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-deprecated-declarations" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release ..
make
diff --git a/graphics/scantailor-advanced/scantailor-advanced.info b/graphics/scantailor-advanced/scantailor-advanced.info
index 6883eb99ea..89ebaa2207 100644
--- a/graphics/scantailor-advanced/scantailor-advanced.info
+++ b/graphics/scantailor-advanced/scantailor-advanced.info
@@ -1,8 +1,8 @@
PRGNAM="scantailor-advanced"
-VERSION="1.0.16"
+VERSION="20200531_3d1e74e"
HOMEPAGE="https://github.com/4lex4/scantailor-advanced"
-DOWNLOAD="https://github.com/4lex4/scantailor-advanced/archive/v1.0.16/scantailor-advanced-1.0.16.tar.gz"
-MD5SUM="1011e3ed6fe0e65fcedc25389a29bd23"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/scantailor-advanced-20200531_3d1e74e.tar.xz"
+MD5SUM="61dfa53ca5f607aa03f4809a796cef08"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="qt5"
diff --git a/graphics/scantailor/README b/graphics/scantailor/README
deleted file mode 100644
index a54118cbd1..0000000000
--- a/graphics/scantailor/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Scan Tailor is an interactive post-processing tool for scanned
-pages. It performs operations such as page splitting, deskewing,
-adding/removing borders, and others. You give it raw scans, and you
-get pages ready to be printed or assembled into a PDF or DJVU file.
-Scanning, optical character recognition, and assembling multi-page
-documents are out of scope of this project.
diff --git a/graphics/scantailor/scantailor.SlackBuild b/graphics/scantailor/scantailor.SlackBuild
deleted file mode 100644
index 11e7a7e3a3..0000000000
--- a/graphics/scantailor/scantailor.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for scantailor
-
-# Written by Zhischenko Sergey <gishenko@mail.ru>
-
-PRGNAM=scantailor
-SRCNAM=EXPERIMENTAL
-VERSION=${VERSION:-2016_01_13}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-${SRCNAM}_${VERSION}
-tar xvf $CWD/${SRCNAM}_${VERSION}.tar.gz || tar xvf $CWD/$PRGNAM-${SRCNAM}_${VERSION}.tar.gz
-cd $PRGNAM-${SRCNAM}_${VERSION}
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-mkdir build
-cd build
- cmake \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release ..
-
- make
- make install DESTDIR=$PKG
-cd ..
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps/
-cp resources/appicon.svg $PKG/usr/share/icons/hicolor/scalable/apps/scantailor.svg
-mkdir -p $PKG/usr/share/applications
-cp $CWD/scantailor.desktop $PKG/usr/share/applications/scantailor.desktop
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- COPYING GPL3.txt \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/scantailor/scantailor.desktop b/graphics/scantailor/scantailor.desktop
deleted file mode 100644
index 03ef07fd16..0000000000
--- a/graphics/scantailor/scantailor.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Scan Tailor
-Comment=An interactive post-processing tool for scanned pages.
-Icon=scantailor
-Exec=scantailor %u
-TryExec=scantailor
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Graphics;
-
diff --git a/graphics/scantailor/scantailor.info b/graphics/scantailor/scantailor.info
deleted file mode 100644
index 15146007f0..0000000000
--- a/graphics/scantailor/scantailor.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="scantailor"
-VERSION="2016_01_13"
-HOMEPAGE="http://scantailor.sourceforge.net/"
-DOWNLOAD="https://github.com/Tulon/scantailor/archive/EXPERIMENTAL_2016_01_13.tar.gz"
-MD5SUM="90617c2bc82f288bfed472b9b03a1eef"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="qt5-legacy"
-MAINTAINER="Zhischenko Sergey"
-EMAIL="gishenko@mail.ru"
diff --git a/graphics/scantailor/slack-desc b/graphics/scantailor/slack-desc
deleted file mode 100644
index ad70749353..0000000000
--- a/graphics/scantailor/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-scantailor: scantailor (interactive post-processing tool for scanned pages)
-scantailor:
-scantailor: Scan Tailor is an interactive post-processing tool for scanned
-scantailor: pages. It performs operations such as page splitting, deskewing,
-scantailor: adding/removing borders, and others. You give it raw scans, and you
-scantailor: get pages ready to be printed or assembled into a PDF or DJVU file.
-scantailor: Scanning, optical character recognition, and assembling multi-page
-scantailor: documents are out of scope of this project.
-scantailor:
-scantailor:
-scantailor:
diff --git a/graphics/simple-scan/libwebpmux.patch b/graphics/simple-scan/libwebpmux.patch
new file mode 100644
index 0000000000..51d17eb7dd
--- /dev/null
+++ b/graphics/simple-scan/libwebpmux.patch
@@ -0,0 +1,38 @@
+From 47d3532459863e3b0bc1c7fd3a200f612863c814 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 14 Sep 2019 20:03:47 +0200
+Subject: [PATCH] libwepmix: Fix use of possibly unassigned local variable
+ 'data'
+
+---
+ src/libwebpmux.vapi | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/libwebpmux.vapi b/src/libwebpmux.vapi
+index f2461a2..42d2886 100644
+--- a/src/libwebpmux.vapi
++++ b/src/libwebpmux.vapi
+@@ -61,9 +61,7 @@ namespace WebP
+ [CCode (cname = "vala_set_image")]
+ public MuxError set_image (uint8[] bitstream, bool copy_data)
+ {
+- Data data;
+- data.bytes = bitstream;
+- data.size = bitstream.length;
++ Data data = { bitstream, bitstream.length };
+ return _set_image (data, copy_data);
+ }
+
+@@ -89,9 +87,7 @@ namespace WebP
+ public MuxError set_chunk (string fourcc, uint8[] chunk_data, bool copy_data)
+ requires (fourcc.length == 4)
+ {
+- Data data;
+- data.bytes = chunk_data;
+- data.size = chunk_data.length;
++ Data data = { chunk_data ,chunk_data.length };
+ return _set_chunk ((uchar[]) fourcc, data, copy_data);
+ }
+
+--
+2.22.0
diff --git a/graphics/simple-scan/simple-scan.SlackBuild b/graphics/simple-scan/simple-scan.SlackBuild
index 4014836c87..d8ac34317d 100644
--- a/graphics/simple-scan/simple-scan.SlackBuild
+++ b/graphics/simple-scan/simple-scan.SlackBuild
@@ -26,8 +26,8 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM="simple-scan"
-VERSION=${VERSION:-3.25.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.34.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -71,6 +71,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 640 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/libwebpmux.patch
+
meson --prefix $PKG/usr build
# Fix for meson-0.44.0, thanks to Andrew Clemons
diff --git a/graphics/simple-scan/simple-scan.info b/graphics/simple-scan/simple-scan.info
index 5c6d85d344..826b74bacf 100644
--- a/graphics/simple-scan/simple-scan.info
+++ b/graphics/simple-scan/simple-scan.info
@@ -1,8 +1,8 @@
PRGNAM="simple-scan"
-VERSION="3.25.1"
-HOMEPAGE="https://launchpad.net/simple-scan"
-DOWNLOAD="https://launchpad.net/simple-scan/3.25/3.25.1/+download/simple-scan-3.25.1.tar.xz"
-MD5SUM="6bff2b9bdfb529e21582f4a65c3f2d27"
+VERSION="3.34.0"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+DOWNLOAD="https://gitlab.gnome.org/GNOME/simple-scan/-/archive/3.34.0/simple-scan-3.34.0.tar.bz2"
+MD5SUM="69464d41aa25c5de2385f332dd22f508"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="colord packagekit meson libgusb vala"
diff --git a/graphics/simple-scan/slack-desc b/graphics/simple-scan/slack-desc
index d201d02f6e..9df18325a6 100644
--- a/graphics/simple-scan/slack-desc
+++ b/graphics/simple-scan/slack-desc
@@ -12,7 +12,7 @@ simple-scan: simple-scan is a simple scanning utility without the overwhelming
simple-scan: options of xsane.
simple-scan:
simple-scan:
-simple-scan: Homepage: https://launchpad.net/simple-scan
+simple-scan: Homepage: https://gitlab.gnome.org/GNOME/simple-scan
simple-scan:
simple-scan:
simple-scan:
diff --git a/graphics/vulkan-sdk/README b/graphics/vulkan-sdk/README
deleted file mode 100644
index 3226fd36df..0000000000
--- a/graphics/vulkan-sdk/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Vulkan supports multiple GPUs and multiple global contexts (VkInstance).
-The ICD loader is necessary to support multiple GPUs and the VkInstance
-level Vulkan commands. Additionally, the loader manages inserting Vulkan
-layer libraries, including validation layers between the application and
-the ICD.
-
-This will not provide a vulkan driver which must be acquired elsewhere.
-
-This SlackBuild will compile vulkan-sdk from source.
diff --git a/graphics/vulkan-sdk/slack-desc b/graphics/vulkan-sdk/slack-desc
deleted file mode 100644
index 1d3eec170b..0000000000
--- a/graphics/vulkan-sdk/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-vulkan-sdk: vulkan-sdk (Vulkan ICD Loader and Validation Layers)
-vulkan-sdk:
-vulkan-sdk: Vulkan supports multiple GPUs and multiple global contexts
-vulkan-sdk: (VkInstance). The ICD loader is necessary to support multiple GPUs
-vulkan-sdk: and the VkInstance level Vulkan commands. Additionally, the loader
-vulkan-sdk: manages inserting Vulkan layer libraries, including validation layers
-vulkan-sdk: between the application and the ICD.
-vulkan-sdk:
-vulkan-sdk: Homepage: https://www.khronos.org/vulkan/
-vulkan-sdk:
-vulkan-sdk:
diff --git a/graphics/vulkan-sdk/vulkan-loader-cmake.patch b/graphics/vulkan-sdk/vulkan-loader-cmake.patch
deleted file mode 100644
index dcb63fd6cc..0000000000
--- a/graphics/vulkan-sdk/vulkan-loader-cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d15214545..fe277fcd6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -138,7 +138,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
- # all compilers until they all accept the C++17 standard
- if(CMAKE_COMPILER_IS_GNUCC)
- set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -Wno-stringop-truncation -Wno-stringop-overflow")
-- if(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 7.1)
-+ if(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 7.1 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.1)
- set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -Wimplicit-fallthrough=0")
- endif()
- endif()
diff --git a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
deleted file mode 100644
index c6f0e97fc2..0000000000
--- a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for vulkan-sdk
-
-# Copyright 2016, 2017 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2019-2020 Hunter Sezen California, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=vulkan-sdk
-VERSION=${VERSION:-1.2.141.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-SRC=$TMP/$PRGNAM-$VERSION
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -eu
-
-chdir () { cd -- "$SRC/$1"; printf %s\\n '' "Building $1" ''; }
-
-cmake_build () {
- mkdir -p build
- cd build
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \
- -DCMAKE_BUILD_TYPE=Release \
- "${@:-}" ..
- make
- make install DESTDIR=$PKG
-}
-
-# For best compatibility use git versions which upstream also uses.
-# Vulkan-ValidationLayers/scripts/known_good.json
-# glslang/known_good.json
-# https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/1082
-GLSLANG_VERSION=${GLSLANG_VERSION:-e00d27c6d65b7d3e72506a311d7f053da4051295}
-SPIRV_HEADERS_VERSION=${SPIRV_HEADERS_VERSION:-ac638f1815425403e946d0ab78bac71d2bdbf3be}
-SPIRV_TOOLS_VERSION=${SPIRV_TOOLS_VERSION:-e128ab0d624ce7beb08eb9656bb260c597a46d0a}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-
-(
- tar xvf $CWD/glslang-$GLSLANG_VERSION.tar.gz
- cd glslang-$GLSLANG_VERSION/External
- tar xvf $CWD/SPIRV-Tools-$SPIRV_TOOLS_VERSION.tar.gz
- mv SPIRV-Tools-$SPIRV_TOOLS_VERSION spirv-tools
- cd spirv-tools/external
- tar xvf $CWD/SPIRV-Headers-$SPIRV_HEADERS_VERSION.tar.gz
- mv SPIRV-Headers-$SPIRV_HEADERS_VERSION spirv-headers
-)
-
-tar xvf $CWD/Vulkan-Headers-sdk-$VERSION.tar.gz
-tar xvf $CWD/Vulkan-Loader-sdk-$VERSION.tar.gz
-tar xvf $CWD/Vulkan-ValidationLayers-sdk-$VERSION.tar.gz
-tar xvf $CWD/Vulkan-Tools-sdk-$VERSION.tar.gz
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
-
-chdir glslang-$GLSLANG_VERSION
-
-cmake_build \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_SKIP_RPATH=TRUE
-
-chdir Vulkan-Headers-sdk-$VERSION
-
-# Require an older cmake version.
-sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
-
-cmake_build
-
-chdir Vulkan-Loader-sdk-$VERSION
-
-ORIGCFLAGS="$SLKCFLAGS"
-
-# Fix build with clang on 32-bit systems
-# https://github.com/gentoo/gentoo/pull/13369
-if [ "$ARCH" = i586 ] || [ "$ARCH" = i686 ] &&
- "${CC:-cc}" --version 2>/dev/null | grep -qi clang; then
- SLKCFLAGS="$SLKCFLAGS -fno-integrated-as"
-fi
-
-# Require an older cmake version.
-sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
-
-# cmake 3.5.2 does not have GREATER_EQUAL
-patch -p1 < $CWD/vulkan-loader-cmake.patch
-
-cmake_build \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_SKIP_RPATH=TRUE \
- -DBUILD_TESTS=OFF \
- -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
- -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr
-
-SLKCFLAGS="$ORIGCFLAGS"
-
-chdir Vulkan-ValidationLayers-sdk-$VERSION
-
-SPIRV_HEADERS='External/spirv-tools/external/spirv-headers'
-
-# Require an older cmake version.
-sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
-
-# Disable hardcoded errors
-patch -p1 < $CWD/vulkan-validationlayers-cmake.patch
-
-cmake_build \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_DATADIR=share \
- -DCMAKE_SKIP_RPATH=TRUE \
- -DBUILD_TESTS=OFF \
- -DBUILD_WSI_XLIB_SUPPORT=ON \
- -DBUILD_WSI_XCB_SUPPORT=ON \
- -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
- -DGLSLANG_INSTALL_DIR=$PKG/usr \
- -DSPIRV_HEADERS_INSTALL_DIR="$SRC/glslang-$GLSLANG_VERSION/$SPIRV_HEADERS" \
- -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr
-
-chdir Vulkan-Tools-sdk-$VERSION
-
-# Require an older cmake version.
-sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
-
-cmake_build \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_SKIP_RPATH=TRUE \
- -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
- -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \
- -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \
- -DGLSLANG_INSTALL_DIR=$PKG/usr
-
-cd -- "$SRC"
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
- grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Vulkan-Loader-sdk-$VERSION/*.txt \
- Vulkan-Loader-sdk-$VERSION/loader/LoaderAndLayerInterface.md \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/vulkan-sdk/vulkan-sdk.info b/graphics/vulkan-sdk/vulkan-sdk.info
deleted file mode 100644
index 65fe9c403c..0000000000
--- a/graphics/vulkan-sdk/vulkan-sdk.info
+++ /dev/null
@@ -1,22 +0,0 @@
-PRGNAM="vulkan-sdk"
-VERSION="1.2.141.0"
-HOMEPAGE="https://www.khronos.org/vulkan/"
-DOWNLOAD="https://github.com/KhronosGroup/SPIRV-Headers/archive/ac638f1815425403e946d0ab78bac71d2bdbf3be/SPIRV-Headers-ac638f1815425403e946d0ab78bac71d2bdbf3be.tar.gz \
- https://github.com/KhronosGroup/SPIRV-Tools/archive/e128ab0d624ce7beb08eb9656bb260c597a46d0a/SPIRV-Tools-e128ab0d624ce7beb08eb9656bb260c597a46d0a.tar.gz \
- https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.2.141.0/Vulkan-Headers-sdk-1.2.141.0.tar.gz \
- https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.141.0/Vulkan-Loader-sdk-1.2.141.0.tar.gz \
- https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.2.141.0/Vulkan-Tools-sdk-1.2.141.0.tar.gz \
- https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.141.0/Vulkan-ValidationLayers-sdk-1.2.141.0.tar.gz \
- https://github.com/KhronosGroup/glslang/archive/e00d27c6d65b7d3e72506a311d7f053da4051295/glslang-e00d27c6d65b7d3e72506a311d7f053da4051295.tar.gz"
-MD5SUM="4dde857e9ecfe44025478876286f0915 \
- 118a03167510564c9453534adb379c46 \
- 4067d1268504c4e2bb47135aea55ae17 \
- 87e41363a65bba24cd1231557b4bca8c \
- d74d6536dfa19a972149a5e41830249c \
- 5baf1ca0e462c72140748bf82cd31eb4 \
- 88f06a4835895a46fa073035084b0f48"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
diff --git a/graphics/vulkan-sdk/vulkan-validationlayers-cmake.patch b/graphics/vulkan-sdk/vulkan-validationlayers-cmake.patch
deleted file mode 100644
index 797b1435e1..0000000000
--- a/graphics/vulkan-sdk/vulkan-validationlayers-cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f328d7c7..45895dd4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -117,14 +117,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
- -fno-builtin-memcmp
- -fvisibility=hidden)
-
-- # Treat warnings as errors for versions of GCC and c++11-compliant Clang versions that are shipped on Ubuntu 18.04 or older.
-- if((CMAKE_COMPILER_IS_GNUCXX AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.3.0)) OR
-- (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") AND
-- (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0.0) AND
-- (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 7.0.0)))
-- add_compile_options(-Werror)
-- endif()
--
- set(CMAKE_C_STANDARD 99)
- set(CMAKE_CXX_STANDARD 11)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
diff --git a/graphics/wayland-protocols/README b/graphics/wayland-protocols/README
deleted file mode 100644
index 6bd446926c..0000000000
--- a/graphics/wayland-protocols/README
+++ /dev/null
@@ -1,9 +0,0 @@
-wayland-protocols contains Wayland protocols that add functionality
-not available in the Wayland core protocol. Such protocols either add
-completely new functionality, or extend the functionality of some
-other protocol either in Wayland core, or some other protocol in
-wayland-protocols.
-
-A protocol in wayland-protocols consists of a directory containing a
-set of XML files containing the protocol specification, and a README
-file containing detailed state and a list of maintainers.
diff --git a/graphics/wayland-protocols/slack-desc b/graphics/wayland-protocols/slack-desc
deleted file mode 100644
index 94d8845e55..0000000000
--- a/graphics/wayland-protocols/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-wayland-protocols: wayland-protocols (Wayland protocols)
-wayland-protocols:
-wayland-protocols: wayland-protocols contains Wayland protocols that add functionality
-wayland-protocols: not available in the Wayland core protocol. Such protocols either add
-wayland-protocols: completely new functionality, or extend the functionality of some
-wayland-protocols: other protocol either in Wayland core, or some other protocol in
-wayland-protocols: wayland-protocols.
-wayland-protocols:
-wayland-protocols: A protocol in wayland-protocols consists of a directory containing a
-wayland-protocols: set of XML files containing the protocol specification, and a README
-wayland-protocols: file containing detailed state and a list of maintainers.
diff --git a/graphics/wayland-protocols/wayland-protocols.SlackBuild b/graphics/wayland-protocols/wayland-protocols.SlackBuild
deleted file mode 100644
index e335be7b3a..0000000000
--- a/graphics/wayland-protocols/wayland-protocols.SlackBuild
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for wayland-protocols
-
-# Copyright 2017 Duncan Roe, Melbourne, Australia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=wayland-protocols
-VERSION=${VERSION:-1.18}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/wayland-protocols/wayland-protocols.info b/graphics/wayland-protocols/wayland-protocols.info
deleted file mode 100644
index c8846e3309..0000000000
--- a/graphics/wayland-protocols/wayland-protocols.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="wayland-protocols"
-VERSION="1.18"
-HOMEPAGE="https://wayland.freedesktop.org/"
-DOWNLOAD="https://wayland.freedesktop.org/releases/wayland-protocols-1.18.tar.xz"
-MD5SUM="af38f22d8e233c2f2e00ddc8dcc94694"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="wayland"
-MAINTAINER="Duncan Roe"
-EMAIL="duncan_roe@optusnet.com.au"
diff --git a/graphics/yafaray-blender/yafaray-blender.SlackBuild b/graphics/yafaray-blender/yafaray-blender.SlackBuild
index c2a0c49b98..f72c5b24fe 100644
--- a/graphics/yafaray-blender/yafaray-blender.SlackBuild
+++ b/graphics/yafaray-blender/yafaray-blender.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Slackware build script for yafaray
+# Slackware build script for yafaray-blender
# Copyright (c) 2009 Alan Alberghini <414N@slacky.it>
# All rights reserved.
@@ -29,7 +29,7 @@
# 1 - Initial release.
PRGNAM=yafaray-blender
-VERSION=${VERSION:-0.1.1}
+VERSION=${VERSION:-3.2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -40,28 +40,26 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-BLENDER_PLUGIN_DIR="/opt/blender/script"
+BLENDER_PLUGIN_DIR="/opt/blender/scripts/addons"
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM
-unzip "$CWD/YafaRay-blender.${VERSION}.zip"
-cd $PRGNAM
+rm -rf Blender-Exporter-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd Blender-Exporter-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-mkdir -p ${PKG}/usr/share/yafaray/blender ${PKG}/${BLENDER_PLUGIN_DIR}
-cp -t ${PKG}/usr/share/yafaray/blender *.py
-
-# This link is needed to install the plugin system-wide
-ln -sf /usr/share/yafaray/blender/yafaray_ui.py ${PKG}/${BLENDER_PLUGIN_DIR}
+cd ..
+mkdir -p ${PKG}${BLENDER_PLUGIN_DIR}
+mv Blender-Exporter-$VERSION ${PKG}${BLENDER_PLUGIN_DIR}/yafaray_v3
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/graphics/yafaray-blender/yafaray-blender.info b/graphics/yafaray-blender/yafaray-blender.info
index 026dcdf5f8..9756fb5c1a 100644
--- a/graphics/yafaray-blender/yafaray-blender.info
+++ b/graphics/yafaray-blender/yafaray-blender.info
@@ -1,8 +1,8 @@
PRGNAM="yafaray-blender"
-VERSION="0.1.1"
+VERSION="3.2.0"
HOMEPAGE="http://www.yafaray.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/YafaRay-blender.0.1.1.zip"
-MD5SUM="d7e7f86b9e90e7f960707ebaea1843ab"
+DOWNLOAD="https://github.com/YafaRay/Blender-Exporter/archive/v3.2.0/yafaray-blender-3.2.0.tar.gz"
+MD5SUM="1660eb796fb204f07691dd0571f4bceb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="yafaray blender"
diff --git a/graphics/yafaray/README b/graphics/yafaray/README
index 0634be71c9..29763c62d7 100644
--- a/graphics/yafaray/README
+++ b/graphics/yafaray/README
@@ -2,10 +2,6 @@ YafaRay is a free open-source raytracing engine. Raytracing is a rendering
technique for generating realistic images by tracing the path of light
through a 3D scene.
-This package is built by default with QT4 support (needed if you intend to use
-the blender plugin too). If you don't want it, launch the script as follows:
-# USEQT=no ./yafaray.SlackBuild (assuming you're root)
+python3 is an optional dependency, to enable python bindings.
-You can also build Python bindings, provided you have swig and Python
-installed. Simply run
-# BUILDPYTHON=yes ./yafaray.SlackBuild (always assuming you're root)
+To disable building the Qt gui pass the script the variable QTGUI=OFF
diff --git a/graphics/yafaray/yafaray.SlackBuild b/graphics/yafaray/yafaray.SlackBuild
index c5c40c292b..9b2ee9e9dd 100644
--- a/graphics/yafaray/yafaray.SlackBuild
+++ b/graphics/yafaray/yafaray.SlackBuild
@@ -29,14 +29,16 @@
# 1.0 - Initial release.
# 1.1 - Removed a bashism (==) to become ash-compatible.
+# Modified by the SlackBuilds.org project
+
PRGNAM=yafaray
-VERSION=${VERSION:-0.1.1}
+VERSION=${VERSION:-3.2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -47,14 +49,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-DOCS="LICENSE CODING INSTALL"
-# Set to yes to build the qt4 gui (needs qt4)
-USEQT=${USEQT:-yes}
-# Set to yes to build python bindings too (needs swig)
-BUILDPYTHON=${BUILDPYTHON:-no}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,61 +68,37 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM
-unzip "$CWD/YafaRay.${VERSION}.zip"
-cd $PRGNAM
+rm -rf Core-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd Core-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-if [ ${USEQT} = yes ]; then
- QTTARGET="YF_QTDIR=/usr WITH_YF_QT=true"
-else
- QTTARGET=""
-fi
-
-# The build system is kinda 'naive': it hardcodes the PREFIX and other
-# directories specified at configure-time into the final libs, so we can't
-# specify PREFIX=${PKG}/usr, YF_LIBOUT=${PKG}/usr/lib.. because, when the
-# package will be installed, the program will try to find its libraries in a
-# /tmp path, and not in /usr/lib/yafaray as it should.
-# An easy workaround is to exploit the included debian package creator to
-# install all the files in a temporary location without having to specify a
-# "fake" PREFIX location. However, this seems to be glitchy too, as specifying
-# a different YF_PACKPATH doesn't seem to work fine, so we have to manually
-# copy the files from the temporary debian build path to $PKG in the end.
-
-if [ ${BUILDPYTHON} = no ]; then
- scons debian $QTTARGET PREFIX=/usr \
- YF_LIBOUT=/usr/lib${LIBDIRSUFFIX} \
- YF_PLUGINPATH=/usr/lib${LIBDIRSUFFIX}/yafaray \
- REL_CCFLAGS="${SLKCFLAGS}" || echo "Don't worry about the dpkg error"
-else
- scons swig debian $QTTARGET PREFIX=/usr \
- YF_LIBOUT=/usr/lib${LIBDIRSUFFIX} \
- YF_PLUGINPATH=/usr/lib${LIBDIRSUFFIX}/yafaray \
- REL_CCFLAGS="${SLKCFLAGS}" || echo "Don't worry about the dpkg error"
- # Install also python bindings (manually T_T)
- mkdir -p ${PKG}/usr/lib${LIBDIRSUFFIX}/python2.6/site-packages
- mv bindings/python/* ${PKG}/usr/lib${LIBDIRSUFFIX}/python2.6/site-packages/
-fi
-
-# Copy "debian" package root to our package root.
-# mv may complain if the python bindings have already been
-# moved to their new home, hence we use cp + rm.
-cp -r debian/${PRGNAM}/* ${PKG}
-rm -rf debian/${PRGNAM}
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DYAF_LIB_DIR=lib$LIBDIRSUFFIX \
+ -DWITH_QT=${QTGUI:-ON} \
+ -DCMAKE_BUILD_TYPE=Release ..
+ make
+ make install DESTDIR=$PKG
+cd ..
+
+# We install these manually
+rm -fR $PKG/usr/share/doc
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- $DOCS \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG CODING LICENSES README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/graphics/yafaray/yafaray.info b/graphics/yafaray/yafaray.info
index a65706fcc5..c6af52edc6 100644
--- a/graphics/yafaray/yafaray.info
+++ b/graphics/yafaray/yafaray.info
@@ -1,10 +1,10 @@
PRGNAM="yafaray"
-VERSION="0.1.1"
+VERSION="3.2.0"
HOMEPAGE="http://www.yafaray.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/YafaRay.0.1.1.zip"
-MD5SUM="d1722dec25299f6f3fcc1d7c661a4e90"
+DOWNLOAD="https://github.com/YafaRay/Core/archive/v3.2.0/yafaray-3.2.0.tar.gz"
+MD5SUM="191e81b3d8c942302b97c142049365df"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="opencv"
MAINTAINER="Alan Alberghini"
EMAIL="414N@slacky.it"
diff --git a/ham/fldigi/fldigi.SlackBuild b/ham/fldigi/fldigi.SlackBuild
index b45d7c3250..b0aafdefae 100644
--- a/ham/fldigi/fldigi.SlackBuild
+++ b/ham/fldigi/fldigi.SlackBuild
@@ -68,7 +68,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/ham/soundmodem/soundmodem.SlackBuild b/ham/soundmodem/soundmodem.SlackBuild
index 4f724fcbb9..17a2e7fdfc 100644
--- a/ham/soundmodem/soundmodem.SlackBuild
+++ b/ham/soundmodem/soundmodem.SlackBuild
@@ -64,7 +64,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS -fgnu89-inline" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/ham/svxlink/gcc6.patch b/ham/svxlink/gcc6.patch
new file mode 100644
index 0000000000..3d01b118ae
--- /dev/null
+++ b/ham/svxlink/gcc6.patch
@@ -0,0 +1,23 @@
+From 611cc5cc134f710f94fc8987375259bd8af34604 Mon Sep 17 00:00:00 2001
+From: Tobias Blomberg <git@sm0svx.shacknet.nu>
+Date: Mon, 19 Jun 2017 22:04:20 +0200
+Subject: [PATCH] Fix compilation problem in Async::AudioDeviceAlsa
+
+- On newer compilers the compilation would fail on ambiguous call to abs
+---
+ src/async/audio/AsyncAudioDeviceAlsa.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/async/audio/AsyncAudioDeviceAlsa.cpp b/src/async/audio/AsyncAudioDeviceAlsa.cpp
+index 17d255e8..15d760d5 100644
+--- a/src/async/audio/AsyncAudioDeviceAlsa.cpp
++++ b/src/async/audio/AsyncAudioDeviceAlsa.cpp
+@@ -548,7 +548,7 @@ bool AudioDeviceAlsa::initParams(snd_pcm_t *pcm_handle)
+ return false;
+ }
+
+- if (::abs(real_rate - sample_rate) > 100)
++ if (::abs(static_cast<int>(real_rate) - sample_rate) > 100)
+ {
+ cerr << "*** ERROR: The sample rate could not be set to "
+ << sample_rate << "Hz for ALSA device \"" << dev_name << "\". "
diff --git a/ham/svxlink/svxlink.SlackBuild b/ham/svxlink/svxlink.SlackBuild
index 486723dbbc..b1165941f3 100644
--- a/ham/svxlink/svxlink.SlackBuild
+++ b/ham/svxlink/svxlink.SlackBuild
@@ -107,12 +107,15 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# From upstream
+patch -p2 < $CWD/gcc6.patch
+
mkdir -p build
cd build
cmake \
$BUILD_QTEL \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONF_INSTALL_DIR=/etc \
-DLOCAL_STATE_DIR=/var \
diff --git a/libraries/Atlas-C++/Atlas-C++.SlackBuild b/libraries/Atlas-C++/Atlas-C++.SlackBuild
index ebd6a108a4..0d55715acd 100644
--- a/libraries/Atlas-C++/Atlas-C++.SlackBuild
+++ b/libraries/Atlas-C++/Atlas-C++.SlackBuild
@@ -70,7 +70,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -Wno-error=deprecated" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/libraries/CEGUI0.7/CEGUI0.7.SlackBuild b/libraries/CEGUI0.7/CEGUI0.7.SlackBuild
index 30917134f4..18d54dd14a 100644
--- a/libraries/CEGUI0.7/CEGUI0.7.SlackBuild
+++ b/libraries/CEGUI0.7/CEGUI0.7.SlackBuild
@@ -72,7 +72,7 @@ find -L . \
patch -p1 < $CWD/CEGUI.patch
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/libraries/FreeImage/010_avoid-raw-literal.diff b/libraries/FreeImage/010_avoid-raw-literal.diff
deleted file mode 100644
index a22d3f58a8..0000000000
--- a/libraries/FreeImage/010_avoid-raw-literal.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-# See: https://sourceforge.net/p/freeimage/discussion/36110/thread/605ef8e4
-#
---- Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c.orig 2015-02-20 03:34:38.000000000 +1000
-+++ Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c 2016-11-20 08:42:49.733624164 +1000
-@@ -54,9 +54,9 @@
- "srl %[temp5], %[temp5], 24 \n\t" \
- "srl %[temp6], %[temp6], 24 \n\t" \
- "srl %[temp7], %[temp7], 24 \n\t" \
-- "sb %[temp5], "#R"(%[dst]) \n\t" \
-- "sb %[temp6], "#G"(%[dst]) \n\t" \
-- "sb %[temp7], "#B"(%[dst]) \n\t" \
-+ "sb %[temp5], " #R "(%[dst]) \n\t" \
-+ "sb %[temp6], " #G "(%[dst]) \n\t" \
-+ "sb %[temp7], " #B "(%[dst]) \n\t" \
-
- #define ASM_CLOBBER_LIST() \
- : [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), [temp2]"=&r"(temp2), \
---- Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c.orig 2015-02-20 03:34:36.000000000 +1000
-+++ Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c 2016-11-20 08:39:33.163757201 +1000
-@@ -34,15 +34,15 @@
- G = G - t2 + kGCst; \
- B = B + kBCst; \
- __asm__ volatile ( \
-- "shll_s.w %["#R"], %["#R"], 9 \n\t" \
-- "shll_s.w %["#G"], %["#G"], 9 \n\t" \
-- "shll_s.w %["#B"], %["#B"], 9 \n\t" \
-- "precrqu_s.qb.ph %["#R"], %["#R"], $zero \n\t" \
-- "precrqu_s.qb.ph %["#G"], %["#G"], $zero \n\t" \
-- "precrqu_s.qb.ph %["#B"], %["#B"], $zero \n\t" \
-- "srl %["#R"], %["#R"], 24 \n\t" \
-- "srl %["#G"], %["#G"], 24 \n\t" \
-- "srl %["#B"], %["#B"], 24 \n\t" \
-+ "shll_s.w %[" #R "], %[" #R "], 9 \n\t" \
-+ "shll_s.w %[" #G "], %[" #G "], 9 \n\t" \
-+ "shll_s.w %[" #B "], %[" #B "], 9 \n\t" \
-+ "precrqu_s.qb.ph %[" #R "], %[" #R "], $zero \n\t" \
-+ "precrqu_s.qb.ph %[" #G "], %[" #G "], $zero \n\t" \
-+ "precrqu_s.qb.ph %[" #B "], %[" #B "], $zero \n\t" \
-+ "srl %[" #R "], %[" #R "], 24 \n\t" \
-+ "srl %[" #G "], %[" #G "], 24 \n\t" \
-+ "srl %[" #B "], %[" #B "], 24 \n\t" \
- : [R]"+r"(R), [G]"+r"(G), [B]"+r"(B) \
- : \
- ); \
diff --git a/libraries/FreeImage/FreeImage.SlackBuild b/libraries/FreeImage/FreeImage.SlackBuild
index 9787e0772a..200292024e 100644
--- a/libraries/FreeImage/FreeImage.SlackBuild
+++ b/libraries/FreeImage/FreeImage.SlackBuild
@@ -5,7 +5,7 @@
# Taken over in 2011 by Alan Alberghini <414N@slacky.it>
PRGNAM=FreeImage
-VERSION=${VERSION:-3.17.0}
+VERSION=${VERSION:-3.18.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -53,10 +53,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Patch in order to compile on gcc >= 5.1 environments
-# Thanks to Christoph Willing
-patch -p0 < $CWD/010_avoid-raw-literal.diff
-
CFLAGS="$SLKCFLAGS -fexceptions -fvisibility=hidden -DNO_LCMS" \
CXXFLAGS="$SLKCFLAGS -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy" \
make INSTALLDIR=$PKG/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG
diff --git a/libraries/FreeImage/FreeImage.info b/libraries/FreeImage/FreeImage.info
index 10a5f841cb..639d2753d1 100644
--- a/libraries/FreeImage/FreeImage.info
+++ b/libraries/FreeImage/FreeImage.info
@@ -1,8 +1,8 @@
PRGNAM="FreeImage"
-VERSION="3.17.0"
+VERSION="3.18.0"
HOMEPAGE="http://freeimage.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/freeimage/FreeImage3170.zip"
-MD5SUM="459e15f0ec75d6efa3c7bd63277ead86"
+DOWNLOAD="http://downloads.sourceforge.net/freeimage/FreeImage3180.zip"
+MD5SUM="f8ba138a3be233a3eed9c456e42e2578"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/OpenAL/OpenAL.SlackBuild b/libraries/OpenAL/OpenAL.SlackBuild
deleted file mode 100644
index 7dccf74faf..0000000000
--- a/libraries/OpenAL/OpenAL.SlackBuild
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for OpenAL Soft
-#
-# Copyright 2009-2017 Erik W. Hanson, Minneapolis, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=OpenAL
-SRCNAM=openal-soft
-VERSION=${VERSION:-1.18.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-cmake \
- -DCMAKE_C_FLAGS="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL="on" \
- -DCMAKE_BUILD_TYPE=Release \
- -DALSOFT_EXAMPLES=OFF \
- -DLIB_SUFFIX=${LIBDIRSUFFIX}
-
-make
-make install/strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/OpenAL/OpenAL.info b/libraries/OpenAL/OpenAL.info
deleted file mode 100644
index d7c3d0a7d1..0000000000
--- a/libraries/OpenAL/OpenAL.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="OpenAL"
-VERSION="1.18.0"
-HOMEPAGE="https://www.openal-soft.org/"
-DOWNLOAD="https://www.openal-soft.org/openal-releases/openal-soft-1.18.0.tar.bz2"
-MD5SUM="704d41343b52dd04115de2dcdac5de03"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
diff --git a/libraries/OpenAL/README b/libraries/OpenAL/README
deleted file mode 100644
index c3abf611b6..0000000000
--- a/libraries/OpenAL/README
+++ /dev/null
@@ -1,2 +0,0 @@
-OpenAL is a cross-platform 3D audio API appropriate for use with gaming
-applications and many other types of audio applications.
diff --git a/libraries/OpenAL/slack-desc b/libraries/OpenAL/slack-desc
deleted file mode 100644
index df3e7dacbf..0000000000
--- a/libraries/OpenAL/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-OpenAL: OpenAL (a cross-platform 3D audio API)
-OpenAL:
-OpenAL: OpenAL is a cross-platform 3D audio API appropriate for use with
-OpenAL: gaming applications and many other types of audio applications.
-OpenAL:
-OpenAL: https://www.openal-soft.org/
-OpenAL:
-OpenAL:
-OpenAL:
-OpenAL:
-OpenAL:
diff --git a/libraries/OpenSceneGraph/0008-Fix_wxWidgets_gl.patch b/libraries/OpenSceneGraph/0008-Fix_wxWidgets_gl.patch
new file mode 100644
index 0000000000..70cc792eb8
--- /dev/null
+++ b/libraries/OpenSceneGraph/0008-Fix_wxWidgets_gl.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -763,8 +763,7 @@ IF (BUILD_OSG_EXAMPLES AND NOT ANDROID
+ FIND_PACKAGE(GLUT)
+ FIND_PACKAGE(FOX)
+
+- SET(wxWidgets_USE_LIBS base core gl net)
+- FIND_PACKAGE(wxWidgets)
++ FIND_PACKAGE(wxWidgets COMPONENTS base core gl net)
+
+ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
+
diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
index a158f30565..41183973f1 100644
--- a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
+++ b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
@@ -59,6 +59,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Work around for wx_gtk3_gl library not being linked with - thanks fedora
+patch -p1 < $CWD/0008-Fix_wxWidgets_gl.patch
+
mkdir -p build
cd build
cmake .. \
diff --git a/libraries/PyQt5/PyQt5.SlackBuild b/libraries/PyQt5/PyQt5.SlackBuild
deleted file mode 100644
index 712a5aceda..0000000000
--- a/libraries/PyQt5/PyQt5.SlackBuild
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for PyQt5
-
-# Copyright 2008 Aleksandar Samardzic <asamardzic@gmail.com>
-# Copyright 2008, 2009, 2010, 2011, 2015 Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
-# Copyright 2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
-# Copyright 2017 Larry Hajali <larryhaja[at]gmail[dot]com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Robby Workman <rworkman@slackware.com>
-# Modified by Eric Hameleers <alien@slackware.com>
-# Adapted by Marcel Saegebarth <marc@mos6581.de>
-# Adapted by Matteo Bernardini <ponce@slackbuilds.org>
-# Updated for Qt5-5.9.6 by David Woodfall <dave@slackbuilds.org>
-
-PRGNAM=PyQt5
-VERSION=${VERSION:-5.13.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# From alienBOB's SlackBuild
-# Remove code that is unneeded if Qt is not bundled and crashes on python2
-# https://www.riverbankcomputing.com/pipermail/pyqt/2019-July/041896.html
-cat $CWD/patches/pyqt5-python2-crash.patch | patch -p1 --verbose
-
-export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5
-export QT5DIR=/usr/lib${LIBDIRSUFFIX}/qt5
-PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
-
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-
-python configure.py \
- --confirm-license \
- --qsci-api \
- --verbose \
- --sip=/usr/bin/python2-sip \
- --sip-incdir="/usr/include/python$PYTHONVER/python2-sip" \
- -q /usr/bin/qmake-qt5
-
-make
-make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Remove rpaths (from alienBOB's SlackBuild):
-for file in $(find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null); do
- if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then
- patchelf --remove-rpath $file
- fi
-done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog LICENSE NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/PyQt5/PyQt5.info b/libraries/PyQt5/PyQt5.info
deleted file mode 100644
index 390bd46fb5..0000000000
--- a/libraries/PyQt5/PyQt5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="PyQt5"
-VERSION="5.13.2"
-HOMEPAGE="https://riverbankcomputing.com/software/pyqt/intro/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/PyQt5-5.13.2.tar.gz"
-MD5SUM="c1023cb9c3d29a89fc109b163a0175c0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="qt5 python2-sip enum34"
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/libraries/PyQt5/README b/libraries/PyQt5/README
deleted file mode 100644
index 23ab8cbdae..0000000000
--- a/libraries/PyQt5/README
+++ /dev/null
@@ -1,2 +0,0 @@
-PyQt5 is a set of Python bindings for Trolltech's Qt5 application
-framework and runs on all platforms supported by Qt5.
diff --git a/libraries/PyQt5/patches/pyqt5-python2-crash.patch b/libraries/PyQt5/patches/pyqt5-python2-crash.patch
deleted file mode 100644
index 14462f7563..0000000000
--- a/libraries/PyQt5/patches/pyqt5-python2-crash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in
---- PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in 2019-06-25 14:41:02.000000000 +0200
-+++ PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in 2019-07-01 17:06:34.882644535 +0200
-@@ -151,8 +151,4 @@
- // initialised first (at least for Windows) and this is the only way to
- // guarantee things are done in the right order.
- PyQtSlotProxy::mutex = new QMutex(QMutex::Recursive);
--
-- // Load the embedded qt.conf file if there is a bundled copy of Qt.
-- if (!qpycore_qt_conf())
-- Py_FatalError("PyQt5.QtCore: Unable to embed qt.conf");
- }
-
diff --git a/libraries/PyQt5/slack-desc b/libraries/PyQt5/slack-desc
deleted file mode 100644
index 27986b3ade..0000000000
--- a/libraries/PyQt5/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-PyQt5: PyQt5 (Python bindings for Qt)
-PyQt5:
-PyQt5: PyQt5 is a set of Python bindings for Trolltech's Qt5 application
-PyQt5: framework and runs on all platforms supported by Qt5.
-PyQt5:
-PyQt5: Homepage: https://riverbankcomputing.com/software/pyqt/intro/
-PyQt5:
-PyQt5:
-PyQt5:
-PyQt5:
-PyQt5:
diff --git a/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild b/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild
deleted file mode 100644
index 475f0bf2fc..0000000000
--- a/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for QScintilla-qt5
-
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=QScintilla-qt5
-SRCNAM=QScintilla
-VERSION=${VERSION:-2.11.5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-export QMAKEFEATURES=$TMP/$SRCNAM-$VERSION/Qt4Qt5/features/
-
-cd Qt4Qt5
- qmake-qt5 qscintilla.pro QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11"
- make install INSTALL_ROOT=$PKG
-cd -
-
-cd designer-Qt4Qt5
- qmake-qt5 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11"
- make install INSTALL_ROOT=$PKG
-cd -
-
-cd Python
- python3 configure.py --pyqt=PyQt5 -c --qmake /usr/bin/qmake-qt5 -n ../Qt4Qt5 -o ../Qt4Qt5 --sip=/usr/bin/python3-sip -c
- make install INSTALL_ROOT=$PKG -j1
-cd -
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- ChangeLog LICENSE NEWS \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/QScintilla-qt5/QScintilla-qt5.info b/libraries/QScintilla-qt5/QScintilla-qt5.info
deleted file mode 100644
index c6a4be0f0e..0000000000
--- a/libraries/QScintilla-qt5/QScintilla-qt5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="QScintilla-qt5"
-VERSION="2.11.5"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/QScintilla-2.11.5.tar.gz"
-MD5SUM="c31d77e1fcc218ed3f27458fa80d4dc9"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-PyQt5"
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
diff --git a/libraries/QScintilla-qt5/README b/libraries/QScintilla-qt5/README
deleted file mode 100644
index 4d197996f7..0000000000
--- a/libraries/QScintilla-qt5/README
+++ /dev/null
@@ -1,11 +0,0 @@
-QScintilla includes features especially useful when editing and debugging
-source code. These include support for syntax styling, error indicators, code
-completion, and call tips. The selection margin can contain markers like those
-used in debuggers to indicate breakpoints and the current line. Styling
-choices are more open than with many editors, allowing the use of proportional
-fonts, bold and italics, multiple foreground and background colours, and
-multiple fonts.
-
-Building qscintilla-qt5 while an older verion is installed can cause run-time
-errors. To avoid issues, unistall the current package before running this
-script.
diff --git a/libraries/QScintilla-qt5/slack-desc b/libraries/QScintilla-qt5/slack-desc
deleted file mode 100644
index 01e5175244..0000000000
--- a/libraries/QScintilla-qt5/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-QScintilla-qt5: QScintilla-qt5 (Qt5 port of the Scintilla C++ editor control)
-QScintilla-qt5:
-QScintilla-qt5: QScintilla includes features especially useful when editing and
-QScintilla-qt5: debugging source code. These include support for syntax styling,
-QScintilla-qt5: error indicators, code completion, and call tips. The selection
-QScintilla-qt5: margin can contain markers like those used in debuggers to
-QScintilla-qt5: indicate breakpoints and the current line. Styling choices are
-QScintilla-qt5: more open than with many editors, allowing the use of
-QScintilla-qt5: proportional fonts, bold and italics, multiple foreground and
-QScintilla-qt5: background colours, and multiple fonts.
-QScintilla-qt5:
diff --git a/libraries/SDL2/README b/libraries/SDL2/README
deleted file mode 100644
index 7fa6c9b740..0000000000
--- a/libraries/SDL2/README
+++ /dev/null
@@ -1,9 +0,0 @@
-SDL2 (Simple DirectMedia Layer Version 2)
-
-Simple DirectMedia Layer is a cross-platform development library designed to
-provide low-level access to audio, keyboard, mouse, joystick, and graphics
-hardware via OpenGL.
-
-SDL is written in C and works natively with C++.
-
-This is safe to install alongside Slackware's SDL libraries.
diff --git a/libraries/SDL2/SDL2.SlackBuild b/libraries/SDL2/SDL2.SlackBuild
deleted file mode 100644
index 9172772783..0000000000
--- a/libraries/SDL2/SDL2.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for SDL2
-
-# Copyright 2013 Dugan Chen Canada
-# Copyright 2020 Isaac Yu
-# Copyright 2020 B. Watson
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# 20200415 bkw:
-# - take over maintenance
-# - don't install static libSDL2.a
-# - don't copy CMakeLists.txt to doc dir (it's not documentation)
-# - don't copy useless INSTALL.txt to doc dir
-# - BUILD=2
-
-PRGNAM=SDL2
-VERSION=${VERSION:-2.0.12}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-mkdir -p build
-cd build
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DBUILD_SHARED_LIBS=ON \
- -DCMAKE_BUILD_TYPE=Release ..
- make
- make install/strip DESTDIR=$PKG
-cd ..
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-rm -f INSTALL.txt CMakeLists.txt # don't copy these to doc dir
-cp -a *.txt docs/*.md $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/SDL2/SDL2.info b/libraries/SDL2/SDL2.info
deleted file mode 100644
index a245b7b23a..0000000000
--- a/libraries/SDL2/SDL2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="SDL2"
-VERSION="2.0.12"
-HOMEPAGE="https://libsdl.org"
-DOWNLOAD="https://www.libsdl.org/release/SDL2-2.0.12.tar.gz"
-MD5SUM="783b6f2df8ff02b19bb5ce492b99c8ff"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/libraries/SDL2/slack-desc b/libraries/SDL2/slack-desc
deleted file mode 100644
index fa23090367..0000000000
--- a/libraries/SDL2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-SDL2: SDL2 (Simple DirectMedia Layer Version 2)
-SDL2:
-SDL2: Simple DirectMedia Layer is a cross-platform development library
-SDL2: designed to provide low-level access to audio, keyboard, mouse,
-SDL2: joystick, and graphics hardware ia via OpenGL.
-SDL2:
-SDL2: SDL is written in C and works natively with C++.
-SDL2:
-SDL2: https://libsdl.org
-SDL2:
-SDL2:
diff --git a/libraries/SDL2_image/README b/libraries/SDL2_image/README
deleted file mode 100644
index 29cb3e0633..0000000000
--- a/libraries/SDL2_image/README
+++ /dev/null
@@ -1,6 +0,0 @@
-SDL2_image (image loading library)
-
-SDL2_image is a simple library to load images of various formats as
-SDL surfaces. It is safe to install alongside Slackware's SDL libraries.
-
-libwebp is an optional dependency.
diff --git a/libraries/SDL2_image/SDL2_image.SlackBuild b/libraries/SDL2_image/SDL2_image.SlackBuild
deleted file mode 100644
index 2383fce4aa..0000000000
--- a/libraries/SDL2_image/SDL2_image.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for SDL2_image
-
-# Copyright 2013 Dugan Chen Canada
-# Copyright 2020 B. Watson
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# 20200415 bkw:
-# - take over maintenance
-# - update for v2.0.5
-
-PRGNAM=SDL2_image
-VERSION=${VERSION:-2.0.5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --enable-static=no \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux \
- --enable-jpg-shared=no
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/SDL2_image/SDL2_image.info b/libraries/SDL2_image/SDL2_image.info
deleted file mode 100644
index dc9a5639f5..0000000000
--- a/libraries/SDL2_image/SDL2_image.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="SDL2_image"
-VERSION="2.0.5"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_image/"
-DOWNLOAD="https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.5.tar.gz"
-MD5SUM="f26f3a153360a8f09ed5220ef7b07aea"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="SDL2"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/libraries/SDL2_image/slack-desc b/libraries/SDL2_image/slack-desc
deleted file mode 100644
index c92a593f27..0000000000
--- a/libraries/SDL2_image/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-SDL2_image: SDL2_image (image loading library)
-SDL2_image:
-SDL2_image: SDL2_image is a simple image loading library. It loads images of
-SDL2_image: various formats as SDL surfaces and textures.
-SDL2_image:
-SDL2_image: https://www.libsdl.org/projects/SDL_image/
-SDL2_image:
-SDL2_image:
-SDL2_image:
-SDL2_image:
-SDL2_image:
diff --git a/libraries/SDL2_mixer/README b/libraries/SDL2_mixer/README
deleted file mode 100644
index c0d858829b..0000000000
--- a/libraries/SDL2_mixer/README
+++ /dev/null
@@ -1,13 +0,0 @@
-SDL2_mixer (sample multi-channel audio mixer library)
-
-SDL2_mixer is a sample multi-channel audio mixer library. It supports
-any number of simultaneously playing channels of 16-bit stereo audio,
-plus a single channel of music.
-
-It is safe to install alongside Slackware's SDL libraries.
-
-Optional dependencies are:
-
-* libmodplug (for MOD support)
-* fluidsynth (for MIDI support via SDL_SOUNDFONTS)
-* smpeg2 (for MP3 support, not available on SBo)
diff --git a/libraries/SDL2_mixer/SDL2_mixer.SlackBuild b/libraries/SDL2_mixer/SDL2_mixer.SlackBuild
deleted file mode 100644
index dbeb3f64ef..0000000000
--- a/libraries/SDL2_mixer/SDL2_mixer.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for SDL2_mixer
-
-# Copyright 2013-2015 Dugan Chen Canada
-# Copyright 2020 B. Watson
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# 20200415 bkw:
-# - take over maintenance
-
-PRGNAM=SDL2_mixer
-VERSION=${VERSION:-2.0.4}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="-Wl,-s" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-static=no \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a playmus.c playwave.c $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/SDL2_mixer/SDL2_mixer.info b/libraries/SDL2_mixer/SDL2_mixer.info
deleted file mode 100644
index d2806c3ec4..0000000000
--- a/libraries/SDL2_mixer/SDL2_mixer.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="SDL2_mixer"
-VERSION="2.0.4"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
-DOWNLOAD="https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.4.tar.gz"
-MD5SUM="a36e8410cac46b00a4d01752b32c3eb1"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="SDL2"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/libraries/SDL2_mixer/slack-desc b/libraries/SDL2_mixer/slack-desc
deleted file mode 100644
index bf7934c6ee..0000000000
--- a/libraries/SDL2_mixer/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-SDL2_mixer: SDL2_mixer (sample multi-channel audio mixer library)
-SDL2_mixer:
-SDL2_mixer: SDL_mixer is a sample multi-channel audio mixer library. It supports
-SDL2_mixer: any number of simultaneously playing channels of 16-bit stereo audio,
-SDL2_mixer: plus a single channel of music.
-SDL2_mixer:
-SDL2_mixer: https://www.libsdl.org/projects/SDL_mixer/
-SDL2_mixer:
-SDL2_mixer:
-SDL2_mixer:
-SDL2_mixer:
diff --git a/libraries/SDL2_net/README b/libraries/SDL2_net/README
deleted file mode 100644
index 52a733802e..0000000000
--- a/libraries/SDL2_net/README
+++ /dev/null
@@ -1,5 +0,0 @@
-SDL2_net (network library for SDL2)
-
-This SDL2 extension is a small cross platform networking library.
-
-It is safe to install alongside Slackware's SDL libraries.
diff --git a/libraries/SDL2_net/SDL2_net.SlackBuild b/libraries/SDL2_net/SDL2_net.SlackBuild
deleted file mode 100644
index d2ed7105b7..0000000000
--- a/libraries/SDL2_net/SDL2_net.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for SDL2_net
-
-# Copyright 2013 Dugan Chen Canada
-# Copyright 2020 B. Watson
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# 20200415 bkw:
-# - take over maintenance
-# - i486 => i586
-
-PRGNAM=SDL2_net
-VERSION=${VERSION:-2.0.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --enable-static=no \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux \
- --disable-gui
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/demo
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a chat.cpp chat.h chatd.c $PKG/usr/doc/$PRGNAM-$VERSION/demo
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/SDL2_net/SDL2_net.info b/libraries/SDL2_net/SDL2_net.info
deleted file mode 100644
index 94ecc23d2f..0000000000
--- a/libraries/SDL2_net/SDL2_net.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="SDL2_net"
-VERSION="2.0.1"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_net/"
-DOWNLOAD="https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.0.1.tar.gz"
-MD5SUM="5c1d9d1cfa63301b141cb5c0de2ea7c4"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="SDL2"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/libraries/SDL2_net/slack-desc b/libraries/SDL2_net/slack-desc
deleted file mode 100644
index 3f45345ca4..0000000000
--- a/libraries/SDL2_net/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-SDL2_net: SDL2_net (cross platform networking library)
-SDL2_net:
-SDL2_net: This is a small cross platform networking library.
-SDL2_net:
-SDL2_net:
-SDL2_net:
-SDL2_net:
-SDL2_net:
-SDL2_net:
-SDL2_net:
-SDL2_net:
diff --git a/libraries/SDL2_ttf/README b/libraries/SDL2_ttf/README
deleted file mode 100644
index 156d760c94..0000000000
--- a/libraries/SDL2_ttf/README
+++ /dev/null
@@ -1,6 +0,0 @@
-SDL2_ttf (SDL2 truetype font library)
-
-This is a sample library which allows you to use TrueType fonts
-in your SDL2 applications.
-
-It is safe to install alongside Slackware's SDL packages.
diff --git a/libraries/SDL2_ttf/SDL2_ttf.SlackBuild b/libraries/SDL2_ttf/SDL2_ttf.SlackBuild
deleted file mode 100644
index 14ba2ea487..0000000000
--- a/libraries/SDL2_ttf/SDL2_ttf.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for SDL2_ttf
-
-# Copyright 2013 Dugan Chen Canada
-# Copyright 2020 B. Watson
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# 20200415 bkw:
-# - take over maintenance
-# - update for v2.0.15
-# - i486 => i586
-
-PRGNAM=SDL2_ttf
-VERSION=${VERSION:-2.0.15}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --enable-static=no \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a showfont.c $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/SDL2_ttf/SDL2_ttf.info b/libraries/SDL2_ttf/SDL2_ttf.info
deleted file mode 100644
index cf8310556c..0000000000
--- a/libraries/SDL2_ttf/SDL2_ttf.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="SDL2_ttf"
-VERSION="2.0.15"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_ttf/"
-DOWNLOAD="https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.15.tar.gz"
-MD5SUM="04fe06ff7623d7bdcb704e82f5f88391"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="SDL2"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/libraries/SDL2_ttf/slack-desc b/libraries/SDL2_ttf/slack-desc
deleted file mode 100644
index dbd7fee216..0000000000
--- a/libraries/SDL2_ttf/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-SDL2_ttf: SDL2_ttf (SDL2 truetype font library)
-SDL2_ttf:
-SDL2_ttf: This is a sample library which allows you to use
-SDL2_ttf: TrueType fonts in your SDL applications.
-SDL2_ttf:
-SDL2_ttf:
-SDL2_ttf:
-SDL2_ttf:
-SDL2_ttf:
-SDL2_ttf:
-SDL2_ttf:
diff --git a/libraries/SDL_sound/README b/libraries/SDL_sound/README
deleted file mode 100644
index ebd91df6bc..0000000000
--- a/libraries/SDL_sound/README
+++ /dev/null
@@ -1,2 +0,0 @@
-SDL_sound is a library that handles the decoding of several popular
-sound file formats, such as .WAV and .MP3.
diff --git a/libraries/SDL_sound/SDL_sound.SlackBuild b/libraries/SDL_sound/SDL_sound.SlackBuild
deleted file mode 100644
index 3098531f6a..0000000000
--- a/libraries/SDL_sound/SDL_sound.SlackBuild
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for SDL_sound
-
-# Copyright 2009 Erik W. Hanson, Minneapolis, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=SDL_sound
-VERSION=${VERSION:-1.0.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --disable-static \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG COPYING CREDITS INSTALL README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/SDL_sound/SDL_sound.info b/libraries/SDL_sound/SDL_sound.info
deleted file mode 100644
index a71fe7caaa..0000000000
--- a/libraries/SDL_sound/SDL_sound.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="SDL_sound"
-VERSION="1.0.3"
-HOMEPAGE="http://icculus.org/SDL_sound/"
-DOWNLOAD="http://icculus.org/SDL_sound/downloads/SDL_sound-1.0.3.tar.gz"
-MD5SUM="aa09cd52df85d29bee87a664424c94b5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
diff --git a/libraries/SDL_sound/slack-desc b/libraries/SDL_sound/slack-desc
deleted file mode 100644
index f3e2740c1d..0000000000
--- a/libraries/SDL_sound/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-SDL_sound: SDL_sound (a sound library add-on for SDL)
-SDL_sound:
-SDL_sound: SDL_sound is a library that handles the decoding of several popular
-SDL_sound: sound file formats, such as .WAV and .MP3.
-SDL_sound:
-SDL_sound:
-SDL_sound:
-SDL_sound:
-SDL_sound:
-SDL_sound:
-SDL_sound:
diff --git a/libraries/SFGUI/SFGUI.SlackBuild b/libraries/SFGUI/SFGUI.SlackBuild
index 4d1707634a..834f3d0f3c 100644
--- a/libraries/SFGUI/SFGUI.SlackBuild
+++ b/libraries/SFGUI/SFGUI.SlackBuild
@@ -10,13 +10,13 @@
# without any warranty.
PRGNAM=SFGUI
-VERSION=${VERSION:-0.3.0}
+VERSION=${VERSION:-0.4.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -27,8 +27,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -47,7 +47,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip || unzip $CWD/$VERSION.zip
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -62,13 +62,9 @@ cd build
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_SUFFIX="$LIBDIRSUFFIX" \
-DCMAKE_BUILD_TYPE=Release ..
-# -DLIB_SUFFIX is ignored. Patch CMakeLists as needed.
- sed -i \
- -e "s:\\\${CMAKE_INSTALL_PREFIX}/lib:&${LIBDIRSUFFIX}:" \
- cmake_install.cmake
-
make
make install DESTDIR=$PKG
cd ..
@@ -79,7 +75,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README CHANGELOG FONT.LICENSE LICENSE AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md CHANGELOG.md FONT.LICENSE.md LICENSE.md AUTHORS.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/libraries/SFGUI/SFGUI.info b/libraries/SFGUI/SFGUI.info
index 189165e049..008223a196 100644
--- a/libraries/SFGUI/SFGUI.info
+++ b/libraries/SFGUI/SFGUI.info
@@ -1,8 +1,8 @@
PRGNAM="SFGUI"
-VERSION="0.3.0"
+VERSION="0.4.0"
HOMEPAGE="https://github.com/TankOs/SFGUI"
-DOWNLOAD="https://github.com/TankOs/SFGUI/archive/0.3.0.zip"
-MD5SUM="9e704175dca7c8632e9f72a321c21e25"
+DOWNLOAD="https://github.com/TankOs/SFGUI/archive/0.4.0/SFGUI-0.4.0.tar.gz"
+MD5SUM="16d4784fbdba30583a6c4fd38c27b323"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="SFML"
diff --git a/libraries/VTK/VTK.SlackBuild b/libraries/VTK/VTK.SlackBuild
index ae29a67c07..e1e7c06b93 100644
--- a/libraries/VTK/VTK.SlackBuild
+++ b/libraries/VTK/VTK.SlackBuild
@@ -96,6 +96,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i '/include <QTextStream>/a #include <QPainterPath>' \
+ Rendering/Qt/vtkQtLabelRenderStrategy.cxx \
+ Rendering/Qt/vtkQtStringToImage.cxx
+
if pkg-config --exists proj ; then
proj="-DVTK_USE_SYSTEM_LIBPROJ:BOOL=ON"
# proj6 patch courtesy of
diff --git a/libraries/agg/agg.SlackBuild b/libraries/agg/agg.SlackBuild
index 02a9477479..619b80b00f 100644
--- a/libraries/agg/agg.SlackBuild
+++ b/libraries/agg/agg.SlackBuild
@@ -71,6 +71,7 @@ CXXFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
+ --disable-examples \
--disable-static \
--build=$ARCH-slackware-linux
diff --git a/libraries/agg/patches/0016-bad-const.patch b/libraries/agg/patches/0016-bad-const.patch
new file mode 100644
index 0000000000..045e77ba13
--- /dev/null
+++ b/libraries/agg/patches/0016-bad-const.patch
@@ -0,0 +1,12 @@
+diff -u -r agg-2.5/include/agg_renderer_outline_aa.h agg-2.5-const/include/agg_renderer_outline_aa.h
+--- agg-2.5/include/agg_renderer_outline_aa.h 2006-10-09 06:07:08.000000000 +0200
++++ agg-2.5-const/include/agg_renderer_outline_aa.h 2018-06-16 23:09:16.500057814 +0200
+@@ -1375,7 +1375,7 @@
+ //---------------------------------------------------------------------
+ void profile(const line_profile_aa& prof) { m_profile = &prof; }
+ const line_profile_aa& profile() const { return *m_profile; }
+- line_profile_aa& profile() { return *m_profile; }
++ line_profile_aa& profile() { return *const_cast<line_profile_aa*>(m_profile); }
+
+ //---------------------------------------------------------------------
+ int subpixel_width() const { return m_profile->subpixel_width(); }
diff --git a/libraries/argon2/README b/libraries/argon2/README
deleted file mode 100644
index d4460f624c..0000000000
--- a/libraries/argon2/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This is the reference C implementation of Argon2, the password-hashing
-function that won the Password Hashing Competition (PHC).
-
-Argon2 is a password-hashing function that summarizes the state of the art
-in the design of memory-hard functions and can be used to hash passwords
-for credential storage, key derivation, or other applications.
-
-It has a simple design aimed at the highest memory filling rate and effective
-use of multiple computing units, while still providing defense against
-tradeoff attacks (by exploiting the cache and memory organization of the
-recent processors).
diff --git a/libraries/argon2/argon2.SlackBuild b/libraries/argon2/argon2.SlackBuild
deleted file mode 100644
index 3f40797c36..0000000000
--- a/libraries/argon2/argon2.SlackBuild
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for argon2
-
-# Copyright 2017, 2020 Mario Preksavec, Zagreb, Croatia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=argon2
-SRCNAM=phc-winner-argon2
-VERSION=${VERSION:-20190702}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- LIBDIRSUFFIX="64"
-else
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Fix build options and library path:
-sed -i "s/CFLAGS += -std=c89 -O3 -Wall -g -Iinclude -Isrc/CFLAGS += -std=c89 -Iinclude -Isrc/g" Makefile
-sed -i "s/LIBRARY_REL ?= lib.*/LIBRARY_REL = lib${LIBDIRSUFFIX}/g" Makefile
-sed -i "s/CFLAGS += -march=\$(OPTTARGET)/CFLAGS += ${SLKCFLAGS}/g" Makefile
-
-make libs DESTDIR=$PKG
-make install DESTDIR=$PKG
-
-install -Dm644 man/$PRGNAM.1 $PKG/usr/man/man1/$PRGNAM.1
-install -Dm644 lib$PRGNAM.pc $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/lib$PRGNAM.pc
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG.md LICENSE README.md argon2-specs.pdf $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/argon2/argon2.info b/libraries/argon2/argon2.info
deleted file mode 100644
index 2e80df058c..0000000000
--- a/libraries/argon2/argon2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="argon2"
-VERSION="20190702"
-HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2/"
-DOWNLOAD="https://github.com/P-H-C/phc-winner-argon2/archive/20190702.tar.gz"
-MD5SUM="0f234cc21ac6cebfe373da6afa70bb1d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mario Preksavec"
-EMAIL="mario at slackware dot hr"
diff --git a/libraries/argon2/slack-desc b/libraries/argon2/slack-desc
deleted file mode 100644
index 0be295ca69..0000000000
--- a/libraries/argon2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-argon2: argon2 (password-hashing function)
-argon2:
-argon2: Argon2 is a password-hashing function that summarizes the state of
-argon2: the art in the design of memory-hard functions and can be used to
-argon2: hash passwords for credential storage, key derivation, or other
-argon2: applications.
-argon2:
-argon2: Homepage: https://github.com/P-H-C/phc-winner-argon2/
-argon2:
-argon2:
-argon2:
diff --git a/libraries/avr-libc/avr-libc.SlackBuild b/libraries/avr-libc/avr-libc.SlackBuild
index 3c1455ba09..c2866302f1 100644
--- a/libraries/avr-libc/avr-libc.SlackBuild
+++ b/libraries/avr-libc/avr-libc.SlackBuild
@@ -13,13 +13,13 @@
# incorrect use of this script.
PRGNAM=avr-libc
-VERSION=${VERSION:-1.8.1}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.0.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -36,8 +36,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,6 +65,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+./bootstrap
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -82,8 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \
make all
make install DOC_INST_DIR=$PKG/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# Don't strip the libraries to avoid damaging them
# Create the directory for program documentation.
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/avr-libc/avr-libc.info b/libraries/avr-libc/avr-libc.info
index b8e89f4dda..b2f5078b3d 100644
--- a/libraries/avr-libc/avr-libc.info
+++ b/libraries/avr-libc/avr-libc.info
@@ -1,8 +1,8 @@
PRGNAM="avr-libc"
-VERSION="1.8.1"
+VERSION="2.0.0"
HOMEPAGE="http://avr-libc.nongnu.org/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/avr-libc/avr-libc-1.8.1.tar.bz2"
-MD5SUM="0caccead59eaaa61ac3f060ca3a803ef"
+DOWNLOAD="http://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2"
+MD5SUM="2360981cd5d94e1d7a70dfc6983bdf15"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="avr-gcc"
diff --git a/libraries/bamf/add_compile_warning_flags.patch b/libraries/bamf/add_compile_warning_flags.patch
new file mode 100644
index 0000000000..203ccc75d3
--- /dev/null
+++ b/libraries/bamf/add_compile_warning_flags.patch
@@ -0,0 +1,71 @@
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=940164
+
+diff -Naur bamf-0.5.4.orig/configure.ac bamf-0.5.4/configure.ac
+--- bamf-0.5.4.orig/configure.ac 2018-11-07 23:39:11.355315678 +0100
++++ bamf-0.5.4/configure.ac 2019-11-18 12:57:04.534000000 +0100
+@@ -18,14 +18,15 @@
+ GNOME_COMPILE_WARNINGS(maximum)
+
+ AM_MAINTAINER_MODE
+-AM_DISABLE_STATIC
+-AM_PROG_LIBTOOL
+ AC_ISC_POSIX
+ AC_SUBST(ACLOCAL_AMFLAFS, "$ACLOCAL_FLAGS -I m4")
+
+ PKG_PROG_PKG_CONFIG
+ if test "x$PKG_CONFIG" = "x"; then AC_MSG_ERROR([You need to install pkg-config]); fi
+
++LT_INIT([disable-static])
++LT_LIB_M
++
+ # Checks for programs.
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+@@ -154,8 +155,39 @@
+ #
+ AM_PATH_GTK_3_0
+
++# Compile warnings
++AC_ARG_ENABLE(compile-warnings,
++ AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
++ [Trun on compiler warnings]),,
++ [enable_compile_warnings=maximum])
++
++warning_flags=
++
++case "$enable_compile_warnings" in
++no)
++warning_flags=
++;;
++minimum)
++warning_flags="-Wall"
++;;
++yes)
++warning_flags="-wall -Wno-error=deprecated-declarations"
++;;
++maximum|error)
++warning_flags="-Wall -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration"
++if test "$enable_compile_warnings" = "error" ; then
++ warning_flags="$warning_flags -Werror"
++fi
++;;
++*)
++AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
++;;
++esac
++AC_MSG_CHECKING(what warning flags to pass to the C compiler)
++AC_MSG_RESULT($warning_flags)
++
+ dnl CFLAGS
+-CFLAGS="$CFLAGS -Wall -Werror -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm"
++CFLAGS="$CFLAGS $warning_flags $LIBM"
+
+ AC_SUBST(BAMFDAEMON_CFLAGS)
+ AC_SUBST(BAMFDAEMON_LIBS)
+@@ -190,5 +222,6 @@
+ Headless tests: ${enable_headless_tests}
+ Coverage Reporting: ${use_gcov}
+ Export actions menus: ${enable_export_actions_menu}
++ Compiler Flags: ${CFLAGS}
+
+ EOF
diff --git a/libraries/bamf/bamf.SlackBuild b/libraries/bamf/bamf.SlackBuild
index c950ae1115..0a12d2f802 100644
--- a/libraries/bamf/bamf.SlackBuild
+++ b/libraries/bamf/bamf.SlackBuild
@@ -70,6 +70,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/add_compile_warning_flags.patch
+autoreconf -vif
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -79,7 +82,8 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-introspection \
+ --enable-introspection \
+ --enable-compile-warnings=no \
--build=$ARCH-slackware-linux
make
diff --git a/libraries/bamf/bamf.info b/libraries/bamf/bamf.info
index af9621ea49..600d9355a9 100644
--- a/libraries/bamf/bamf.info
+++ b/libraries/bamf/bamf.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://launchpad.net/bamf/0.5/0.5.4/+download/bamf-0.5.4.tar.gz"
MD5SUM="e5078ec8f6c8a9d77242010dcd3b3217"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="libgtop libwnck3"
+REQUIRES="gnome-common libgtop libwnck3"
MAINTAINER="Donald Cooley"
EMAIL="chytraeus@protonmail.com"
diff --git a/libraries/beignet/beignet.SlackBuild b/libraries/beignet/beignet.SlackBuild
index ce61606dea..1d7a06dcdd 100644
--- a/libraries/beignet/beignet.SlackBuild
+++ b/libraries/beignet/beignet.SlackBuild
@@ -24,7 +24,7 @@
# -----------------------------------------------------------------------------
PRGNAM=beignet
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.3.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
DOCS="README.md docs NEWS.mdwn COPYING"
@@ -75,6 +75,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/llvm6.patch
+
mkdir -p build
cd build
cmake \
diff --git a/libraries/beignet/beignet.info b/libraries/beignet/beignet.info
index dae99c57d9..fff7aa7b6d 100644
--- a/libraries/beignet/beignet.info
+++ b/libraries/beignet/beignet.info
@@ -1,8 +1,8 @@
PRGNAM="beignet"
-VERSION="1.3.1"
+VERSION="1.3.2"
HOMEPAGE="https://01.org/beignet"
-DOWNLOAD="https://01.org/sites/default/files/beignet-1.3.1-source.tar.gz"
-MD5SUM="850886a71a34672ca26a42046d0bb442"
+DOWNLOAD="https://01.org/sites/default/files/beignet-1.3.2-source.tar.gz"
+MD5SUM="a577ab18d67a891c8767b8ea62253543"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/beignet/llvm6.patch b/libraries/beignet/llvm6.patch
new file mode 100644
index 0000000000..f3634e2389
--- /dev/null
+++ b/libraries/beignet/llvm6.patch
@@ -0,0 +1,30 @@
+diff -uprb Beignet-1.3.2-Source.orig/backend/src/llvm/llvm_to_gen.cpp Beignet-1.3.2-Source/backend/src/llvm/llvm_to_gen.cpp
+--- Beignet-1.3.2-Source.orig/backend/src/llvm/llvm_to_gen.cpp 2017-10-24 09:04:48.000000000 +0300
++++ Beignet-1.3.2-Source/backend/src/llvm/llvm_to_gen.cpp 2018-03-16 16:08:54.669963824 +0200
+@@ -322,7 +322,11 @@ namespace gbe
+ DataLayout DL(&mod);
+
+ gbeDiagnosticContext dc;
++#if LLVM_VERSION_MAJOR >= 6
++ mod.getContext().setDiagnosticHandlerCallBack(&gbeDiagnosticHandler,&dc);
++#else
+ mod.getContext().setDiagnosticHandler(&gbeDiagnosticHandler,&dc);
++#endif
+
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 37
+ mod.setDataLayout(DL);
+diff -uprb Beignet-1.3.2-Source.orig/backend/src/llvm/llvm_unroll.cpp Beignet-1.3.2-Source/backend/src/llvm/llvm_unroll.cpp
+--- Beignet-1.3.2-Source.orig/backend/src/llvm/llvm_unroll.cpp 2017-10-24 09:04:48.000000000 +0300
++++ Beignet-1.3.2-Source/backend/src/llvm/llvm_unroll.cpp 2018-03-16 16:09:47.736403557 +0200
+@@ -205,7 +205,9 @@ namespace gbe {
+ if (parentTripCount != 0 && currTripCount * parentTripCount > 32) {
+ //Don't change the unrollID if doesn't force unroll.
+ //setUnrollID(parentL, false);
+-#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 38
++#if LLVM_VERSION_MAJOR >= 6
++ loopInfo.erase(parentL);
++#elif LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 38
+ loopInfo.markAsRemoved(parentL);
+ #else
+ LPM.deleteLoopFromQueue(parentL);
+Only in Beignet-1.3.2-Source: build
diff --git a/libraries/belle-sip/belle-sip.SlackBuild b/libraries/belle-sip/belle-sip.SlackBuild
index 60a6869a5c..a823f815cd 100644
--- a/libraries/belle-sip/belle-sip.SlackBuild
+++ b/libraries/belle-sip/belle-sip.SlackBuild
@@ -92,6 +92,8 @@ autoreconf -ivf
# Kill the accursed -Werror (fix for -current)
SLKCFLAGS="$SLKCFLAGS -Wno-error"
+patch -p1 < $CWD/gcc9.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
CPPFLAGS="${CPPFLAGS} -I/usr/include/antlr3" \
diff --git a/libraries/belle-sip/gcc9.patch b/libraries/belle-sip/gcc9.patch
new file mode 100644
index 0000000000..35fa1ceae0
--- /dev/null
+++ b/libraries/belle-sip/gcc9.patch
@@ -0,0 +1,19 @@
+diff --git a/src/dns.h b/src/dns.h
+index ac390ae..33d99de 100644
+--- a/src/dns.h
++++ b/src/dns.h
+@@ -158,14 +158,6 @@ DNS_PUBLIC int *dns_debug_p(void);
+
+ #define dns_quietinit(...) \
+ DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP
+-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4
+-#define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push")
+-#define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"")
+-#define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop")
+-
+-/* GCC parses the _Pragma operator less elegantly than clang. */
+-#define dns_quietinit(...) \
+- __extension__ ({ DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__; DNS_PRAGMA_POP })
+ #else
+ #define DNS_PRAGMA_PUSH
+ #define DNS_PRAGMA_QUIET
diff --git a/libraries/ccrtp/ccrtp.SlackBuild b/libraries/ccrtp/ccrtp.SlackBuild
index 04fff8c2b7..9ea1685863 100644
--- a/libraries/ccrtp/ccrtp.SlackBuild
+++ b/libraries/ccrtp/ccrtp.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ccrtp
-VERSION=${VERSION:-2.0.9}
+VERSION=${VERSION:-2.1.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/libraries/ccrtp/ccrtp.info b/libraries/ccrtp/ccrtp.info
index 38929c008d..0232990714 100644
--- a/libraries/ccrtp/ccrtp.info
+++ b/libraries/ccrtp/ccrtp.info
@@ -1,8 +1,8 @@
PRGNAM="ccrtp"
-VERSION="2.0.9"
+VERSION="2.1.2"
HOMEPAGE="http://www.gnu.org/software/ccrtp/"
-DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/ccrtp/ccrtp-2.0.9.tar.gz"
-MD5SUM="f2e143c2558fbbe5715a1f04be2fb692"
+DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/ccrtp/ccrtp-2.1.2.tar.gz"
+MD5SUM="e6792cbd8b705901c205a509bd7f812f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ucommon"
diff --git a/libraries/cffi/cffi.SlackBuild b/libraries/cffi/cffi.SlackBuild
index fff9a062b1..9e9f2d82e6 100644
--- a/libraries/cffi/cffi.SlackBuild
+++ b/libraries/cffi/cffi.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cffi
-VERSION=${VERSION:-1.11.5}
+VERSION=${VERSION:-1.13.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/libraries/cffi/cffi.info b/libraries/cffi/cffi.info
index bea16058d3..f64849ab41 100644
--- a/libraries/cffi/cffi.info
+++ b/libraries/cffi/cffi.info
@@ -1,8 +1,8 @@
PRGNAM="cffi"
-VERSION="1.11.5"
+VERSION="1.13.2"
HOMEPAGE="http://cffi.readthedocs.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/e7/a7/4cd50e57cc6f436f1cc3a7e8fa700ff9b8b4d471620629074913e3735fb2/cffi-1.11.5.tar.gz"
-MD5SUM="ac8492f4ad952360737413e82d661908"
+DOWNLOAD="https://files.pythonhosted.org/packages/2d/bf/960e5a422db3ac1a5e612cb35ca436c3fc985ed4b7ed13a1b4879006f450/cffi-1.13.2.tar.gz"
+MD5SUM="652203cf99faa254efff7fab23c2f3a2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="pycparser"
diff --git a/libraries/cppo/README b/libraries/cppo/README
new file mode 100644
index 0000000000..b8f9d84c8c
--- /dev/null
+++ b/libraries/cppo/README
@@ -0,0 +1,2 @@
+Cppo is an equivalent of the C preprocessor for OCaml programs.
+It allows the definition of simple macros and file.
diff --git a/libraries/cppo/cppo.SlackBuild b/libraries/cppo/cppo.SlackBuild
new file mode 100644
index 0000000000..13d2735cdf
--- /dev/null
+++ b/libraries/cppo/cppo.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for cppo
+
+# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=cppo
+VERSION=${VERSION:-1.6.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+dune build
+dune install --destdir=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+rm -fR $PKG/usr/doc
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/cppo/cppo.info b/libraries/cppo/cppo.info
new file mode 100644
index 0000000000..1ca6d5a170
--- /dev/null
+++ b/libraries/cppo/cppo.info
@@ -0,0 +1,10 @@
+PRGNAM="cppo"
+VERSION="1.6.6"
+HOMEPAGE="https://github.com/ocaml-community/cppo/"
+DOWNLOAD="https://github.com/ocaml-community/cppo/archive/v1.6.6/cppo-1.6.6.tar.gz"
+MD5SUM="2258f90f3b7f0190bda76b710df0af56"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="dune ocamlbuild"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/cppo/slack-desc b/libraries/cppo/slack-desc
new file mode 100644
index 0000000000..bc43af6c08
--- /dev/null
+++ b/libraries/cppo/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+cppo: cppo (C-style preprocessor for OCaml)
+cppo:
+cppo: Cppo is an equivalent of the C preprocessor for OCaml programs.
+cppo: It allows the definition of simple macros and file.
+cppo:
+cppo: homepage: https://github.com/ocaml-community/cppo
+cppo:
+cppo:
+cppo:
+cppo:
+cppo:
diff --git a/libraries/cracklib/README b/libraries/cracklib/README
deleted file mode 100644
index ab5ef98d14..0000000000
--- a/libraries/cracklib/README
+++ /dev/null
@@ -1,12 +0,0 @@
-CrackLib is a library containing a C function (well, lots of functions
-really, but you only need to use one of them) which may be used in a
-"passwd"-like program.
-
-The idea is simple: try to prevent users from choosing passwords that
-could guessed by "Crack" by filtering them out at the source.
-
-An example of its use can be located in the SAMBA examples directory.
-The crackcheck program included with SAMBA will use the library to ensure
-that the user doesn't pick a weak password.
-
-A larger dictionary is included.
diff --git a/libraries/cracklib/cracklib.SlackBuild b/libraries/cracklib/cracklib.SlackBuild
deleted file mode 100644
index 5bab9933a9..0000000000
--- a/libraries/cracklib/cracklib.SlackBuild
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for cracklib
-
-# Copyright (c) 2011-2012 Chris Walker <kris240376@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=cracklib
-VERSION=${VERSION:-2.9.6}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-DICT=${DICT:-cracklib-words-$VERSION}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mcpu=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-shared \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-# Install large cracklib dictionary file if it exists
-if [ -e $CWD/${DICT}.gz ]; then
- zcat $CWD/${DICT}.gz > $PKG/usr/share/cracklib/$PRGNAM-large
-elif [ -e $CWD/${DICT} ]; then
- cat $CWD/${DICT} > $PKG/usr/share/cracklib/$PRGNAM-large
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS INSTALL NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
-chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
-
-sh ./util/cracklib-format dicts/cracklib-small \
- | sh ./util/cracklib-packer $PKG/usr/share/cracklib/pw_dict
-
-mkdir $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/cracklib/cracklib.info b/libraries/cracklib/cracklib.info
deleted file mode 100644
index da40b276c7..0000000000
--- a/libraries/cracklib/cracklib.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="cracklib"
-VERSION="2.9.6"
-HOMEPAGE="https://github.com/cracklib/cracklib"
-DOWNLOAD="https://ftp.osuosl.org/pub/blfs/conglomeration/cracklib/cracklib-2.9.6.tar.gz \
- https://ftp.osuosl.org/pub/blfs/conglomeration/cracklib/cracklib-words-2.9.6.gz"
-MD5SUM="c52f463585d85924b28cdc1e373ae06d \
- cae1257e3a9f95c917cc9dbbab852316"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Christopher Walker"
-EMAIL="kris240376@gmail.com"
diff --git a/libraries/cracklib/slack-desc b/libraries/cracklib/slack-desc
deleted file mode 100644
index 99d278b04c..0000000000
--- a/libraries/cracklib/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-cracklib: cracklib (password crack library)
-cracklib:
-cracklib: CrackLib is a library containing a C function (well, lots of functions
-cracklib: really, but you only need to use one of them) which may be used in a
-cracklib: "passwd"-like program.
-cracklib:
-cracklib: The idea is simple: try to prevent users from choosing passwords that
-cracklib: could be guessed by "Crack" by filtering them out, at source.
-cracklib:
-cracklib:
-cracklib:
diff --git a/libraries/cuneiform/cuneiform-gcc.patch b/libraries/cuneiform/cuneiform-gcc.patch
new file mode 100644
index 0000000000..4b51da8e84
--- /dev/null
+++ b/libraries/cuneiform/cuneiform-gcc.patch
@@ -0,0 +1,98 @@
+diff -wbBur cuneiform-linux-1.1.0/cuneiform_src/Kern/include/utf8-tables.h cuneiform-linux-1.1.0.q/cuneiform_src/Kern/include/utf8-tables.h
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/include/utf8-tables.h 2011-04-19 16:49:57.000000000 +0400
++++ cuneiform-linux-1.1.0.q/cuneiform_src/Kern/include/utf8-tables.h 2017-07-05 16:35:34.338871445 +0300
+@@ -68,7 +68,7 @@
+ #endif
+
+
+-const char win1250_to_utf8[][4] = {
++const unsigned char win1250_to_utf8[][4] = {
+ {0, 0, 0, 0},
+ {1, 0, 0, 0},
+ {2, 0, 0, 0},
+@@ -328,7 +328,7 @@
+ };
+
+
+-const char win1251_to_utf8[][4] = {
++const unsigned char win1251_to_utf8[][4] = {
+ {0, 0, 0, 0},
+ {1, 0, 0, 0},
+ {2, 0, 0, 0},
+@@ -587,7 +587,7 @@
+ {209, 143, 0, 0},
+ };
+
+-const char win1252_to_utf8[][4] = {
++const unsigned char win1252_to_utf8[][4] = {
+ {0, 0, 0, 0},
+ {1, 0, 0, 0},
+ {2, 0, 0, 0},
+@@ -847,7 +847,7 @@
+ };
+
+
+-const char win1254_to_utf8[][4] = {
++const unsigned char win1254_to_utf8[][4] = {
+ {0, 0, 0, 0},
+ {1, 0, 0, 0},
+ {2, 0, 0, 0},
+@@ -1107,7 +1107,7 @@
+ };
+
+
+-const char win1257_to_utf8[][4] = {
++const unsigned char win1257_to_utf8[][4] = {
+ {0, 0, 0, 0},
+ {1, 0, 0, 0},
+ {2, 0, 0, 0},
+diff -wbBur cuneiform-linux-1.1.0/cuneiform_src/Kern/rfrmt/sources/main/stdafx.h
+cuneiform-linux-1.1.0.q/cuneiform_src/Kern/rfrmt/sources/main/stdafx.h
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/rfrmt/sources/main/stdafx.h 2011-04-19 16:49:57.000000000 +0400
++++ cuneiform-linux-1.1.0.q/cuneiform_src/Kern/rfrmt/sources/main/stdafx.h 2017-07-05 16:37:23.528866265 +0300
+@@ -74,6 +74,9 @@
+ //отключаем warning о Ñлишком длинных stl'ных именах
+ #pragma warning(disable:4786)
+
++#undef min
++#undef max
++
+ #include <vector>
+ typedef std::vector<uint16_t> vectorWord;
+
+diff -wbBur cuneiform-linux-1.1.0/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp
+cuneiform-linux-1.1.0.q/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp 2011-04-19 16:49:57.000000000 +0400
++++ cuneiform-linux-1.1.0.q/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp 2017-07-05 16:33:02.962211959 +0300
+@@ -594,8 +594,8 @@
+ return FALSE;
+ }
+
+- wNewHeight = (mbMarginsFlag ? abs(mrMargins.rmBottomMarg - mrMargins.rmTopMarg) : mpSourceDIB->GetLinesNumber());
+- wNewWidth = (mbMarginsFlag ? abs(mrMargins.rmLeftMarg - mrMargins.rmRightMarg) : mpSourceDIB->GetLineWidth());
++ wNewHeight = (mbMarginsFlag ? std::abs((long int)(mrMargins.rmBottomMarg - mrMargins.rmTopMarg)) : mpSourceDIB->GetLinesNumber());
++ wNewWidth = (mbMarginsFlag ? std::abs((long int)(mrMargins.rmLeftMarg - mrMargins.rmRightMarg)) : mpSourceDIB->GetLineWidth());
+ mpSourceDIB->GetResolutionDPM( &wXResolution, &wYResolution);
+
+ if ( !mpDestinationDIB->CreateDIBBegin( wNewWidth, wNewHeight, BitCount) )
+diff -wbBur cuneiform-linux-1.1.0/cuneiform_src/Kern/rout/src/codetables.cpp cuneiform-linux-1.1.0.q/cuneiform_src/Kern/rout/src/codetables.cpp
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/rout/src/codetables.cpp 2011-04-19 16:49:57.000000000 +0400
++++ cuneiform-linux-1.1.0.q/cuneiform_src/Kern/rout/src/codetables.cpp 2017-07-05 16:36:05.178869982 +0300
+@@ -939,11 +939,11 @@
+
+ const char * getUTF8Str(const unsigned char in, const int codepage) {
+ switch(codepage) {
+- case 1250 : return win1250_to_utf8[in];
+- case 1251 : return win1251_to_utf8[in];
+- case 1252 : return win1252_to_utf8[in];
+- case 1254 : return win1254_to_utf8[in];
+- case 1257 : return win1257_to_utf8[in];
++ case 1250 : return (const char *)win1250_to_utf8[in];
++ case 1251 : return (const char *)win1251_to_utf8[in];
++ case 1252 : return (const char *)win1252_to_utf8[in];
++ case 1254 : return (const char *)win1254_to_utf8[in];
++ case 1257 : return (const char *)win1257_to_utf8[in];
+ default : return "?";
+ }
+ }
+
diff --git a/libraries/cuneiform/cuneiform.SlackBuild b/libraries/cuneiform/cuneiform.SlackBuild
index 10103d58f8..2fbeed8b1b 100644
--- a/libraries/cuneiform/cuneiform.SlackBuild
+++ b/libraries/cuneiform/cuneiform.SlackBuild
@@ -11,7 +11,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -53,6 +53,11 @@ find -L . \
sed -i 's/\r//g' cuneiform_src/Addfiles/license.txt
+# Thanks to Debian
+patch -p1 < $CWD/strings.patch
+# Thanks to ARCH Linux
+patch -p1 < $CWD/cuneiform-gcc.patch
+
mkdir build
cd build
cmake \
@@ -70,8 +75,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- issues.txt readme.txt original*.rtf cuneiform_src/Addfiles/license.txt \
+cp -a issues.txt readme.txt original*.rtf cuneiform_src/Addfiles/license.txt \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/cuneiform/strings.patch b/libraries/cuneiform/strings.patch
new file mode 100644
index 0000000000..d7b585eab7
--- /dev/null
+++ b/libraries/cuneiform/strings.patch
@@ -0,0 +1,19 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: avoid strings.h collision
+
+--- a/cuneiform_src/Kern/hhh/tigerh/h/strings.h
++++ b/cuneiform_src/Kern/hhh/tigerh/h/strings.h
+@@ -75,6 +75,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * *
+ ***************************************************************************/
+
++#include_next <strings.h>
++#if 0
+ # ifndef __STRINGS_H_INCLUDE
+ # define __STRINGS_H_INCLUDE
+
+@@ -154,3 +156,4 @@ extern STRING *pStringsListEnd;
+ extern STRING *pStringsUpList;
+ extern STRING *pStringsDownList;
+ # endif
++#endif
diff --git a/libraries/efivar/README b/libraries/efivar/README
deleted file mode 100644
index 18459b204f..0000000000
--- a/libraries/efivar/README
+++ /dev/null
@@ -1 +0,0 @@
-efivar - Tools and libraries to manipulate EFI variables
diff --git a/libraries/efivar/efivar.SlackBuild b/libraries/efivar/efivar.SlackBuild
deleted file mode 100644
index 19ab3ecf46..0000000000
--- a/libraries/efivar/efivar.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for efivar
-
-# Copyright 2017-2019 Andrew Clemons, Wellington New Zealand
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=efivar
-VERSION=${VERSION:-37}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-SLKCFLAGS="$SLKCFLAGS -flto"
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make -j1 libdir=/usr/lib$LIBDIRSUFFIX/ mandir=/usr/man/
-make -j1 install DESTDIR=$PKG/ libdir=/usr/lib$LIBDIRSUFFIX/ mandir=/usr/man/
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- COPYING README.md TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/efivar/efivar.info b/libraries/efivar/efivar.info
deleted file mode 100644
index 9858916849..0000000000
--- a/libraries/efivar/efivar.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="efivar"
-VERSION="37"
-HOMEPAGE="https://github.com/rhboot/efivar"
-DOWNLOAD="https://github.com/rhboot/efivar/archive/37/efivar-37.tar.gz"
-MD5SUM="c47be879853137b6493fe49dd9c70e1d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Andrew Clemons"
-EMAIL="andrew.clemons@gmail.com"
diff --git a/libraries/efivar/slack-desc b/libraries/efivar/slack-desc
deleted file mode 100644
index f2eca450ba..0000000000
--- a/libraries/efivar/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-efivar: efivar (Tools and library to manipulate EFI variables.)
-efivar:
-efivar: Tools and libraries to manipulate EFI variables
-efivar:
-efivar: https://github.com/rhboot/efivar
-efivar:
-efivar:
-efivar:
-efivar:
-efivar:
-efivar:
diff --git a/libraries/enum34/README b/libraries/enum34/README
deleted file mode 100644
index 511af98413..0000000000
--- a/libraries/enum34/README
+++ /dev/null
@@ -1,2 +0,0 @@
-enum34 is the new Python stdlib enum module available in Python 3.4
-backported for previous versions of Python from 2.4 to 3.3.
diff --git a/libraries/enum34/enum34.SlackBuild b/libraries/enum34/enum34.SlackBuild
deleted file mode 100644
index 8e4f662533..0000000000
--- a/libraries/enum34/enum34.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for enum34
-
-# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=enum34
-VERSION=${VERSION:-1.1.6}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a PKG-INFO enum/LICENSE enum/README enum/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/enum34/enum34.info b/libraries/enum34/enum34.info
deleted file mode 100644
index bad09b3250..0000000000
--- a/libraries/enum34/enum34.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="enum34"
-VERSION="1.1.6"
-HOMEPAGE="https://pypi.python.org/pypi/enum34"
-DOWNLOAD="https://pypi.python.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz"
-MD5SUM="5f13a0841a61f7fc295c514490d120d0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/libraries/enum34/slack-desc b/libraries/enum34/slack-desc
deleted file mode 100644
index d9ce9cd84a..0000000000
--- a/libraries/enum34/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-enum34: enum34 (backported Python 3.4 Enum)
-enum34:
-enum34: An enumeration is a set of symbolic names (members) bound to unique,
-enum34: constant values. Within an enumeration, the members can be compared
-enum34: by identity, and the enumeration itself can be iterated over.
-enum34:
-enum34: Homepage : https://pypi.python.org/pypi/enum34
-enum34:
-enum34:
-enum34:
-enum34:
diff --git a/libraries/fuzzylite/fuzzylite.SlackBuild b/libraries/fuzzylite/fuzzylite.SlackBuild
index 70961c4d7c..d75feb8637 100644
--- a/libraries/fuzzylite/fuzzylite.SlackBuild
+++ b/libraries/fuzzylite/fuzzylite.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=fuzzylite
-VERSION=${VERSION:-5.1}
+VERSION=${VERSION:-6.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -91,7 +91,7 @@ fi
rm $PKG/usr/lib${LIBDIRSUFFIX}/libfuzzylite-static.a
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHOR ChangeLog README.md LICENSE COPYING* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHOR README.md LICENSE COPYING* $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/libraries/fuzzylite/fuzzylite.info b/libraries/fuzzylite/fuzzylite.info
index f81b2e5914..ee96c5ed57 100644
--- a/libraries/fuzzylite/fuzzylite.info
+++ b/libraries/fuzzylite/fuzzylite.info
@@ -1,8 +1,8 @@
PRGNAM="fuzzylite"
-VERSION="5.1"
+VERSION="6.0"
HOMEPAGE="https://www.fuzzylite.com"
-DOWNLOAD="https://github.com/fuzzylite/fuzzylite/archive/v5.1.tar.gz"
-MD5SUM="fcee03636fa417847d703e55cf11e34f"
+DOWNLOAD="https://github.com/fuzzylite/fuzzylite/archive/v6.0/fuzzylite-6.0.tar.gz"
+MD5SUM="34f3e1b27aa2abd9210b7d90f9d45785"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/gdl/gdl.SlackBuild b/libraries/gdl/gdl.SlackBuild
index 6ad5f2032c..d2157b7388 100644
--- a/libraries/gdl/gdl.SlackBuild
+++ b/libraries/gdl/gdl.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gdl
-VERSION=${VERSION:-3.26.0}
+VERSION=${VERSION:-3.34.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -88,7 +88,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS \
+cp -a AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/gdl/gdl.info b/libraries/gdl/gdl.info
index c4667a0207..49fb2d17de 100644
--- a/libraries/gdl/gdl.info
+++ b/libraries/gdl/gdl.info
@@ -1,8 +1,8 @@
PRGNAM="gdl"
-VERSION="3.26.0"
+VERSION="3.34.0"
HOMEPAGE="https://www.gnome.org/"
-DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/gdl/3.26/gdl-3.26.0.tar.xz"
-MD5SUM="1366cbca43242336f5e61b010145d76e"
+DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/gdl/3.34/gdl-3.34.0.tar.xz"
+MD5SUM="d624f2ca85555402828d5c4a98912b82"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/gstreamer-editing-services/gstreamer-editing-services.SlackBuild b/libraries/gstreamer-editing-services/gstreamer-editing-services.SlackBuild
index 6ba6fb2d4d..e23a1b1b71 100644
--- a/libraries/gstreamer-editing-services/gstreamer-editing-services.SlackBuild
+++ b/libraries/gstreamer-editing-services/gstreamer-editing-services.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gstreamer-editing-services
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.14.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/libraries/gstreamer-editing-services/gstreamer-editing-services.info b/libraries/gstreamer-editing-services/gstreamer-editing-services.info
index e58125ace5..f11b134a9f 100644
--- a/libraries/gstreamer-editing-services/gstreamer-editing-services.info
+++ b/libraries/gstreamer-editing-services/gstreamer-editing-services.info
@@ -1,8 +1,8 @@
PRGNAM="gstreamer-editing-services"
-VERSION="1.6.2"
+VERSION="1.14.0"
HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-editing-services.html"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.6.2.tar.xz"
-MD5SUM="76a1aa3f08af4c56b08d784aea46b712"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.14.0.tar.xz"
+MD5SUM="6f49450e692f6a5e328e57be811d2d82"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/gstreamermm/fix_warnings.patch b/libraries/gstreamermm/fix_warnings.patch
new file mode 100644
index 0000000000..fccb480a11
--- /dev/null
+++ b/libraries/gstreamermm/fix_warnings.patch
@@ -0,0 +1,15 @@
+Author: Marcin Kolny <marcin.kolny@gmail.com>
+Description: Fix warnings
+Origin: https://git.gnome.org/browse/gstreamermm/commit/gstreamer/gstreamermm/check.cc?id=c5006faf05bc4b46767d30f42bcb6157836b7540
+Last-update: 2016-09-25
+--- a/gstreamer/gstreamermm/check.cc
++++ b/gstreamer/gstreamermm/check.cc
+@@ -54,7 +54,7 @@
+
+ element = ElementFactory::create_element (factory, factory);
+
+- ThrowIf (element, "Could not create a '" + factory + "' element");
++ ThrowIf (!!element, "Could not create a '" + factory + "' element");
+ CheckRefCount (element->gobj(), factory, 1);
+
+ return element;
diff --git a/libraries/gstreamermm/gstreamermm.SlackBuild b/libraries/gstreamermm/gstreamermm.SlackBuild
index 73ece14f12..d6c0925fd9 100644
--- a/libraries/gstreamermm/gstreamermm.SlackBuild
+++ b/libraries/gstreamermm/gstreamermm.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Needed for gcc >= 7.x - Thanks to opensuse
+patch -p1 < $CWD/fix_warnings.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS -std=c++11" \
./configure \
diff --git a/libraries/gtkglext/0002-GCC-8-fixes.patch b/libraries/gtkglext/0002-GCC-8-fixes.patch
new file mode 100644
index 0000000000..266f5fefc1
--- /dev/null
+++ b/libraries/gtkglext/0002-GCC-8-fixes.patch
@@ -0,0 +1,34 @@
+From 1fe275cd7dfa9f3a6db771b0cb945d96787e72cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
+Date: Thu, 15 Mar 2018 15:56:20 +0100
+Subject: [PATCH 2/2] GCC-8 fixes.
+
+---
+ gdk/gdkglshapes.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdk/gdkglshapes.c b/gdk/gdkglshapes.c
+index f72abba..9d1197f 100644
+--- a/gdk/gdkglshapes.c
++++ b/gdk/gdkglshapes.c
+@@ -544,7 +544,7 @@ static GLfloat idata[12][3] =
+ {-Z, -X, 0}
+ };
+
+-static int index[20][3] =
++static int iindex[20][3] =
+ {
+ {0, 4, 1},
+ {0, 9, 4},
+@@ -574,7 +574,7 @@ icosahedron(GLenum shadeType)
+ int i;
+
+ for (i = 19; i >= 0; i--) {
+- drawtriangle(i, idata, index, shadeType);
++ drawtriangle(i, idata, iindex, shadeType);
+ }
+ }
+
+--
+2.14.3
+
diff --git a/libraries/gtkglext/gtkglext.SlackBuild b/libraries/gtkglext/gtkglext.SlackBuild
index 4aa77fbbfe..b95332a485 100644
--- a/libraries/gtkglext/gtkglext.SlackBuild
+++ b/libraries/gtkglext/gtkglext.SlackBuild
@@ -72,6 +72,8 @@ find -L . \
# Don't disable deprecated stuff
patch -p1 < $CWD/gtkglext-no-deprecated-flags.patch
+# From fedora - conflicting definition
+patch -p1 < $CWD/0002-GCC-8-fixes.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -79,7 +81,6 @@ CXXFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--disable-static \
- --enable-gtk-doc \
--enable-debug=no \
--build=$ARCH-slackware-linux
diff --git a/libraries/gtksourceview3/gtksourceview3.SlackBuild b/libraries/gtksourceview3/gtksourceview3.SlackBuild
index adf532d033..30826998bd 100644
--- a/libraries/gtksourceview3/gtksourceview3.SlackBuild
+++ b/libraries/gtksourceview3/gtksourceview3.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=gtksourceview3
SRCNAM=gtksourceview
-VERSION=${VERSION:-3.18.4}
+VERSION=${VERSION:-3.24.11}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/libraries/gtksourceview3/gtksourceview3.info b/libraries/gtksourceview3/gtksourceview3.info
index 4f05f8d29b..8d171af68d 100644
--- a/libraries/gtksourceview3/gtksourceview3.info
+++ b/libraries/gtksourceview3/gtksourceview3.info
@@ -1,8 +1,8 @@
PRGNAM="gtksourceview3"
-VERSION="3.18.4"
-HOMEPAGE="http://projects.gnome.org/gtksourceview/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/3.18/gtksourceview-3.18.4.tar.xz"
-MD5SUM="b2fa71fc6b63c9ffb7aaed6c20859f4d"
+VERSION="3.24.11"
+HOMEPAGE="https://projects.gnome.org/gtksourceview/"
+DOWNLOAD="https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.11.tar.xz"
+MD5SUM="b748da426a7d64e1304f0c532b0f2a67"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="glade"
diff --git a/libraries/gtksourceview4/README b/libraries/gtksourceview4/README
new file mode 100644
index 0000000000..50bc5ddb9c
--- /dev/null
+++ b/libraries/gtksourceview4/README
@@ -0,0 +1,4 @@
+GtkSourceView is a portable C library that extends the standard GTK+
+framework for multiline text editing with support for configurable
+syntax highlighting, unlimited undo/redo, UTF-8 compliant caseless
+searching, printing and other features typical of a source code editor.
diff --git a/libraries/gtksourceview4/gtksourceview4.SlackBuild b/libraries/gtksourceview4/gtksourceview4.SlackBuild
new file mode 100644
index 0000000000..e7ce6ca1fb
--- /dev/null
+++ b/libraries/gtksourceview4/gtksourceview4.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# Slackware build script for gtksourceview
+
+# Copyright 2012-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=gtksourceview4
+SRCNAM=gtksourceview
+VERSION=${VERSION:-4.0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --enable-glade-catalog \
+ --build=$ARCH-slackware-linux
+
+# At the end of build process, the uninstalled gtksourceview.pc is
+# used. Let's make sure pkg-config can find it.
+PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$TMP/$PRGNAM-$VERSION make
+make install-strip DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* HACKING NEWS README \
+ $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/gtksourceview4/gtksourceview4.info b/libraries/gtksourceview4/gtksourceview4.info
new file mode 100644
index 0000000000..76c94956dc
--- /dev/null
+++ b/libraries/gtksourceview4/gtksourceview4.info
@@ -0,0 +1,10 @@
+PRGNAM="gtksourceview4"
+VERSION="4.0.3"
+HOMEPAGE="http://projects.gnome.org/gtksourceview/"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/4.0/gtksourceview-4.0.3.tar.xz"
+MD5SUM="91e01df36e1476083f7b8a474f7d0c34"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="glade"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/libraries/gtksourceview4/slack-desc b/libraries/gtksourceview4/slack-desc
new file mode 100644
index 0000000000..5ceea4e49e
--- /dev/null
+++ b/libraries/gtksourceview4/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+gtksourceview4: gtksourceview4 (a GTK+ framework for source code editing)
+gtksourceview4:
+gtksourceview4: GtkSourceView is a portable C library that extends the standard
+gtksourceview4: GTK+ framework for multiline text editing with support for
+gtksourceview4: configurable syntax highlighting, unlimited undo/redo, UTF-8
+gtksourceview4: compliant caseless searching, printing and other features
+gtksourceview4: typical of a source code editor.
+gtksourceview4:
+gtksourceview4: Homepage: http://projects.gnome.org/gtksourceview/
+gtksourceview4:
+gtksourceview4:
diff --git a/libraries/hpx/gcc7.patch b/libraries/hpx/gcc7.patch
new file mode 100644
index 0000000000..ab8d5cb94a
--- /dev/null
+++ b/libraries/hpx/gcc7.patch
@@ -0,0 +1,23 @@
+From cc15d1c67144200f070e74d80b6d840df0a16ee3 Mon Sep 17 00:00:00 2001
+From: Thomas Heller <thomas.heller@cs.fau.de>
+Date: Thu, 4 May 2017 08:15:13 +0200
+Subject: [PATCH] Fixing uninitialized usage warning with gcc 7
+
+---
+ src/runtime/parcelset/parcel.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/runtime/parcelset/parcel.cpp b/src/runtime/parcelset/parcel.cpp
+index 0f86c4043a1..56714af4c7b 100644
+--- a/src/runtime/parcelset/parcel.cpp
++++ b/src/runtime/parcelset/parcel.cpp
+@@ -47,7 +47,8 @@ namespace hpx { namespace parcelset
+ creation_time_(util::high_resolution_timer::now()),
+ #endif
+ source_id_(naming::invalid_gid),
+- dest_(naming::invalid_gid)
++ dest_(naming::invalid_gid),
++ has_continuation_(false)
+ {}
+
+ parcel_data::parcel_data(naming::gid_type&& dest, naming::address&& addr,
diff --git a/libraries/hpx/hpx.SlackBuild b/libraries/hpx/hpx.SlackBuild
index 0dbdd285e9..5156a21773 100644
--- a/libraries/hpx/hpx.SlackBuild
+++ b/libraries/hpx/hpx.SlackBuild
@@ -69,11 +69,15 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# From upstream
+patch -p1 < $CWD/gcc7.patch
+
mkdir -p build
cd build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DHPX_WITH_CXX11=On \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB=lib${LIBDIRSUFFIX} \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/libraries/http-parser/http-parser.SlackBuild b/libraries/http-parser/http-parser.SlackBuild
index f4d9f81cda..cf7916d940 100644
--- a/libraries/http-parser/http-parser.SlackBuild
+++ b/libraries/http-parser/http-parser.SlackBuild
@@ -69,7 +69,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=implicit-fallthrough=" \
make install \
PREFIX=$PKG/usr \
LIBDIR=$PKG/usr/lib${LIBDIRSUFFIX}
diff --git a/libraries/hyphen/README b/libraries/hyphen/README
deleted file mode 100644
index 97633624e6..0000000000
--- a/libraries/hyphen/README
+++ /dev/null
@@ -1 +0,0 @@
-Hyphenation library to use converted TeX hyphenation patterns.
diff --git a/libraries/hyphen/hyphen.SlackBuild b/libraries/hyphen/hyphen.SlackBuild
deleted file mode 100644
index 6dee782114..0000000000
--- a/libraries/hyphen/hyphen.SlackBuild
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for hyphen
-
-# Copyright 2015, 2018 Hunter Sezen California, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=hyphen
-VERSION=${VERSION:-2.8.8}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYIN* ChangeLog INSTALL NEWS READM* THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/hyphen/hyphen.info b/libraries/hyphen/hyphen.info
deleted file mode 100644
index a897f30b17..0000000000
--- a/libraries/hyphen/hyphen.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="hyphen"
-VERSION="2.8.8"
-HOMEPAGE="https://hunspell.github.io/"
-DOWNLOAD="https://sourceforge.net/projects/hunspell/files/Hyphen/2.8/hyphen-2.8.8.tar.gz"
-MD5SUM="5ade6ae2a99bc1e9e57031ca88d36dad"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
diff --git a/libraries/hyphen/slack-desc b/libraries/hyphen/slack-desc
deleted file mode 100644
index 003ab36875..0000000000
--- a/libraries/hyphen/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-hyphen: hyphen (hyphenation library)
-hyphen:
-hyphen: Hyphenation library to use converted TeX hyphenation pattern
-hyphen:
-hyphen: Homepage: https://hunspell.github.io/
-hyphen:
-hyphen:
-hyphen:
-hyphen:
-hyphen:
-hyphen:
diff --git a/libraries/id3lib/README b/libraries/id3lib/README
deleted file mode 100644
index f809127d2d..0000000000
--- a/libraries/id3lib/README
+++ /dev/null
@@ -1,10 +0,0 @@
-This package provides a software library for manipulating ID3v1
-and ID3v2 tags. It provides a convenient interface for software
-developers to include standards-compliant ID3v1/2 tagging
-capabilities in their applications.
-
-Features include identification of valid tags, automatic size
-conversions, (re)synchronisation of tag frames, seamless tag
-(de)compression, and optional padding facilities.
-
-This SlackBuild applies several patches provided by Debian team.
diff --git a/libraries/id3lib/id3lib.SlackBuild b/libraries/id3lib/id3lib.SlackBuild
deleted file mode 100644
index 9c036b3e4a..0000000000
--- a/libraries/id3lib/id3lib.SlackBuild
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for id3lib
-
-# Heavily based on original slackbuild by AlienBOB.
-# Modified by Robby Workman <rworkman@slackbuilds.org>
-# Copyright 2006-2010 Halim Issa <yallaone@gmail.com>
-# Copyright 2020 Dominik Drobek <dominik.drobek (at) o2.pl>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=id3lib
-VERSION=${VERSION:-3.8.3}
-BUILD=${BUILD:-4}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Apply patches from Slackware-current:
-patch -p1 -i $CWD/patches/id3lib.cppheaders.patch
-patch -p1 -i $CWD/patches/id3lib.manpages.patch
-patch -p1 -i $CWD/patches/id3lib.utf8_writing.patch
-patch -p1 -i $CWD/patches/id3lib.mkstemp.patch
-patch -p1 -i $CWD/patches/id3lib.c_wrapper.patch
-patch -p1 -i $CWD/patches/id3lib.nullpointer_check.patch
-patch -p1 -i $CWD/patches/id3lib.vbr_stack_smash.patch
-
-# iomanip.h is obsolete; use the standard C++ header:
-sed -e "s%iomanip.h%iomanip%g" -i configure
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --enable-static=no \
- --enable-debug=no \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/man/man1
-cp -a doc/man/* $PKG/usr/man/man1
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS COPYING ChangeLog HISTORY NEWS README THANKS TODO doc/*.txt \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/id3lib/id3lib.info b/libraries/id3lib/id3lib.info
deleted file mode 100644
index 15fa568f65..0000000000
--- a/libraries/id3lib/id3lib.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="id3lib"
-VERSION="3.8.3"
-HOMEPAGE="http://id3lib.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/id3lib/id3lib-3.8.3.tar.gz"
-MD5SUM="19f27ddd2dda4b2d26a559a4f0f402a7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dominik Drobek"
-EMAIL="dominik.drobek (at) o2.pl"
diff --git a/libraries/id3lib/patches/id3lib.c_wrapper.patch b/libraries/id3lib/patches/id3lib.c_wrapper.patch
deleted file mode 100644
index d72e81c0ec..0000000000
--- a/libraries/id3lib/patches/id3lib.c_wrapper.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-This patch adds C wrapper functions for field encoding.
-
-It was first introduced in version 3.8.3-8 and fixes
-http://bugs.debian.org/281292
---- a/include/id3.h
-+++ b/include/id3.h
-@@ -104,6 +104,9 @@
- ID3_C_EXPORT void CCONV ID3Field_GetBINARY (const ID3Field *field, uchar *buffer, size_t buffLength);
- ID3_C_EXPORT void CCONV ID3Field_FromFile (ID3Field *field, const char *fileName);
- ID3_C_EXPORT void CCONV ID3Field_ToFile (const ID3Field *field, const char *fileName);
-+ ID3_C_EXPORT bool CCONV ID3Field_SetEncoding (ID3Field *field, ID3_TextEnc enc);
-+ ID3_C_EXPORT ID3_TextEnc CCONV ID3Field_GetEncoding (const ID3Field *field);
-+ ID3_C_EXPORT bool CCONV ID3Field_IsEncodable (const ID3Field *field);
-
- /* field-info wrappers */
- ID3_C_EXPORT char* CCONV ID3FrameInfo_ShortName (ID3_FrameID frameid);
---- a/src/c_wrapper.cpp
-+++ b/src/c_wrapper.cpp
-@@ -681,6 +681,39 @@
- }
- }
-
-+ ID3_C_EXPORT bool CCONV
-+ ID3Field_SetEncoding(ID3Field *field, ID3_TextEnc enc)
-+ {
-+ bool changed = false;
-+ if (field)
-+ {
-+ ID3_CATCH(changed = reinterpret_cast<ID3_Field *>(field)->SetEncoding(enc));
-+ }
-+ return changed;
-+ }
-+
-+ ID3_C_EXPORT ID3_TextEnc CCONV
-+ ID3Field_GetEncoding(const ID3Field *field)
-+ {
-+ ID3_TextEnc enc = ID3TE_NONE;
-+ if (field)
-+ {
-+ ID3_CATCH(enc = reinterpret_cast<const ID3_Field *>(field)->GetEncoding());
-+ }
-+ return enc;
-+ }
-+
-+ ID3_C_EXPORT bool CCONV
-+ ID3Field_IsEncodable(const ID3Field *field)
-+ {
-+ bool isEncodable = false;
-+ if (field)
-+ {
-+ ID3_CATCH(isEncodable = reinterpret_cast<const ID3_Field *>(field)->IsEncodable());
-+ }
-+ return isEncodable;
-+ }
-+
- #ifdef __cplusplus
- }
- #endif /* __cplusplus */
diff --git a/libraries/id3lib/patches/id3lib.cppheaders.patch b/libraries/id3lib/patches/id3lib.cppheaders.patch
deleted file mode 100644
index a9b45ab02c..0000000000
--- a/libraries/id3lib/patches/id3lib.cppheaders.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-This patch imports the proper C++ headers
---- a/include/id3/id3lib_strings.h
-+++ b/include/id3/id3lib_strings.h
-@@ -30,6 +30,7 @@
- #define _ID3LIB_STRINGS_H_
-
- #include <string>
-+#include <cstring>
-
- #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
- namespace std
---- a/include/id3/writers.h
-+++ b/include/id3/writers.h
-@@ -30,7 +30,7 @@
-
- #include "id3/writer.h"
- #include "id3/id3lib_streams.h"
--//#include <string.h>
-+#include <cstring>
-
- class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
- {
diff --git a/libraries/id3lib/patches/id3lib.manpages.patch b/libraries/id3lib/patches/id3lib.manpages.patch
deleted file mode 100644
index cebf3d4d40..0000000000
--- a/libraries/id3lib/patches/id3lib.manpages.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-This patch adds debian-made man pages
---- /dev/null
-+++ b/doc/man/id3info.1
-@@ -0,0 +1,31 @@
-+.TH ID3INFO 1 "May 2000" local "User Command"
-+.SH NAME
-+id3info \- Display id3 tag information.
-+.SH SYNOPSIS
-+.B id3info
-+.RB [
-+.I OPTION
-+.RB ]
-+.RB [
-+.I FILE
-+.RB ]
-+.br
-+.SH DESCRIPTION
-+.B Id3info
-+displays both the id3v1 and id3v2 tag information for a file.
-+Id3info will not differentiate between the two types of tags.
-+.SH OPTIONS
-+.TP
-+.B \-h, \-\-help
-+Display help and exit
-+.TP
-+.B \-v, \-\-version
-+Display version information and exit
-+.SH SEE ALSO
-+id3convert(1), id3tag(1), id3v2(1)
-+.SH AUTHOR
-+.B id3lib
-+was originally designed and implemented by Dirk Mahoney and is
-+maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
-+Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
-+
---- /dev/null
-+++ b/doc/man/id3tag.1
-@@ -0,0 +1,69 @@
-+.TH ID3TAG 1 "May 2000" local "User Command"
-+.SH NAME
-+id3tag \- Tags an mp3 file with id3v1 and/or id3v2 tags.
-+.SH SYNOPSIS
-+.B id3tag
-+.RB [
-+.I OPTION
-+.RB ] ...
-+.RB [
-+.I FILE
-+.RB ] ...
-+.br
-+.SH DESCRIPTION
-+.B Id3tag
-+will render both types of tag by default. Only the last
-+tag type indicated in the option list will be used. Non-
-+rendered will remain unchanged in the original file. Will
-+also parse and convert Lyrics3 v2.0 frames, but will not
-+render them.
-+
-+.SH OPTIONS
-+.TP
-+.B \-1, \-\-v1tag
-+Render only the id3v1 tag
-+.TP
-+.B \-2, \-\-v2tag
-+Render only the id3v2 tag
-+.TP
-+.B \-h, \-\-help
-+Display help and exit
-+.TP
-+.B \-v, \-\-version
-+Display version information and exit
-+.TP
-+.B \-a, \-\-artist ARTIST
-+Set the artist information
-+.TP
-+.B \-s, \-\-song SONG
-+Set the song title information
-+.TP
-+.B \-A, \-\-album ALBUM
-+Set the album title information
-+.TP
-+.B \-c, \-\-comment COMMENT
-+Set the comment information
-+.TP
-+.B \-C, \-\-desc DESCRIPTION
-+Set the comment description
-+.TP
-+.B \-g, \-\-genre num
-+Set the genre number
-+.TP
-+.B \-y, \-\-year num
-+Set the year
-+.TP
-+.B \-t, \-\-track num
-+Set the track number
-+.TP
-+.B \-T, \-\-total num
-+Set the total number of tracks on the album
-+
-+.SH SEE ALSO
-+id3convert(1), id3info(1), id3v2(1)
-+.SH AUTHOR
-+.B id3lib
-+was originally designed and implemented by Dirk Mahoney and is
-+maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
-+Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
-+
---- /dev/null
-+++ b/doc/man/id3convert.1
-@@ -0,0 +1,47 @@
-+.TH ID3CONVERT 1 "May 2000" local "User Command"
-+.SH NAME
-+id3convert \- Converts between id3v1 and id3v2 tags of an mp3 file.
-+.SH SYNOPSIS
-+.B id3convert
-+.RB [
-+.I OPTION
-+.RB ]
-+.RB [
-+.I FILE
-+.RB ]
-+.br
-+.SH DESCRIPTION
-+.B Id3convert
-+converts between id3v1 and id3v2 tags of an mp3 file. Id3convert will render
-+both types of tag by default. Only the last tag type indicated in the option
-+list will be used. Non-rendered tags will remain unchanged in the original
-+file. Id3convert will also parse and convert Lyrics3 v2.0 frames, but will
-+not render them.
-+
-+.SH OPTIONS
-+.TP
-+.B \-1, \-\-v1tag
-+Render only the id3v1 tag
-+.TP
-+.B \-2, \-\-v2tag
-+Render only the id3v2 tag
-+.TP
-+.B \-s, \-\-strip
-+Strip, rather than render, the tags
-+.TP
-+.B \-p, \-\-padding
-+Use padding in the tag
-+.TP
-+.B \-h, \-\-help
-+Display help and exit
-+.TP
-+.B \-v, \-\-version
-+Display version information and exit
-+
-+.SH SEE ALSO
-+id3tag(1), id3info(1), id3v2(1)
-+.SH AUTHOR
-+.B id3lib
-+was originally designed and implemented by Dirk Mahoney and is
-+maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
-+Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
---- /dev/null
-+++ b/doc/man/id3cp.1
-@@ -0,0 +1,38 @@
-+.TH ID3CP 1 "July 2001" local "User Command"
-+.SH NAME
-+id3cp \- Copies tags from one file to another.
-+.SH SYNOPSIS
-+.B id3cp
-+.RB [
-+.I OPTION
-+.RB ] ...
-+.RB [
-+.I SOURCE
-+.RB ]
-+.RB [
-+.I DEST
-+.RB ]
-+.br
-+.SH DESCRIPTION
-+.B Id3cp
-+copies tags from SOURCE to DEST.
-+.SH OPTIONS
-+.TP
-+.B \-1, \-\-v1tag
-+Render only the id3v1 tag
-+.TP
-+.B \-2, \-\-v2tag
-+Render only the id3v2 tag
-+.TP
-+.B \-h, \-\-help
-+Display help and exit
-+.TP
-+.B \-v, \-\-version
-+Display version information and exit
-+.SH SEE ALSO
-+id3convert(1), id3info(1), id3v2(1)
-+.SH AUTHOR
-+.B id3lib
-+was originally designed and implemented by Dirk Mahoney and is
-+maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
-+Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
diff --git a/libraries/id3lib/patches/id3lib.mkstemp.patch b/libraries/id3lib/patches/id3lib.mkstemp.patch
deleted file mode 100644
index 36c84179fc..0000000000
--- a/libraries/id3lib/patches/id3lib.mkstemp.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-This patch fixes an issues where temporary files were created in an insecure
-way.
-
-It was first intruduced in version 3.8.3-7 and fixes
-http://bugs.debian.org/438540
---- a/src/tag_file.cpp
-+++ b/src/tag_file.cpp
-@@ -242,8 +242,8 @@
- strcpy(sTempFile, filename.c_str());
- strcat(sTempFile, sTmpSuffix.c_str());
-
--#if ((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP))
-- // This section is for Windows folk && gcc 3.x folk
-+#if !defined(HAVE_MKSTEMP)
-+ // This section is for Windows folk
- fstream tmpOut;
- createFile(sTempFile, tmpOut);
-
-@@ -257,7 +257,7 @@
- tmpOut.write((char *)tmpBuffer, nBytes);
- }
-
--#else //((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP))
-+#else //!defined(HAVE_MKSTEMP)
-
- // else we gotta make a temp file, copy the tag into it, copy the
- // rest of the old file after the tag, delete the old file, rename
-@@ -270,7 +270,7 @@
- //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");
- }
-
-- ofstream tmpOut(fd);
-+ ofstream tmpOut(sTempFile);
- if (!tmpOut)
- {
- tmpOut.close();
-@@ -285,14 +285,14 @@
- uchar tmpBuffer[BUFSIZ];
- while (file)
- {
-- file.read(tmpBuffer, BUFSIZ);
-+ file.read((char *)tmpBuffer, BUFSIZ);
- size_t nBytes = file.gcount();
-- tmpOut.write(tmpBuffer, nBytes);
-+ tmpOut.write((char *)tmpBuffer, nBytes);
- }
-
- close(fd); //closes the file
-
--#endif ////((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP))
-+#endif ////!defined(HAVE_MKSTEMP)
-
- tmpOut.close();
- file.close();
diff --git a/libraries/id3lib/patches/id3lib.nullpointer_check.patch b/libraries/id3lib/patches/id3lib.nullpointer_check.patch
deleted file mode 100644
index d4ca5d292f..0000000000
--- a/libraries/id3lib/patches/id3lib.nullpointer_check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-This patch adds a check for a null pointer
---- a/src/header_tag.cpp
-+++ b/src/header_tag.cpp
-@@ -54,7 +54,7 @@
- {
- size_t bytesUsed = ID3_TagHeader::SIZE;
-
-- if (_info->is_extended)
-+ if (_info && _info->is_extended)
- {
- bytesUsed += _info->extended_bytes;
- }
diff --git a/libraries/id3lib/patches/id3lib.utf8_writing.patch b/libraries/id3lib/patches/id3lib.utf8_writing.patch
deleted file mode 100644
index 3d3f50fed6..0000000000
--- a/libraries/id3lib/patches/id3lib.utf8_writing.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Patch from 'Spoon' to fix issues with writing certain unicode characters
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,8 @@
-+2006-02-17 Jerome Couderc
-+
-+ * Patch from Spoon to fix UTF-16 writing bug
-+ http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
-+
- 2003-03-02 Sunday 17:38 Thijmen Klok <thijmen@id3lib.org>
-
- * THANKS (1.20): added more people
---- a/src/io_helpers.cpp
-+++ b/src/io_helpers.cpp
-@@ -363,11 +363,22 @@
- // Write the BOM: 0xFEFF
- unicode_t BOM = 0xFEFF;
- writer.writeChars((const unsigned char*) &BOM, 2);
-+ // Patch from Spoon : 2004-08-25 14:17
-+ // http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
-+ // Wrong code
-+ //for (size_t i = 0; i < size; i += 2)
-+ //{
-+ // unicode_t ch = (data[i] << 8) | data[i+1];
-+ // writer.writeChars((const unsigned char*) &ch, 2);
-+ //}
-+ // Right code
-+ unsigned char *pdata = (unsigned char *) data.c_str();
- for (size_t i = 0; i < size; i += 2)
- {
-- unicode_t ch = (data[i] << 8) | data[i+1];
-+ unicode_t ch = (pdata[i] << 8) | pdata[i+1];
- writer.writeChars((const unsigned char*) &ch, 2);
- }
-+ // End patch
- }
- return writer.getCur() - beg;
- }
diff --git a/libraries/id3lib/patches/id3lib.vbr_stack_smash.patch b/libraries/id3lib/patches/id3lib.vbr_stack_smash.patch
deleted file mode 100644
index 9bf33e9787..0000000000
--- a/libraries/id3lib/patches/id3lib.vbr_stack_smash.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix crashes when reading VBR MP3 file.
-Bug-Ubuntu: https://launchpad.net/bugs/444466
-Origin: upstream, http://sourceforge.net/tracker/?func=detail&aid=937707&group_id=979&atid=300979
-Forwarded: yes
-Author: Urs Fleisch
-
-Index: id3lib3.8.3-3.8.3/src/mp3_parse.cpp
-===================================================================
---- id3lib3.8.3-3.8.3.orig/src/mp3_parse.cpp 2009-10-06 23:12:10.381250132 +0200
-+++ id3lib3.8.3-3.8.3/src/mp3_parse.cpp 2009-10-06 23:14:09.545252591 +0200
-@@ -465,7 +465,7 @@
- // from http://www.xingtech.com/developer/mp3/
-
- const size_t VBR_HEADER_MIN_SIZE = 8; // "xing" + flags are fixed
-- const size_t VBR_HEADER_MAX_SIZE = 116; // frames, bytes, toc and scale are optional
-+ const size_t VBR_HEADER_MAX_SIZE = 120; // frames, bytes, toc and scale are optional
-
- if (mp3size >= vbr_header_offest + VBR_HEADER_MIN_SIZE)
- {
diff --git a/libraries/id3lib/slack-desc b/libraries/id3lib/slack-desc
deleted file mode 100644
index 2d363781b1..0000000000
--- a/libraries/id3lib/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-id3lib: id3lib (ID3 tag manipulation library)
-id3lib:
-id3lib: This package provides a library for manipulating ID3v1 and ID3v2 tags.
-id3lib: Features include identification of valid tags, automatic size
-id3lib: conversions, (re)synchronisation of tag frames, seamless tag
-id3lib: (de)compression, and optional padding facilities. Additionally, it can
-id3lib: display mp3 header info such as bitrate.
-id3lib:
-id3lib: Homepage: http://id3lib.sourceforge.net/
-id3lib:
-id3lib:
diff --git a/libraries/isl/README b/libraries/isl/README
deleted file mode 100644
index 342213d403..0000000000
--- a/libraries/isl/README
+++ /dev/null
@@ -1,8 +0,0 @@
-isl is a library for manipulating sets and relations of integer points
-bounded by linear constraints. Supported operations on sets include
-intersection, union, set difference, emptiness check, convex hull,
-(integer) affine hull, integer projection, computings the lexicographic
-minimum using parametric integer programming, coalescing and parametric
-vertex enumeration. It also includes an ILP solver based on generalized
-basis reduction, transitive closures on maps (which may encode infinite
-graphs), dependence analysis and bounds on piecewise step-polynomials.
diff --git a/libraries/isl/isl.SlackBuild b/libraries/isl/isl.SlackBuild
deleted file mode 100644
index 58173fad6d..0000000000
--- a/libraries/isl/isl.SlackBuild
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for isl
-
-# Copyright 2017 Jan F. Chadima <jfch@jagda.eu>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=isl
-VERSION=${VERSION:-0.18}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="${SLKCFLAGS:--O2 -march=i586 -mtune=i686}"
- LIBDIRSUFFIX=""
- GNUEABI=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="${SLKCFLAGS:--O2 -march=i686 -mtune=i686}"
- LIBDIRSUFFIX=""
- GNUEABI=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="${SLKCFLAGS:--O2 -fPIC}"
- LIBDIRSUFFIX="64"
- GNUEABI=""
-elif [ "$ARCH" = "arm" ]; then
- SLKCFLAGS="${SLKCFLAGS:--O3 -march=armv4t -mtune=cortex-a6 -fPIC}"
- LIBDIRSUFFIX=""
- GNUEABI="-gnueabi"
-elif [ "$ARCH" = "armv7hl" ]; then
- SLKCFLAGS="${SLKCFLAGS:--O3 -march=armv7-a -mtune=cortex-a8 -mfpu=neon-vfpv4 -fPIC}"
- LIBDIRSUFFIX=""
- GNUEABI="-gnueabi"
-else
- SLKCFLAGS="${SLKCFLAGS:--O2}"
- LIBDIRSUFFIX=""
- GNUEABI=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib$LIBDIRSUFFIX \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux$GNUEABI
-
-make
-make install DESTDIR=$PKG
-
-# Move gdb extension to its place.
-mkdir -p $PKG/usr/share/gdb/auto-load/usr/lib$LIBDIRSUFFIX
-mv $PKG/usr/lib$LIBDIRSUFFIX/*-gdb.py* \
- $PKG/usr/share/gdb/auto-load/usr/lib$LIBDIRSUFFIX
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS ChangeLog LICENSE README doc/*.bib doc/*.pdf doc/*.pod doc/*.tex \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/isl/isl.info b/libraries/isl/isl.info
deleted file mode 100644
index 1784d2ae24..0000000000
--- a/libraries/isl/isl.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="isl"
-VERSION="0.18"
-HOMEPAGE="http://isl.gforge.inria.fr"
-DOWNLOAD="http://isl.gforge.inria.fr/isl-0.18.tar.xz"
-MD5SUM="5337cd4c29101fe8e8e1b0f5948f91e2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Jan F. Chadima"
-EMAIL="jfch@jagda.eu"
diff --git a/libraries/isl/slack-desc b/libraries/isl/slack-desc
deleted file mode 100644
index 8bd67300f0..0000000000
--- a/libraries/isl/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-isl: isl (Integer point manipulation library)
-isl:
-isl: isl is a library for manipulating sets and relations of integer
-isl: points bounded by linear constraints.
-isl:
-isl: Homepage: http://isl.gforge.inria.fr/
-isl:
-isl:
-isl:
-isl:
-isl:
diff --git a/libraries/jansson/README b/libraries/jansson/README
deleted file mode 100644
index 658898eea1..0000000000
--- a/libraries/jansson/README
+++ /dev/null
@@ -1 +0,0 @@
-Jansson is a C library for encoding, decoding and manipulating JSON data.
diff --git a/libraries/jansson/jansson.SlackBuild b/libraries/jansson/jansson.SlackBuild
deleted file mode 100644
index 442ed044e0..0000000000
--- a/libraries/jansson/jansson.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for jansson
-
-# Copyright 2014-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=jansson
-VERSION=${VERSION:-2.12}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-static=no \
- --disable-silent-rules \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/jansson/jansson.info b/libraries/jansson/jansson.info
deleted file mode 100644
index edd491c9fd..0000000000
--- a/libraries/jansson/jansson.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="jansson"
-VERSION="2.12"
-HOMEPAGE="http://www.digip.org/jansson/"
-DOWNLOAD="http://www.digip.org/jansson/releases/jansson-2.12.tar.bz2"
-MD5SUM="317dbaf90a9f85ea0ec7b12d080d173d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/libraries/jansson/slack-desc b/libraries/jansson/slack-desc
deleted file mode 100644
index 9379939173..0000000000
--- a/libraries/jansson/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-jansson: jansson (C library)
-jansson:
-jansson: Jansson is a C library for encoding, decoding and manipulating JSON
-jansson: data.
-jansson:
-jansson: Homepage: http://www.digip.org/jansson/
-jansson:
-jansson:
-jansson:
-jansson:
-jansson:
diff --git a/libraries/json-glib/README b/libraries/json-glib/README
deleted file mode 100644
index 84d3d2669b..0000000000
--- a/libraries/json-glib/README
+++ /dev/null
@@ -1,3 +0,0 @@
-JSON-GLib is a library providing serialization and deserialization
-support for the JavaScript Object Notation (JSON) format described
-by RFC 4627.
diff --git a/libraries/json-glib/json-glib.SlackBuild b/libraries/json-glib/json-glib.SlackBuild
deleted file mode 100644
index acf870593e..0000000000
--- a/libraries/json-glib/json-glib.SlackBuild
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for JSON-Glib
-#
-# Copyright 2009-2017 Erik W. Hanson, Minneapolis, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=json-glib
-VERSION=${VERSION:-1.2.8}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var/lib \
- --mandir=/usr/man \
- --disable-static \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS COPYING ChangeLog NEWS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-ln -s /usr/share/gtk-doc/html/json-glib $PKG/usr/doc/$PRGNAM-$VERSION/html
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/json-glib/json-glib.info b/libraries/json-glib/json-glib.info
deleted file mode 100644
index 50a013fe73..0000000000
--- a/libraries/json-glib/json-glib.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="json-glib"
-VERSION="1.2.8"
-HOMEPAGE="http://live.gnome.org/JsonGlib"
-DOWNLOAD="http://ftp.acc.umu.se/pub/GNOME/sources/json-glib/1.2/json-glib-1.2.8.tar.xz"
-MD5SUM="ff31e7d0594df44318e12facda3d086e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
diff --git a/libraries/json-glib/slack-desc b/libraries/json-glib/slack-desc
deleted file mode 100644
index 3f96be22b3..0000000000
--- a/libraries/json-glib/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-json-glib: json-glib (a de/serialization library for the JS Object Notation)
-json-glib:
-json-glib: JSON-GLib is a library providing serialization and deserialization
-json-glib: support for the JavaScript Object Notation (JSON) format described
-json-glib: by RFC 4627.
-json-glib:
-json-glib: Homepage: http://live.gnome.org/JsonGlib
-json-glib:
-json-glib:
-json-glib:
-json-glib:
diff --git a/libraries/keybinder/README b/libraries/keybinder/README
new file mode 100644
index 0000000000..4a7e8750a8
--- /dev/null
+++ b/libraries/keybinder/README
@@ -0,0 +1,5 @@
+keybinder is a library for registering global keyboard shortcuts.
+Keybinder works with GTK-based applications using the X Window System.
+This is the gtk+2 version.
+
+lua is an optional dependency.
diff --git a/libraries/keybinder/keybinder.SlackBuild b/libraries/keybinder/keybinder.SlackBuild
new file mode 100644
index 0000000000..97d0e3b50b
--- /dev/null
+++ b/libraries/keybinder/keybinder.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for keybinder
+
+# Copyright 2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=keybinder
+VERSION=${VERSION:-0.3.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+DOCS="AUTHORS COPYING* INSTALL NEWS README* examples"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --disable-static \
+ --disable-python \
+ --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/keybinder/keybinder.info b/libraries/keybinder/keybinder.info
new file mode 100644
index 0000000000..bb4b8c6cbd
--- /dev/null
+++ b/libraries/keybinder/keybinder.info
@@ -0,0 +1,10 @@
+PRGNAM="keybinder"
+VERSION="0.3.1"
+HOMEPAGE="https://github.com/kupferlauncher/keybinder/"
+DOWNLOAD="https://github.com/kupferlauncher/keybinder/releases/download/v0.3.1/keybinder-0.3.1.tar.gz"
+MD5SUM="a6d7caae0dcb040b08692b008a68a507"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/keybinder/slack-desc b/libraries/keybinder/slack-desc
new file mode 100644
index 0000000000..918225a0af
--- /dev/null
+++ b/libraries/keybinder/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+keybinder: keybinder (keyboard shortcut library)
+keybinder:
+keybinder: keybinder is a library for registering global keyboard shortcuts.
+keybinder: Keybinder works with GTK-based applications using the X Window System.
+keybinder: This is the gtk+2 version.
+keybinder:
+keybinder: homepage: http://kaizer.se/wiki/keybinder/
+keybinder:
+keybinder:
+keybinder:
+keybinder:
diff --git a/libraries/lablgtk/README b/libraries/lablgtk/README
index aac7126de1..c549b2f274 100644
--- a/libraries/lablgtk/README
+++ b/libraries/lablgtk/README
@@ -1,6 +1,6 @@
LablGTK is an Objective Caml interface to gtk+/gtk+-2
-LablGTK uses the rich type system of Objective Caml 3 to provide a strongly
+LablGTK uses the rich type system of Objective Caml to provide a strongly
typed, yet very comfortable, object-oriented interface to gtk+.
Some optional dependencies are libgnomecanvas, libgnomeui,
diff --git a/libraries/lablgtk/lablgtk.SlackBuild b/libraries/lablgtk/lablgtk.SlackBuild
index 5cb0a33e18..563eda8643 100644
--- a/libraries/lablgtk/lablgtk.SlackBuild
+++ b/libraries/lablgtk/lablgtk.SlackBuild
@@ -24,13 +24,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=lablgtk
-VERSION=${VERSION:-2.18.4}
+VERSION=${VERSION:-2.18.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -82,7 +82,7 @@ make -j1 world
make DESTDIR=$PKG install
# remove file conflicting with ocaml's ones
-rm -f $PKG/usr/lib$LIBDIRSUFFIX/ocaml/ld.conf
+rm $PKG/usr/lib$LIBDIRSUFFIX/ocaml/ld.conf || exit 1
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/libraries/lablgtk/lablgtk.info b/libraries/lablgtk/lablgtk.info
index 24707f09b1..f8136d4d2a 100644
--- a/libraries/lablgtk/lablgtk.info
+++ b/libraries/lablgtk/lablgtk.info
@@ -1,10 +1,10 @@
PRGNAM="lablgtk"
-VERSION="2.18.4"
+VERSION="2.18.8"
HOMEPAGE="http://lablgtk.forge.ocamlcore.org"
-DOWNLOAD="https://forge.ocamlcore.org/frs/download.php/1602/lablgtk-2.18.4.tar.gz"
-MD5SUM="cb95497a3a34facd70d475892a806d02"
+DOWNLOAD="https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/lablgtk-2.18.8.tar.gz"
+MD5SUM="97c1572965a2942133eaff5123775d11"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ocaml-findlib"
-MAINTAINER="Markus Hutmacher"
-EMAIL="mailing@markhu.de"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/lame/CVE-2017-15018.patch.gz b/libraries/lame/CVE-2017-15018.patch.gz
deleted file mode 100644
index 30d768d4f0..0000000000
--- a/libraries/lame/CVE-2017-15018.patch.gz
+++ /dev/null
Binary files differ
diff --git a/libraries/lame/README b/libraries/lame/README
deleted file mode 100644
index 6e4fe7db20..0000000000
--- a/libraries/lame/README
+++ /dev/null
@@ -1,5 +0,0 @@
-lame (LAME Ain't an Mp3 Encoder)
-
-LAME is an educational tool to be used for learning about MP3 encoding.
-The goal of the LAME project is to use the open source model to improve
-the psycho acoustics, noise shaping, and speed of MP3.
diff --git a/libraries/lame/lame.SlackBuild b/libraries/lame/lame.SlackBuild
deleted file mode 100644
index 368f47b1ee..0000000000
--- a/libraries/lame/lame.SlackBuild
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for lame
-
-# Copyright 2006 Martin Lefebvre <dadexter@gmail.com>
-# Copyright 2008,2010 Michiel van Wessem, Manchester, United Kingdom
-# Copyright 2019 B. Watson
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Now maintained by B. Watson <yalhcru@gmail.com>
-
-# 20191231 bkw:
-# - take over maintenance
-# - update for v3.100
-
-PRGNAM=lame
-VERSION=${VERSION:-3.100}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-# This stuff isn't needed for 3.100, but keep compatibility with the
-# old 3.99.5 version:
-if [ "$VERSION" = "3.99.5" ]; then
- # Fix for the newer gcc
- # http://www.linuxfromscratch.org/blfs/view/svn/multimedia/lame.html
- case "$ARCH" in
- i?86) sed -i -e '/xmmintrin\.h/d' configure ;;
- esac
-
- # Fix CVE-2017-15018
- zcat $CWD/CVE-2017-15018.patch.gz | patch -p1
-fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --htmldir=/usr/doc/$PRGNAM-$VERSION \
- --enable-nasm \
- --enable-static=no \
- --build=$ARCH-slackware-linux
-
-make pkgdocdir=/usr/doc/$PRGNAM-$VERSION
-make install-strip pkgdocdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG
-
-gzip -9 $PKG/usr/man/man1/$PRGNAM.1
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a API COPYING ChangeLog DEFINES HACKING INSTALL* LICENSE README* \
- STYLEGUIDE TODO USAGE $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/lame/lame.info b/libraries/lame/lame.info
deleted file mode 100644
index 3ce4d08494..0000000000
--- a/libraries/lame/lame.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="lame"
-VERSION="3.100"
-HOMEPAGE="http://lame.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/lame/lame-3.100.tar.gz"
-MD5SUM="83e260acbe4389b54fe08e0bdbf7cddb"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/libraries/lame/slack-desc b/libraries/lame/slack-desc
deleted file mode 100644
index c8c2c6d12e..0000000000
--- a/libraries/lame/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-lame: lame (LAME Ain't an Mp3 Encoder)
-lame:
-lame: LAME is an educational tool to be used for learning about MP3
-lame: encoding. The goal of the LAME project is to use the open source
-lame: model to improve the psycho acoustics, noise shaping, and speed of
-lame: MP3.
-lame:
-lame:
-lame:
-lame:
-lame:
diff --git a/libraries/libart-lgpl/README b/libraries/libart-lgpl/README
new file mode 100644
index 0000000000..1dfaf798f6
--- /dev/null
+++ b/libraries/libart-lgpl/README
@@ -0,0 +1,3 @@
+Libart is a library for high-performance 2D graphics. It was used by
+both KDE and GNOME. This is the LGPL'd component of the library.
+Raph Levien <raph@acm.org> is the author of libart.
diff --git a/libraries/libart-lgpl/libart-lgpl.SlackBuild b/libraries/libart-lgpl/libart-lgpl.SlackBuild
new file mode 100644
index 0000000000..27801d55a5
--- /dev/null
+++ b/libraries/libart-lgpl/libart-lgpl.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for libart-lgpl
+
+# Copyright 2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libart-lgpl
+VERSION=${VERSION:-r14.0.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+DOCS="AUTHORS COPYING ChangeLog NEWS README"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --disable-static \
+ --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libart-lgpl/libart-lgpl.info b/libraries/libart-lgpl/libart-lgpl.info
new file mode 100644
index 0000000000..13a7454980
--- /dev/null
+++ b/libraries/libart-lgpl/libart-lgpl.info
@@ -0,0 +1,10 @@
+PRGNAM="libart-lgpl"
+VERSION="r14.0.4"
+HOMEPAGE="http://mirror.git.trinitydesktop.org/cgit/libart-lgpl/"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/libart-lgpl-r14.0.4.tar.xz"
+MD5SUM="12e8ee49a6c843fad3a4be9b3514104a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/libart-lgpl/slack-desc b/libraries/libart-lgpl/slack-desc
new file mode 100644
index 0000000000..eb0120d1d0
--- /dev/null
+++ b/libraries/libart-lgpl/slack-desc
@@ -0,0 +1,20 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+libart-lgpl: libart_lgpl (graphics library)
+libart-lgpl:
+libart-lgpl: Libart is a library for high-performance 2D graphics. It was used by
+libart-lgpl: both KDE and GNOME. This is the LGPL'd component of the library.
+libart-lgpl: Raph Levien <raph@acm.org> is the author of libart.
+libart-lgpl:
+libart-lgpl: homepage: http://mirror.git.trinitydesktop.org/cgit/libart-lgpl/
+libart-lgpl:
+libart-lgpl:
+libart-lgpl:
+libart-lgpl:
+libart-lgpl:
diff --git a/libraries/libbluray/README b/libraries/libbluray/README
deleted file mode 100644
index aab8dd8f96..0000000000
--- a/libraries/libbluray/README
+++ /dev/null
@@ -1,15 +0,0 @@
-libbluray is an open-source library designed for Blu-Ray Discs playback for
-media players, like VLC or MPlayer. libbluray integrates navigation, playlist
-parsing, menus and BD-J. libbluray is DRM-circumvention free, and thus, safe to
-integrate in your software.
-
-Optional runtime dependencies: libaacs and libbdplus
-
-Optional build time dependency is graphviz, apache-ant and jdk. To build the
-extra bdjava capabilities, apache-ant and jdk are needed. Then run the
-slackbuild as:
-
- BDJAVA=yes sh libbluray.SlackBuild
-
-Most commercial Blu-Ray are protected by AACS or BD+ technologies and this
-library is not enough to playback those discs.
diff --git a/libraries/libbluray/libbluray.SlackBuild b/libraries/libbluray/libbluray.SlackBuild
deleted file mode 100644
index a7817f828b..0000000000
--- a/libraries/libbluray/libbluray.SlackBuild
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libbluray
-
-# Copyright 2011-2020 Larry Hajali <larryhaja[at]gmail[dot]com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libbluray
-VERSION=${VERSION:-1.2.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Hack for compiling xine plugin bindings for libbluray.
-sed -i -e '/pkg-config libbluray/d' -e 's|0644|0755|' player_wrappers/xine/Makefile
-
-# If you want bdjava enabled then set BDAJVA=yes to the slackbuild.
-if [ "${BDJAVA:-no}" == 'yes' ]; then
- OPT_ARGS="--enable-bdjava-jar"
-else
- OPT_ARGS="--disable-bdjava-jar"
-fi
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --disable-silent-rules \
- --enable-static=no \
- $OPT_ARGS \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-# Install the xine bluray plugin
-CFLAGS="$SLKCFLAGS -I$PKG/usr/include" \
-LDFLAGS="-L$PKG/usr/lib$LIBDIRSUFFIX" \
-LIBS_BD="-lbluray" \
-make -C player_wrappers/xine DESTDIR=$PKG install
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README.txt player_wrappers/xine/HOWTO $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libbluray/libbluray.info b/libraries/libbluray/libbluray.info
deleted file mode 100644
index 4abbb88185..0000000000
--- a/libraries/libbluray/libbluray.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libbluray"
-VERSION="1.2.0"
-HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-DOWNLOAD="http://ftp.videolan.org/pub/videolan/libbluray/1.2.0/libbluray-1.2.0.tar.bz2"
-MD5SUM="c3a8485ed713fc09c26d24cd1e022e0c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/libraries/libbluray/slack-desc b/libraries/libbluray/slack-desc
deleted file mode 100644
index 920e26f2a7..0000000000
--- a/libraries/libbluray/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libbluray: libbluray (Blu-Ray Disc playback library)
-libbluray:
-libbluray: libbluray is an open-source library designed for Blu-Ray Discs
-libbluray: playback for media players, like VLC or MPlayer.
-libbluray:
-libbluray: Homepage: http://www.videolan.org/developers/libbluray.html
-libbluray:
-libbluray:
-libbluray:
-libbluray:
-libbluray:
diff --git a/libraries/libc++/README b/libraries/libc++/README
deleted file mode 100644
index 6573443a04..0000000000
--- a/libraries/libc++/README
+++ /dev/null
@@ -1,5 +0,0 @@
-libc++ is the LLVM C++ standard library, targeting C++11.
-This SlackBuild will produce a version of libc++ that uses the
-libc++abi ABI interface.
-
-Note that the experimental library is NOT built by this script.
diff --git a/libraries/libc++/libc++.SlackBuild b/libraries/libc++/libc++.SlackBuild
deleted file mode 100644
index 8df3cbd82a..0000000000
--- a/libraries/libc++/libc++.SlackBuild
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libc++
-
-# Copyright 2017 Coastal Carolina University
-# Copyright 2020 Hunter Sezen California, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libc++
-VERSION=${VERSION:-3.8.0}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-tar xvf $CWD/llvm-$VERSION.src.tar.xz
-cd llvm-$VERSION.src
-
-(
- cd projects
- tar xvf $CWD/libcxx-$VERSION.src.tar.xz
- mv libcxx-$VERSION.src libcxx
- tar xvf $CWD/libcxxabi-$VERSION.src.tar.xz
- mv libcxxabi-$VERSION.src libcxxabi
-)
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
- cmake \
- -DCMAKE_C_COMPILER="clang" \
- -DCMAKE_CXX_COMPILER="clang++" \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLLVM_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \
- -DLIBCXX_INCLUDE_DOCS=ON \
- -DCMAKE_BUILD_TYPE=Release ..
- make install-libcxx install-libcxxabi DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
- grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp projects/libcxx/CREDITS.TXT \
- $PKG/usr/doc/$PRGNAM-$VERSION/libcxx-CREDITS.TXT
-cp projects/libcxx/LICENSE.TXT \
- $PKG/usr/doc/$PRGNAM-$VERSION/libcxx-LICENSE.TXT
-cp projects/libcxxabi/CREDITS.TXT \
- $PKG/usr/doc/$PRGNAM-$VERSION/libcxxabi-CREDITS.TXT
-cp projects/libcxxabi/LICENSE.TXT \
- $PKG/usr/doc/$PRGNAM-$VERSION/libcxxabi-LICENSE.TXT
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libc++/libc++.info b/libraries/libc++/libc++.info
deleted file mode 100644
index 9fd41afe86..0000000000
--- a/libraries/libc++/libc++.info
+++ /dev/null
@@ -1,14 +0,0 @@
-PRGNAM="libc++"
-VERSION="3.8.0"
-HOMEPAGE="http://libcxx.llvm.org/"
-DOWNLOAD="http://releases.llvm.org/3.8.0/llvm-3.8.0.src.tar.xz \
- http://releases.llvm.org/3.8.0/libcxx-3.8.0.src.tar.xz \
- http://releases.llvm.org/3.8.0/libcxxabi-3.8.0.src.tar.xz"
-MD5SUM="07a7a74f3c6bd65de4702bf941b511a0 \
- d6e0bdbbee39f7907ad74fd56d03b88a \
- bbe6b4d72c7c5978550d370af529bcf7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libunwind"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
diff --git a/libraries/libc++/slack-desc b/libraries/libc++/slack-desc
deleted file mode 100644
index 3991a810fa..0000000000
--- a/libraries/libc++/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libc++: libc++ (LLVM C++ standard library implementation)
-libc++:
-libc++: libc++ is a new implementation of the C++ standard library,
-libc++: targeting C++11.
-libc++:
-libc++: Homepage: http://libcxx.llvm.org/
-libc++:
-libc++:
-libc++:
-libc++:
-libc++:
diff --git a/libraries/libclaw/lib.patch b/libraries/libclaw/lib.patch
deleted file mode 100644
index 8ea8694e1a..0000000000
--- a/libraries/libclaw/lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libclaw-1.7.4/CMakeLists.orig.txt 2015-05-14 17:54:05.443919651 +0300
-+++ libclaw-1.7.4/CMakeLists.txt 2015-05-14 17:54:22.925701098 +0300
-@@ -30,7 +30,7 @@
- set( CLAW_CODE_DIR claw/code/ )
- set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/include/" )
- set( CLAW_INSTALLDIR_SOURCE include/claw/ )
--set( CLAW_INSTALLDIR_LIB lib/ )
-+set( CLAW_INSTALLDIR_LIB lib64/ )
- set( CLAW_INSTALLDIR_DOC share/doc/libclaw${CLAW_VERSION_MAJOR}/ )
- set( CLAW_TRANSLATIONS_INSTALL_DIR "share/locale" )
- set( CLAW_EXECUTABLE_DIR bin/ )
diff --git a/libraries/libclaw/libclaw.SlackBuild b/libraries/libclaw/libclaw.SlackBuild
index 1cee1fa691..7b426f6ace 100644
--- a/libraries/libclaw/libclaw.SlackBuild
+++ b/libraries/libclaw/libclaw.SlackBuild
@@ -69,9 +69,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-if [ "$ARCH" = "x86_64" ]; then
- patch -p1 < $CWD/lib.patch
-fi
+# Apply some patches from fedora
+for i in $CWD/patches/*.patch ; do patch -p1 < $i ; done
mkdir -p build
cd build
@@ -79,6 +78,7 @@ cd build
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DCMAKE_BUILD_TYPE=Release ..
make
make install DESTDIR=$PKG
diff --git a/libraries/libclaw/patches/01_libclaw-1.7.4-libdir.patch b/libraries/libclaw/patches/01_libclaw-1.7.4-libdir.patch
new file mode 100644
index 0000000000..7e1172f22b
--- /dev/null
+++ b/libraries/libclaw/patches/01_libclaw-1.7.4-libdir.patch
@@ -0,0 +1,36 @@
+diff -up libclaw-1.7.4/claw-config.in.libdir libclaw-1.7.4/claw-config.in
+--- libclaw-1.7.4/claw-config.in.libdir 2013-07-03 13:34:38.000000000 -0600
++++ libclaw-1.7.4/claw-config.in 2016-12-29 16:58:52.140591117 -0700
+@@ -140,7 +140,7 @@ while test $# -gt 0; do
+ echo -I$CLAW_INCLUDE_DIRECTORY
+ ;;
+ --libs)
+- libdirs="-L${exec_prefix}/lib "
++ libdirs="-L${exec_prefix}/@CLAW_INSTALLDIR_LIB@ "
+
+ echo -n "$libdirs"
+ echo $(print_libraries)
+diff -up libclaw-1.7.4/CMakeLists.txt.libdir libclaw-1.7.4/CMakeLists.txt
+--- libclaw-1.7.4/CMakeLists.txt.libdir 2016-12-29 16:50:24.124507641 -0700
++++ libclaw-1.7.4/CMakeLists.txt 2016-12-29 16:50:24.137508590 -0700
+@@ -30,7 +30,7 @@ endif(SVN_ENTRIES)
+ set( CLAW_CODE_DIR claw/code/ )
+ set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/include/" )
+ set( CLAW_INSTALLDIR_SOURCE include/claw/ )
+-set( CLAW_INSTALLDIR_LIB lib/ )
++set( CLAW_INSTALLDIR_LIB "lib${LIB_SUFFIX}/" )
+ set( CLAW_INSTALLDIR_DOC share/doc/libclaw${CLAW_VERSION_MAJOR}/ )
+ set( CLAW_TRANSLATIONS_INSTALL_DIR "share/locale" )
+ set( CLAW_EXECUTABLE_DIR bin/ )
+diff -up libclaw-1.7.4/cmake-module/CMakeLists.txt.libdir libclaw-1.7.4/cmake-module/CMakeLists.txt
+--- libclaw-1.7.4/cmake-module/CMakeLists.txt.libdir 2013-07-03 13:34:38.000000000 -0600
++++ libclaw-1.7.4/cmake-module/CMakeLists.txt 2016-12-29 16:50:24.148509393 -0700
+@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6)
+ project(claw:cmake-modules)
+
+ if( NOT CLAW_CMAKE_MODULES_INSTALL_PATH )
+- set( CLAW_CMAKE_MODULES_INSTALL_PATH "share/cmake/libclaw" )
++ set( CLAW_CMAKE_MODULES_INSTALL_PATH "lib${LIB_SUFFIX}/cmake/libclaw" )
+ endif( NOT CLAW_CMAKE_MODULES_INSTALL_PATH )
+
+ set( CLAW_CMAKE_MODULES
diff --git a/libraries/libclaw/patches/02_libclaw-1.7.4-gcc62.patch b/libraries/libclaw/patches/02_libclaw-1.7.4-gcc62.patch
new file mode 100644
index 0000000000..e1da77043d
--- /dev/null
+++ b/libraries/libclaw/patches/02_libclaw-1.7.4-gcc62.patch
@@ -0,0 +1,89 @@
+From a13a75306bba55538ba7d5188ffc1a7eb34f173b Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Mon, 28 Nov 2016 10:21:33 +0100
+Subject: [PATCH 1/2] Deal with correct getline() type
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+ libclaw-1.7.4/claw/code/configuration_file.cpp:
+ In member function ‘bool claw::configuration_file::get_line(std::istream&,
+ const claw::configuration_file::syntax_description&, std::__cxx11::string&) const’:
+ libclaw-1.7.4/claw/code/configuration_file.cpp:444:39: error: cannot convert
+ ‘std::basic_istream<char>’ to ‘bool’ in initialization
+ bool result = text::getline(is, line);
+---
+ claw/code/configuration_file.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/claw/code/configuration_file.cpp b/claw/code/configuration_file.cpp
+index e7bb26a..3839cff 100644
+--- a/claw/code/configuration_file.cpp
++++ b/claw/code/configuration_file.cpp
+@@ -441,7 +441,7 @@ claw::configuration_file::file_end() const
+ bool claw::configuration_file::get_line
+ ( std::istream& is, const syntax_description& syntax, std::string& line ) const
+ {
+- bool result = text::getline(is, line);
++ bool result = text::getline(is, line).good();
+
+ if ( result )
+ {
+--
+2.9.3
+
+From cadc97d9626307d2f1fcf113099c9c4ca0f7cf6b Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Mon, 28 Nov 2016 10:09:33 +0100
+Subject: [PATCH 2/2] Do something random to make C++ happy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+ In file included from /usr/include/boost/bind.hpp:22:0, libclaw-1.7.4/claw/code/tween/single_tweener.cpp:32:
+ /usr/include/boost/bind/bind.hpp: In instantiation of ‘void boost::_bi::list2<A1, A2>::operator()(boost::_bi::type<void>, F&, A&, int) [with F = void (*)(double&, double&); A = boost::_bi::rrlist1<double>; A1 = boost::reference_wrapper<double>; A2 = boost::arg<1>]’:
+ /usr/include/boost/bind/bind.hpp:1234:50: required from ‘boost::_bi::bind_t<R, F, L>::result_type boost::_bi::bind_t<R, F, L>::operator()(A1&&) [with A1 = double; R = void; F = void (*)(double&, double&); L = boost::_bi::list2<boost::reference_wrapper<double>, boost::arg<1> >; boost::_bi::bind_t<R, F, L>::result_type = void]’
+ /usr/include/boost/function/function_template.hpp:159:11: required from ‘static void boost::detail::function::void_function_obj_invoker1<FunctionObj, R, T0>::invoke(boost::detail::function::function_buffer&, T0) [with FunctionObj = boost::_bi::bind_t<void, void (*)(double&, double&), boost::_bi::list2<boost::reference_wrapper<double>, boost::arg<1> > >; R = void; T0 = double]’
+ /usr/include/boost/function/function_template.hpp:937:38: required from ‘void boost::function1<R, T1>::assign_to(Functor) [with Functor = boost::_bi::bind_t<void, void (*)(double&, double&), boost::_bi::list2<boost::reference_wrapper<double>, boost::arg<1> > >; R = void; T0 = double]’
+ /usr/include/boost/function/function_template.hpp:727:7: required from ‘boost::function1<R, T1>::function1(Functor, typename boost::enable_if_c<(! boost::is_integral<Functor>::value), int>::type) [with Functor = boost::_bi::bind_t<void, void (*)(double&, double&), boost::_bi::list2<boost::reference_wrapper<double>, boost::arg<1> > >; R = void; T0 = double; typename boost::enable_if_c<(! boost::is_integral<Functor>::value), int>::type = int]’
+ /usr/include/boost/function/function_template.hpp:1073:16: required from ‘boost::function<R(T0)>::function(Functor, typename boost::enable_if_c<(! boost::is_integral<Functor>::value), int>::type) [with Functor = boost::_bi::bind_t<void, void (*)(double&, double&), boost::_bi::list2<boost::reference_wrapper<double>, boost::arg<1> > >; R = void; T0 = double; typename boost::enable_if_c<(! boost::is_integral<Functor>::value), int>::type = int]’
+ /usr/include/boost/function/function_template.hpp:1126:5: required from ‘typename boost::enable_if_c<(! boost::is_integral<Functor>::value), boost::function<R(T0)>&>::type boost::function<R(T0)>::operator=(Functor) [with Functor = boost::_bi::bind_t<void, void (*)(double&, double&), boost::_bi::list2<boost::reference_wrapper<double>, boost::arg<1> > >; R = void; T0 = double; typename boost::enable_if_c<(! boost::is_integral<Functor>::value), boost::function<R(T0)>&>::type = boost::function<void(double)>&]’
+ libclaw-1.7.4/claw/code/tween/single_tweener.cpp:125:62: required from here
+ /usr/include/boost/bind/bind.hpp:319:35: error: invalid initialization of non-const reference of type ‘double&’ from an rvalue of type ‘double’
+ unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_]);
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ CMakeFiles/claw_tween-static.dir/build.make:89: recipe for target 'CMakeFiles/claw_tween-static.dir/claw/code/tween/single_tweener.cpp.o' failed
+---
+ claw/code/tween/single_tweener.cpp | 2 +-
+ claw/tween/single_tweener.hpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/claw/code/tween/single_tweener.cpp b/claw/code/tween/single_tweener.cpp
+index 2a3c7fe..d173eec 100644
+--- a/claw/code/tween/single_tweener.cpp
++++ b/claw/code/tween/single_tweener.cpp
+@@ -241,7 +241,7 @@ double claw::tween::single_tweener::do_update( double dt )
+ const double result = dt - t;
+ m_date += t;
+
+- const double val( get_value() );
++ double val( get_value() );
+
+ m_callback(val);
+
+diff --git a/claw/tween/single_tweener.hpp b/claw/tween/single_tweener.hpp
+index 9f05671..f730cfa 100644
+--- a/claw/tween/single_tweener.hpp
++++ b/claw/tween/single_tweener.hpp
+@@ -51,7 +51,7 @@ namespace claw
+ public:
+ /** \brief The type of the function called when the single_tweener is
+ updated. */
+- typedef boost::function<void (double)> update_function;
++ typedef boost::function<void (double&)> update_function;
+
+ /** \brief The type of the function used to compute the new value. */
+ typedef boost::function<double (double)> easing_function;
+--
+2.9.3
+
diff --git a/libraries/libclaw/patches/03_libclaw-1.7.4-gcc7.patch b/libraries/libclaw/patches/03_libclaw-1.7.4-gcc7.patch
new file mode 100644
index 0000000000..dd89e3e256
--- /dev/null
+++ b/libraries/libclaw/patches/03_libclaw-1.7.4-gcc7.patch
@@ -0,0 +1,36 @@
+Patch taken from upstream and edited for use in Fedora:
+
+commit 6033275773313fe052f6e222321a8ec87587fbe6
+Author: Julien Jorge <julien.jorge@iscool-e.com>
+Date: Thu Apr 24 20:39:18 2014 +0200
+
+ Fix various errors pointed by clang on iOS.
+
+diff --git a/claw/impl/box_2d.tpp b/claw/impl/box_2d.tpp
+index e4b6936..71f3883 100644
+--- a/claw/impl/box_2d.tpp
++++ b/claw/impl/box_2d.tpp
+@@ -136,8 +136,8 @@ template<typename U>
+ claw::math::box_2d<U> claw::math::box_2d<T>::cast_value_type_to() const
+ {
+ return claw::math::box_2d<U>
+- ( first_point.cast_value_type_to<U>(),
+- second_point.cast_value_type_to<U>() );
++ ( first_point.template cast_value_type_to<U>(),
++ second_point.template cast_value_type_to<U>() );
+ } // box_2d::cast_value_type_to()
+
+ /*----------------------------------------------------------------------------*/
+diff --git a/claw/impl/rectangle.tpp b/claw/impl/rectangle.tpp
+index 9e6f14a..3c3c8f3 100644
+--- a/claw/impl/rectangle.tpp
++++ b/claw/impl/rectangle.tpp
+@@ -140,7 +140,7 @@ template<typename U>
+ claw::math::rectangle<U> claw::math::rectangle<T>::cast_value_type_to() const
+ {
+ return claw::math::rectangle<U>
+- ( position.cast_value_type_to<U>(), (U)width, (U)height );
++ ( position.template cast_value_type_to<U>(), (U)width, (U)height );
+ } // rectangle::cast_value_type_to()
+
+ /*----------------------------------------------------------------------------*/
diff --git a/libraries/libcue/README b/libraries/libcue/README
deleted file mode 100644
index 1284d6e548..0000000000
--- a/libraries/libcue/README
+++ /dev/null
@@ -1 +0,0 @@
-This is the CUE Sheet Parser Library project ("libcue").
diff --git a/libraries/libcue/libcue.SlackBuild b/libraries/libcue/libcue.SlackBuild
deleted file mode 100644
index cdc656418d..0000000000
--- a/libraries/libcue/libcue.SlackBuild
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for libcue
-#
-# Copyright 2010-2015 Erik W. Hanson, Minneapolis, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libcue
-VERSION=${VERSION:-1.4.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-static \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog NEWS README \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libcue/libcue.info b/libraries/libcue/libcue.info
deleted file mode 100644
index 12dc15bbf6..0000000000
--- a/libraries/libcue/libcue.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libcue"
-VERSION="1.4.0"
-HOMEPAGE="https://github.com/lipnitsk/libcue"
-DOWNLOAD="https://github.com/lipnitsk/libcue/releases/download/v1.4.0/libcue-1.4.0.tar.bz2"
-MD5SUM="5f5045f00e6ac92d9a057fe5b0982c69"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
diff --git a/libraries/libcue/slack-desc b/libraries/libcue/slack-desc
deleted file mode 100644
index 8f3c749094..0000000000
--- a/libraries/libcue/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libcue: libcue (CUE Sheet Parser Library)
-libcue:
-libcue: This is the CUE Sheet Parser Library project ("libcue")
-libcue:
-libcue:
-libcue:
-libcue:
-libcue:
-libcue:
-libcue:
-libcue:
diff --git a/libraries/libcuefile/libcuefile.SlackBuild b/libraries/libcuefile/libcuefile.SlackBuild
index 4111753fbb..499da0205c 100644
--- a/libraries/libcuefile/libcuefile.SlackBuild
+++ b/libraries/libcuefile/libcuefile.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Slackware build script for libreplaygain
+# Slackware build script for libcuefile
# Written by Å ime Ramov <s@ramov.com>
PRGNAM=libcuefile
@@ -10,7 +10,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -21,8 +21,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -45,10 +45,10 @@ tar xzvf $CWD/$PRGNAM\_$VERSION.tar.gz
cd $PRGNAM\_$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# adding missing include files to CMakeLists.txt
echo 'INSTALL(FILES ${libcuefile_SOURCE_DIR}/include/cuetools/cuefile.h ${libcuefile_SOURCE_DIR}/include/cuetools/cd.h ${libcuefile_SOURCE_DIR}/include/cuetools/cdtext.h DESTINATION include/cuetools)' >> src/CMakeLists.txt
@@ -59,12 +59,12 @@ cmake \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=${LIBDIRSUFFIX}
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} .
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/libdbus-c++/gcc47.patch b/libraries/libdbus-c++/gcc47.patch
deleted file mode 100644
index 6a82773006..0000000000
--- a/libraries/libdbus-c++/gcc47.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/eventloop-integration.cpp.orig 2012-05-09 11:22:09.683290763 +0200
-+++ src/eventloop-integration.cpp 2012-05-09 11:22:44.313288912 +0200
-@@ -38,6 +38,7 @@
- #include <cassert>
- #include <sys/poll.h>
- #include <fcntl.h>
-+#include <unistd.h>
-
- using namespace DBus;
- using namespace std;
diff --git a/libraries/libdbus-c++/libdbus-c++.SlackBuild b/libraries/libdbus-c++/libdbus-c++.SlackBuild
index 3df02abcb3..77bbd394c2 100644
--- a/libraries/libdbus-c++/libdbus-c++.SlackBuild
+++ b/libraries/libdbus-c++/libdbus-c++.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libdbus-c++
-VERSION=${VERSION:-0.9.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20160924_e3455d2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,22 +60,20 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Fix compiling with newer gcc versions
-patch -p0 -i $CWD/gcc47.patch
+# Apply some patches (thanks opensuse!)
+for i in $CWD/patches/*.patch ; do patch -p0 < $i ; done
-# Fix https://sourceforge.net/p/dbus-cplusplus/bugs/5/
-patch -p1 -i $CWD/nested_variant_map.patch
+./bootstrap
-LDFLAGS="-lpthread" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/libraries/libdbus-c++/libdbus-c++.info b/libraries/libdbus-c++/libdbus-c++.info
index df6ec8de77..264ec943dc 100644
--- a/libraries/libdbus-c++/libdbus-c++.info
+++ b/libraries/libdbus-c++/libdbus-c++.info
@@ -1,8 +1,8 @@
PRGNAM="libdbus-c++"
-VERSION="0.9.0"
+VERSION="20160924_e3455d2"
HOMEPAGE="http://dbus-cplusplus.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/dbus-cplusplus/libdbus-c++-0.9.0.tar.gz"
-MD5SUM="e752116f523fa88ef041e63d3dee4de2"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/libdbus-c++-20160924_e3455d2.tar.xz"
+MD5SUM="f6aa26e23d73fa0f02d03e68932f8be7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/libdbus-c++/nested_variant_map.patch b/libraries/libdbus-c++/nested_variant_map.patch
deleted file mode 100644
index 8b41ed3a3a..0000000000
--- a/libraries/libdbus-c++/nested_variant_map.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdbus-c++-0.9.0/src/message.cpp 2016-02-20 12:15:52.069704535 +0100
-+++ libdbus-c++-0.9.0-patch/src/message.cpp 2016-02-20 12:31:34.159854472 +0100
-@@ -347,6 +347,7 @@
- (
- (DBusMessageIter *) & (to._iter),
- from.type(),
-- from.type() == DBUS_TYPE_VARIANT ? NULL : sig,
-+ from.type() == DBUS_TYPE_DICT_ENTRY ||
-+ from.type() == DBUS_TYPE_STRUCT ? NULL : sig,
- (DBusMessageIter *) & (to_container._iter)
- );
diff --git a/libraries/libdbus-c++/patches/libdbus-c++-gcc7.patch b/libraries/libdbus-c++/patches/libdbus-c++-gcc7.patch
new file mode 100644
index 0000000000..42efd3ab8a
--- /dev/null
+++ b/libraries/libdbus-c++/patches/libdbus-c++-gcc7.patch
@@ -0,0 +1,11 @@
+Index: src/pipe.cpp
+===================================================================
+--- src/pipe.cpp.orig 2011-11-30 00:16:31.000000000 +0200
++++ src/pipe.cpp 2017-03-27 10:34:55.261175583 +0200
+@@ -83,5 +83,5 @@ ssize_t Pipe::read(void *buffer, unsigne
+ void Pipe::signal()
+ {
+ // TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work...
+- ::write(_fd_write, '\0', 1);
++ ::write(_fd_write, 0, 1);
+ }
diff --git a/libraries/libdbus-c++/patches/libdbus-c++-glibmm-2.43.patch b/libraries/libdbus-c++/patches/libdbus-c++-glibmm-2.43.patch
new file mode 100644
index 0000000000..56bce80d17
--- /dev/null
+++ b/libraries/libdbus-c++/patches/libdbus-c++-glibmm-2.43.patch
@@ -0,0 +1,13 @@
+--- examples/glib/dbus-browser.h.orig 2016-09-24 11:03:56.000000000 +0200
++++ examples/glib/dbus-browser.h 2017-06-21 14:58:48.350046047 +0200
+@@ -1,9 +1,9 @@
+ #ifndef __DEMO_DBUS_BROWSER_H
+ #define __DEMO_DBUS_BROWSER_H
+
++#include <gtkmm.h>
+ #include <dbus-c++/dbus.h>
+ #include <dbus-c++/glib-integration.h>
+-#include <gtkmm.h>
+
+ #include "dbus-glue.h"
+
diff --git a/libraries/libdbus-c++/patches/libdbus-c++-nodocdatetime.patch b/libraries/libdbus-c++/patches/libdbus-c++-nodocdatetime.patch
new file mode 100644
index 0000000000..68684c8add
--- /dev/null
+++ b/libraries/libdbus-c++/patches/libdbus-c++-nodocdatetime.patch
@@ -0,0 +1,25 @@
+Index: doc/foot.html
+===================================================================
+--- doc/foot.html.orig 2016-09-24 11:03:56.000000000 +0200
++++ doc/foot.html 2017-04-10 15:51:55.951931300 +0200
+@@ -10,7 +10,6 @@
+ <table><tr>
+ <td></td>
+ <td class="copyright">Copyright &copy;$year DBus-C++ Project</td>
+- <td class="generated">Docs generated $datetime</td>
+ </tr></table>
+ </div>
+
+Index: doc/Doxyfile.in
+===================================================================
+--- doc/Doxyfile.in.orig 2016-09-24 11:03:56.000000000 +0200
++++ doc/Doxyfile.in 2017-04-10 15:54:18.748279756 +0200
+@@ -836,7 +836,7 @@ HTML_STYLESHEET = @srcdir@/dbus-c
+ # page will contain the date and time when the page was generated. Setting
+ # this to NO can help when comparing the output of multiple runs.
+
+-HTML_TIMESTAMP = YES
++HTML_TIMESTAMP = NO
+
+ # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+ # files or namespaces will be aligned in HTML using tables. If set to
diff --git a/libraries/libdbus-c++/patches/libdbus-c++-noreturn.patch b/libraries/libdbus-c++/patches/libdbus-c++-noreturn.patch
new file mode 100644
index 0000000000..b87abf331f
--- /dev/null
+++ b/libraries/libdbus-c++/patches/libdbus-c++-noreturn.patch
@@ -0,0 +1,21 @@
+Index: include/dbus-c++/util.h
+===================================================================
+--- include/dbus-c++/util.h.orig 2011-11-28 17:03:19.000000000 +0200
++++ include/dbus-c++/util.h 2012-03-11 13:21:18.851849466 +0200
+@@ -243,6 +243,7 @@ public:
+ // TODO: think about return type in this case
+ // this assert should help me to find the use case where it's needed...
+ //assert (false);
++ return _cb->call(param);
+ }
+
+ R call(P param) const
+@@ -255,6 +256,8 @@ public:
+ // TODO: think about return type in this case
+ // this assert should help me to find the use case where it's needed...
+ //assert (false);
++ return _cb->call(param);
++
+ }
+
+ bool empty() const
diff --git a/libraries/libdbus-c++/patches/libdbus-c++-pthread.patch b/libraries/libdbus-c++/patches/libdbus-c++-pthread.patch
new file mode 100644
index 0000000000..38b3878ac2
--- /dev/null
+++ b/libraries/libdbus-c++/patches/libdbus-c++-pthread.patch
@@ -0,0 +1,11 @@
+Index: dbus-c++-1.pc.in
+===================================================================
+--- dbus-c++-1.pc.in.orig 2011-11-28 22:52:01.000000000 +0200
++++ dbus-c++-1.pc.in 2012-03-11 15:49:36.452603560 +0200
+@@ -7,5 +7,5 @@ Name: @PACKAGE@
+ Description: Native C++ bindings for D-Bus
+ Requires: dbus-1
+ Version: @VERSION@
+-Libs: -L${libdir} -ldbus-c++-1
++Libs: -L${libdir} -ldbus-c++-1 -lpthread
+ Cflags: -I${includedir}/dbus-c++-1 -DDBUS_API_SUBJECT_TO_CHANGE
diff --git a/libraries/libdbus-c++/patches/libdbus-c++-sover.patch b/libraries/libdbus-c++/patches/libdbus-c++-sover.patch
new file mode 100644
index 0000000000..3517991846
--- /dev/null
+++ b/libraries/libdbus-c++/patches/libdbus-c++-sover.patch
@@ -0,0 +1,28 @@
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am.orig 2016-09-24 11:03:56.000000000 +0200
++++ src/Makefile.am 2017-03-28 14:53:22.941031645 +0200
+@@ -28,6 +28,9 @@ libdbus_c___1_la_CXXFLAGS = \
+ -I$(top_srcdir)/include \
+ -Wno-unused-parameter
+
++libdbus_c___1_la_LDFLAGS= \
++ -version-info "$(SOVER)"
++
+ libdbus_c___1_la_LIBADD = \
+ $(dbus_LIBS)
+
+Index: src/integration/glib/Makefile.am
+===================================================================
+--- src/integration/glib/Makefile.am.orig 2016-09-24 11:03:56.000000000 +0200
++++ src/integration/glib/Makefile.am 2017-03-28 15:04:24.695822590 +0200
+@@ -16,6 +16,9 @@ libdbus_c___glib_1_la_LIBADD = \
+ $(dbus_LIBS) \
+ $(glib_LIBS)
+
++libdbus_c___glib_1_la_LDFLAGS= \
++ -version-info "$(SOVER)"
++
+ AM_CPPFLAGS = \
+ $(dbus_CFLAGS) \
+ $(glib_CFLAGS)
diff --git a/libraries/libdbusmenu/libdbusmenu.SlackBuild b/libraries/libdbusmenu/libdbusmenu.SlackBuild
index 554247df9c..de7200eff1 100644
--- a/libraries/libdbusmenu/libdbusmenu.SlackBuild
+++ b/libraries/libdbusmenu/libdbusmenu.SlackBuild
@@ -84,6 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
+ --disable-gtk-doc \
--build=$ARCH-slackware-linux
make
diff --git a/libraries/libedit/README b/libraries/libedit/README
deleted file mode 100644
index b1bcec0aea..0000000000
--- a/libraries/libedit/README
+++ /dev/null
@@ -1,12 +0,0 @@
-This is an autotool- and libtoolized port of the NetBSD Editline library
-(libedit). This Berkeley-style licensed command line editor library
-provides generic line editing, history, and tokenization functions,
-similar to those found in GNU Readline.
-
-The slackbuild has a build time variable called LIBEDIT_WIDEC, which if
-set to `yes', turns on the wide character support of the built libedit
-library. Although the support is there, initial testing shows that it
-acts weird, and displays Unicode byte sequences instead of the real
-typed-in characters. You can experiment with it, but don't count on it
-until it is cleared up. The default build option was and is disabled
-widechar support.
diff --git a/libraries/libedit/libedit.SlackBuild b/libraries/libedit/libedit.SlackBuild
deleted file mode 100644
index d8786407b9..0000000000
--- a/libraries/libedit/libedit.SlackBuild
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libedit
-
-# Copyright 2011 Mikko Värri, Finland
-# Copyright 2013-2019 LEVAI Daniel
-# Copyright 2020 Donald Cooley, South Haven, Indiana, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libedit
-VERSION=${VERSION:-20191231_3.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-SRC_VERSION=$(echo $VERSION | tr _ -)
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$SRC_VERSION
-tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz
-cd $PRGNAM-$SRC_VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-if [ "${LIBEDIT_WIDEC}" = 'yes' ];then
- LIBEDIT_WIDEC='--enable-widec'
-else
- LIBEDIT_WIDEC='--disable-widec'
-fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --disable-static \
- --build=$ARCH-slackware-linux \
-
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog INSTALL THANKS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libedit/libedit.info b/libraries/libedit/libedit.info
deleted file mode 100644
index 769d994479..0000000000
--- a/libraries/libedit/libedit.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libedit"
-VERSION="20191231_3.1"
-HOMEPAGE="https://www.thrysoee.dk/editline/"
-DOWNLOAD="https://thrysoee.dk/editline/libedit-20191231-3.1.tar.gz"
-MD5SUM="2e22a51131de94ff2df24901f7cfe416"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
diff --git a/libraries/libedit/slack-desc b/libraries/libedit/slack-desc
deleted file mode 100644
index b2d9e4a965..0000000000
--- a/libraries/libedit/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libedit: libedit (Command line editor library)
-libedit:
-libedit: This is an autotool- and libtoolized port of the NetBSD Editline
-libedit: library (libedit). This Berkeley-style licensed command line editor
-libedit: library provides generic line editing, history, and tokenization
-libedit: functions, similar to those found in GNU Readline.
-libedit:
-libedit: Homepage: https://www.thrysoee.dk/editline/
-libedit:
-libedit:
-libedit:
diff --git a/libraries/libevhtp/libevhtp.SlackBuild b/libraries/libevhtp/libevhtp.SlackBuild
index 4b6993221c..0697ea8e9c 100644
--- a/libraries/libevhtp/libevhtp.SlackBuild
+++ b/libraries/libevhtp/libevhtp.SlackBuild
@@ -25,13 +25,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libevhtp
-VERSION=${VERSION:-1.2.10}
+VERSION=${VERSION:-1.2.16}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -74,6 +74,8 @@ find -L . \
# fix wrong version number
sed -i "s/@PROJECT_VERSION@/${VERSION}/" evhtp.pc.in
+sed -i "s|/lib/pkgconfig|/lib$LIBDIRSUFFIX/pkgconfig|" CMakeLists.txt
+
mkdir -p build
cd build
cmake \
diff --git a/libraries/libevhtp/libevhtp.info b/libraries/libevhtp/libevhtp.info
index 64efb10f0f..cdd66ddc85 100644
--- a/libraries/libevhtp/libevhtp.info
+++ b/libraries/libevhtp/libevhtp.info
@@ -1,8 +1,8 @@
PRGNAM="libevhtp"
-VERSION="1.2.10"
+VERSION="1.2.16"
HOMEPAGE="https://github.com/criticalstack/libevhtp"
-DOWNLOAD="https://github.com/criticalstack/libevhtp/archive/1.2.10/libevhtp-1.2.10.tar.gz"
-MD5SUM="e7261c7e34654f78047431d169b88806"
+DOWNLOAD="https://github.com/criticalstack/libevhtp/archive/1.2.16/libevhtp-1.2.16.tar.gz"
+MD5SUM="6eebc21fe41201612ac814764bf7474a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/libffado/libffado-2.4.2-python38.patch b/libraries/libffado/libffado-2.4.2-python38.patch
new file mode 100644
index 0000000000..d0ad2e956d
--- /dev/null
+++ b/libraries/libffado/libffado-2.4.2-python38.patch
@@ -0,0 +1,24 @@
+diff -ruN a/support/mixer-qt4/ffado/configuration.py b/support/mixer-qt4/ffado/configuration.py
+--- a/support/mixer-qt4/ffado/configuration.py 2017-03-28 13:38:34.000000000 +0200
++++ b/support/mixer-qt4/ffado/configuration.py 2019-11-24 20:55:05.284341627 +0100
+@@ -20,7 +20,8 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #
+
+-import re, os
++import os
++import dbus
+
+ import shlex
+
+@@ -53,6 +54,10 @@
+ self.addDevice( dev )
+
+ def getDeviceById( self, vendor, model ):
++ if isinstance(vendor, dbus.Int32):
++ vendor = str(int(vendor))
++ if isinstance(model, dbus.Int32):
++ model = str(int(model))
+ log.debug("DeviceList::getDeviceById( %s, %s )" % (vendor, model ))
+ for dev in self.devices:
+ if int("%s" % dev['vendorid'], 0) == int("%s" % vendor, 0) and \
diff --git a/libraries/libffado/libffado-mixer.patch b/libraries/libffado/libffado-mixer.patch
deleted file mode 100644
index 30ab57ce1d..0000000000
--- a/libraries/libffado/libffado-mixer.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/tests/test-enhanced-mixer.cpp
-+++ b/tests/test-enhanced-mixer.cpp
-@@ -77,7 +77,7 @@
- exit(0);
- }
-
-- int errno = 0;
-+ extern int errno;
- char* tail;
- int node_id = strtol( argv[1], &tail, 0 );
- int fb_id = strtol( argv[2], &tail, 0 );
---- a/tests/test-mixer.cpp
-+++ b/tests/test-mixer.cpp
-@@ -227,7 +227,7 @@
- exit(0);
- }
-
-- int errno = 0;
-+ extern int errno;
- char* tail;
- int port = strtol( argv[1], &tail, 0 );
- int node_id = strtol( argv[2], &tail, 0 );
---- a/tests/test-pan.cpp
-+++ b/tests/test-pan.cpp
-@@ -131,7 +131,7 @@
- exit(0);
- }
-
-- int errno = 0;
-+ extern int errno;
- char* tail;
- int node_id = strtol( argv[1], &tail, 0 );
- int fb_id = strtol( argv[2], &tail, 0 );
---- a/tests/test-volume.cpp
-+++ b/tests/test-volume.cpp
-@@ -127,7 +127,7 @@
- exit(0);
- }
-
-- int errno = 0;
-+ extern int errno;
- char* tail;
- int node_id = strtol( argv[1], &tail, 0 );
- int fb_id = strtol( argv[2], &tail, 0 );
-
diff --git a/libraries/libffado/libffado.SlackBuild b/libraries/libffado/libffado.SlackBuild
index f0bc67fb3b..3bdea71f19 100644
--- a/libraries/libffado/libffado.SlackBuild
+++ b/libraries/libffado/libffado.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libffado
-VERSION=${VERSION:-2.2.1}
+VERSION=${VERSION:-2.4.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
TARGET="i386"
elif [ "$ARCH" = "i686" ]; then
@@ -69,25 +69,20 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Use our CFLAGS
-sed -i "s/-O2 -DNDEBUG/$SLKCFLAGS -DNDEBUG/" SConstruct
-
-patch -p1 < $CWD/libffado-mixer.patch
+patch -p1 < $CWD/libffado-2.4.2-python38.patch
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=gnu++11 -Wno-deprecated-declarations" \
scons \
PREFIX=/usr \
LIBDIR=/usr/lib${LIBDIRSUFFIX} \
DIST_TARGET="$TARGET" \
- COMPILE_FLAGS="$CFLAGS -std=gnu++11" \
+ CUSTOM_ENV="True" \
DEBUG="False"
scons \
- --implicit-deps-unchanged \
- PREFIX=/usr \
- LIBDIR=/usr/lib${LIBDIRSUFFIX} \
- DIST_TARGET="$TARGET" \
- DEBUG="False" \
DESTDIR=$PKG \
+ WILL_DEAL_WITH_XDG_MYSELF="True" \
install
mkdir -p $PKG/usr/share/{applications,pixmaps}
diff --git a/libraries/libffado/libffado.info b/libraries/libffado/libffado.info
index 04eee7ed85..69c2e4e9cb 100644
--- a/libraries/libffado/libffado.info
+++ b/libraries/libffado/libffado.info
@@ -1,10 +1,10 @@
PRGNAM="libffado"
-VERSION="2.2.1"
+VERSION="2.4.2"
HOMEPAGE="http://www.ffado.org/"
-DOWNLOAD="http://www.ffado.org/files/libffado-2.2.1.tgz"
-MD5SUM="e113d828835051f835fb4a329cb0cbd4"
+DOWNLOAD="http://www.ffado.org/files/libffado-2.4.2.tgz"
+MD5SUM="2b7eddffeaac68cdd145928a6cb62540"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="libconfig libiec61883 libxml++"
+REQUIRES="libconfig libdbus-c++ libiec61883 libxml++"
MAINTAINER="Heinz Wiesinger"
EMAIL="pprkut@liwjatan.at"
diff --git a/libraries/libfilezilla/libfilezilla.SlackBuild b/libraries/libfilezilla/libfilezilla.SlackBuild
index 7b78cb007d..fcd78d6b20 100644
--- a/libraries/libfilezilla/libfilezilla.SlackBuild
+++ b/libraries/libfilezilla/libfilezilla.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libfilezilla
-VERSION=${VERSION:-0.16.0}
+VERSION=${VERSION:-0.21.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/libraries/libfilezilla/libfilezilla.info b/libraries/libfilezilla/libfilezilla.info
index a8fcd5e7ef..d831a31084 100644
--- a/libraries/libfilezilla/libfilezilla.info
+++ b/libraries/libfilezilla/libfilezilla.info
@@ -1,8 +1,8 @@
PRGNAM="libfilezilla"
-VERSION="0.16.0"
+VERSION="0.21.0"
HOMEPAGE="https://lib.filezilla-project.org/"
-DOWNLOAD="https://download.filezilla-project.org/libfilezilla/libfilezilla-0.16.0.tar.bz2"
-MD5SUM="045c8358067e48d8a2584284e8676139"
+DOWNLOAD="https://download.filezilla-project.org/libfilezilla/libfilezilla-0.21.0.tar.bz2"
+MD5SUM="40b8f122e43b640cb9e6597fb1b1081a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/libfreehand/Add-missing-semicolon-to-fix-build-with-icu-65.1.patch b/libraries/libfreehand/Add-missing-semicolon-to-fix-build-with-icu-65.1.patch
new file mode 100644
index 0000000000..2a904e4fb7
--- /dev/null
+++ b/libraries/libfreehand/Add-missing-semicolon-to-fix-build-with-icu-65.1.patch
@@ -0,0 +1,29 @@
+From af3197f795625f5188602073205a34369698b6df Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 4 Oct 2019 01:46:12 +0200
+Subject: [PATCH] Add missing semicolon to fix build with icu 65.1
+
+Change-Id: I7a0b0d600e9f7770245a7485813a944bfac4f088
+Reviewed-on: https://gerrit.libreoffice.org/80224
+Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
+Tested-by: Miklos Vajna <vmiklos@collabora.com>
+---
+ src/lib/libfreehand_utils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/libfreehand_utils.cpp b/src/lib/libfreehand_utils.cpp
+index 439c457..32f23e0 100644
+--- a/src/lib/libfreehand_utils.cpp
++++ b/src/lib/libfreehand_utils.cpp
+@@ -162,7 +162,7 @@ void libfreehand::_appendUTF16(librevenge::RVNGString &text, std::vector<unsigne
+ while (j < length)
+ {
+ UChar32 c;
+- U16_NEXT(s, j, length, c)
++ U16_NEXT(s, j, length, c);
+ unsigned char outbuf[U8_MAX_LENGTH+1];
+ int i = 0;
+ U8_APPEND_UNSAFE(&outbuf[0], i, c);
+--
+2.23.0
+
diff --git a/libraries/libfreehand/libfreehand.SlackBuild b/libraries/libfreehand/libfreehand.SlackBuild
index 59c1ad8258..a52617bf0a 100644
--- a/libraries/libfreehand/libfreehand.SlackBuild
+++ b/libraries/libfreehand/libfreehand.SlackBuild
@@ -79,6 +79,8 @@ else
cppunit='--disable-tests'
fi
+patch -p1 < $CWD/Add-missing-semicolon-to-fix-build-with-icu-65.1.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/libraries/libgexiv2/README b/libraries/libgexiv2/README
deleted file mode 100644
index 40c7cae33c..0000000000
--- a/libraries/libgexiv2/README
+++ /dev/null
@@ -1,3 +0,0 @@
-gexiv2 is a GObject wrapper around the Exiv2 photo metadata library.
-It allows for GNOME applications to easily inspect and update
-EXIF, IPTC, and XMP metadata in photo files of various formats.
diff --git a/libraries/libgexiv2/libgexiv2.SlackBuild b/libraries/libgexiv2/libgexiv2.SlackBuild
deleted file mode 100644
index be7abf73da..0000000000
--- a/libraries/libgexiv2/libgexiv2.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for entangle
-
-# Copyright 2014 Soydaner Ulker Istanbul,Turkey
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libgexiv2
-SRCNAM=gexiv2
-VERSION=${VERSION:-0.10.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --enable-introspection \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS README THANKS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libgexiv2/libgexiv2.info b/libraries/libgexiv2/libgexiv2.info
deleted file mode 100644
index 6942a4f407..0000000000
--- a/libraries/libgexiv2/libgexiv2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libgexiv2"
-VERSION="0.10.3"
-HOMEPAGE="https://wiki.gnome.org/gexiv2"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gexiv2/0.10/gexiv2-0.10.3.tar.xz"
-MD5SUM="f255100a009027d4eaa0f075bb79c655"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="vala"
-MAINTAINER="Soydaner Ulker"
-EMAIL="soydaner@kahverengi.com"
diff --git a/libraries/libgexiv2/slack-desc b/libraries/libgexiv2/slack-desc
deleted file mode 100644
index ae4dcb9130..0000000000
--- a/libraries/libgexiv2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libgexiv2: libgexiv2 (GObject wrapper around Exiv2 library)
-libgexiv2:
-libgexiv2: gexiv2 is a GObject wrapper around the Exiv2 photo metadata library.
-libgexiv2: It allows for GNOME applications to easily inspect and update EXIF,
-libgexiv2: IPTC, and XMP metadata in photo files of various formats.
-libgexiv2: Homepage: https://wiki.gnome.org/gexiv2
-libgexiv2:
-libgexiv2:
-libgexiv2:
-libgexiv2:
-libgexiv2:
diff --git a/libraries/libgksu/libgksu.SlackBuild b/libraries/libgksu/libgksu.SlackBuild
index 6bdbbe3bb9..994ea9b76f 100644
--- a/libraries/libgksu/libgksu.SlackBuild
+++ b/libraries/libgksu/libgksu.SlackBuild
@@ -99,6 +99,7 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-schemas-install \
--enable-shared \
--disable-static \
+ --disable-gtk-doc \
--build=$ARCH-slackware-linux
make
diff --git a/libraries/libgme/libgme.SlackBuild b/libraries/libgme/libgme.SlackBuild
index aff3006026..5c31220d83 100644
--- a/libraries/libgme/libgme.SlackBuild
+++ b/libraries/libgme/libgme.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=libgme
_PRGNAM=game-music-emu
-VERSION=${VERSION:-0.6.2}
+VERSION=${VERSION:-0.6.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/libraries/libgme/libgme.info b/libraries/libgme/libgme.info
index 9b59d4ba1a..6a76066f60 100644
--- a/libraries/libgme/libgme.info
+++ b/libraries/libgme/libgme.info
@@ -1,8 +1,8 @@
PRGNAM="libgme"
-VERSION="0.6.2"
+VERSION="0.6.3"
HOMEPAGE="https://bitbucket.org/mpyne/game-music-emu/wiki/Home"
-DOWNLOAD="https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-0.6.2.tar.xz"
-MD5SUM="057ddaff2af5f8b4a7c8d11c45e1ea00"
+DOWNLOAD="https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-0.6.3.tar.xz"
+MD5SUM="c96c65efbadc9acb10c0f9382ba66e0d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/libgnome/libgnome.SlackBuild b/libraries/libgnome/libgnome.SlackBuild
index 15083db758..a05779e965 100644
--- a/libraries/libgnome/libgnome.SlackBuild
+++ b/libraries/libgnome/libgnome.SlackBuild
@@ -69,6 +69,12 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# https://github.com/voidlinux/void-packages/commit/f16a2d557e84f5d7f5ece8b2022aab4fd17aa0ce
+for f in $(find . -type f -exec file "{}" \; | grep "C source" | cut -d ':' -f1); do
+ echo "${f}"
+ recode ISO-8859-1..UTF-8 "${f}"
+done
+
# Fix for the newer glib
sed -i "/-DG_DISABLE_DEPRECATED/d" libgnome/Makefile.*
diff --git a/libraries/libgnome/libgnome.info b/libraries/libgnome/libgnome.info
index 5b173bffdb..1fe704d75d 100644
--- a/libraries/libgnome/libgnome.info
+++ b/libraries/libgnome/libgnome.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/libgnome/2.32/libgnome-2.32.1.
MD5SUM="a4345e6087ae6195d65a4674ffdca559"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="gnome-vfs"
+REQUIRES="gnome-vfs recode"
MAINTAINER="Erik Hanson"
EMAIL="erik@slackbuilds.org"
diff --git a/libraries/libgnomecanvas/libgnomecanvas.info b/libraries/libgnomecanvas/libgnomecanvas.info
index 5d5066e396..4c42aff604 100644
--- a/libraries/libgnomecanvas/libgnomecanvas.info
+++ b/libraries/libgnomecanvas/libgnomecanvas.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.30/libgnomecan
MD5SUM="ffcbb719c671ff5cd86e59aeba8d0b92"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libart-lgpl"
MAINTAINER="Erik Hanson"
EMAIL="erik@slackbuilds.org"
diff --git a/libraries/libgnomeprint/libgnomeprint.SlackBuild b/libraries/libgnomeprint/libgnomeprint.SlackBuild
index 931db6a313..ffec017e14 100644
--- a/libraries/libgnomeprint/libgnomeprint.SlackBuild
+++ b/libraries/libgnomeprint/libgnomeprint.SlackBuild
@@ -85,6 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--localstatedir=/var \
--enable-static=no \
+ --disable-gtk-doc \
--build=$ARCH-slackware-linux
make
diff --git a/libraries/libgnomeprint/libgnomeprint.info b/libraries/libgnomeprint/libgnomeprint.info
index 348444b4cb..789c856c58 100644
--- a/libraries/libgnomeprint/libgnomeprint.info
+++ b/libraries/libgnomeprint/libgnomeprint.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://ftp.gnome.org/pub/gnome/sources/libgnomeprint/2.18/libgnomepri
MD5SUM="63b05ffb5386e131487c6af30f4c56ac"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="libgnomecups"
+REQUIRES="libart-lgpl libgnomecups"
MAINTAINER="David Somero"
EMAIL="dsomero@hotmail.com"
diff --git a/libraries/libgnomeprintui/libgnomeprintui.SlackBuild b/libraries/libgnomeprintui/libgnomeprintui.SlackBuild
index aa61f32cfd..d90f5d46da 100644
--- a/libraries/libgnomeprintui/libgnomeprintui.SlackBuild
+++ b/libraries/libgnomeprintui/libgnomeprintui.SlackBuild
@@ -84,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--localstatedir=/var \
--enable-static=no \
- --enable-gtk-doc=yes \
+ --enable-gtk-doc=no \
--build=$ARCH-slackware-linux
make
diff --git a/libraries/libgnomeui/libgnomeui.SlackBuild b/libraries/libgnomeui/libgnomeui.SlackBuild
index d048a25b90..948f6d7fdc 100644
--- a/libraries/libgnomeui/libgnomeui.SlackBuild
+++ b/libraries/libgnomeui/libgnomeui.SlackBuild
@@ -69,6 +69,12 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# https://github.com/voidlinux/void-packages/commit/f16a2d557e84f5d7f5ece8b2022aab4fd17aa0ce
+for f in $(find . -type f -exec file "{}" \; | grep "C source" | cut -d ':' -f1); do
+ echo "${f}"
+ recode ISO-8859-1..UTF-8 "${f}"
+done
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/libraries/libidn2/README b/libraries/libidn2/README
deleted file mode 100644
index 972855606d..0000000000
--- a/libraries/libidn2/README
+++ /dev/null
@@ -1,5 +0,0 @@
-GNU Libidn is a fully documented implementation of the Stringprep,
-Punycode and IDNA 2003 specifications. Libidn's purpose is to encode
-and decode internationalized domain names.
-
-The libidn2 package does not clash with Slackware's libidn package.
diff --git a/libraries/libidn2/libidn2.SlackBuild b/libraries/libidn2/libidn2.SlackBuild
deleted file mode 100644
index 8ccfaa4583..0000000000
--- a/libraries/libidn2/libidn2.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libidn2
-
-# Copyright 2017 Mohammad Etemaddar Iran
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libidn2
-VERSION=${VERSION:-2.0.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.lz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -size 0 -delete
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- ABOUT-NLS AUTHORS CONTRIBUTING.md COPYING* INSTALL NEWS README* \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libidn2/libidn2.info b/libraries/libidn2/libidn2.info
deleted file mode 100644
index b07454fe03..0000000000
--- a/libraries/libidn2/libidn2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libidn2"
-VERSION="2.0.4"
-HOMEPAGE="https://www.gnu.org/software/libidn/"
-DOWNLOAD="https://ftp.gnu.org/gnu/libidn/libidn2-2.0.4.tar.lz"
-MD5SUM="376e879081abe810449389ffcc300585"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mohammad Etemaddar"
-EMAIL="mohammad.etemaddar@gmail.com"
diff --git a/libraries/libidn2/slack-desc b/libraries/libidn2/slack-desc
deleted file mode 100644
index 251ce06f1c..0000000000
--- a/libraries/libidn2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libidn2: libidn2 (GNU IDN Library version 2)
-libidn2:
-libidn2: GNU Libidn is a fully documented implementation of the Stringprep,
-libidn2: Punycode and IDNA 2003 specifications. Libidn's purpose is to encode
-libidn2: and decode internationalized domain names.
-libidn2:
-libidn2: The libidn2 package does not clash with Slackware's libidn package.
-libidn2:
-libidn2:
-libidn2:
-libidn2:
diff --git a/libraries/libido3/libido3.SlackBuild b/libraries/libido3/libido3.SlackBuild
index d642540364..4b86f212f8 100644
--- a/libraries/libido3/libido3.SlackBuild
+++ b/libraries/libido3/libido3.SlackBuild
@@ -76,6 +76,9 @@ patch -p1 --verbose \
# Pinched from Manjaro
patch -p1 --verbose < $CWD/ido-optional-ubuntu-private.patch
+# Disable warnings-as-errors
+sed -i "s|-Wall -Werror|-Wall|" src/Makefile.am
+
./autogen.sh
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/libraries/libindicator3/libindicator3.SlackBuild b/libraries/libindicator3/libindicator3.SlackBuild
index c47ccefa2a..f4c8d0ee8a 100644
--- a/libraries/libindicator3/libindicator3.SlackBuild
+++ b/libraries/libindicator3/libindicator3.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Disable warnings-as-errors
+sed -i "s|-Wall -Werror|-Wall|" */Makefile.am
+
./autogen.sh
CFLAGS="$SLKCFLAGS -Wno-deprecated -Wno-deprecated-declarations" \
CXXFLAGS="$SLKCFLAGS -Wno-deprecated -Wno-deprecated-declarations" \
diff --git a/libraries/libinput/README b/libraries/libinput/README
deleted file mode 100644
index 6ffad5d887..0000000000
--- a/libraries/libinput/README
+++ /dev/null
@@ -1,11 +0,0 @@
-libinput (Input device library)
-
-libinput is a library to handle input devices in Wayland compositors
-and to provide a generic X.Org input driver.
-
-It provides device detection, device handling, input device event
-processing and abstraction so minimize the amount of custom input
-code compositors need to provide the common set of functionality
-that users expect. Input event processing includes scaling touch
-coordinates, generating pointer events from touchpads, pointer
-acceleration, etc.
diff --git a/libraries/libinput/libinput.SlackBuild b/libraries/libinput/libinput.SlackBuild
deleted file mode 100644
index 166cec6539..0000000000
--- a/libraries/libinput/libinput.SlackBuild
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for libinput.
-#
-# Copyright 2016-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libinput
-VERSION=${VERSION:-1.15.5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
-cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-meson --prefix /usr --libdir lib${LIBDIRSUFFIX} --mandir /usr/man \
- build -Ddebug-gui="false" -Dtests="false" -Ddocumentation="false" \
--Dudev-dir="/lib/udev"
-
-DESTDIR=$PKG ninja -C build all install
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -r COPYING README.md doc/ $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libinput/libinput.info b/libraries/libinput/libinput.info
deleted file mode 100644
index dee766addc..0000000000
--- a/libraries/libinput/libinput.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libinput"
-VERSION="1.15.5"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput"
-DOWNLOAD="https://www.freedesktop.org/software/libinput/libinput-1.15.5.tar.xz"
-MD5SUM="c9a1b15bb932eaf22f840efe4c3f84eb"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libwacom meson graphviz python-evdev pyudev"
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
diff --git a/libraries/libinput/slack-desc b/libraries/libinput/slack-desc
deleted file mode 100644
index bd32ce654d..0000000000
--- a/libraries/libinput/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libinput: libinput (Input device library)
-libinput:
-libinput: libinput is a library to handle input devices in Wayland compositors
-libinput: and to provide a generic X.Org input driver.
-libinput:
-libinput: Home page: https://www.freedesktop.org/wiki/Software/libinput/
-libinput:
-libinput:
-libinput:
-libinput:
-libinput:
diff --git a/libraries/libircclient/libircclient.SlackBuild b/libraries/libircclient/libircclient.SlackBuild
index 70d4361559..b53a7626bc 100644
--- a/libraries/libircclient/libircclient.SlackBuild
+++ b/libraries/libircclient/libircclient.SlackBuild
@@ -73,6 +73,10 @@ find -L . \
# example: error: 'LIBIRC_RFC_RPL_ENDOFNAMES' was not declared in this scope
patch -p1 < $CWD/libircclient-1.6-rfc.patch
+# for openssl-1.1.x
+sed -i "s|SSL_library_init|OPENSSL_init_ssl|" configure.in
+autoreconf -vif
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/libraries/libkqueue/libkqueue.SlackBuild b/libraries/libkqueue/libkqueue.SlackBuild
index a989d26944..c5eb815798 100644
--- a/libraries/libkqueue/libkqueue.SlackBuild
+++ b/libraries/libkqueue/libkqueue.SlackBuild
@@ -25,7 +25,7 @@
# Modified by the slackbuilds.org project.
PRGNAM=libkqueue
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.3.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -75,22 +75,28 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
- ./configure \
- --prefix=/usr \
- --mandir=/usr/man \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var
+mkdir -p build
+cd build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DCMAKE_BUILD_TYPE=Release ..
+ make
+ make install DESTDIR=$PKG
+cd ..
-make -j1
-make install DESTDIR=$PKG
+# MAN_INSTALL_DIR is actually ignored ATM
+mv $PKG/usr/share/man $PKG/usr/man
+rm -fR $PKG/usr/share
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a BUGS ChangeLog LICENSE README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/libraries/libkqueue/libkqueue.info b/libraries/libkqueue/libkqueue.info
index 6cd089bc9f..b446f003bf 100644
--- a/libraries/libkqueue/libkqueue.info
+++ b/libraries/libkqueue/libkqueue.info
@@ -1,8 +1,8 @@
PRGNAM="libkqueue"
-VERSION="2.0.1"
+VERSION="2.3.1"
HOMEPAGE="https://github.com/mheily/libkqueue"
-DOWNLOAD="http://sourceforge.net/projects/libkqueue/files/libkqueue-2.0/libkqueue-2.0.1.tar.gz"
-MD5SUM="3d939aa5fa83a870aee71f2181b22994"
+DOWNLOAD="https://github.com/mheily/libkqueue/archive/v2.3.1/libkqueue-2.3.1.tar.gz"
+MD5SUM="e64baefa000c5667f4a15ea93fe8356b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/libmemcached/libmemcached.SlackBuild b/libraries/libmemcached/libmemcached.SlackBuild
index 3cc3e35ca1..aa21736960 100644
--- a/libraries/libmemcached/libmemcached.SlackBuild
+++ b/libraries/libmemcached/libmemcached.SlackBuild
@@ -82,7 +82,7 @@ export PATH="/usr/libexec:$PATH"
patch -p1 < $CWD/patches/libmemcached-fix-linking-with-libpthread.patch
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--exec-prefix=/usr \
diff --git a/libraries/libmp4v2/libmp4v2.SlackBuild b/libraries/libmp4v2/libmp4v2.SlackBuild
index a7e1eb8c40..7c567eb738 100644
--- a/libraries/libmp4v2/libmp4v2.SlackBuild
+++ b/libraries/libmp4v2/libmp4v2.SlackBuild
@@ -84,7 +84,7 @@ find -L . \
autoreconf -vif
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive -Wno-narrowing" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/libraries/libmusicbrainz/libmusicbrainz.SlackBuild b/libraries/libmusicbrainz/libmusicbrainz.SlackBuild
index e378f14ade..85ea239ddb 100644
--- a/libraries/libmusicbrainz/libmusicbrainz.SlackBuild
+++ b/libraries/libmusicbrainz/libmusicbrainz.SlackBuild
@@ -52,7 +52,7 @@ find -L . \
patch -p1 < $CWD/libmusicbrainz-2.1.5-include_stringh.patch
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -Wno-narrowing" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/libraries/libmusicbrainz5/libmusicbrainz5.SlackBuild b/libraries/libmusicbrainz5/libmusicbrainz5.SlackBuild
index 7ffe5dde0c..bb3afb2772 100644
--- a/libraries/libmusicbrainz5/libmusicbrainz5.SlackBuild
+++ b/libraries/libmusicbrainz5/libmusicbrainz5.SlackBuild
@@ -70,6 +70,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Patch for the newer cmake
+patch -p1 < $CWD/no_wildcards.patch
+
mkdir -p build
(
cd build
diff --git a/libraries/libmusicbrainz5/no_wildcards.patch b/libraries/libmusicbrainz5/no_wildcards.patch
new file mode 100644
index 0000000000..b14d17e745
--- /dev/null
+++ b/libraries/libmusicbrainz5/no_wildcards.patch
@@ -0,0 +1,24 @@
+From 36262d60fe92fe7a2c9bfb40e736bfcd29a6c3bd Mon Sep 17 00:00:00 2001
+From: Abderrahim Kitouni <a.kitouni@gmail.com>
+Date: Fri, 13 Apr 2018 09:56:57 +0100
+Subject: [PATCH] src/CMakelists.txt: do not use wildcards for dependencies
+
+This is discouraged by cmake's documentation and doesn't work with the ninja generator.
+---
+ src/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 68c04e3..f7439d3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -37,7 +37,8 @@ ADD_CUSTOM_COMMAND(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
+ COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
+- DEPENDS make-c-interface cinterface.xml *.inc
++ DEPENDS make-c-interface cinterface.xml c-int-medium-defines.inc c-int-query-source.inc c-int-source-funcs.inc
++ c-int-medium-source.inc c-int-release-defines.inc c-int-query-defines.inc c-int-release-source.inc
+ )
+
+ ADD_CUSTOM_TARGET(src_gen DEPENDS mb5_c.h)
diff --git a/libraries/libmwaw/libmwaw.SlackBuild b/libraries/libmwaw/libmwaw.SlackBuild
index 8019a62064..c6d9bcdf8a 100644
--- a/libraries/libmwaw/libmwaw.SlackBuild
+++ b/libraries/libmwaw/libmwaw.SlackBuild
@@ -75,7 +75,7 @@ case "${DOC:-0}" in
esac
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -Wno-error=implicit-fallthrough= -Wno-error=int-in-bool-context" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/libraries/libnice/README b/libraries/libnice/README
deleted file mode 100644
index 7dbda42b89..0000000000
--- a/libraries/libnice/README
+++ /dev/null
@@ -1,12 +0,0 @@
-The GLib ICE implementation
-
-Libnice is an implementation of the IETF's draft Interactice
-Connectivity Establishment standard (ICE). It provides GLib-based library,
-libnice and GStreamer elements.
-
-ICE is useful for applications that want to establish peer-to-peer UDP
-data streams. It automates the process of traversing NATs and provides
-security against some attacks.
-
-Existing standards that use ICE include Session Initiation Protocol
-(SIP) and XMPP Jingle.
diff --git a/libraries/libnice/libnice.SlackBuild b/libraries/libnice/libnice.SlackBuild
deleted file mode 100644
index 2508b5a3e2..0000000000
--- a/libraries/libnice/libnice.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libnice
-
-# Copyright 2009 David Woodfall <dave@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libnice
-VERSION=${VERSION:-0.1.14}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-static=no \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS NEWS COPYING INSTALL README COPYING.LGPL TODO COPYING.MPL \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libnice/libnice.info b/libraries/libnice/libnice.info
deleted file mode 100644
index c1bc56fcb7..0000000000
--- a/libraries/libnice/libnice.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libnice"
-VERSION="0.1.14"
-HOMEPAGE="https://nice.freedesktop.org"
-DOWNLOAD="https://nice.freedesktop.org/releases/libnice-0.1.14.tar.gz"
-MD5SUM="c9b9b74b8ae1b3890e4bd93f1b70e8ff"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/libraries/libnice/slack-desc b/libraries/libnice/slack-desc
deleted file mode 100644
index 60b1ef2c70..0000000000
--- a/libraries/libnice/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libnice: libnice (The GLib ICE implementation)
-libnice:
-libnice: Libnice is an implementation of the IETF's draft Interactice
-libnice: Connectivity Establishment standard (ICE). It provides GLib-based
-libnice: library, libnice and GStreamer elements. ICE is useful for
-libnice: applications that want to establish peer-to-peer UDP data streams.
-libnice: It automates the process of traversing NATs and provides security
-libnice: against some attacks. Existing standards that use ICE include
-libnice: include Session Initiation Protocol (SIP) and XMPP Jingle.
-libnice:
-libnice: Homepage: http://nice.freedesktop.org
diff --git a/libraries/liboauth/liboauth-1.0.3-openssl-1.1.0-2.patch b/libraries/liboauth/liboauth-1.0.3-openssl-1.1.0-2.patch
new file mode 100644
index 0000000000..eafd3eb9bf
--- /dev/null
+++ b/libraries/liboauth/liboauth-1.0.3-openssl-1.1.0-2.patch
@@ -0,0 +1,147 @@
+Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org)
+Date: 2017-05-27
+Initial Package Version: 1.0.3
+Update by: Bruce Dubbs
+Date: 2017-06-14
+Upstream Status: Submitted
+Origin: https://github.com/x42/liboauth/issues/9
+Description: Fixes build issue with OpenSSL-1.1.0.
+Update: Additional fix from upstream. Three lines changed.
+
+diff -Naurp liboauth-1.0.3-orig/src/hash.c liboauth-1.0.3/src/hash.c
+--- liboauth-1.0.3-orig/src/hash.c 2013-10-04 08:02:50.000000000 -0500
++++ liboauth-1.0.3/src/hash.c 2017-05-27 00:51:04.708633351 -0500
+@@ -362,6 +362,11 @@ looser:
+ #include "oauth.h" // base64 encode fn's.
+ #include <openssl/hmac.h>
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++#define EVP_MD_CTX_new EVP_MD_CTX_create
++#define EVP_MD_CTX_free EVP_MD_CTX_destroy
++#endif
++
+ char *oauth_sign_hmac_sha1 (const char *m, const char *k) {
+ return(oauth_sign_hmac_sha1_raw (m, strlen(m), k, strlen(k)));
+ }
+@@ -386,7 +391,7 @@ char *oauth_sign_rsa_sha1 (const char *m
+ unsigned char *sig = NULL;
+ unsigned char *passphrase = NULL;
+ unsigned int len=0;
+- EVP_MD_CTX md_ctx;
++ EVP_MD_CTX *md_ctx;
+
+ EVP_PKEY *pkey;
+ BIO *in;
+@@ -399,24 +404,31 @@ char *oauth_sign_rsa_sha1 (const char *m
+ return xstrdup("liboauth/OpenSSL: can not read private key");
+ }
+
++ md_ctx = EVP_MD_CTX_new();
++ if (md_ctx == NULL) {
++ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX");
++ }
++
+ len = EVP_PKEY_size(pkey);
+ sig = (unsigned char*)xmalloc((len+1)*sizeof(char));
+
+- EVP_SignInit(&md_ctx, EVP_sha1());
+- EVP_SignUpdate(&md_ctx, m, strlen(m));
+- if (EVP_SignFinal (&md_ctx, sig, &len, pkey)) {
++ EVP_SignInit(md_ctx, EVP_sha1());
++ EVP_SignUpdate(md_ctx, m, strlen(m));
++ if (EVP_SignFinal (md_ctx, sig, &len, pkey)) {
+ char *tmp;
+ sig[len] = '\0';
+ tmp = oauth_encode_base64(len,sig);
+ OPENSSL_free(sig);
+ EVP_PKEY_free(pkey);
++ EVP_MD_CTX_free(md_ctx);
+ return tmp;
+ }
++ EVP_MD_CTX_free(md_ctx);
+ return xstrdup("liboauth/OpenSSL: rsa-sha1 signing failed");
+ }
+
+ int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) {
+- EVP_MD_CTX md_ctx;
++ EVP_MD_CTX *md_ctx;
+ EVP_PKEY *pkey;
+ BIO *in;
+ X509 *cert = NULL;
+@@ -437,13 +449,18 @@ int oauth_verify_rsa_sha1 (const char *m
+ return -2;
+ }
+
++ md_ctx = EVP_MD_CTX_new();
++ if (md_ctx == NULL) {
++ return -2;
++ }
++
+ b64d= (unsigned char*) xmalloc(sizeof(char)*strlen(s));
+ slen = oauth_decode_base64(b64d, s);
+
+- EVP_VerifyInit(&md_ctx, EVP_sha1());
+- EVP_VerifyUpdate(&md_ctx, m, strlen(m));
+- err = EVP_VerifyFinal(&md_ctx, b64d, slen, pkey);
+- EVP_MD_CTX_cleanup(&md_ctx);
++ EVP_VerifyInit(md_ctx, EVP_sha1());
++ EVP_VerifyUpdate(md_ctx, m, strlen(m));
++ err = EVP_VerifyFinal(md_ctx, b64d, slen, pkey);
++ EVP_MD_CTX_free(pkey);
+ EVP_PKEY_free(pkey);
+ xfree(b64d);
+ return (err);
+@@ -455,35 +472,41 @@ int oauth_verify_rsa_sha1 (const char *m
+ */
+ char *oauth_body_hash_file(char *filename) {
+ unsigned char fb[BUFSIZ];
+- EVP_MD_CTX ctx;
++ EVP_MD_CTX *ctx;
+ size_t len=0;
+ unsigned char *md;
+ FILE *F= fopen(filename, "r");
+ if (!F) return NULL;
+
+- EVP_MD_CTX_init(&ctx);
+- EVP_DigestInit(&ctx,EVP_sha1());
++ ctx = EVP_MD_CTX_new();
++ if (ctx == NULL) {
++ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX");
++ }
++ EVP_DigestInit(ctx,EVP_sha1());
+ while (!feof(F) && (len=fread(fb,sizeof(char),BUFSIZ, F))>0) {
+- EVP_DigestUpdate(&ctx, fb, len);
++ EVP_DigestUpdate(ctx, fb, len);
+ }
+ fclose(F);
+ len=0;
+ md=(unsigned char*) xcalloc(EVP_MD_size(EVP_sha1()),sizeof(unsigned char));
+- EVP_DigestFinal(&ctx, md,(unsigned int*) &len);
+- EVP_MD_CTX_cleanup(&ctx);
++ EVP_DigestFinal(ctx, md,(unsigned int*) &len);
++ EVP_MD_CTX_free(ctx);
+ return oauth_body_hash_encode(len, md);
+ }
+
+ char *oauth_body_hash_data(size_t length, const char *data) {
+- EVP_MD_CTX ctx;
++ EVP_MD_CTX *ctx;
+ size_t len=0;
+ unsigned char *md;
+ md=(unsigned char*) xcalloc(EVP_MD_size(EVP_sha1()),sizeof(unsigned char));
+- EVP_MD_CTX_init(&ctx);
+- EVP_DigestInit(&ctx,EVP_sha1());
+- EVP_DigestUpdate(&ctx, data, length);
+- EVP_DigestFinal(&ctx, md,(unsigned int*) &len);
+- EVP_MD_CTX_cleanup(&ctx);
++ ctx = EVP_MD_CTX_new();
++ if (ctx == NULL) {
++ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX");
++ }
++ EVP_DigestInit(ctx,EVP_sha1());
++ EVP_DigestUpdate(ctx, data, length);
++ EVP_DigestFinal(ctx, md,(unsigned int*) &len);
++ EVP_MD_CTX_free(ctx);
+ return oauth_body_hash_encode(len, md);
+ }
+
diff --git a/libraries/liboauth/liboauth.SlackBuild b/libraries/liboauth/liboauth.SlackBuild
index 819e22333a..9f225f8676 100644
--- a/libraries/liboauth/liboauth.SlackBuild
+++ b/libraries/liboauth/liboauth.SlackBuild
@@ -77,6 +77,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# port to openssl-1.1.x
+patch -p1 < $CWD/liboauth-1.0.3-openssl-1.1.0-2.patch
+
# compile in clean dir
mkdir -v build
cd build
diff --git a/libraries/libopenshot/512.patch b/libraries/libopenshot/512.patch
new file mode 100644
index 0000000000..3adac26b1c
--- /dev/null
+++ b/libraries/libopenshot/512.patch
@@ -0,0 +1,51 @@
+From 13290364e7bea54164ab83d973951f2898ad9e23 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Sat, 16 May 2020 02:33:37 +0300
+Subject: [PATCH] FFmpegUtilities: replace variable definition with statement
+ expression
+
+It is needed to avoid multiple definitions of AV_GET_CODEC_CONTEXT,
+which is considered as an error with '-fno-common' which is default
+since gcc-10.
+
+Fixes: #511
+---
+ include/FFmpegUtilities.h | 18 ++++++++----------
+ 1 file changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/include/FFmpegUtilities.h b/include/FFmpegUtilities.h
+index 62d64df1..b4ec951f 100644
+--- a/include/FFmpegUtilities.h
++++ b/include/FFmpegUtilities.h
+@@ -163,11 +163,10 @@
+ #define AV_FREE_CONTEXT(av_context) avcodec_free_context(&av_context)
+ #define AV_GET_CODEC_TYPE(av_stream) av_stream->codecpar->codec_type
+ #define AV_FIND_DECODER_CODEC_ID(av_stream) av_stream->codecpar->codec_id
+- auto AV_GET_CODEC_CONTEXT = [](AVStream* av_stream, AVCodec* av_codec) { \
+- AVCodecContext *context = avcodec_alloc_context3(av_codec); \
+- avcodec_parameters_to_context(context, av_stream->codecpar); \
+- return context; \
+- };
++ #define AV_GET_CODEC_CONTEXT(av_stream, av_codec) \
++ ({ AVCodecContext *context = avcodec_alloc_context3(av_codec); \
++ avcodec_parameters_to_context(context, av_stream->codecpar); \
++ context; })
+ #define AV_GET_CODEC_PAR_CONTEXT(av_stream, av_codec) av_codec;
+ #define AV_GET_CODEC_FROM_STREAM(av_stream,codec_in)
+ #define AV_GET_CODEC_ATTRIBUTES(av_stream, av_context) av_stream->codecpar
+@@ -199,11 +198,10 @@
+ #define AV_FREE_CONTEXT(av_context) avcodec_free_context(&av_context)
+ #define AV_GET_CODEC_TYPE(av_stream) av_stream->codecpar->codec_type
+ #define AV_FIND_DECODER_CODEC_ID(av_stream) av_stream->codecpar->codec_id
+- auto AV_GET_CODEC_CONTEXT = [](AVStream* av_stream, AVCodec* av_codec) { \
+- AVCodecContext *context = avcodec_alloc_context3(av_codec); \
+- avcodec_parameters_to_context(context, av_stream->codecpar); \
+- return context; \
+- };
++ #define AV_GET_CODEC_CONTEXT(av_stream, av_codec) \
++ ({ AVCodecContext *context = avcodec_alloc_context3(av_codec); \
++ avcodec_parameters_to_context(context, av_stream->codecpar); \
++ context; })
+ #define AV_GET_CODEC_PAR_CONTEXT(av_stream, av_codec) av_codec;
+ #define AV_GET_CODEC_FROM_STREAM(av_stream,codec_in)
+ #define AV_GET_CODEC_ATTRIBUTES(av_stream, av_context) av_stream->codecpar
diff --git a/libraries/libopenshot/libopenshot.SlackBuild b/libraries/libopenshot/libopenshot.SlackBuild
index 21480212eb..d2d6bebdcf 100644
--- a/libraries/libopenshot/libopenshot.SlackBuild
+++ b/libraries/libopenshot/libopenshot.SlackBuild
@@ -70,6 +70,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/512.patch
mkdir -p build
cd build
cmake \
diff --git a/libraries/libopusenc/README b/libraries/libopusenc/README
deleted file mode 100644
index 44dab27110..0000000000
--- a/libraries/libopusenc/README
+++ /dev/null
@@ -1,2 +0,0 @@
-libopusenc is a library that provides an easy way to encode Ogg
-Opus files.
diff --git a/libraries/libopusenc/libopusenc.SlackBuild b/libraries/libopusenc/libopusenc.SlackBuild
deleted file mode 100644
index 199690a36a..0000000000
--- a/libraries/libopusenc/libopusenc.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libopusenc
-
-# Copyright 2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libopusenc
-VERSION=${VERSION:-0.2.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-static=no \
- --enable-fixed-point \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libopusenc/libopusenc.info b/libraries/libopusenc/libopusenc.info
deleted file mode 100644
index 2347f6e5a3..0000000000
--- a/libraries/libopusenc/libopusenc.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libopusenc"
-VERSION="0.2.1"
-HOMEPAGE="https://opus-codec.org/"
-DOWNLOAD="https://archive.mozilla.org/pub/opus/libopusenc-0.2.1.tar.gz"
-MD5SUM="f038ea0f4168d184c76b42d293697c57"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="opus"
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/libraries/libopusenc/slack-desc b/libraries/libopusenc/slack-desc
deleted file mode 100644
index 041704af97..0000000000
--- a/libraries/libopusenc/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libopusenc: libopusenc (High-level Opus decoding library)
-libopusenc:
-libopusenc: libopusenc is a library that provides an easy way to encode Ogg
-libopusenc: Opus files.
-libopusenc:
-libopusenc:
-libopusenc:
-libopusenc: Project site: https://opus-codec.org/
-libopusenc:
-libopusenc:
-libopusenc:
diff --git a/libraries/libpeas/libpeas.SlackBuild b/libraries/libpeas/libpeas.SlackBuild
index 9ab50bcfec..08be4cbf6f 100644
--- a/libraries/libpeas/libpeas.SlackBuild
+++ b/libraries/libpeas/libpeas.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Slackware build script for libpeas
-# Copyright 2013-2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,13 +22,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libpeas
-VERSION=${VERSION:-1.16.0}
+VERSION=${VERSION:-1.24.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -39,8 +39,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -53,7 +53,7 @@ else
LIBDIRSUFFIX=""
fi
-DOCS="AUTHORS COPYING ChangeLog NEWS README"
+DOCS="AUTHORS COPYING NEWS README"
set -e
@@ -70,22 +70,23 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-sed -i -e 's|"lua5.1 |"lua |' -e 's|with_lua51=lua5.1|with_lua51=lua|' configure
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-gtk \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir build
+cd build
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ meson .. \
+ --buildtype=release \
+ --infodir=/usr/info \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ -Dvapi=true \
+ -Ddoc=true
+ ninja
+ DESTDIR=$PKG ninja install
+cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/libraries/libpeas/libpeas.info b/libraries/libpeas/libpeas.info
index f9c6dac566..3c46c9c1df 100644
--- a/libraries/libpeas/libpeas.info
+++ b/libraries/libpeas/libpeas.info
@@ -1,8 +1,8 @@
PRGNAM="libpeas"
-VERSION="1.16.0"
+VERSION="1.24.1"
HOMEPAGE="https://wiki.gnome.org/Projects/Libpeas"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libpeas/1.16/libpeas-1.16.0.tar.xz"
-MD5SUM="48c5b3da391da1ae390e9d45d88a6aeb"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libpeas/1.24/libpeas-1.24.1.tar.xz"
+MD5SUM="bbecf334a7333d0a5d4d655ba38be9b4"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/libpwquality/README b/libraries/libpwquality/README
deleted file mode 100644
index b2abc40825..0000000000
--- a/libraries/libpwquality/README
+++ /dev/null
@@ -1,11 +0,0 @@
-libpwquality (library for password quality checking and generation)
-
-The libpwquality library purpose is to provide common functions for
-password quality checking and also scoring them based on their apparent
-randomness. The library also provides a function for generating random
-passwords with good pronounceability. The library supports reading and
-parsing of a configuration file.
-
-In the package there are also very simple utilities that use the library
-function and PAM module that can be used instead of pam_cracklib. The
-module supports all the options of pam_cracklib.
diff --git a/libraries/libpwquality/libpwquality.SlackBuild b/libraries/libpwquality/libpwquality.SlackBuild
deleted file mode 100644
index 19ae93af09..0000000000
--- a/libraries/libpwquality/libpwquality.SlackBuild
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for libpwquality.
-#
-# Copyright 2020 pyllyukko
-# Copyright 2015-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libpwquality
-VERSION=${VERSION:-1.4.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-autoreconf -fiv
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-static=no \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS README"
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libpwquality/libpwquality.info b/libraries/libpwquality/libpwquality.info
deleted file mode 100644
index f2e94a1c26..0000000000
--- a/libraries/libpwquality/libpwquality.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libpwquality"
-VERSION="1.4.2"
-HOMEPAGE="https://github.com/libpwquality/libpwquality/"
-DOWNLOAD="https://github.com/libpwquality/libpwquality/archive/libpwquality-1.4.2.tar.gz"
-MD5SUM="13bd34cde12ccbf00a2e1747030f9663"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="cracklib"
-MAINTAINER="pyllyukko"
-EMAIL="pyllyukko@maimed.org"
diff --git a/libraries/libpwquality/slack-desc b/libraries/libpwquality/slack-desc
deleted file mode 100644
index dc0b8e0b16..0000000000
--- a/libraries/libpwquality/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libpwquality: libpwquality (library for password quality checking and generation)
-libpwquality:
-libpwquality: libpwquality's purpose is to provide common functions for password
-libpwquality: quality checking and also scoring them based on their apparent
-libpwquality: randomness. The library also provides a function for generating
-libpwquality: random passwords with good pronounceability.
-libpwquality:
-libpwquality: Home page: https://github.com/libpwquality/libpwquality/
-libpwquality:
-libpwquality:
-libpwquality:
diff --git a/libraries/libqinfinity/libqinfinity.SlackBuild b/libraries/libqinfinity/libqinfinity.SlackBuild
index 4820de7ca0..751f619b74 100644
--- a/libraries/libqinfinity/libqinfinity.SlackBuild
+++ b/libraries/libqinfinity/libqinfinity.SlackBuild
@@ -58,7 +58,7 @@ mkdir -p build
cd build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=narrowing" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DCMAKE_BUILD_TYPE=Release ..
diff --git a/libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch b/libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch
new file mode 100644
index 0000000000..eb196ea16a
--- /dev/null
+++ b/libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch
@@ -0,0 +1,342 @@
+Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c
++++ libquicktime-1.2.4/plugins/ffmpeg/audio.c
+@@ -545,7 +545,7 @@ static int decode_chunk_vbr(quicktime_t
+
+ #if DECODE_AUDIO3 || DECODE_AUDIO4
+ codec->pkt.data = codec->chunk_buffer;
+- codec->pkt.size = packet_size + FF_INPUT_BUFFER_PADDING_SIZE;
++ codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE;
+
+ #if DECODE_AUDIO4
+ frame_bytes = avcodec_decode_audio4(codec->avctx, &f,
+@@ -583,7 +583,7 @@ static int decode_chunk_vbr(quicktime_t
+ (codec->sample_buffer_end - codec->sample_buffer_start)],
+ &bytes_decoded,
+ codec->chunk_buffer,
+- packet_size + FF_INPUT_BUFFER_PADDING_SIZE);
++ packet_size + AV_INPUT_BUFFER_PADDING_SIZE);
+ if(frame_bytes < 0)
+ {
+ lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio2 error");
+@@ -645,13 +645,13 @@ static int decode_chunk(quicktime_t * fi
+ return 0;
+ }
+
+- if(codec->chunk_buffer_alloc < mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE)
++ if(codec->chunk_buffer_alloc < mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE)
+ {
+- codec->chunk_buffer_alloc = mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE;
++ codec->chunk_buffer_alloc = mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE;
+ codec->chunk_buffer = realloc(codec->chunk_buffer, codec->chunk_buffer_alloc);
+ }
+ memset(codec->chunk_buffer + codec->bytes_in_chunk_buffer, 0,
+- mph.frame_bytes - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE);
++ mph.frame_bytes - codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE);
+ num_samples = mph.samples_per_frame;
+ codec->bytes_in_chunk_buffer = mph.frame_bytes;
+ }
+@@ -695,7 +695,7 @@ static int decode_chunk(quicktime_t * fi
+ {
+
+
+- /* BIG NOTE: We pass extra FF_INPUT_BUFFER_PADDING_SIZE for the buffer size
++ /* BIG NOTE: We pass extra AV_INPUT_BUFFER_PADDING_SIZE for the buffer size
+ because we know, that lqt_read_audio_chunk allocates 16 extra bytes for us */
+
+ /* Some really broken mp3 files have the header bytes split across 2 chunks */
+@@ -761,7 +761,7 @@ static int decode_chunk(quicktime_t * fi
+
+ #if DECODE_AUDIO3 || DECODE_AUDIO4
+ codec->pkt.data = &codec->chunk_buffer[bytes_used];
+- codec->pkt.size = codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE;
++ codec->pkt.size = codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE;
+
+ #if DECODE_AUDIO4
+
+@@ -798,7 +798,7 @@ static int decode_chunk(quicktime_t * fi
+ (codec->sample_buffer_end - codec->sample_buffer_start)],
+ &bytes_decoded,
+ &codec->chunk_buffer[bytes_used],
+- codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE);
++ codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE);
+ #endif
+ if(frame_bytes < 0)
+ {
+@@ -838,7 +838,7 @@ static int decode_chunk(quicktime_t * fi
+ }
+ }
+
+- /* This happens because ffmpeg adds FF_INPUT_BUFFER_PADDING_SIZE to the bytes returned */
++ /* This happens because ffmpeg adds AV_INPUT_BUFFER_PADDING_SIZE to the bytes returned */
+
+ if(codec->bytes_in_chunk_buffer < 0)
+ codec->bytes_in_chunk_buffer = 0;
+Index: libquicktime-1.2.4/plugins/ffmpeg/params.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c
++++ libquicktime-1.2.4/plugins/ffmpeg/params.c
+@@ -124,16 +124,6 @@ typedef struct
+ }
+
+
+-enum_t me_method[] =
+- {
+- { "Zero", ME_ZERO },
+- { "Phods", ME_PHODS },
+- { "Log", ME_LOG },
+- { "X1", ME_X1 },
+- { "Epzs", ME_EPZS },
+- { "Full", ME_FULL }
+- };
+-
+ enum_t prediction_method[] =
+ {
+ { "Left", FF_PRED_LEFT },
+@@ -163,15 +153,6 @@ enum_t mb_decision[] =
+ { "Rate distoration", FF_MB_DECISION_RD }
+ };
+
+-enum_t coder_type[] =
+- {
+- { "VLC", FF_CODER_TYPE_VLC },
+- { "Arithmetic", FF_CODER_TYPE_AC },
+- { "Raw", FF_CODER_TYPE_RAW },
+- { "RLE", FF_CODER_TYPE_RLE },
+- { "Deflate", FF_CODER_TYPE_DEFLATE },
+- };
+-
+ #define PARAM_ENUM(name, var, arr) \
+ if(!strcasecmp(key, name)) \
+ { \
+@@ -203,7 +184,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+ PARAM_INT_SCALE("ff_bit_rate_audio",bit_rate,1000);
+ PARAM_INT_SCALE("ff_bit_rate_video",bit_rate,1000);
+ PARAM_INT_SCALE("ff_bit_rate_tolerance",bit_rate_tolerance,1000);
+- PARAM_ENUM("ff_me_method",me_method,me_method);
++ PARAM_DICT_INT("ff_me_method","motion-est");
+ PARAM_INT("ff_gop_size",gop_size);
+ PARAM_FLOAT("ff_qcompress",qcompress);
+ PARAM_FLOAT("ff_qblur",qblur);
+@@ -227,10 +208,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+ PARAM_INT("ff_rc_min_rate",rc_min_rate);
+ PARAM_INT("ff_rc_max_rate",rc_max_rate);
+ PARAM_INT_SCALE("ff_rc_buffer_size",rc_buffer_size,1000);
+- PARAM_FLOAT("ff_rc_buffer_aggressivity",rc_buffer_aggressivity);
+ PARAM_FLOAT("ff_i_quant_factor",i_quant_factor);
+ PARAM_QP2LAMBDA("ff_i_quant_offset",i_quant_offset);
+- PARAM_FLOAT("ff_rc_initial_cplx",rc_initial_cplx);
++ PARAM_DICT_INT("ff_rc_initial_cplx","rc_init_cplx");
+ PARAM_FLOAT("ff_lumi_masking",lumi_masking);
+ PARAM_FLOAT("ff_temporal_cplx_masking",temporal_cplx_masking);
+ PARAM_FLOAT("ff_spatial_cplx_masking",spatial_cplx_masking);
+@@ -255,8 +235,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+ PARAM_INT("ff_me_range",me_range);
+ PARAM_ENUM("ff_mb_decision",mb_decision,mb_decision);
+ PARAM_INT("ff_scenechange_threshold",scenechange_threshold);
+- PARAM_QP2LAMBDA("ff_lmin", lmin);
+- PARAM_QP2LAMBDA("ff_lmax", lmax);
++ PARAM_DICT_INT("ff_lmin", "lmin");
++ PARAM_DICT_INT("ff_lmax", "lmax");
+ PARAM_INT("ff_noise_reduction",noise_reduction);
+ PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);
+
+@@ -269,33 +249,29 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+ #endif
+
+ PARAM_INT("ff_thread_count",thread_count);
+- PARAM_INT("ff_me_threshold",me_threshold);
+- PARAM_INT("ff_mb_threshold",mb_threshold);
+ PARAM_INT("ff_nsse_weight",nsse_weight);
+- PARAM_FLOAT("ff_border_masking",border_masking);
++ PARAM_DICT_INT("ff_border_masking","border_mask");
+ PARAM_QP2LAMBDA("ff_mb_lmin", mb_lmin);
+ PARAM_QP2LAMBDA("ff_mb_lmax", mb_lmax);
+ PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation);
+ PARAM_INT("ff_bidir_refine",bidir_refine);
+ PARAM_INT("ff_brd_scale",brd_scale);
+- PARAM_INT("ff_scenechange_factor",scenechange_factor);
+- PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE);
+- PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV);
+- PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL);
+- PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC);
+- PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0);
++ PARAM_FLAG("ff_flag_qscale",AV_CODEC_FLAG_QSCALE);
++ PARAM_FLAG("ff_flag_4mv",AV_CODEC_FLAG_4MV);
++ PARAM_FLAG("ff_flag_qpel",AV_CODEC_FLAG_QPEL);
++ PARAM_DICT_FLAG("ff_flag_gmc","gmc");
++ PARAM_DICT_FLAG("ff_flag_mv0","mpv_flags");
+ // PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused
+- PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY);
+- PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE);
+- PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP);
++ PARAM_FLAG("ff_flag_gray",AV_CODEC_FLAG_GRAY);
++ PARAM_DICT_FLAG("ff_flag_normalize_aqp","naq");
+ // PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ PARAM_FLAG("ff_flag_trellis_quant",CODEC_FLAG_TRELLIS_QUANT);
+ #else
+ PARAM_INT("ff_trellis",trellis);
+ #endif
+- PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT);
+- PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED);
++ PARAM_FLAG("ff_flag_bitexact",AV_CODEC_FLAG_BITEXACT);
++ PARAM_FLAG("ff_flag_ac_pred",AV_CODEC_FLAG_AC_PRED);
+ // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused
+
+ #if LIBAVCODEC_VERSION_MAJOR >= 55
+@@ -303,9 +279,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+ PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd");
+ PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop");
+ #else
+- PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD);
+- PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD);
+- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
++ PARAM_FLAG("ff_flag_cbp_rd",AV_CODEC_FLAG_CBP_RD);
++ PARAM_FLAG("ff_flag_qp_rd",AV_CODEC_FLAG_QP_RD);
++ PARAM_FLAG2("ff_flag2_strict_gop",AV_CODEC_FLAG2_STRICT_GOP);
+ #endif
+
+ #if LIBAVCODEC_VERSION_MAJOR >= 54
+@@ -313,14 +289,14 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+ PARAM_DICT_FLAG("ff_flag_obmc","obmc");
+ PARAM_DICT_FLAG("ff_flag_h263p_slice_struct","structured_slices");
+ #else
+- PARAM_FLAG("ff_flag_h263p_aiv",CODEC_FLAG_H263P_AIV);
+- PARAM_FLAG("ff_flag_obmc",CODEC_FLAG_OBMC);
+- PARAM_FLAG("ff_flag_h263p_slice_struct",CODEC_FLAG_H263P_SLICE_STRUCT);
++ PARAM_FLAG("ff_flag_h263p_aiv",AV_CODEC_FLAG_H263P_AIV);
++ PARAM_FLAG("ff_flag_obmc",AV_CODEC_FLAG_OBMC);
++ PARAM_FLAG("ff_flag_h263p_slice_struct",AV_CODEC_FLAG_H263P_SLICE_STRUCT);
+ #endif
+
+- PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER);
+- PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP);
+- PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST);
+- PARAM_ENUM("ff_coder_type",coder_type,coder_type);
++ PARAM_FLAG("ff_flag_loop_filter",AV_CODEC_FLAG_LOOP_FILTER);
++ PARAM_FLAG("ff_flag_closed_gop",AV_CODEC_FLAG_CLOSED_GOP);
++ PARAM_FLAG2("ff_flag2_fast",AV_CODEC_FLAG2_FAST);
++ PARAM_DICT_INT("ff_coder_type","coder");
+
+ }
+Index: libquicktime-1.2.4/plugins/ffmpeg/params.h
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h
++++ libquicktime-1.2.4/plugins/ffmpeg/params.h
+@@ -149,7 +149,7 @@ the reference. Unused for constant quant
+ .type = LQT_PARAMETER_INT, \
+ .val_default = { .val_int = 0 }, \
+ .val_min = { .val_int = 0 }, \
+- .val_max = { .val_int = FF_MAX_B_FRAMES }, \
++ .val_max = { .val_int = 16 }, \
+ .help_string = TRS("Maximum number of B-frames between non B-frames") \
+ }
+
+Index: libquicktime-1.2.4/plugins/ffmpeg/video.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c
++++ libquicktime-1.2.4/plugins/ffmpeg/video.c
+@@ -781,7 +781,7 @@ static int lqt_ffmpeg_decode_video(quick
+ if(extradata)
+ {
+ codec->extradata =
+- calloc(1, extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
++ calloc(1, extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
+ memcpy(codec->extradata, extradata, extradata_size);
+ codec->avctx->extradata_size = extradata_size;
+ codec->avctx->extradata = codec->extradata;
+@@ -1140,8 +1140,8 @@ static int init_imx_encoder(quicktime_t
+ codec->avctx->qmin = 1;
+ codec->avctx->qmax = 3;
+ codec->avctx->rtp_payload_size = 1; // ??
+- codec->avctx->rc_buffer_aggressivity = 0.25;
+- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY;
++ av_dict_set(&codec->options, "rc_buf_aggressivity", "0.25", 0);
++ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_LOW_DELAY;
+
+ #if (LIBAVCODEC_VERSION_MAJOR < 54)
+ codec->avctx->flags2 |= CODEC_FLAG2_INTRA_VLC|CODEC_FLAG2_NON_LINEAR_QUANT;
+@@ -1328,7 +1328,7 @@ static int lqt_ffmpeg_encode_video(quick
+ // codec->avctx->time_base.den = 1;
+ // codec->avctx->time_base.num = lqt_video_time_scale(file, track);
+
+- if(codec->avctx->flags & CODEC_FLAG_QSCALE)
++ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE)
+ codec->avctx->global_quality = codec->qscale;
+
+ codec->avctx->width = width;
+@@ -1344,7 +1344,7 @@ static int lqt_ffmpeg_encode_video(quick
+ {
+ if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
+ {
+- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ codec->write_global_header = 1;
+ }
+
+@@ -1360,7 +1360,7 @@ static int lqt_ffmpeg_encode_video(quick
+ {
+ lqt_log(file, LQT_LOG_INFO, LOG_DOMAIN, "Enabling interlaced encoding");
+ codec->avctx->flags |=
+- (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN);
++ (AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME|AV_CODEC_FLAG_ALT_SCAN);
+ }
+ #endif
+ }
+@@ -1387,7 +1387,7 @@ static int lqt_ffmpeg_encode_video(quick
+ {
+ if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
+ {
+- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ codec->write_global_header = 1;
+ }
+ }
+@@ -1410,7 +1410,7 @@ static int lqt_ffmpeg_encode_video(quick
+ {
+ if(vtrack->interlace_mode != LQT_INTERLACE_NONE)
+ {
+- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT;
++ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
+ }
+ }
+ else if(codec->is_imx)
+@@ -1422,7 +1422,7 @@ static int lqt_ffmpeg_encode_video(quick
+ if(codec->pass == 1)
+ {
+ codec->stats_file = fopen(codec->stats_filename, "w");
+- codec->avctx->flags |= CODEC_FLAG_PASS1;
++ codec->avctx->flags |= AV_CODEC_FLAG_PASS1;
+ }
+ else if(codec->pass == codec->total_passes)
+ {
+@@ -1438,7 +1438,7 @@ static int lqt_ffmpeg_encode_video(quick
+ fclose(codec->stats_file);
+ codec->stats_file = (FILE*)0;
+
+- codec->avctx->flags |= CODEC_FLAG_PASS2;
++ codec->avctx->flags |= AV_CODEC_FLAG_PASS2;
+ }
+ }
+ /* Open codec */
+@@ -1516,7 +1516,7 @@ static int lqt_ffmpeg_encode_video(quick
+ }
+
+ codec->frame->pts = vtrack->timestamp;
+- if(codec->avctx->flags & CODEC_FLAG_QSCALE)
++ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE)
+ codec->frame->quality = codec->qscale;
+ #ifdef DO_INTERLACE
+ if(vtrack->interlace_mode != LQT_INTERLACE_NONE)
+@@ -1599,8 +1599,7 @@ static int lqt_ffmpeg_encode_video(quick
+ else if(codec->encoder->id == AV_CODEC_ID_MPEG4)
+ {
+ int advanced = 0;
+- if(codec->avctx->max_b_frames ||
+- (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC)))
++ if(codec->avctx->max_b_frames)
+ advanced = 1;
+
+ setup_header_mpeg4(file, track, codec->avctx->extradata,
diff --git a/libraries/libquicktime/libquicktime.SlackBuild b/libraries/libquicktime/libquicktime.SlackBuild
index 8b74f00782..b26035d2d3 100644
--- a/libraries/libquicktime/libquicktime.SlackBuild
+++ b/libraries/libquicktime/libquicktime.SlackBuild
@@ -69,9 +69,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Fix compatibility with ffmpeg 3.x
+# Fix compatibility with ffmpeg 4.x
patch -p1 -i $CWD/libquicktime-1.2.4-ffmpeg2.patch
patch -p1 -i $CWD/libquicktime-ffmpeg3.patch
+patch -p1 -i $CWD/libquicktime-1.2.4-ffmpeg4.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/libraries/libqxt/libqxt-gcc6.patch b/libraries/libqxt/libqxt-gcc6.patch
new file mode 100644
index 0000000000..519646d6eb
--- /dev/null
+++ b/libraries/libqxt/libqxt-gcc6.patch
@@ -0,0 +1,11 @@
+--- a/src/core/qxtslotjob.cpp 2011-11-24 16:10:32.000000000 -0600
++++ b/src/core/qxtslotjob.cpp 2016-03-07 16:20:32.758268253 -0600
+@@ -174,7 +174,7 @@ This uses QxtSignalWaiter so it will _no
+
+ QVariant QxtFuture::delayedResult(int msec)
+ {
+- if (!waiter->wait(msec, false))
++ if (!waiter->wait(msec, NULL))
+ return QVariant();
+ return job->result();
+ }
diff --git a/libraries/libqxt/libqxt.SlackBuild b/libraries/libqxt/libqxt.SlackBuild
index 870d2ead16..fe260941aa 100644
--- a/libraries/libqxt/libqxt.SlackBuild
+++ b/libraries/libqxt/libqxt.SlackBuild
@@ -74,6 +74,9 @@ find -L . \
# Fix linking during the xrandr test
sed -i "s|lXrandr$|lXrandr -lX11|" config.tests/xrandr/xrandr.pro
+# Thanks to Archlinux for this
+patch -p1 < $CWD/libqxt-gcc6.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure -prefix /usr -libdir /usr/lib$LIBDIRSUFFIX
diff --git a/libraries/libreplaygain/libreplaygain.SlackBuild b/libraries/libreplaygain/libreplaygain.SlackBuild
index 60554fedb3..a7f3e187c2 100644
--- a/libraries/libreplaygain/libreplaygain.SlackBuild
+++ b/libraries/libreplaygain/libreplaygain.SlackBuild
@@ -10,7 +10,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -21,8 +21,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -45,10 +45,10 @@ tar xzvf $CWD/$PRGNAM\_$VERSION.tar.gz
cd $PRGNAM\_$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# adding missing include file to CMakeLists.txt
echo 'INSTALL(FILES ${libreplaygain_SOURCE_DIR}/include/replaygain/gain_analysis.h DESTINATION include/replaygain)' >> src/CMakeLists.txt
@@ -59,12 +59,12 @@ cmake \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=${LIBDIRSUFFIX}
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} .
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/libsass/libsass.SlackBuild b/libraries/libsass/libsass.SlackBuild
index 1bd0d73920..854b010f0b 100644
--- a/libraries/libsass/libsass.SlackBuild
+++ b/libraries/libsass/libsass.SlackBuild
@@ -21,7 +21,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libsass
-VERSION=${VERSION:-3.6.4}
+VERSION=${VERSION:-3.6.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/libraries/libsass/libsass.info b/libraries/libsass/libsass.info
index 9ed96c3c27..cf6b1f7a1a 100644
--- a/libraries/libsass/libsass.info
+++ b/libraries/libsass/libsass.info
@@ -1,8 +1,8 @@
PRGNAM="libsass"
-VERSION="3.6.4"
+VERSION="3.6.1"
HOMEPAGE="http://sass-lang.com/libsass"
-DOWNLOAD="https://github.com/sass/libsass/archive/3.6.4/libsass-3.6.4.tar.gz"
-MD5SUM="602f7ff300f41f9d456c60a67270e3e0"
+DOWNLOAD="https://github.com/sass/libsass/archive/3.6.1/libsass-3.6.1.tar.gz"
+MD5SUM="8b0aee63fd535cf6f40b254a6f453d24"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/libsearpc/libsearpc.SlackBuild b/libraries/libsearpc/libsearpc.SlackBuild
index 56aed9cbda..99407b59c5 100644
--- a/libraries/libsearpc/libsearpc.SlackBuild
+++ b/libraries/libsearpc/libsearpc.SlackBuild
@@ -25,13 +25,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libsearpc
-VERSION=${VERSION:-3.0.7}
+VERSION=${VERSION:-3.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,8 +61,8 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION-latest
-tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -88,7 +88,7 @@ make
make install-strip DESTDIR=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE.txt INSTALL README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/libraries/libsearpc/libsearpc.info b/libraries/libsearpc/libsearpc.info
index 24f2e679a6..292bc4baa5 100644
--- a/libraries/libsearpc/libsearpc.info
+++ b/libraries/libsearpc/libsearpc.info
@@ -1,7 +1,7 @@
PRGNAM="libsearpc"
-VERSION="3.0.7"
+VERSION="3.1.0"
HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/libsearpc/archive/v3.0.7.tar.gz"
+DOWNLOAD="https://github.com/haiwen/libsearpc/archive/v3.1.0/libsearpc-3.1.0.tar.gz"
MD5SUM="1d20e93e0fb39f98c907e633d9f1b11b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/libraries/libsidplayfp/libsidplayfp.SlackBuild b/libraries/libsidplayfp/libsidplayfp.SlackBuild
index 8406a5fb5d..f9c3c6aae0 100644
--- a/libraries/libsidplayfp/libsidplayfp.SlackBuild
+++ b/libraries/libsidplayfp/libsidplayfp.SlackBuild
@@ -25,13 +25,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libsidplayfp
-VERSION=${VERSION:-1.8.6}
+VERSION=${VERSION:-1.8.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/libraries/libsidplayfp/libsidplayfp.info b/libraries/libsidplayfp/libsidplayfp.info
index 1a24881670..ad709ec1ca 100644
--- a/libraries/libsidplayfp/libsidplayfp.info
+++ b/libraries/libsidplayfp/libsidplayfp.info
@@ -1,8 +1,8 @@
PRGNAM="libsidplayfp"
-VERSION="1.8.6"
+VERSION="1.8.7"
HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-DOWNLOAD="http://downloads.sourceforge.net/project/sidplay-residfp/libsidplayfp/1.8/libsidplayfp-1.8.6.tar.gz"
-MD5SUM="fe1a88baa347cb896234327f61e62428"
+DOWNLOAD="http://downloads.sourceforge.net/sidplay-residfp/libsidplayfp-1.8.7.tar.gz"
+MD5SUM="9f6d46a1c2572cc2a6837173895d6f21"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="xa"
diff --git a/libraries/libsodium/README b/libraries/libsodium/README
deleted file mode 100644
index d401f6c292..0000000000
--- a/libraries/libsodium/README
+++ /dev/null
@@ -1,2 +0,0 @@
-libsodium is a portable fork of NaCl with a compatible API. It is a software
-library for network communication, encryption, decryption, signatures, etc.
diff --git a/libraries/libsodium/libsodium.SlackBuild b/libraries/libsodium/libsodium.SlackBuild
deleted file mode 100644
index d116e15595..0000000000
--- a/libraries/libsodium/libsodium.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libsodium
-
-# Copyright 2019 T3slider <t3slider@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libsodium
-VERSION=${VERSION:-1.0.18}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-static=no \
- --build=$ARCH-slackware-linux
-
-make
-make check
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS ChangeLog LICENSE README.markdown THANKS \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libsodium/libsodium.info b/libraries/libsodium/libsodium.info
deleted file mode 100644
index 885712aec3..0000000000
--- a/libraries/libsodium/libsodium.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libsodium"
-VERSION="1.0.18"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-DOWNLOAD="https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz"
-MD5SUM="3ca9ebc13b6b4735acae0a6a4c4f9a95"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="T3slider"
-EMAIL="t3slider@gmail.com"
diff --git a/libraries/libsodium/slack-desc b/libraries/libsodium/slack-desc
deleted file mode 100644
index 9f9b669bc6..0000000000
--- a/libraries/libsodium/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libsodium: libsodium (a library for network communication and cryptography)
-libsodium:
-libsodium: libsodium is a portable fork of NaCl with a compatible API. It is
-libsodium: a software library for network communication, encryption, decryption,
-libsodium: signatures, etc.
-libsodium:
-libsodium: https://github.com/jedisct1/libsodium
-libsodium:
-libsodium:
-libsodium:
-libsodium:
diff --git a/libraries/libsrtp/libsrtp.SlackBuild b/libraries/libsrtp/libsrtp.SlackBuild
index 0ec00c4f3a..5bcb7cad5e 100644
--- a/libraries/libsrtp/libsrtp.SlackBuild
+++ b/libraries/libsrtp/libsrtp.SlackBuild
@@ -78,7 +78,6 @@ CXXFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
- --enable-openssl \
--disable-debug \
--build=$ARCH-slackware-linux
diff --git a/libraries/libtxc_dxtn/README b/libraries/libtxc_dxtn/README
deleted file mode 100644
index a20c465fa6..0000000000
--- a/libraries/libtxc_dxtn/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This library provides the GL_EXT_texture_compression_s3tc extenstion for Mesa
-for using precompressed textures with hardware decompression (precompressed
-textures are used by most modern games).
-
-Due to US patent restrictions, this library is not part of Mesa itself.
diff --git a/libraries/libtxc_dxtn/libtxc_dxtn.SlackBuild b/libraries/libtxc_dxtn/libtxc_dxtn.SlackBuild
deleted file mode 100644
index 49192eecb0..0000000000
--- a/libraries/libtxc_dxtn/libtxc_dxtn.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libtxc_dxtn
-
-# Copyright 2012 Carlos Corbacho <carlos@strangeworlds.co.uk>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libtxc_dxtn
-VERSION=${VERSION:-1.0.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libtxc_dxtn/libtxc_dxtn.info b/libraries/libtxc_dxtn/libtxc_dxtn.info
deleted file mode 100644
index 57831f2652..0000000000
--- a/libraries/libtxc_dxtn/libtxc_dxtn.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libtxc_dxtn"
-VERSION="1.0.1"
-HOMEPAGE="https://people.freedesktop.org/~cbrill/libtxc_dxtn/"
-DOWNLOAD="https://people.freedesktop.org/~cbrill/libtxc_dxtn/libtxc_dxtn-1.0.1.tar.bz2"
-MD5SUM="7105107f07ac49753f4b61ba9d0c79c5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Carlos Corbacho"
-EMAIL="carlos@strangeworlds.co.uk"
diff --git a/libraries/libtxc_dxtn/slack-desc b/libraries/libtxc_dxtn/slack-desc
deleted file mode 100644
index 86695e02b8..0000000000
--- a/libraries/libtxc_dxtn/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libtxc_dxtn: libtxc_dxtn (S3TC for Mesa)
-libtxc_dxtn:
-libtxc_dxtn: Support for using precompressed textures with hardware decompression
-libtxc_dxtn: in Mesa (currently used by most new games).
-libtxc_dxtn:
-libtxc_dxtn:
-libtxc_dxtn:
-libtxc_dxtn:
-libtxc_dxtn:
-libtxc_dxtn:
-libtxc_dxtn:
diff --git a/libraries/libunicap/gcc10.patch b/libraries/libunicap/gcc10.patch
new file mode 100644
index 0000000000..638f4eb8d9
--- /dev/null
+++ b/libraries/libunicap/gcc10.patch
@@ -0,0 +1,25 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for libunicap <= 0.9.12 to declare the
+struct as extern in header files (https://gcc.gnu.org/gcc-10/porting_to.html).
+
+--- libunicap-0.9.12/common/queue.h 2010-01-17 08:49:29.000000000 +0100
++++ libunicap-0.9.12/common/queue.h.gcc10 2020-02-09 23:30:16.963136320 +0100
+@@ -24,7 +24,7 @@
+ #include <sys/time.h>
+ #include <semaphore.h>
+
+-struct _unicap_queue
++extern struct _unicap_queue
+ {
+ sem_t sema;
+ sem_t *psema;
+--- libunicap-0.9.12/cpi/euvccam/queue.h 2010-01-19 07:52:49.000000000 +0100
++++ libunicap-0.9.12/cpi/euvccam/queue.h.gcc10 2020-02-09 23:30:05.037048713 +0100
+@@ -24,7 +24,7 @@
+ #include <sys/time.h>
+ #include <semaphore.h>
+
+-struct _unicap_queue
++extern struct _unicap_queue
+ {
+ sem_t sema;
+ sem_t *psema;
diff --git a/libraries/libunicap/libunicap.SlackBuild b/libraries/libunicap/libunicap.SlackBuild
index 35f2eee368..45b4174e18 100644
--- a/libraries/libunicap/libunicap.SlackBuild
+++ b/libraries/libunicap/libunicap.SlackBuild
@@ -52,6 +52,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+patch -p1 < $CWD/gcc10.patch
+
# This header has moved
sed -i "s|linux\/videodev\.|libv4l1-videodev.|" \
cpi/v4l/v4l.c cpi/v4l2cpi/uvcvideo.h
diff --git a/libraries/libunwind/README b/libraries/libunwind/README
deleted file mode 100644
index c650d3ee47..0000000000
--- a/libraries/libunwind/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Libunwind is a portable and efficient C programming interface
-to determine the call-chain of a program.
-
-The API is useful in a number of applications:
-
-* debuggers
-* introspection
-* efficient setjmp()
-* ...
diff --git a/libraries/libunwind/libunwind.SlackBuild b/libraries/libunwind/libunwind.SlackBuild
deleted file mode 100644
index 6d9dbe168f..0000000000
--- a/libraries/libunwind/libunwind.SlackBuild
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libunwind
-
-# Copyright 2013 tjohann <thorsten.johannvorderbrueggen@t-online.de>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libunwind
-VERSION=${VERSION:-1.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README TODO"
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make
-# make pdf # doesn't work
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libunwind/libunwind.info b/libraries/libunwind/libunwind.info
deleted file mode 100644
index 4f4c7c124b..0000000000
--- a/libraries/libunwind/libunwind.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libunwind"
-VERSION="1.1"
-HOMEPAGE="http://www.nongnu.org/libunwind/"
-DOWNLOAD="http://download.savannah.nongnu.org/releases/libunwind/libunwind-1.1.tar.gz"
-MD5SUM="fb4ea2f6fbbe45bf032cd36e586883ce"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="tjohann"
-EMAIL="thorsten.johannvorderbrueggen@t-online.de"
diff --git a/libraries/libunwind/slack-desc b/libraries/libunwind/slack-desc
deleted file mode 100644
index 3fe00993a0..0000000000
--- a/libraries/libunwind/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libunwind: libunwind (C programming interface to determine the call-chain)
-libunwind:
-libunwind: It is a portable and efficient C programming interface
-libunwind: to determine the call-chain of a program.
-libunwind: The API is useful in a number of applications:
-libunwind: * debuggers
-libunwind: * introspection
-libunwind: * efficient setjmp()
-libunwind: * ...
-libunwind:
-libunwind: Homepage: http://www.nongnu.org/libunwind
diff --git a/libraries/libuv/README b/libraries/libuv/README
deleted file mode 100644
index 7f4ea4e1cf..0000000000
--- a/libraries/libuv/README
+++ /dev/null
@@ -1 +0,0 @@
-libuv is a multi-platform support library with a focus on asynchronous I/O.
diff --git a/libraries/libuv/libuv.SlackBuild b/libraries/libuv/libuv.SlackBuild
deleted file mode 100644
index 0e6b9b004d..0000000000
--- a/libraries/libuv/libuv.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# SlackBuild script for libuv
-
-# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libuv
-VERSION=${VERSION:-1.39.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-v$VERSION
-tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
-cd $PRGNAM-v$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-./autogen.sh
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS LICENSE README.md \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libuv/libuv.info b/libraries/libuv/libuv.info
deleted file mode 100644
index 79ae5df7b4..0000000000
--- a/libraries/libuv/libuv.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libuv"
-VERSION="1.39.0"
-HOMEPAGE="http://libuv.org/"
-DOWNLOAD="https://dist.libuv.org/dist/v1.39.0/libuv-v1.39.0.tar.gz"
-MD5SUM="66bf6355e35a36fbe32729f8edc22648"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
diff --git a/libraries/libuv/slack-desc b/libraries/libuv/slack-desc
deleted file mode 100644
index e164db36c0..0000000000
--- a/libraries/libuv/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libuv: libuv (Cross-platform asychronous I/O)
-libuv:
-libuv: libuv is a multi-platform support library with a focus on
-libuv: asynchronous I/O.
-libuv:
-libuv:
-libuv:
-libuv:
-libuv:
-libuv:
-libuv:
diff --git a/libraries/libvirt-glib/libvirt-glib.SlackBuild b/libraries/libvirt-glib/libvirt-glib.SlackBuild
index 60a9c1969f..d75dee4058 100644
--- a/libraries/libvirt-glib/libvirt-glib.SlackBuild
+++ b/libraries/libvirt-glib/libvirt-glib.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libvirt-glib
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-3.0.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/libraries/libvirt-glib/libvirt-glib.info b/libraries/libvirt-glib/libvirt-glib.info
index 90a4b953cc..6217ff56cd 100644
--- a/libraries/libvirt-glib/libvirt-glib.info
+++ b/libraries/libvirt-glib/libvirt-glib.info
@@ -1,8 +1,8 @@
PRGNAM="libvirt-glib"
-VERSION="1.0.0"
+VERSION="3.0.0"
HOMEPAGE="http://libvirt.org/"
-DOWNLOAD="https://libvirt.org/sources/glib/libvirt-glib-1.0.0.tar.gz"
-MD5SUM="cb1332e97c175606306fe8966f8243af"
+DOWNLOAD="https://libvirt.org/sources/glib/libvirt-glib-3.0.0.tar.gz"
+MD5SUM="1c9a7c43118ba44e7b8eacc9c105f498"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libvirt vala"
diff --git a/libraries/libvirt-python/libvirt-python.SlackBuild b/libraries/libvirt-python/libvirt-python.SlackBuild
index 9688b5afe4..8ecccb3148 100644
--- a/libraries/libvirt-python/libvirt-python.SlackBuild
+++ b/libraries/libvirt-python/libvirt-python.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libvirt-python
-VERSION=${VERSION:-4.5.0}
+VERSION=${VERSION:-5.10.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -66,7 +66,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-python setup.py install --root=$PKG
+python2 setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/libraries/libvirt-python/libvirt-python.info b/libraries/libvirt-python/libvirt-python.info
index 0670df4073..e0c28f7ae4 100644
--- a/libraries/libvirt-python/libvirt-python.info
+++ b/libraries/libvirt-python/libvirt-python.info
@@ -1,8 +1,8 @@
PRGNAM="libvirt-python"
-VERSION="4.5.0"
-HOMEPAGE="http://libvirt.org"
-DOWNLOAD="https://libvirt.org/sources/python/libvirt-python-4.5.0.tar.gz"
-MD5SUM="0c1b66a8878d6436b036565060707f73"
+VERSION="5.10.0"
+HOMEPAGE="https://libvirt.org"
+DOWNLOAD="https://libvirt.org/sources/python/libvirt-python-5.10.0.tar.gz"
+MD5SUM="045c8b45a1aed0725d874ce072027570"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libvirt"
diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild
index 84008caff4..00641011d2 100644
--- a/libraries/libvirt/libvirt.SlackBuild
+++ b/libraries/libvirt/libvirt.SlackBuild
@@ -5,8 +5,8 @@
# Maintained by Robby Workman <rworkman@slackbuilds.org>
PRGNAM=libvirt
-VERSION=${VERSION:-4.5.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.10.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -56,8 +56,11 @@ sed -i "s|(prefix)/lib/sysctl|(sysconfdir)/sysctl|" src/Makefile.in
patch -p1 < $CWD/use-virtgroup-in-polkit-rules.diff
sed -i -e "s,@VIRTGROUP@,$VIRTGROUP,g" src/remote/libvirtd.rules
+# Since 5.10: "configure: error: Build directory must be different from source directory"
+mkdir -p build
+cd build
CFLAGS="$SLKCFLAGS" \
-./configure \
+../configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--bindir=/usr/sbin \
@@ -79,6 +82,7 @@ make \
HTML_DIR=/usr/doc/$PRGNAM-$VERSION \
EXAMPLE_DIR=/usr/doc/$PRGNAM-$VERSION/examples \
install-strip DESTDIR=$PKG
+cd ..
# we don't have augeas
rm -fr $PKG/usr/share/augeas
diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info
index f8186d1ad3..1bb424b0f9 100644
--- a/libraries/libvirt/libvirt.info
+++ b/libraries/libvirt/libvirt.info
@@ -1,10 +1,10 @@
PRGNAM="libvirt"
-VERSION="4.5.0"
+VERSION="5.10.0"
HOMEPAGE="http://libvirt.org"
-DOWNLOAD="https://libvirt.org/sources/libvirt-4.5.0.tar.xz"
-MD5SUM="692b2d00907438ed08a68813d3177cd3"
+DOWNLOAD="https://libvirt.org/sources/libvirt-5.10.0.tar.xz"
+MD5SUM="d15aaba3f1e7dc311aacbded48f0dff7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="yajl urlgrabber"
+REQUIRES="yajl"
MAINTAINER="Robby Workman"
EMAIL="rworkman@slackbuilds.org"
diff --git a/libraries/libwacom/README b/libraries/libwacom/README
deleted file mode 100644
index 6ee0b09e28..0000000000
--- a/libraries/libwacom/README
+++ /dev/null
@@ -1,5 +0,0 @@
-libwacom (Library to identify Wacom tablets and their features)
-
-Manages the libraries, configuration, and diagnostic tools for Wacom
-tablets running under Linux. It also maintains updated Linux kernel
-drivers and Xorg/XFree86 XInput drivers.
diff --git a/libraries/libwacom/libwacom.SlackBuild b/libraries/libwacom/libwacom.SlackBuild
deleted file mode 100644
index 4ab5729ef9..0000000000
--- a/libraries/libwacom/libwacom.SlackBuild
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for libwacom.
-#
-# Copyright 2016-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libwacom
-VERSION=${VERSION:-1.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$(uname -m)" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$(uname -m) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
-mv $PRGNAM-$PRGNAM-$VERSION $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp COPYING NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libwacom/libwacom.info b/libraries/libwacom/libwacom.info
deleted file mode 100644
index 6b403adad4..0000000000
--- a/libraries/libwacom/libwacom.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libwacom"
-VERSION="1.3"
-HOMEPAGE="https://github.com/linuxwacom/libwacom"
-DOWNLOAD="https://github.com/linuxwacom/libwacom/archive/libwacom-1.3/libwacom-libwacom-1.3.tar.gz"
-MD5SUM="37afb3880bbb454e813069992ee523ea"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
diff --git a/libraries/libwacom/slack-desc b/libraries/libwacom/slack-desc
deleted file mode 100644
index 35db81dc05..0000000000
--- a/libraries/libwacom/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libwacom: libwacom (Library to identify Wacom tablets and their features)
-libwacom:
-libwacom: Manages the libraries, configuration, and diagnostic tools for Wacom
-libwacom: tablets running under Linux. It also maintains updated Linux kernel
-libwacom: drivers and Xorg/XFree86 XInput drivers.
-libwacom:
-libwacom: Home Page: https://github.com/linuxwacom/libwacom
-libwacom:
-libwacom:
-libwacom:
-libwacom:
diff --git a/libraries/libwebp/README b/libraries/libwebp/README
deleted file mode 100644
index 1ea4235291..0000000000
--- a/libraries/libwebp/README
+++ /dev/null
@@ -1,18 +0,0 @@
-WebP is a method of lossy compression that can be used on photographic
-images. The degree of compression is adjustable so a user can choose
-the trade-off between file size and image quality.
-WebP typically achieves an average of 39% more compression than JPEG
-and JPEG 2000, without loss of image quality.
-
-WebP is a new image format that provides lossless and lossy compression for
-images on the web. WebP lossless images are 26% smaller in size compared to
-PNGs. WebP lossy images are 25-34% smaller in size compared to JPEG images at
-equivalent SSIM index.
-
-WebP supports lossless transparency (also known as alpha channel) with just 22%
-additional bytes. Transparency is also supported with lossy compression and
-typically provides 3x smaller file sizes compared to PNG when lossy compression
-is acceptable for the red/green/blue color channels.
-
-Webmasters and web developers can use the WebP image format to create smaller
-and richer images that can help make the web faster.
diff --git a/libraries/libwebp/libwebp.SlackBuild b/libraries/libwebp/libwebp.SlackBuild
deleted file mode 100644
index 7f941c2246..0000000000
--- a/libraries/libwebp/libwebp.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for webP
-# written by powtrix (@gmail.com)
-
-PRGNAM=libwebp
-VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --disable-static \
- --disable-silent-rules \
- --enable-everything \
- --enable-swap-16bit-csp \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-(
- cd swig
- # Fix temporary working directory.
- sed -i "/^tmpdir/s|=.*|= 'tmpdir'|" setup.py
- CFLAGS="$SLKCFLAGS -I$PKG/usr/include" \
- LDFLAGS="-L$PKG/usr/lib${LIBDIRSUFFIX} -lwebp" \
- python setup.py install --root=$PKG
- # Install the python3 module if python3 is installed
- if $(python3 -c 'import sys' 2>/dev/null); then
- CFLAGS="$SLKCFLAGS -I$PKG/usr/include" \
- LDFLAGS="-L$PKG/usr/lib${LIBDIRSUFFIX} -lwebp" \
- python3 setup.py install --root=$PKG
- fi
-)
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog NEWS PATENTS README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libwebp/libwebp.info b/libraries/libwebp/libwebp.info
deleted file mode 100644
index ac10fcac7c..0000000000
--- a/libraries/libwebp/libwebp.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libwebp"
-VERSION="1.1.0"
-HOMEPAGE="https://developers.google.com/speed/webp/"
-DOWNLOAD="http://downloads.webmproject.org/releases/webp/libwebp-1.1.0.tar.gz"
-MD5SUM="7e047f2cbaf584dff7a8a7e0f8572f18"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="powtrix"
-EMAIL="powtrix@gmail.com"
diff --git a/libraries/libwebp/slack-desc b/libraries/libwebp/slack-desc
deleted file mode 100644
index c37e841aaf..0000000000
--- a/libraries/libwebp/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libwebp: libwebp (WebP photo compression library)
-libwebp:
-libwebp: WebP is a method of lossy compression that can be used on
-libwebp: photographic images. The degree of compression is adjustable so a
-libwebp: user can choose the trade-off between file size and image quality.
-libwebp: WebP typically achieves an average of 39% more compression than
-libwebp: JPEG and JPEG 2000, without loss of image quality.
-libwebp:
-libwebp: Homepage: https://developers.google.com/speed/webp/
-libwebp:
-libwebp:
diff --git a/libraries/libwps/libwps.SlackBuild b/libraries/libwps/libwps.SlackBuild
index 838e0c09dd..4e14aff208 100644
--- a/libraries/libwps/libwps.SlackBuild
+++ b/libraries/libwps/libwps.SlackBuild
@@ -75,7 +75,7 @@ case "${DOC:-0}" in
esac
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -Wno-error=implicit-fallthrough=" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/libraries/libxkbcommon/README b/libraries/libxkbcommon/README
deleted file mode 100644
index ea0d4567fe..0000000000
--- a/libraries/libxkbcommon/README
+++ /dev/null
@@ -1,11 +0,0 @@
-xkbcommon is a library to handle keyboard descriptions, including
-loading them from disk, parsing them and handling their state.
-It's mainly meant for client toolkits, window systems, and other
-system applications; currently that includes Wayland, kmscon,
-GTK+, Clutter, and more.
-
-This Slackbuild disables Wayland support by default. In enabling
-Wayland support (which requires wayland-protocols), run the script
-with the following command:
-
-WAYLAND=yes ./libxkbcommon.SlackBuild
diff --git a/libraries/libxkbcommon/libxkbcommon.SlackBuild b/libraries/libxkbcommon/libxkbcommon.SlackBuild
deleted file mode 100644
index 4e04b1c3c6..0000000000
--- a/libraries/libxkbcommon/libxkbcommon.SlackBuild
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libxkbcommon
-
-# Copyright 2013 Anton Sil'uev, Russia
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=libxkbcommon
-VERSION=${VERSION:-0.10.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-if [ ${WAYLAND:-no} = yes ]; then
- ENABLE_WAYLAND=true
-else
- ENABLE_WAYLAND=false
-fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-meson --prefix /usr --mandir /usr/man --libdir lib${LIBDIRSUFFIX} -Denable-wayland=$ENABLE_WAYLAND build
-
-DESTDIR=$PKG ninja -C build all install
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.md NEWS PACKAGING doc/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libxkbcommon/libxkbcommon.info b/libraries/libxkbcommon/libxkbcommon.info
deleted file mode 100644
index 3eedf1a4f2..0000000000
--- a/libraries/libxkbcommon/libxkbcommon.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libxkbcommon"
-VERSION="0.10.0"
-HOMEPAGE="https://xkbcommon.org/"
-DOWNLOAD="https://xkbcommon.org/download/libxkbcommon-0.10.0.tar.xz"
-MD5SUM="2d9ad3a46b317138b5e72a91cf105451"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="meson"
-MAINTAINER="Isaac Yu"
-EMAIL="isaacyu1@isaacyu1.com"
diff --git a/libraries/libxkbcommon/slack-desc b/libraries/libxkbcommon/slack-desc
deleted file mode 100644
index 2fc5187f45..0000000000
--- a/libraries/libxkbcommon/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-libxkbcommon: libxkbcommon (library to handle keyboard descriptions)
-libxkbcommon:
-libxkbcommon: libxkbcommon is a keymap compiler and support library which processes
-libxkbcommon: a reduced subset of keymaps as defined by the XKB specification.
-libxkbcommon: Primarily, a keymap is created from a set of
-libxkbcommon: Rules/Model/Layout/Variant/Options names, processed through an
-libxkbcommon: XKB ruleset, and compiled into a struct xkb_keymap, which is
-libxkbcommon: the base type for all xkbcommon operations.
-libxkbcommon:
-libxkbcommon: libxkbcommon does not distribute a dataset itself, other than for
-libxkbcommon: testing purposes.
diff --git a/libraries/libzdb/libzdb.SlackBuild b/libraries/libzdb/libzdb.SlackBuild
index 00f439ba09..2267542660 100644
--- a/libraries/libzdb/libzdb.SlackBuild
+++ b/libraries/libzdb/libzdb.SlackBuild
@@ -83,7 +83,6 @@ CXXFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--enable-static=no \
--enable-protected \
- --enable-openssl \
--enable-sqliteunlock \
--with-mysql \
--with-sqlite=/usr/include \
diff --git a/libraries/libzrtpcpp/libzrtpcpp.SlackBuild b/libraries/libzrtpcpp/libzrtpcpp.SlackBuild
index 0fe58e8c8d..a717ac8ec9 100644
--- a/libraries/libzrtpcpp/libzrtpcpp.SlackBuild
+++ b/libraries/libzrtpcpp/libzrtpcpp.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=libzrtpcpp
SRCNAM=ZRTPCPP
-VERSION=${VERSION:-4.1.2}
+VERSION=${VERSION:-4.6.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -55,7 +55,7 @@ else
LIBDIRSUFFIX=""
fi
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README.md $CWD/$PRGNAM.SlackBuild"
+DOCS="AUTHORS COPYING ChangeLog INSTALL README.md $CWD/$PRGNAM.SlackBuild"
set -e
diff --git a/libraries/libzrtpcpp/libzrtpcpp.info b/libraries/libzrtpcpp/libzrtpcpp.info
index 362f787ee7..280482cd0a 100644
--- a/libraries/libzrtpcpp/libzrtpcpp.info
+++ b/libraries/libzrtpcpp/libzrtpcpp.info
@@ -1,8 +1,8 @@
PRGNAM="libzrtpcpp"
-VERSION="4.1.2"
+VERSION="4.6.6"
HOMEPAGE="http://www.gnutelephony.org/"
-DOWNLOAD="https://github.com/wernerd/ZRTPCPP/archive/V4.1.2.tar.gz"
-MD5SUM="dd13e50d0106eb38132fd74bd024664c"
+DOWNLOAD="https://github.com/wernerd/ZRTPCPP/archive/V4.6.6/ZRTPCPP-4.6.6.tar.gz"
+MD5SUM="e4f4fd0b5f228782cde398fbcff5d139"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ccrtp"
diff --git a/libraries/live555/live555.SlackBuild b/libraries/live555/live555.SlackBuild
index 7c4d4605a1..8112c1aa9c 100644
--- a/libraries/live555/live555.SlackBuild
+++ b/libraries/live555/live555.SlackBuild
@@ -62,6 +62,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# This header isn't shipped in glibc >= 2.26 anymore
+# https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
+sed -i 's/#include <xlocale.h>.*/#include <locale.h>/' liveMedia/include/Locale.hh
+
for f in $(find . -type f |xargs grep -l "PREFIX =") ; do echo $f; sed -i -e "/PREFIX =/c\PREFIX = \/usr" $f ; done
for f in $(find . -type f |xargs grep -l "LIBDIR =") ; do echo $f; sed -i -e "/LIBDIR =/c\LIBDIR = \$(PREFIX)\/lib$LIBDIRSUFFIX" $f ; done
diff --git a/libraries/luacrypto/luacrypto.SlackBuild b/libraries/luacrypto/luacrypto.SlackBuild
index fc7995e3ae..2deb6e70fc 100644
--- a/libraries/luacrypto/luacrypto.SlackBuild
+++ b/libraries/luacrypto/luacrypto.SlackBuild
@@ -71,7 +71,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+LIBS="-L/usr/lib${LIBDIRSUFFIX}/openssl-1.0" \
+CFLAGS="$SLKCFLAGS -I/usr/include/openssl-1.0" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/libraries/lxqt-build-tools/lxqt-build-tools.SlackBuild b/libraries/lxqt-build-tools/lxqt-build-tools.SlackBuild
index 6d7a11dc22..2c2ad34bbf 100644
--- a/libraries/lxqt-build-tools/lxqt-build-tools.SlackBuild
+++ b/libraries/lxqt-build-tools/lxqt-build-tools.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for lxqt-build-tools
#
# Copyright 2016-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# Copyright 2018-2019 Matteo Bernardini, Pisa, Italy.
+# Copyright 2018-2020 Matteo Bernardini, Pisa, Italy.
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM="lxqt-build-tools"
-VERSION=${VERSION:-0.6.0}
+VERSION=${VERSION:-0.7.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -70,11 +70,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# glib2 >= 2.50 is actually needed to build all of the LXQt components,
-# but we can't have them on 14.2 because we lack kde framework 5, so we
-# force a lower requirement to let us use this for what we can
-sed -i "s|2\.50|2.46|" CMakeLists.txt || exit 1
-
mkdir build
cd build
cmake \
diff --git a/libraries/lxqt-build-tools/lxqt-build-tools.info b/libraries/lxqt-build-tools/lxqt-build-tools.info
index c3ec2db312..54473e5915 100644
--- a/libraries/lxqt-build-tools/lxqt-build-tools.info
+++ b/libraries/lxqt-build-tools/lxqt-build-tools.info
@@ -1,8 +1,8 @@
PRGNAM="lxqt-build-tools"
-VERSION="0.6.0"
+VERSION="0.7.0"
HOMEPAGE="https://github.com/lxde/lxqt-build-tools"
-DOWNLOAD="https://github.com/lxde/lxqt-build-tools/archive/0.6.0/lxqt-build-tools-0.6.0.tar.gz"
-MD5SUM="5688b9dd430d0730c31bb9a7873ed9fd"
+DOWNLOAD="https://github.com/lxde/lxqt-build-tools/archive/0.7.0/lxqt-build-tools-0.7.0.tar.gz"
+MD5SUM="2c9fcec8642ca9ccc8b8b470e811c95b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="qt5"
diff --git a/libraries/med/med.SlackBuild b/libraries/med/med.SlackBuild
index 2620575135..e69fecfe96 100644
--- a/libraries/med/med.SlackBuild
+++ b/libraries/med/med.SlackBuild
@@ -78,6 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--enable-fortran \
+ --disable-python \
--disable-static \
--build=$ARCH-slackware-linux
diff --git a/libraries/menu-cache/menu-cache.SlackBuild b/libraries/menu-cache/menu-cache.SlackBuild
index b5157fa1fa..34be5b38de 100644
--- a/libraries/menu-cache/menu-cache.SlackBuild
+++ b/libraries/menu-cache/menu-cache.SlackBuild
@@ -72,7 +72,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Apply upstream patches
+# Apply upstream patches and fix building with gcc >= 10.x
for i in $CWD/patches/* ; do patch -p1 < $i ; done
sh autogen.sh || true
diff --git a/libraries/menu-cache/patches/Support-gcc10-compilation.patch b/libraries/menu-cache/patches/Support-gcc10-compilation.patch
new file mode 100644
index 0000000000..29f8e53444
--- /dev/null
+++ b/libraries/menu-cache/patches/Support-gcc10-compilation.patch
@@ -0,0 +1,108 @@
+From 1ce739649b4d66339a03fc0ec9ee7a2f7c141780 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Fri, 24 Jan 2020 13:33:00 +0900
+Subject: [PATCH] Support gcc10 compilation
+
+gcc10 now defaults to -fno-common, and with gcc10 menu-cache compilation fails like
+
+/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:167: multiple definition of `DirDirs'; main.o:menu-cache-gen/menu-tags.h:167: first defined here
+/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:164: multiple definition of `AppDirs'; main.o:menu-cache-gen/menu-tags.h:164: first defined here
+/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:52: multiple definition of `menuTag_Layout'; main.o:menu-cache-gen/menu-tags.h:52: first defined here
+....
+
+This patch fixes compilation with gcc10: properly declaring variables in header with "extern", and also removing some unneeded variables in header files.
+---
+ menu-cache-gen/menu-tags.h | 55 ++++++++++++--------------------------
+ 1 file changed, 17 insertions(+), 38 deletions(-)
+
+diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h
+index f3fd7d3..f71c0bc 100644
+--- a/menu-cache-gen/menu-tags.h
++++ b/menu-cache-gen/menu-tags.h
+@@ -22,38 +22,17 @@
+ #include <libfm/fm-extra.h>
+ #include <menu-cache.h>
+
+-FmXmlFileTag menuTag_Menu;
+-FmXmlFileTag menuTag_AppDir;
+-FmXmlFileTag menuTag_DefaultAppDirs;
+-FmXmlFileTag menuTag_DirectoryDir;
+-FmXmlFileTag menuTag_DefaultDirectoryDirs;
+-FmXmlFileTag menuTag_Include;
+-FmXmlFileTag menuTag_Exclude;
+-FmXmlFileTag menuTag_Filename;
+-FmXmlFileTag menuTag_Or;
+-FmXmlFileTag menuTag_And;
+-FmXmlFileTag menuTag_Not;
+-FmXmlFileTag menuTag_Category;
+-FmXmlFileTag menuTag_MergeFile;
+-FmXmlFileTag menuTag_MergeDir;
+-FmXmlFileTag menuTag_DefaultMergeDirs;
+-FmXmlFileTag menuTag_Directory;
+-FmXmlFileTag menuTag_Name;
+-FmXmlFileTag menuTag_Deleted;
+-FmXmlFileTag menuTag_NotDeleted;
+-FmXmlFileTag menuTag_OnlyUnallocated;
+-FmXmlFileTag menuTag_NotOnlyUnallocated;
+-FmXmlFileTag menuTag_All;
+-FmXmlFileTag menuTag_LegacyDir;
+-FmXmlFileTag menuTag_KDELegacyDirs;
+-FmXmlFileTag menuTag_Move;
+-FmXmlFileTag menuTag_Old;
+-FmXmlFileTag menuTag_New;
+-FmXmlFileTag menuTag_Layout;
+-FmXmlFileTag menuTag_DefaultLayout;
+-FmXmlFileTag menuTag_Menuname;
+-FmXmlFileTag menuTag_Separator;
+-FmXmlFileTag menuTag_Merge;
++extern FmXmlFileTag menuTag_AppDir;
++extern FmXmlFileTag menuTag_DirectoryDir;
++extern FmXmlFileTag menuTag_Include;
++extern FmXmlFileTag menuTag_Exclude;
++extern FmXmlFileTag menuTag_Filename;
++extern FmXmlFileTag menuTag_Or;
++extern FmXmlFileTag menuTag_And;
++extern FmXmlFileTag menuTag_Not;
++extern FmXmlFileTag menuTag_Category;
++extern FmXmlFileTag menuTag_All;
++extern FmXmlFileTag menuTag_LegacyDir;
+
+ typedef enum {
+ MERGE_NONE, /* starting value */
+@@ -152,19 +131,19 @@ typedef struct {
+ } MenuRule;
+
+ /* requested language(s) */
+-char **languages;
++extern char **languages;
+
+ /* list of menu files to monitor */
+-GSList *MenuFiles;
++extern GSList *MenuFiles;
+
+ /* list of menu dirs to monitor */
+-GSList *MenuDirs;
++extern GSList *MenuDirs;
+
+ /* list of available app dirs */
+-GSList *AppDirs;
++extern GSList *AppDirs;
+
+ /* list of available dir dirs */
+-GSList *DirDirs;
++extern GSList *DirDirs;
+
+ /* parse and merge menu files */
+ MenuMenu *get_merged_menu(const char *file, FmXmlFile **xmlfile, GError **error);
+@@ -177,7 +156,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char *menuname, const char *fil
+ void _free_layout_items(GList *data);
+
+ /* verbosity level */
+-gint verbose;
++extern gint verbose;
+
+ #define DBG if (verbose) g_debug
+ #define VDBG if (verbose > 1) g_debug
+--
+2.24.1
+
diff --git a/libraries/npth/README b/libraries/npth/README
deleted file mode 100644
index b89f596996..0000000000
--- a/libraries/npth/README
+++ /dev/null
@@ -1,11 +0,0 @@
-npth (New GNU Portable Threads Library)
-
-nPth is a library to provide the GNU Pth API and thus a non-preemptive
-threads implementation.
-
-In contrast to GNU Pth is is based on the system's standard threads
-implementation. This allows the use of libraries which are not compatible
-to GNU Pth. Experience with a Windows Pth emulation showed that this
-is a solid way to provide a co-routine based framework.
-
-This library is required to compile GnuPG 2.1.
diff --git a/libraries/npth/npth.SlackBuild b/libraries/npth/npth.SlackBuild
deleted file mode 100644
index 570dd8e992..0000000000
--- a/libraries/npth/npth.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for nPth
-
-# Copyright 2016 pyllyukko
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=npth
-VERSION=${VERSION:-1.6}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING.LIB ChangeLog HACKING INSTALL NEWS README VERSION \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/npth/npth.info b/libraries/npth/npth.info
deleted file mode 100644
index 61f97c00b1..0000000000
--- a/libraries/npth/npth.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="npth"
-VERSION="1.6"
-HOMEPAGE="https://www.gnupg.org/related_software/npth/index.html"
-DOWNLOAD="https://www.gnupg.org/ftp/gcrypt/npth/npth-1.6.tar.bz2"
-MD5SUM="375d1a15ad969f32d25f1a7630929854"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="pyllyukko"
-EMAIL="pyllyukko AT maimed dot org"
diff --git a/libraries/npth/slack-desc b/libraries/npth/slack-desc
deleted file mode 100644
index fa1c3c2ab7..0000000000
--- a/libraries/npth/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-npth: npth (New GNU Portable Threads Library)
-npth:
-npth: nPth is a library to provide the GNU Pth API and thus a non-preemptive
-npth: threads implementation.
-npth:
-npth: In contrast to GNU Pth is is based on the system's standard threads
-npth: implementation. This allows the use of libraries which are not
-npth: compatible to GNU Pth. Experience with a Windows Pth emulation showed
-npth: that this is a solid way to provide a co-routine based framework.
-npth:
-npth: Homepage: https://www.gnupg.org/related_software/npth/index.html
diff --git a/libraries/nx-libs/nx-libs.SlackBuild b/libraries/nx-libs/nx-libs.SlackBuild
index 78f38de601..339b39d486 100644
--- a/libraries/nx-libs/nx-libs.SlackBuild
+++ b/libraries/nx-libs/nx-libs.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=nx-libs
-VERSION=${VERSION:-3.5.99.20_1}
+VERSION=${VERSION:-3.5.99.24}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -63,7 +63,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$SRCVERSION
-tar xvf $CWD/$PRGNAM-$SRCVERSION-full.tar.gz
+tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
cd $PRGNAM-$SRCVERSION
chown -R root:root .
find -L . \
diff --git a/libraries/nx-libs/nx-libs.info b/libraries/nx-libs/nx-libs.info
index 40682b6b44..285b393030 100644
--- a/libraries/nx-libs/nx-libs.info
+++ b/libraries/nx-libs/nx-libs.info
@@ -1,8 +1,8 @@
PRGNAM="nx-libs"
-VERSION="3.5.99.20_1"
+VERSION="3.5.99.24"
HOMEPAGE="http://www.x2go.org"
-DOWNLOAD="https://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.99.20-1-full.tar.gz"
-MD5SUM="15ab120295db892369cf9eb90f650006"
+DOWNLOAD="https://github.com/ArcticaProject/nx-libs/archive/3.5.99.24/nx-libs-3.5.99.24.tar.gz"
+MD5SUM="6522dacb180acd97247d98282b3fdaf2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/oath-toolkit/oath-toolkit-new-glibc-check.patch b/libraries/oath-toolkit/oath-toolkit-new-glibc-check.patch
new file mode 100644
index 0000000000..eab3315fbc
--- /dev/null
+++ b/libraries/oath-toolkit/oath-toolkit-new-glibc-check.patch
@@ -0,0 +1,25 @@
+Description: Check _IO_EOF_SEEN instead of _IO_ftrylockfile
+ Needed to get fseeko.c to build with glibc 2.28.
+ Inspired by https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e.
+Author: Sascha Steinbiss <satta@debian.org>
+Last-Update: 2019-02-09
+--- a/liboath/gl/fseeko.c
++++ b/liboath/gl/fseeko.c
+@@ -47,7 +47,7 @@
+ #endif
+
+ /* These tests are based on fpurge.c. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_read_end == fp->_IO_read_ptr
+ && fp->_IO_write_ptr == fp->_IO_write_base
+ && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@
+ return -1;
+ }
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
diff --git a/libraries/oath-toolkit/oath-toolkit.SlackBuild b/libraries/oath-toolkit/oath-toolkit.SlackBuild
index a7a678abaf..d5014a5859 100644
--- a/libraries/oath-toolkit/oath-toolkit.SlackBuild
+++ b/libraries/oath-toolkit/oath-toolkit.SlackBuild
@@ -70,6 +70,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p1 < $CWD/oath-toolkit-gcc.patch
+patch -p1 < $CWD/oath-toolkit-new-glibc-check.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/libraries/ocaml-camomile/ocaml-camomile.SlackBuild b/libraries/ocaml-camomile/ocaml-camomile.SlackBuild
index 1acdb0ba15..ce1a1b262d 100644
--- a/libraries/ocaml-camomile/ocaml-camomile.SlackBuild
+++ b/libraries/ocaml-camomile/ocaml-camomile.SlackBuild
@@ -21,15 +21,16 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ocaml-camomile
-VERSION=${VERSION:-0.8.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.0.2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
SRCNAM=camomile
+SRCNAM2=Camomile
if [ -z "$ARCH" ]; then
case "$(uname -m)" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$(uname -m) ;;
esac
@@ -40,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -58,9 +59,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
-cd $SRCNAM-$VERSION
+rm -rf $SRCNAM2-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM2-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -68,35 +69,15 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Install missing library, thanks debian
-patch -p1 < $CWD/0002-Install-missing-camomileLibrary.a.patch
+ocaml configure.ml
+dune build -p camomile @install
+DESTDIR=$PKG dune install --prefix=/usr --libdir="$(ocamlfind printconf destdir)"
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr
-
-# add DESTDIR for `install-data'
-sed -i 's|^prefix=\(.*\)$|prefix=$(DESTDIR)\1|' Makefile
-
-# for `install-without-ocamlfind'
-sed -i 's|^OCAMLLIB = \(.*\)$|OCAMLLIB = $(DESTDIR)\1|' Makefile
-
-# for `install-with-ocamlfind'
-long='$(DESTDIR)/$$(ocamlfind printconf destdir)'
-sed -i "s|\\(ocamlfind install\\)| mkdir -p $long; \\1 -destdir $long |" Makefile
-
-make -j1
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file \
- | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null \
- || true
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- COPYING Changes README \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/libraries/ocaml-camomile/ocaml-camomile.info b/libraries/ocaml-camomile/ocaml-camomile.info
index 5706af8a10..028d83635f 100644
--- a/libraries/ocaml-camomile/ocaml-camomile.info
+++ b/libraries/ocaml-camomile/ocaml-camomile.info
@@ -1,8 +1,8 @@
PRGNAM="ocaml-camomile"
-VERSION="0.8.5"
+VERSION="1.0.2"
HOMEPAGE="http://camomile.sourceforge.net/"
-DOWNLOAD="https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2"
-MD5SUM="1e25b6cd4efd26ab38a667db18d83f02"
+DOWNLOAD="https://github.com/yoriyuki/Camomile/archive/1.0.2/camomile-1.0.2.tar.gz"
+MD5SUM="2ec60575e485b0b92f821949a81acb4d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="camlp4"
diff --git a/libraries/ocaml-findlib/ocaml-findlib.SlackBuild b/libraries/ocaml-findlib/ocaml-findlib.SlackBuild
index 489b2d1d52..50c641277f 100644
--- a/libraries/ocaml-findlib/ocaml-findlib.SlackBuild
+++ b/libraries/ocaml-findlib/ocaml-findlib.SlackBuild
@@ -22,7 +22,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ocaml-findlib
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.8.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -30,7 +30,7 @@ SRCNAM=findlib
if [ -z "$ARCH" ]; then
case "$(uname -m)" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$(uname -m) ;;
esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/libraries/ocaml-findlib/ocaml-findlib.info b/libraries/ocaml-findlib/ocaml-findlib.info
index 63828cfae9..d5e7d3ed20 100644
--- a/libraries/ocaml-findlib/ocaml-findlib.info
+++ b/libraries/ocaml-findlib/ocaml-findlib.info
@@ -1,10 +1,10 @@
PRGNAM="ocaml-findlib"
-VERSION="1.6.2"
+VERSION="1.8.1"
HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
-DOWNLOAD="http://download.camlcity.org/download/findlib-1.6.2.tar.gz"
-MD5SUM="530ff275d6b96e140f0d3a03ed14b68e"
+DOWNLOAD="http://download.camlcity.org/download/findlib-1.8.1.tar.gz"
+MD5SUM="18ca650982c15536616dea0e422cbd8c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ocaml"
-MAINTAINER="Markus Hutmacher"
-EMAIL="mailing@markhu.de"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/ocl-icd/README b/libraries/ocl-icd/README
deleted file mode 100644
index 3a939287d6..0000000000
--- a/libraries/ocl-icd/README
+++ /dev/null
@@ -1,19 +0,0 @@
-ocl-icd: free OpenCL ICD Loader
-
-OpenCL implementations are provided as ICD (Installable Client Driver). An
-OpenCL program can use several ICD thanks to the use of an ICD Loader as
-provided by this project. This free ICD Loader can load any (free or non free)
-ICD.
-
-NOTE: ocl-icd should not be needed on systems where graphics drivers
-by AMD or Nvidia already provide an OpenCL ICD Loader implementation.
-To check if you already have an ICD loader, run this as root:
-
- ldconfig -p | grep -i opencl
-
-If nothing is printed out, then your system probably lacks an ICD
-implementation (libOpenCL.so* objects) and you need this package.
-
-If something is printed out, then you don't need this package, as it
-would probably overwrite the ICD loader that came with your graphics
-drivers.
diff --git a/libraries/ocl-icd/ocl-icd.SlackBuild b/libraries/ocl-icd/ocl-icd.SlackBuild
deleted file mode 100644
index c4e5555601..0000000000
--- a/libraries/ocl-icd/ocl-icd.SlackBuild
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ocl-icd
-
-# Copyright (c) 2017-2019 Alan Alberghini <414N@slacky.it>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-#
-# Build history:
-#
-# 1 - Initial release.
-
-PRGNAM=ocl-icd
-VERSION=${VERSION:-2.2.12}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-DOCS="README NEWS COPYING"
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}-${VERSION}.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./bootstrap
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-official-khronos-headers \
- --disable-debug \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- $DOCS \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/ocl-icd/ocl-icd.info b/libraries/ocl-icd/ocl-icd.info
deleted file mode 100644
index 180d3f8ef5..0000000000
--- a/libraries/ocl-icd/ocl-icd.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ocl-icd"
-VERSION="2.2.12"
-HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
-DOWNLOAD="https://github.com/OCL-dev/ocl-icd/archive/v2.2.12.tar.gz"
-MD5SUM="47035a0b597fe334be16a653c7c7951f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Alan Alberghini"
-EMAIL="414N@slacky.it"
diff --git a/libraries/ocl-icd/slack-desc b/libraries/ocl-icd/slack-desc
deleted file mode 100644
index 58678a4610..0000000000
--- a/libraries/ocl-icd/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-ocl-icd: ocl-icd (OpenCL ICD Loader)
-ocl-icd:
-ocl-icd: OpenCL implementations are provided as ICD (Installable Client
-ocl-icd: Driver). An OpenCL program can use several ICD thanks to the use of an
-ocl-icd: ICD Loader as provided by this project. This free ICD Loader can load
-ocl-icd: any (free or non free) ICD.
-ocl-icd:
-ocl-icd:
-ocl-icd:
-ocl-icd: Homepage:
-ocl-icd: https://github.com/OCL-dev/ocl-icd
diff --git a/libraries/opal/README b/libraries/opal/README
index a6a7e53e88..b20eafbaeb 100644
--- a/libraries/opal/README
+++ b/libraries/opal/README
@@ -2,4 +2,4 @@ The Open Phone Abstraction Library (OPAL) is a C++ multi-platform,
multi-protocol library for Fax, Video & Voice over IP and other
networks.
-Optional dependencies are ffmpeg, x264, celt and jdk/openjdk.
+Optional dependencies are x264, celt and jdk/openjdk.
diff --git a/libraries/opal/ffmpeg2.patch b/libraries/opal/ffmpeg2.patch
deleted file mode 100644
index 80dca469d9..0000000000
--- a/libraries/opal/ffmpeg2.patch
+++ /dev/null
@@ -1,398 +0,0 @@
-patch from: http://www.linuxfromscratch.org/blfs/view/svn/multimedia/opal.html
-
-Submitted By: Igor Živković <contact@igor-zivkovic.from.hr>
-Date: 2013-10-08
-Initial Package Version: 3.10.10
-Upstream Status: Unknown
-Origin: Gentoo
-Description: Fixes building against FFmpeg version >= 2.0.0
-
-diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.cxx opal-3.10.10/plugins/video/common/dyna.cxx
---- opal-3.10.10.orig/plugins/video/common/dyna.cxx 2013-02-20 03:18:05.000000000 +0100
-+++ plugins/video/common/dyna.cxx 2013-10-08 12:57:25.058873513 +0200
-@@ -210,7 +210,7 @@
- #endif
-
-
--FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
-+FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
- {
- m_codec = codec;
- if (m_codec==CODEC_ID_H264)
-@@ -348,12 +348,12 @@
- return true;
- }
-
--AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
-+AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id)
- {
- return Favcodec_find_encoder(id);
- }
-
--AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
-+AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id)
- {
- WaitAndSignal m(processLock);
-
-diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.h opal-3.10.10/plugins/video/common/dyna.h
---- opal-3.10.10.orig/plugins/video/common/dyna.h 2013-02-20 03:18:05.000000000 +0100
-+++ plugins/video/common/dyna.h 2013-10-08 12:57:25.058873513 +0200
-@@ -88,13 +88,13 @@
- class FFMPEGLibrary
- {
- public:
-- FFMPEGLibrary(CodecID codec);
-+ FFMPEGLibrary(AVCodecID codec);
- ~FFMPEGLibrary();
-
- bool Load();
-
-- AVCodec *AvcodecFindEncoder(enum CodecID id);
-- AVCodec *AvcodecFindDecoder(enum CodecID id);
-+ AVCodec *AvcodecFindEncoder(enum AVCodecID id);
-+ AVCodec *AvcodecFindDecoder(enum AVCodecID id);
- AVCodecContext *AvcodecAllocContext(void);
- AVFrame *AvcodecAllocFrame(void);
- int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
-@@ -117,15 +117,15 @@
- DynaLink m_libAvcodec;
- DynaLink m_libAvutil;
-
-- CodecID m_codec;
-+ AVCodecID m_codec;
- char m_codecString[32];
-
- void (*Favcodec_init)(void);
- void (*Fav_init_packet)(AVPacket *pkt);
-
- void (*Favcodec_register_all)(void);
-- AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
-- AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
-+ AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id);
-+ AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id);
- AVCodecContext *(*Favcodec_alloc_context)(void);
- AVFrame *(*Favcodec_alloc_frame)(void);
- int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
-diff -Naur opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h
---- opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-02-20 03:18:04.000000000 +0100
-+++ plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-10-08 12:57:25.060873488 +0200
-@@ -101,7 +101,7 @@
- * 1. no value of a existing codec ID changes (that would break ABI),
- * 2. it is as close as possible to similar codecs.
- */
--enum CodecID {
-+enum AVCodecID {
- CODEC_ID_NONE,
-
- /* video codecs */
-@@ -1390,7 +1390,7 @@
-
- char codec_name[32];
- enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
-- enum CodecID codec_id; /* see CODEC_ID_xxx */
-+ enum AVCodecID codec_id; /* see CODEC_ID_xxx */
-
- /**
- * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-@@ -2843,7 +2843,7 @@
- */
- const char *name;
- enum AVMediaType type;
-- enum CodecID id;
-+ enum AVCodecID id;
- int priv_data_size;
- int (*init)(AVCodecContext *);
- int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
-@@ -2898,7 +2898,7 @@
- *
- * See CODEC_ID_xxx
- */
-- enum CodecID id;
-+ enum AVCodecID id;
-
- /**
- * Supported pixel format.
-@@ -3402,10 +3402,10 @@
- /**
- * Find a registered encoder with a matching codec ID.
- *
-- * @param id CodecID of the requested encoder
-+ * @param id AVCodecID of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
--AVCodec *avcodec_find_encoder(enum CodecID id);
-+AVCodec *avcodec_find_encoder(enum AVCodecID id);
-
- /**
- * Find a registered encoder with the specified name.
-@@ -3418,10 +3418,10 @@
- /**
- * Find a registered decoder with a matching codec ID.
- *
-- * @param id CodecID of the requested decoder
-+ * @param id AVCodecID of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
--AVCodec *avcodec_find_decoder(enum CodecID id);
-+AVCodec *avcodec_find_decoder(enum AVCodecID id);
-
- /**
- * Find a registered decoder with the specified name.
-@@ -3822,7 +3822,7 @@
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
--int av_get_bits_per_sample(enum CodecID codec_id);
-+int av_get_bits_per_sample(enum AVCodecID codec_id);
-
- #if FF_API_OLD_SAMPLE_FMT
- /**
-diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx
---- opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.cxx 2013-02-20 03:18:03.000000000 +0100
-+++ plugins/video/H.263-1998/h263-1998.cxx 2013-10-08 12:57:25.061873475 +0200
-@@ -48,6 +48,10 @@
- #endif
-
- #include "h263-1998.h"
-+extern "C"
-+{
-+#include <libavutil/opt.h>
-+}
- #include <limits>
- #include <iomanip>
- #include <stdio.h>
-@@ -203,7 +207,7 @@
- PTRACE(4, m_prefix, "Encoder closed");
- }
-
--bool H263_Base_EncoderContext::Init(CodecID codecId)
-+bool H263_Base_EncoderContext::Init(AVCodecID codecId)
- {
- PTRACE(5, m_prefix, "Opening encoder");
-
-@@ -317,9 +321,9 @@
- // Level 2+
- // works with eyeBeam, signaled via non-standard "D"
- if (atoi(value) == 1)
-- m_context->flags |= CODEC_FLAG_H263P_UMV;
-+ av_opt_set_int(m_context->priv_data, "umv", 1, 0);
- else
-- m_context->flags &= ~CODEC_FLAG_H263P_UMV;
-+ av_opt_set_int(m_context->priv_data, "umv", 0, 0);
- return;
- }
-
-@@ -328,9 +332,9 @@
- // Annex F: Advanced Prediction Mode
- // does not work with eyeBeam
- if (atoi(value) == 1)
-- m_context->flags |= CODEC_FLAG_OBMC;
-+ av_opt_set_int(m_context->priv_data, "obmc", 1, 0);
- else
-- m_context->flags &= ~CODEC_FLAG_OBMC;
-+ av_opt_set_int(m_context->priv_data, "obmc", 0, 0);
- return;
- }
- #endif
-@@ -360,9 +364,9 @@
- // Annex K: Slice Structure
- // does not work with eyeBeam
- if (atoi(value) != 0)
-- m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT;
-+ av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0);
- else
-- m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
-+ av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
- return;
- }
-
-@@ -370,9 +374,9 @@
- // Annex S: Alternative INTER VLC mode
- // does not work with eyeBeam
- if (atoi(value) == 1)
-- m_context->flags |= CODEC_FLAG_H263P_AIV;
-+ av_opt_set_int(m_context->priv_data, "aiv", 1, 0);
- else
-- m_context->flags &= ~CODEC_FLAG_H263P_AIV;
-+ av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
- return;
- }
-
-@@ -450,15 +454,6 @@
- PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
- PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
-
-- #define CODEC_TRACER_FLAG(tracer, flag) \
-- PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled"));
-- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
-- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
-- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
-- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
-- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
-- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
--
- return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
- }
-
-@@ -521,7 +516,7 @@
-
- // Need to copy to local buffer to guarantee 16 byte alignment
- memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
-- m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
-+ m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
-
- /*
- m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
-@@ -603,13 +598,13 @@
- m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
- m_context->opaque = this; // used to separate out packets from different encode threads
-
-- m_context->flags &= ~CODEC_FLAG_H263P_UMV;
-+ av_opt_set_int(m_context->priv_data, "umv", 0, 0);
- m_context->flags &= ~CODEC_FLAG_4MV;
- #if LIBAVCODEC_RTP_MODE
- m_context->flags &= ~CODEC_FLAG_H263P_AIC;
- #endif
-- m_context->flags &= ~CODEC_FLAG_H263P_AIV;
-- m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
-+ av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
-+ av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
-
- return true;
- }
-diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.h opal-3.10.10/plugins/video/H.263-1998/h263-1998.h
---- opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.h 2013-02-20 03:18:03.000000000 +0100
-+++ plugins/video/H.263-1998/h263-1998.h 2013-10-08 12:57:25.062873463 +0200
-@@ -115,7 +115,7 @@
- virtual ~H263_Base_EncoderContext();
-
- virtual bool Init() = 0;
-- virtual bool Init(CodecID codecId);
-+ virtual bool Init(AVCodecID codecId);
-
- virtual bool SetOptions(const char * const * options);
- virtual void SetOption(const char * option, const char * value);
-diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/Makefile.in opal-3.10.10/plugins/video/H.263-1998/Makefile.in
---- opal-3.10.10.orig/plugins/video/H.263-1998/Makefile.in 2013-02-20 03:18:03.000000000 +0100
-+++ plugins/video/H.263-1998/Makefile.in 2013-10-08 12:57:25.062873463 +0200
-@@ -35,7 +35,7 @@
- $(COMMONDIR)/dyna.cxx
-
- CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
--LIBS += @DL_LIBS@
-+LIBS += @DL_LIBS@ @LIBAVUTIL_LIBS@
-
- HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
- ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes)
-diff -Naur opal-3.10.10.orig/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx
---- opal-3.10.10.orig/plugins/video/H.264/gpl/h264_helper.cxx 2013-02-20 03:18:02.000000000 +0100
-+++ plugins/video/H.264/gpl/h264_helper.cxx 2013-10-08 12:57:25.062873463 +0200
-@@ -27,6 +27,7 @@
- #include <fstream>
- #include <stdlib.h>
- #include <sys/stat.h>
-+#include <unistd.h>
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-diff -Naur opal-3.10.10.orig/plugins/video/H.264/h264-x264.cxx opal-3.10.10/plugins/video/H.264/h264-x264.cxx
---- opal-3.10.10.orig/plugins/video/H.264/h264-x264.cxx 2013-02-20 03:18:02.000000000 +0100
-+++ plugins/video/H.264/h264-x264.cxx 2013-10-08 12:57:25.063873450 +0200
-@@ -40,6 +40,9 @@
- #include "plugin-config.h"
- #endif
-
-+#define FF_IDCT_H264 11
-+#define CODEC_FLAG2_SKIP_RD 0x00004000
-+
- #include <codec/opalplugin.hpp>
-
- #include "../common/ffmpeg.h"
-@@ -1071,13 +1074,10 @@
- return false;
-
- m_context->workaround_bugs = FF_BUG_AUTODETECT;
-- m_context->error_recognition = FF_ER_AGGRESSIVE;
- m_context->idct_algo = FF_IDCT_H264;
- m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
- m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
-- m_context->flags2 = CODEC_FLAG2_BRDO |
-- CODEC_FLAG2_MEMC_ONLY |
-- CODEC_FLAG2_DROP_FRAME_TIMECODE |
-+ m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
- CODEC_FLAG2_SKIP_RD |
- CODEC_FLAG2_CHUNKS;
-
-diff -Naur opal-3.10.10.orig/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx
---- opal-3.10.10.orig/plugins/video/H.264/shared/x264wrap.cxx 2013-02-20 03:18:02.000000000 +0100
-+++ plugins/video/H.264/shared/x264wrap.cxx 2013-10-08 12:57:25.064873438 +0200
-@@ -33,6 +33,7 @@
-
- #include <codec/opalplugin.hpp>
- #include <stdio.h>
-+#include <unistd.h>
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-diff -Naur opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in
---- opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/Makefile.in 2013-02-20 03:18:07.000000000 +0100
-+++ plugins/video/MPEG4-ffmpeg/Makefile.in 2013-10-08 12:57:25.064873438 +0200
-@@ -31,7 +31,7 @@
- SRCS := mpeg4.cxx $(COMMONDIR)/dyna.cxx
-
- CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
--LIBS += @DL_LIBS@
-+LIBS += @DL_LIBS@ @LIBAVUTIL_LIBS@
-
- # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
- # Also add libavutil, so ffmpeg headers can #include "log.h".
-diff -Naur opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
---- opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2013-02-20 03:18:07.000000000 +0100
-+++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2013-10-08 12:57:25.065873425 +0200
-@@ -103,6 +103,7 @@
-
- #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
- #include "../common/ffmpeg.h"
-+#include <libavutil/opt.h>
- #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
- }
-
-@@ -589,17 +590,17 @@
- m_avpicture->quality = m_videoQMin;
-
- #ifdef USE_ORIG
-- m_avcontext->flags |= CODEC_FLAG_PART; // data partitioning
-+ av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
- m_avcontext->flags |= CODEC_FLAG_4MV; // 4 motion vectors
- #else
- m_avcontext->max_b_frames=0; /*don't use b frames*/
- m_avcontext->flags|=CODEC_FLAG_AC_PRED;
-- m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
-+ av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0);
- /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
- m_avcontext->flags|=CODEC_FLAG_4MV;
- m_avcontext->flags|=CODEC_FLAG_GMC;
- m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
-- m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+ av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0);
- #endif
- m_avcontext->opaque = this; // for use in RTP callback
- }
-@@ -804,7 +805,7 @@
- // Should the next frame be an I-Frame?
- if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
- {
-- m_avpicture->pict_type = FF_I_TYPE;
-+ m_avpicture->pict_type = AV_PICTURE_TYPE_I;
- }
- else // No IFrame requested, let avcodec decide what to do
- {
-@@ -1325,7 +1326,7 @@
-
- void MPEG4DecoderContext::SetStaticDecodingParams() {
- m_avcontext->flags |= CODEC_FLAG_4MV;
-- m_avcontext->flags |= CODEC_FLAG_PART;
-+ av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
- m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
- }
-
diff --git a/libraries/opal/opal.SlackBuild b/libraries/opal/opal.SlackBuild
index ca382bc4ef..c764a39f32 100644
--- a/libraries/opal/opal.SlackBuild
+++ b/libraries/opal/opal.SlackBuild
@@ -71,17 +71,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# patch and seds from lfs:
-# http://www.linuxfromscratch.org/blfs/view/svn/multimedia/opal.html
-patch -p1 --verbose < $CWD/ffmpeg2.patch
-
-sed -e 's/CODEC_ID/AV_&/' \
- -e 's/PIX_FMT_/AV_&/' \
- -i plugins/video/H.263-1998/h263-1998.cxx \
- plugins/video/common/dyna.cxx \
- plugins/video/H.264/h264-x264.cxx \
- plugins/video/MPEG4-ffmpeg/mpeg4.cxx
-
sed -e '/<< mime.PrintContents/ s/mime/(const std::string\&)&/' \
-i src/im/msrp.cxx &&
@@ -127,6 +116,7 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-msrp \
--enable-sipim \
--enable-plugins \
+ --disable-libavcodec \
--build=$ARCH-slackware-linux
make VERBOSE=1
diff --git a/libraries/openbabel/openbabel.SlackBuild b/libraries/openbabel/openbabel.SlackBuild
index 7bd54ad595..426fab52d4 100644
--- a/libraries/openbabel/openbabel.SlackBuild
+++ b/libraries/openbabel/openbabel.SlackBuild
@@ -25,7 +25,8 @@
# Thanks to Daniil Bratashov (dn2010@gmail.com) for the cmake conversion
PRGNAM=openbabel
-VERSION=${VERSION:-2.3.2}
+VERSION=${VERSION:-2.4.1}
+SRCVER=$(echo $VERSION | tr . -)
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -61,9 +62,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$PRGNAM-$SRCVER
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,9 +72,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Patch for gcc-5 thanks to Arch
-patch -p0 < $CWD/gcc-5.patch
-
mkdir -p build
cd build
cmake \
@@ -95,7 +93,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- ChangeLog AUTHORS COPYING NEWS README THANKS doc/*.html \
+ AUTHORS COPYING NEWS.md README.md THANKS authors.txt doc/*.html \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/openbabel/openbabel.info b/libraries/openbabel/openbabel.info
index ff15c8591e..112968ba8a 100644
--- a/libraries/openbabel/openbabel.info
+++ b/libraries/openbabel/openbabel.info
@@ -1,8 +1,8 @@
PRGNAM="openbabel"
-VERSION="2.3.2"
+VERSION="2.4.1"
HOMEPAGE="http://openbabel.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/openbabel/openbabel-2.3.2.tar.gz"
-MD5SUM="9b0007560d9d838b40ab4ad06daf5610"
+DOWNLOAD="https://github.com/openbabel/openbabel/archive/openbabel-2-4-1/openbabel-2-4-1.tar.gz"
+MD5SUM="c0e0aefeef0f9f2bb2c78109d65c30a5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="jdk"
diff --git a/libraries/pangox-compat/pangox-compat.SlackBuild b/libraries/pangox-compat/pangox-compat.SlackBuild
index f4a0e6928d..051b55203a 100644
--- a/libraries/pangox-compat/pangox-compat.SlackBuild
+++ b/libraries/pangox-compat/pangox-compat.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=pangox-compat
-VERSION=${VERSION:-0.0.2}
+VERSION=${VERSION:-20150430_edb9e09}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
*) export ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=${PKG:-${TMP}/package-$PRGNAM}
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
@@ -62,14 +62,17 @@ cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
-
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Apply upstream patches
+for i in $CWD/patches/*.patch ; do patch -p1 < $i ; done
+NOCONFIGURE=1 ./autogen.sh
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/libraries/pangox-compat/pangox-compat.info b/libraries/pangox-compat/pangox-compat.info
index 125100e1be..90866e9172 100644
--- a/libraries/pangox-compat/pangox-compat.info
+++ b/libraries/pangox-compat/pangox-compat.info
@@ -1,8 +1,8 @@
PRGNAM="pangox-compat"
-VERSION="0.0.2"
+VERSION="20150430_edb9e09"
HOMEPAGE="https://www.pango.org"
-DOWNLOAD="https://ftp.gnome.org/pub/gnome/sources/pangox-compat/0.0/pangox-compat-0.0.2.tar.xz"
-MD5SUM="7bcbd0187f03e1e27af9a81e07249c33"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/pangox-compat-20150430_edb9e09.tar.xz"
+MD5SUM="124c8c6c386df2006d20784b50073fbc"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/pangox-compat/patches/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch b/libraries/pangox-compat/patches/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch
new file mode 100644
index 0000000000..de85c1719d
--- /dev/null
+++ b/libraries/pangox-compat/patches/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch
@@ -0,0 +1,39 @@
+From bd0fcfbd2f8f493e96955c1edd8a791de1e6568a Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jgc@archlinux.org>
+Date: Sun, 19 Feb 2017 07:57:57 +0000
+Subject: [PATCH] Re-add pango_x_get_shaper_map, it is still used in the
+ fallback code
+
+---
+ pangox.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/pangox.c b/pangox.c
+index 0a66cc9..1e6efc6 100644
+--- a/pangox.c
++++ b/pangox.c
+@@ -1344,6 +1344,21 @@ pango_x_font_describe (PangoFont *font)
+ return NULL;
+ }
+
++PangoMap *
++pango_x_get_shaper_map (PangoLanguage *language)
++{
++ static guint engine_type_id = 0;
++ static guint render_type_id = 0;
++
++ if (engine_type_id == 0)
++ {
++ engine_type_id = g_quark_from_static_string (PANGO_ENGINE_TYPE_SHAPE);
++ render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_X);
++ }
++
++ return pango_find_map (language, engine_type_id, render_type_id);
++}
++
+ static PangoCoverage *
+ pango_x_font_get_coverage (PangoFont *font,
+ PangoLanguage *language)
+--
+2.11.1
+
diff --git a/libraries/pangox-compat/patches/0002-disable-shaper.patch b/libraries/pangox-compat/patches/0002-disable-shaper.patch
new file mode 100644
index 0000000000..87f4598e39
--- /dev/null
+++ b/libraries/pangox-compat/patches/0002-disable-shaper.patch
@@ -0,0 +1,15 @@
+--- pangox-compat/pangox.c.orig 2020-05-04 18:31:53.421197064 -0400
++++ pangox-compat/pangox.c 2020-05-04 18:32:41.251146923 -0400
+@@ -277,11 +277,11 @@ pango_x_font_class_init (PangoXFontClass
+ object_class->finalize = pango_x_font_finalize;
+ object_class->dispose = pango_x_font_dispose;
+
+ font_class->describe = pango_x_font_describe;
+ font_class->get_coverage = pango_x_font_get_coverage;
+- font_class->find_shaper = pango_x_font_find_shaper;
++ /* font_class->find_shaper = pango_x_font_find_shaper; */
+ font_class->get_glyph_extents = pango_x_font_get_glyph_extents;
+ font_class->get_metrics = pango_x_font_get_metrics;
+ font_class->get_font_map = pango_x_font_get_font_map;
+ }
+
diff --git a/libraries/pcre2/README b/libraries/pcre2/README
deleted file mode 100644
index 604c47269f..0000000000
--- a/libraries/pcre2/README
+++ /dev/null
@@ -1,2 +0,0 @@
-PCRE2 is a re-working of the original PCRE library to provide an entirely new
-API.
diff --git a/libraries/pcre2/pcre2.SlackBuild b/libraries/pcre2/pcre2.SlackBuild
deleted file mode 100644
index f34a4068f4..0000000000
--- a/libraries/pcre2/pcre2.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for pcre2
-
-# Copyright 2016-2020 Larry Hajali <larryhaja[at]gmail[dot]com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=pcre2
-VERSION=${VERSION:-10.35}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-silent-rules \
- --enable-static=no \
- --enable-pcre2-16 \
- --enable-pcre2-32 \
- --enable-jit \
- --enable-pcre2grep-libz \
- --enable-pcre2grep-libbz2 \
- --enable-pcre2test-libreadline \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/pcre2/pcre2.info b/libraries/pcre2/pcre2.info
deleted file mode 100644
index 620196ad18..0000000000
--- a/libraries/pcre2/pcre2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pcre2"
-VERSION="10.35"
-HOMEPAGE="http://www.pcre.org/"
-DOWNLOAD="https://downloads.sourceforge.net/pcre/pcre2-10.35.tar.bz2"
-MD5SUM="a0674e2cc5941d738c1afddf43fb8745"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/libraries/pcre2/slack-desc b/libraries/pcre2/slack-desc
deleted file mode 100644
index 5eaf0e0af3..0000000000
--- a/libraries/pcre2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-pcre2: pcre2 (Perl 5-style regular expressions. 2nd version)
-pcre2:
-pcre2: PCRE2 is a re-working of the original PCRE library to provide an
-pcre2: entirely new API.
-pcre2:
-pcre2: Homepage: http://www.pcre.org/
-pcre2:
-pcre2:
-pcre2:
-pcre2:
-pcre2:
diff --git a/libraries/php-pgsql/php-pgsql.SlackBuild b/libraries/php-pgsql/php-pgsql.SlackBuild
index d9db0ad0d4..84f562663d 100644
--- a/libraries/php-pgsql/php-pgsql.SlackBuild
+++ b/libraries/php-pgsql/php-pgsql.SlackBuild
@@ -24,13 +24,13 @@
SRCNAM=php
PRGNAM=php-pgsql
-VERSION=${VERSION:-5.6.30}
+VERSION=${VERSION:-7.4.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -126,7 +126,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{pgsql,pdo_pgsql}
-cp ext/pgsql/{CREDITS,README} $PKG/usr/doc/$PRGNAM-$VERSION/pgsql/
+cp ext/pgsql/CREDITS $PKG/usr/doc/$PRGNAM-$VERSION/pgsql/
cp ext/pdo_pgsql/CREDITS $PKG/usr/doc/$PRGNAM-$VERSION/pdo_pgsql/
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/php-pgsql/php-pgsql.info b/libraries/php-pgsql/php-pgsql.info
index b01ec74990..d5426c4f80 100644
--- a/libraries/php-pgsql/php-pgsql.info
+++ b/libraries/php-pgsql/php-pgsql.info
@@ -1,8 +1,8 @@
PRGNAM="php-pgsql"
-VERSION="5.6.30"
+VERSION="7.4.3"
HOMEPAGE="http://php.net/manual/en/book.pgsql.php"
-DOWNLOAD="https://secure.php.net/distributions/php-5.6.30.tar.xz"
-MD5SUM="68753955a8964ae49064c6424f81eb3e"
+DOWNLOAD="https://secure.php.net/distributions/php-7.4.3.tar.xz"
+MD5SUM="853df4727b2dcde52e9cc9d944f87498"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="postgresql"
diff --git a/libraries/physfs/physfs.SlackBuild b/libraries/physfs/physfs.SlackBuild
index 244a1966fa..5974c8225d 100644
--- a/libraries/physfs/physfs.SlackBuild
+++ b/libraries/physfs/physfs.SlackBuild
@@ -72,14 +72,14 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -Wno-error=maybe-uninitialized" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DPHYSFS_BUILD_SHARED=ON \
-DPHYSFS_BUILD_STATIC=OFF \
-DPHYSFS_BUILD_TEST=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX:STRING=${LIBDIRSUFFIX}
+ -DLIB_SUFFIX:STRING=${LIBDIRSUFFIX} .
make
make install DESTDIR=$PKG
diff --git a/libraries/podofo/podofo.SlackBuild b/libraries/podofo/podofo.SlackBuild
index 2a4d4b5002..8fcc29e4ff 100644
--- a/libraries/podofo/podofo.SlackBuild
+++ b/libraries/podofo/podofo.SlackBuild
@@ -69,6 +69,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i "s/BINARY_DIR}\/objects\"/BINARY_DIR}\/objects\" || true/" test/TokenizerTest/CMakeLists.txt
+
# Fix mandir directory.
sed -i 's|share/man|man|' CMakeLists.txt
# Ref: https://sourceforge.net/p/podofo/tickets/28/
diff --git a/libraries/poppler-qt5/poppler-qt5.SlackBuild b/libraries/poppler-qt5/poppler-qt5.SlackBuild
index ce99c22afc..40e56259da 100644
--- a/libraries/poppler-qt5/poppler-qt5.SlackBuild
+++ b/libraries/poppler-qt5/poppler-qt5.SlackBuild
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=poppler-qt5
-VERSION=${VERSION:-0.45.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.68.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -56,8 +56,8 @@ fi
set -e
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+rm -rf $PKG ${PKG}_2
+mkdir -p $TMP $PKG ${PKG}_2 $OUTPUT
cd $TMP
rm -rf ${PRGNAM/-*/}-$VERSION
tar xvf $CWD/${PRGNAM/-*/}-$VERSION.tar.xz
@@ -69,32 +69,38 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+mkdir build
+cd build
CXXFLAGS="$SLKCFLAGS -std=c++11" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --enable-xpdf-headers \
- --enable-poppler-qt4 \
- --enable-poppler-qt5 \
- --disable-silent-rules \
- --enable-cairo-output \
- --mandir=/usr/man \
- --disable-static \
- --without-testdatadir \
- --enable-zlib \
- --build=$ARCH-slackware-linux
-
+cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_MANDIR=/usr/man \
+ -DBUILD_SHARED_LIBS=ON \
+ -DENABLE_QT5=ON \
+ -DENABLE_CMS=lcms2 \
+ -DENABLE_DCTDECODER=libjpeg \
+ -DENABLE_GTK_DOC=ON \
+ -DENABLE_LIBOPENJPEG=openjpeg2 \
+ -DENABLE_XPDF_HEADERS=ON \
+ -DENABLE_ZLIB=ON \
+ -DENABLE_ZLIB_UNCOMPRESS=ON \
+ -DBUILD_GTK_TESTS=OFF \
+ -DBUILD_QT5_TESTS=OFF \
+ -DBUILD_CPP_TESTS=OFF \
+ ..
make
-make -C qt5 install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-install -m 0644 $PRGNAM.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
+make install DESTDIR=${PKG}_2
+cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mkdir -p $PKG/usr/{bin,lib$LIBDIRSUFFIX/pkgconfig,include/poppler}
+mv ${PKG}_2/usr/lib$LIBDIRSUFFIX/lib$PRGNAM.* $PKG/usr/lib$LIBDIRSUFFIX/
+mv ${PKG}_2/usr/lib$LIBDIRSUFFIX/pkgconfig/$PRGNAM.pc $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig
+mv ${PKG}_2/usr/bin/pdfdetach $PKG/usr/bin/
+mv ${PKG}_2/usr/include/poppler/qt5 $PKG/usr/include/poppler/
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/poppler-qt5/poppler-qt5.info b/libraries/poppler-qt5/poppler-qt5.info
index e99b4f6e11..f681888f2c 100644
--- a/libraries/poppler-qt5/poppler-qt5.info
+++ b/libraries/poppler-qt5/poppler-qt5.info
@@ -1,8 +1,8 @@
PRGNAM="poppler-qt5"
-VERSION="0.45.0"
+VERSION="0.68.0"
HOMEPAGE="https://poppler.freedesktop.org/"
-DOWNLOAD="https://poppler.freedesktop.org/poppler-0.45.0.tar.xz"
-MD5SUM="a66e8c3cf6dab91dab5ba90d362c6063"
+DOWNLOAD="https://poppler.freedesktop.org/poppler-0.68.0.tar.xz"
+MD5SUM="722ea5837cdfaae4c98607987000de30"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="qt5"
diff --git a/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch b/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch
deleted file mode 100644
index fcc8d0d2e7..0000000000
--- a/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ptlib-2.10.11/./src/ptlib/common/getdate.y 2013-08-15 01:20:26.000000000 +0200
-+++ /mnt/chroot/cauldron/home/dan/rpm/BUILD/ptlib-2.10.11/src/ptlib/common/getdate.y 2013-12-15 00:24:27.866481490 +0100
-@@ -121,9 +121,9 @@
- static int yylex();
-
- #ifdef __GNUC__
--static int yyerror(char const *msg);
-+static int yyerror(void *, char const *msg);
- #else
--static void yyerror(char const *msg);
-+static void yyerror(void *, char const *msg);
- #endif
-
-
-@@ -132,7 +132,8 @@
-
- %}
-
--%pure_parser
-+%pure-parser
-+%parse-param {void *parseParam}
-
- %union {
- time_t Number;
-@@ -1018,12 +1019,12 @@
- #endif
-
- #ifdef __GNUC__
--int yyerror(const char * s)
-+int yyerror(void *var, const char * s)
- {
- return 0;
- }
- #else
--static void yyerror(const char * s)
-+static void yyerror(void *var, const char * s)
- {
- }
- #endif
diff --git a/libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch b/libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch
new file mode 100644
index 0000000000..7f5d66cf24
--- /dev/null
+++ b/libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch
@@ -0,0 +1,2951 @@
+Submitted By: Armin K. <krejzi at email dot com>
+Updated By: Bruce Dubbs <bduubs at linuxfromscratch dot org>
+Date: 2013-08-20
+ 2016-05-04
+Initial Package Version: 2.10.10
+Upstream Status: Reported
+Origin: Self
+Description: Adds pregenerated C file which isn't generated correctly
+ with Bison 3.0.
+Update: Add fixes for gcc-6
+
+diff -Naur ptlib-2.10.11.orig/include/ptlib/critsec.h ptlib-2.10.11/include/ptlib/critsec.h
+--- ptlib-2.10.11.orig/include/ptlib/critsec.h 2013-08-14 18:20:32.000000000 -0500
++++ ptlib-2.10.11/include/ptlib/critsec.h 2016-05-04 19:40:01.626203961 -0500
+@@ -40,7 +40,7 @@
+ #if P_HAS_ATOMIC_INT
+
+ #if defined(__GNUC__)
+-# if __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
++# if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2) || __GNUC__ >= 5
+ # include <ext/atomicity.h>
+ # else
+ # include <bits/atomicity.h>
+diff -Naur ptlib-2.10.11.orig/make/unix.mak ptlib-2.10.11/make/unix.mak
+--- ptlib-2.10.11.orig/make/unix.mak 2013-08-14 18:20:27.000000000 -0500
++++ ptlib-2.10.11/make/unix.mak 2016-05-04 19:38:50.921583820 -0500
+@@ -729,4 +729,6 @@
+
+ LDLIBS += -l$(PTLIB_BASE)$(LIB_TYPE)
+
++STDCCFLAGS += -Wno-deprecated-declarations
++
+ # End of unix.mak
+diff -Naur ptlib-2.10.11.orig/src/ptlib/common/getdate.tab.c ptlib-2.10.11/src/ptlib/common/getdate.tab.c
+--- ptlib-2.10.11.orig/src/ptlib/common/getdate.tab.c 1969-12-31 18:00:00.000000000 -0600
++++ ptlib-2.10.11/src/ptlib/common/getdate.tab.c 2016-05-04 19:38:59.892281859 -0500
+@@ -0,0 +1,2884 @@
++/* A Bison parser, made by GNU Bison 2.7.12-4996. */
++
++/* Bison implementation for Yacc-like parsers in C
++
++ Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>. */
++
++/* As a special exception, you may create a larger work that contains
++ part or all of the Bison parser skeleton and distribute that work
++ under terms of your choice, so long as that work isn't itself a
++ parser generator using the skeleton or a modified version thereof
++ as a parser skeleton. Alternatively, if you modify or redistribute
++ the parser skeleton itself, you may (at your option) remove this
++ special exception, which will cause the skeleton and the resulting
++ Bison output files to be licensed under the GNU General Public
++ License without this special exception.
++
++ This special exception was added by the Free Software Foundation in
++ version 2.2 of Bison. */
++
++/* C LALR(1) parser skeleton written by Richard Stallman, by
++ simplifying the original so-called "semantic" parser. */
++
++/* All symbols defined below should begin with yy or YY, to avoid
++ infringing on user name space. This should be done even for local
++ variables, as they might otherwise be expanded by user macros.
++ There are some unavoidable exceptions within include files to
++ define necessary library symbols; they are noted "INFRINGES ON
++ USER NAME SPACE" below. */
++
++/* Identify Bison output. */
++#define YYBISON 1
++
++/* Bison version. */
++#define YYBISON_VERSION "2.7.12-4996"
++
++/* Skeleton name. */
++#define YYSKELETON_NAME "yacc.c"
++
++/* Pure parsers. */
++#define YYPURE 1
++
++/* Push parsers. */
++#define YYPUSH 0
++
++/* Pull parsers. */
++#define YYPULL 1
++
++
++
++
++/* Copy the first part of user declarations. */
++/* Line 371 of yacc.c */
++#line 1 "ptlib/common/getdate.y"
++
++/*
++** Originally written by Steven M. Bellovin <smb@research.att.com> while
++** at the University of North Carolina at Chapel Hill. Later tweaked by
++** a couple of people on Usenet. Completely overhauled by Rich $alz
++** <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990;
++**
++** Major hack to coerce it into use with the Equivalence Portable
++** Windows Library.
++**
++** This grammar has 10 shift/reduce conflicts.
++**
++** This code is in the public domain and has no copyright.
++*/
++/* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */
++/* SUPPRESS 288 on yyerrlab *//* Label unused */
++
++
++#include <time.h>
++#include <string.h>
++#include <ctype.h>
++#include <stdlib.h>
++
++#ifndef EOF
++#include <stdio.h>
++#endif
++
++
++#ifdef _WIN32
++#ifdef _MSC_VER
++#pragma warning(disable:4131 4701 4996)
++#endif
++#define STDAPICALLTYPE __stdcall
++#define MSDOS
++#else
++#define STDAPICALLTYPE
++#endif
++
++
++extern int STDAPICALLTYPE PTimeGetChar(void * stream);
++extern void STDAPICALLTYPE PTimeUngetChar(void * stream, int c);
++int STDAPICALLTYPE PTimeGetDateOrder();
++int STDAPICALLTYPE PTimeIsMonthName(const char *, int, int);
++int STDAPICALLTYPE PTimeIsDayName(const char *, int, int);
++
++
++#define EPOCH 1970
++#define HOUR(x) ((time_t)(x) * 60)
++#define SECSPERDAY (24L * 60L * 60L)
++
++
++/*
++** An entry in the lexical lookup table.
++*/
++typedef struct _TABLE {
++ char *name;
++ int type;
++ time_t value;
++} TABLE;
++
++
++/*
++** Daylight-savings mode: on, off, or not yet known.
++*/
++typedef enum _DSTMODE {
++ DSTon, DSToff, DSTmaybe
++} DSTMODE;
++
++/*
++** Meridian: am, pm, or 24-hour style.
++*/
++typedef enum _MERIDIAN {
++ MERam, MERpm, MER24
++} MERIDIAN;
++
++
++/*
++** Global variables. We could get rid of most of these by using a good
++** union as the yacc stack. (This routine was originally written before
++** yacc had the %union construct.) Maybe someday; right now we only use
++** the %union very rarely.
++*/
++struct Variables {
++ void *yyInput;
++ DSTMODE yyDSTmode;
++ time_t yyDayOrdinal;
++ time_t yyDayNumber;
++ int yyHaveDate;
++ int yyHaveDay;
++ int yyHaveRel;
++ int yyHaveTime;
++ int yyHaveZone;
++ time_t yyTimezone;
++ time_t yyDay;
++ time_t yyHour;
++ time_t yyMinutes;
++ time_t yyMonth;
++ time_t yySeconds;
++ time_t yyYear;
++ MERIDIAN yyMeridian;
++ time_t yyRelMonth;
++ time_t yyRelSeconds;
++};
++
++#define VARIABLE ((struct Variables*)parseParam)
++
++
++#define YYPURE 1
++#define YYLEX_PARAM VARIABLE
++#define YYPARSE_PARAM parseParam
++
++#define yyparse PTime_yyparse
++#define yylex PTime_yylex
++#define yyerror PTime_yyerror
++
++#define GCC_VERSION (__GNUC__ * 10000 \
++ + __GNUC_MINOR__ * 100 \
++ + __GNUC_PATCHLEVEL__)
++
++static int yyparse(void *);
++static int yylex();
++
++#ifdef __GNUC__
++static int yyerror(char const *msg);
++#else
++static void yyerror(char const *msg);
++#endif
++
++
++static void SetPossibleDate(struct Variables*, time_t, time_t, time_t);
++
++
++
++/* Line 371 of yacc.c */
++#line 202 "ptlib/common/getdate.tab.c"
++
++# ifndef YY_NULL
++# if defined __cplusplus && 201103L <= __cplusplus
++# define YY_NULL nullptr
++# else
++# define YY_NULL 0
++# endif
++# endif
++
++/* Enabling verbose error messages. */
++#ifdef YYERROR_VERBOSE
++# undef YYERROR_VERBOSE
++# define YYERROR_VERBOSE 1
++#else
++# define YYERROR_VERBOSE 0
++#endif
++
++
++/* Enabling traces. */
++#ifndef YYDEBUG
++# define YYDEBUG 0
++#endif
++#if YYDEBUG
++extern int yydebug;
++#endif
++
++/* Tokens. */
++#ifndef YYTOKENTYPE
++# define YYTOKENTYPE
++ /* Put the tokens into the symbol table, so that GDB and other debuggers
++ know about them. */
++ enum yytokentype {
++ tAGO = 258,
++ tDAY = 259,
++ tDAYZONE = 260,
++ tID = 261,
++ tMERIDIAN = 262,
++ tMINUTE_UNIT = 263,
++ tMONTH = 264,
++ tMONTH_UNIT = 265,
++ tSNUMBER = 266,
++ tS4DIGITNUMBER = 267,
++ tUNUMBER = 268,
++ t4DIGITNUMBER = 269,
++ t6DIGITNUMBER = 270,
++ t8DIGITNUMBER = 271,
++ tSEC_UNIT = 272,
++ tZONE = 273,
++ tMILZONE = 274,
++ tRFC3339 = 275,
++ tDST = 276
++ };
++#endif
++
++
++#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
++typedef union YYSTYPE
++{
++/* Line 387 of yacc.c */
++#line 137 "ptlib/common/getdate.y"
++
++ time_t Number;
++ enum _MERIDIAN Meridian;
++
++
++/* Line 387 of yacc.c */
++#line 269 "ptlib/common/getdate.tab.c"
++} YYSTYPE;
++# define YYSTYPE_IS_TRIVIAL 1
++# define yystype YYSTYPE /* obsolescent; will be withdrawn */
++# define YYSTYPE_IS_DECLARED 1
++#endif
++
++
++#ifdef YYPARSE_PARAM
++#if defined __STDC__ || defined __cplusplus
++int yyparse (void *YYPARSE_PARAM);
++#else
++int yyparse ();
++#endif
++#else /* ! YYPARSE_PARAM */
++#if defined __STDC__ || defined __cplusplus
++int yyparse (void);
++#else
++int yyparse ();
++#endif
++#endif /* ! YYPARSE_PARAM */
++
++
++
++/* Copy the second part of user declarations. */
++
++/* Line 390 of yacc.c */
++#line 296 "ptlib/common/getdate.tab.c"
++
++#ifdef short
++# undef short
++#endif
++
++#ifdef YYTYPE_UINT8
++typedef YYTYPE_UINT8 yytype_uint8;
++#else
++typedef unsigned char yytype_uint8;
++#endif
++
++#ifdef YYTYPE_INT8
++typedef YYTYPE_INT8 yytype_int8;
++#elif (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++typedef signed char yytype_int8;
++#else
++typedef short int yytype_int8;
++#endif
++
++#ifdef YYTYPE_UINT16
++typedef YYTYPE_UINT16 yytype_uint16;
++#else
++typedef unsigned short int yytype_uint16;
++#endif
++
++#ifdef YYTYPE_INT16
++typedef YYTYPE_INT16 yytype_int16;
++#else
++typedef short int yytype_int16;
++#endif
++
++#ifndef YYSIZE_T
++# ifdef __SIZE_TYPE__
++# define YYSIZE_T __SIZE_TYPE__
++# elif defined size_t
++# define YYSIZE_T size_t
++# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
++# define YYSIZE_T size_t
++# else
++# define YYSIZE_T unsigned int
++# endif
++#endif
++
++#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
++
++#ifndef YY_
++# if defined YYENABLE_NLS && YYENABLE_NLS
++# if ENABLE_NLS
++# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
++# define YY_(Msgid) dgettext ("bison-runtime", Msgid)
++# endif
++# endif
++# ifndef YY_
++# define YY_(Msgid) Msgid
++# endif
++#endif
++
++#ifndef __attribute__
++/* This feature is available in gcc versions 2.5 and later. */
++# if (! defined __GNUC__ || __GNUC__ < 2 \
++ || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
++# define __attribute__(Spec) /* empty */
++# endif
++#endif
++
++/* Suppress unused-variable warnings by "using" E. */
++#if ! defined lint || defined __GNUC__
++# define YYUSE(E) ((void) (E))
++#else
++# define YYUSE(E) /* empty */
++#endif
++
++
++/* Identity function, used to suppress warnings about constant conditions. */
++#ifndef lint
++# define YYID(N) (N)
++#else
++#if (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++static int
++YYID (int yyi)
++#else
++static int
++YYID (yyi)
++ int yyi;
++#endif
++{
++ return yyi;
++}
++#endif
++
++#if ! defined yyoverflow || YYERROR_VERBOSE
++
++/* The parser invokes alloca or malloc; define the necessary symbols. */
++
++# ifdef YYSTACK_USE_ALLOCA
++# if YYSTACK_USE_ALLOCA
++# ifdef __GNUC__
++# define YYSTACK_ALLOC __builtin_alloca
++# elif defined __BUILTIN_VA_ARG_INCR
++# include <alloca.h> /* INFRINGES ON USER NAME SPACE */
++# elif defined _AIX
++# define YYSTACK_ALLOC __alloca
++# elif defined _MSC_VER
++# include <malloc.h> /* INFRINGES ON USER NAME SPACE */
++# define alloca _alloca
++# else
++# define YYSTACK_ALLOC alloca
++# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
++ /* Use EXIT_SUCCESS as a witness for stdlib.h. */
++# ifndef EXIT_SUCCESS
++# define EXIT_SUCCESS 0
++# endif
++# endif
++# endif
++# endif
++# endif
++
++# ifdef YYSTACK_ALLOC
++ /* Pacify GCC's `empty if-body' warning. */
++# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
++# ifndef YYSTACK_ALLOC_MAXIMUM
++ /* The OS might guarantee only one guard page at the bottom of the stack,
++ and a page size can be as small as 4096 bytes. So we cannot safely
++ invoke alloca (N) if N exceeds 4096. Use a slightly smaller number
++ to allow for a few compiler-allocated temporary stack slots. */
++# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
++# endif
++# else
++# define YYSTACK_ALLOC YYMALLOC
++# define YYSTACK_FREE YYFREE
++# ifndef YYSTACK_ALLOC_MAXIMUM
++# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
++# endif
++# if (defined __cplusplus && ! defined EXIT_SUCCESS \
++ && ! ((defined YYMALLOC || defined malloc) \
++ && (defined YYFREE || defined free)))
++# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
++# ifndef EXIT_SUCCESS
++# define EXIT_SUCCESS 0
++# endif
++# endif
++# ifndef YYMALLOC
++# define YYMALLOC malloc
++# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
++# endif
++# endif
++# ifndef YYFREE
++# define YYFREE free
++# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++void free (void *); /* INFRINGES ON USER NAME SPACE */
++# endif
++# endif
++# endif
++#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
++
++
++#if (! defined yyoverflow \
++ && (! defined __cplusplus \
++ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
++
++/* A type that is properly aligned for any stack member. */
++union yyalloc
++{
++ yytype_int16 yyss_alloc;
++ YYSTYPE yyvs_alloc;
++};
++
++/* The size of the maximum gap between one aligned stack and the next. */
++# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
++
++/* The size of an array large to enough to hold all stacks, each with
++ N elements. */
++# define YYSTACK_BYTES(N) \
++ ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
++ + YYSTACK_GAP_MAXIMUM)
++
++# define YYCOPY_NEEDED 1
++
++/* Relocate STACK from its old location to the new one. The
++ local variables YYSIZE and YYSTACKSIZE give the old and new number of
++ elements in the stack, and YYPTR gives the new location of the
++ stack. Advance YYPTR to a properly aligned location for the next
++ stack. */
++# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
++ do \
++ { \
++ YYSIZE_T yynewbytes; \
++ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
++ Stack = &yyptr->Stack_alloc; \
++ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
++ yyptr += yynewbytes / sizeof (*yyptr); \
++ } \
++ while (YYID (0))
++
++#endif
++
++#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
++/* Copy COUNT objects from SRC to DST. The source and destination do
++ not overlap. */
++# ifndef YYCOPY
++# if defined __GNUC__ && 1 < __GNUC__
++# define YYCOPY(Dst, Src, Count) \
++ __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
++# else
++# define YYCOPY(Dst, Src, Count) \
++ do \
++ { \
++ YYSIZE_T yyi; \
++ for (yyi = 0; yyi < (Count); yyi++) \
++ (Dst)[yyi] = (Src)[yyi]; \
++ } \
++ while (YYID (0))
++# endif
++# endif
++#endif /* !YYCOPY_NEEDED */
++
++/* YYFINAL -- State number of the termination state. */
++#define YYFINAL 2
++/* YYLAST -- Last index in YYTABLE. */
++#define YYLAST 105
++
++/* YYNTOKENS -- Number of terminals. */
++#define YYNTOKENS 25
++/* YYNNTS -- Number of nonterminals. */
++#define YYNNTS 12
++/* YYNRULES -- Number of rules. */
++#define YYNRULES 51
++/* YYNRULES -- Number of states. */
++#define YYNSTATES 63
++
++/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
++#define YYUNDEFTOK 2
++#define YYMAXUTOK 276
++
++#define YYTRANSLATE(YYX) \
++ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
++
++/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
++static const yytype_uint8 yytranslate[] =
++{
++ 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 23, 2, 2, 24, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 22, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
++ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
++ 15, 16, 17, 18, 19, 20, 21
++};
++
++#if YYDEBUG
++/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
++ YYRHS. */
++static const yytype_uint8 yyprhs[] =
++{
++ 0, 0, 3, 4, 7, 9, 11, 13, 15, 17,
++ 19, 22, 25, 28, 33, 38, 45, 52, 54, 56,
++ 59, 61, 63, 66, 69, 73, 79, 84, 86, 90,
++ 93, 98, 101, 105, 108, 110, 113, 116, 118, 121,
++ 124, 126, 129, 132, 134, 136, 138, 140, 142, 144,
++ 146, 147
++};
++
++/* YYRHS -- A `-1'-separated list of the rules' RHS. */
++static const yytype_int8 yyrhs[] =
++{
++ 26, 0, -1, -1, 26, 27, -1, 28, -1, 29,
++ -1, 31, -1, 30, -1, 32, -1, 35, -1, 13,
++ 7, -1, 14, 12, -1, 15, 12, -1, 34, 22,
++ 34, 36, -1, 34, 22, 34, 12, -1, 34, 22,
++ 34, 22, 34, 36, -1, 34, 22, 34, 22, 34,
++ 12, -1, 18, -1, 5, -1, 18, 21, -1, 19,
++ -1, 4, -1, 4, 23, -1, 34, 4, -1, 34,
++ 24, 34, -1, 34, 24, 34, 24, 34, -1, 34,
++ 11, 11, 20, -1, 16, -1, 34, 9, 11, -1,
++ 9, 34, -1, 9, 34, 23, 34, -1, 34, 9,
++ -1, 34, 9, 34, -1, 33, 3, -1, 33, -1,
++ 34, 8, -1, 11, 8, -1, 8, -1, 11, 17,
++ -1, 34, 17, -1, 17, -1, 11, 10, -1, 34,
++ 10, -1, 10, -1, 13, -1, 14, -1, 15, -1,
++ 13, -1, 14, -1, 15, -1, -1, 7, -1
++};
++
++/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
++static const yytype_uint16 yyrline[] =
++{
++ 0, 153, 153, 154, 157, 160, 163, 166, 169, 172,
++ 175, 181, 189, 197, 203, 210, 216, 226, 230, 235,
++ 239, 249, 253, 257, 263, 266, 269, 273, 278, 282,
++ 289, 294, 301, 306, 310, 313, 316, 319, 322, 325,
++ 328, 331, 334, 337, 342, 345, 348, 353, 379, 390,
++ 407, 410
++};
++#endif
++
++#if YYDEBUG || YYERROR_VERBOSE || 0
++/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
++ First, the terminals, then, starting at YYNTOKENS, nonterminals. */
++static const char *const yytname[] =
++{
++ "$end", "error", "$undefined", "tAGO", "tDAY", "tDAYZONE", "tID",
++ "tMERIDIAN", "tMINUTE_UNIT", "tMONTH", "tMONTH_UNIT", "tSNUMBER",
++ "tS4DIGITNUMBER", "tUNUMBER", "t4DIGITNUMBER", "t6DIGITNUMBER",
++ "t8DIGITNUMBER", "tSEC_UNIT", "tZONE", "tMILZONE", "tRFC3339", "tDST",
++ "':'", "','", "'/'", "$accept", "spec", "item", "time", "zone", "day",
++ "date", "rel", "relunit", "unumber", "number", "o_merid", YY_NULL
++};
++#endif
++
++# ifdef YYPRINT
++/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
++ token YYLEX-NUM. */
++static const yytype_uint16 yytoknum[] =
++{
++ 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
++ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
++ 275, 276, 58, 44, 47
++};
++# endif
++
++/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
++static const yytype_uint8 yyr1[] =
++{
++ 0, 25, 26, 26, 27, 27, 27, 27, 27, 27,
++ 28, 28, 28, 28, 28, 28, 28, 29, 29, 29,
++ 29, 30, 30, 30, 31, 31, 31, 31, 31, 31,
++ 31, 31, 31, 32, 32, 33, 33, 33, 33, 33,
++ 33, 33, 33, 33, 34, 34, 34, 35, 35, 35,
++ 36, 36
++};
++
++/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
++static const yytype_uint8 yyr2[] =
++{
++ 0, 2, 0, 2, 1, 1, 1, 1, 1, 1,
++ 2, 2, 2, 4, 4, 6, 6, 1, 1, 2,
++ 1, 1, 2, 2, 3, 5, 4, 1, 3, 2,
++ 4, 2, 3, 2, 1, 2, 2, 1, 2, 2,
++ 1, 2, 2, 1, 1, 1, 1, 1, 1, 1,
++ 0, 1
++};
++
++/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
++ Performed when YYTABLE doesn't specify something else to do. Zero
++ means the default is an error. */
++static const yytype_uint8 yydefact[] =
++{
++ 2, 0, 1, 21, 18, 37, 0, 43, 0, 44,
++ 45, 46, 27, 40, 17, 20, 3, 4, 5, 7,
++ 6, 8, 34, 0, 9, 22, 44, 45, 46, 29,
++ 36, 41, 38, 10, 11, 12, 19, 33, 23, 35,
++ 31, 42, 0, 39, 0, 0, 0, 28, 32, 0,
++ 50, 24, 30, 26, 51, 14, 0, 13, 0, 50,
++ 25, 16, 15
++};
++
++/* YYDEFGOTO[NTERM-NUM]. */
++static const yytype_int8 yydefgoto[] =
++{
++ -1, 1, 16, 17, 18, 19, 20, 21, 22, 23,
++ 24, 57
++};
++
++/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
++ STATE-NUM. */
++#define YYPACT_NINF -27
++static const yytype_int8 yypact[] =
++{
++ -27, 49, -27, -10, -27, -27, -11, -27, 1, 10,
++ 69, 86, -27, -27, -9, -27, -27, -27, -27, -27,
++ -27, -27, 13, -3, -27, -27, -27, -27, -27, 8,
++ -27, -27, -27, -27, -27, -27, -27, -27, -27, -27,
++ 30, -27, 9, -27, -11, -11, -11, -27, -27, 12,
++ 15, 18, -27, -27, -27, -27, -11, -27, -11, 23,
++ -27, -27, -27
++};
++
++/* YYPGOTO[NTERM-NUM]. */
++static const yytype_int8 yypgoto[] =
++{
++ -27, -27, -27, -27, -27, -27, -27, -27, -27, -6,
++ -27, -26
++};
++
++/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
++ positive, shift that token. If negative, reduce the rule which
++ number is the opposite. If YYTABLE_NINF, syntax error. */
++#define YYTABLE_NINF -50
++static const yytype_int8 yytable[] =
++{
++ 29, 38, 26, 27, 28, 39, 40, 41, 42, 30,
++ -47, 31, 36, 25, 43, -47, 37, 33, 32, 44,
++ 49, 45, 54, -47, -47, -47, -47, 55, -47, -47,
++ 54, 46, 53, 62, 48, 61, 0, 56, 50, 51,
++ 52, 47, 58, 26, 27, 28, 0, 0, 0, 2,
++ 59, 0, 60, 3, 4, 0, 0, 5, 6, 7,
++ 8, 0, 9, 10, 11, 12, 13, 14, 15, -48,
++ 0, 0, 0, 0, -48, 0, 0, 0, 0, 0,
++ 0, 34, -48, -48, -48, -48, -49, -48, -48, 0,
++ 0, -49, 0, 0, 0, 0, 0, 0, 35, -49,
++ -49, -49, -49, 0, -49, -49
++};
++
++#define yypact_value_is_default(Yystate) \
++ (!!((Yystate) == (-27)))
++
++#define yytable_value_is_error(Yytable_value) \
++ YYID (0)
++
++static const yytype_int8 yycheck[] =
++{
++ 6, 4, 13, 14, 15, 8, 9, 10, 11, 8,
++ 0, 10, 21, 23, 17, 5, 3, 7, 17, 22,
++ 11, 24, 7, 13, 14, 15, 16, 12, 18, 19,
++ 7, 23, 20, 59, 40, 12, -1, 22, 44, 45,
++ 46, 11, 24, 13, 14, 15, -1, -1, -1, 0,
++ 56, -1, 58, 4, 5, -1, -1, 8, 9, 10,
++ 11, -1, 13, 14, 15, 16, 17, 18, 19, 0,
++ -1, -1, -1, -1, 5, -1, -1, -1, -1, -1,
++ -1, 12, 13, 14, 15, 16, 0, 18, 19, -1,
++ -1, 5, -1, -1, -1, -1, -1, -1, 12, 13,
++ 14, 15, 16, -1, 18, 19
++};
++
++/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
++ symbol of state STATE-NUM. */
++static const yytype_uint8 yystos[] =
++{
++ 0, 26, 0, 4, 5, 8, 9, 10, 11, 13,
++ 14, 15, 16, 17, 18, 19, 27, 28, 29, 30,
++ 31, 32, 33, 34, 35, 23, 13, 14, 15, 34,
++ 8, 10, 17, 7, 12, 12, 21, 3, 4, 8,
++ 9, 10, 11, 17, 22, 24, 23, 11, 34, 11,
++ 34, 34, 34, 20, 7, 12, 22, 36, 24, 34,
++ 34, 12, 36
++};
++
++#define yyerrok (yyerrstatus = 0)
++#define yyclearin (yychar = YYEMPTY)
++#define YYEMPTY (-2)
++#define YYEOF 0
++
++#define YYACCEPT goto yyacceptlab
++#define YYABORT goto yyabortlab
++#define YYERROR goto yyerrorlab
++
++
++/* Like YYERROR except do call yyerror. This remains here temporarily
++ to ease the transition to the new meaning of YYERROR, for GCC.
++ Once GCC version 2 has supplanted version 1, this can go. However,
++ YYFAIL appears to be in use. Nevertheless, it is formally deprecated
++ in Bison 2.4.2's NEWS entry, where a plan to phase it out is
++ discussed. */
++
++#define YYFAIL goto yyerrlab
++#if defined YYFAIL
++ /* This is here to suppress warnings from the GCC cpp's
++ -Wunused-macros. Normally we don't worry about that warning, but
++ some users do, and we want to make it easy for users to remove
++ YYFAIL uses, which will produce warnings from Bison 2.5. */
++#endif
++
++#define YYRECOVERING() (!!yyerrstatus)
++
++#define YYBACKUP(Token, Value) \
++do \
++ if (yychar == YYEMPTY) \
++ { \
++ yychar = (Token); \
++ yylval = (Value); \
++ YYPOPSTACK (yylen); \
++ yystate = *yyssp; \
++ goto yybackup; \
++ } \
++ else \
++ { \
++ yyerror (YY_("syntax error: cannot back up")); \
++ YYERROR; \
++ } \
++while (YYID (0))
++
++/* Error token number */
++#define YYTERROR 1
++#define YYERRCODE 256
++
++
++/* This macro is provided for backward compatibility. */
++#ifndef YY_LOCATION_PRINT
++# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
++#endif
++
++
++/* YYLEX -- calling `yylex' with the right arguments. */
++#ifdef YYLEX_PARAM
++# define YYLEX yylex (&yylval, YYLEX_PARAM)
++#else
++# define YYLEX yylex (&yylval)
++#endif
++
++/* Enable debugging if requested. */
++#if YYDEBUG
++
++# ifndef YYFPRINTF
++# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
++# define YYFPRINTF fprintf
++# endif
++
++# define YYDPRINTF(Args) \
++do { \
++ if (yydebug) \
++ YYFPRINTF Args; \
++} while (YYID (0))
++
++# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
++do { \
++ if (yydebug) \
++ { \
++ YYFPRINTF (stderr, "%s ", Title); \
++ yy_symbol_print (stderr, \
++ Type, Value); \
++ YYFPRINTF (stderr, "\n"); \
++ } \
++} while (YYID (0))
++
++
++/*--------------------------------.
++| Print this symbol on YYOUTPUT. |
++`--------------------------------*/
++
++/*ARGSUSED*/
++#if (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++static void
++yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
++#else
++static void
++yy_symbol_value_print (yyoutput, yytype, yyvaluep)
++ FILE *yyoutput;
++ int yytype;
++ YYSTYPE const * const yyvaluep;
++#endif
++{
++ FILE *yyo = yyoutput;
++ YYUSE (yyo);
++ if (!yyvaluep)
++ return;
++# ifdef YYPRINT
++ if (yytype < YYNTOKENS)
++ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
++# else
++ YYUSE (yyoutput);
++# endif
++ YYUSE (yytype);
++}
++
++
++/*--------------------------------.
++| Print this symbol on YYOUTPUT. |
++`--------------------------------*/
++
++#if (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++static void
++yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
++#else
++static void
++yy_symbol_print (yyoutput, yytype, yyvaluep)
++ FILE *yyoutput;
++ int yytype;
++ YYSTYPE const * const yyvaluep;
++#endif
++{
++ if (yytype < YYNTOKENS)
++ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
++ else
++ YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
++
++ yy_symbol_value_print (yyoutput, yytype, yyvaluep);
++ YYFPRINTF (yyoutput, ")");
++}
++
++/*------------------------------------------------------------------.
++| yy_stack_print -- Print the state stack from its BOTTOM up to its |
++| TOP (included). |
++`------------------------------------------------------------------*/
++
++#if (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++static void
++yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
++#else
++static void
++yy_stack_print (yybottom, yytop)
++ yytype_int16 *yybottom;
++ yytype_int16 *yytop;
++#endif
++{
++ YYFPRINTF (stderr, "Stack now");
++ for (; yybottom <= yytop; yybottom++)
++ {
++ int yybot = *yybottom;
++ YYFPRINTF (stderr, " %d", yybot);
++ }
++ YYFPRINTF (stderr, "\n");
++}
++
++# define YY_STACK_PRINT(Bottom, Top) \
++do { \
++ if (yydebug) \
++ yy_stack_print ((Bottom), (Top)); \
++} while (YYID (0))
++
++
++/*------------------------------------------------.
++| Report that the YYRULE is going to be reduced. |
++`------------------------------------------------*/
++
++#if (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++static void
++yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
++#else
++static void
++yy_reduce_print (yyvsp, yyrule)
++ YYSTYPE *yyvsp;
++ int yyrule;
++#endif
++{
++ int yynrhs = yyr2[yyrule];
++ int yyi;
++ unsigned long int yylno = yyrline[yyrule];
++ YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
++ yyrule - 1, yylno);
++ /* The symbols being reduced. */
++ for (yyi = 0; yyi < yynrhs; yyi++)
++ {
++ YYFPRINTF (stderr, " $%d = ", yyi + 1);
++ yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
++ &(yyvsp[(yyi + 1) - (yynrhs)])
++ );
++ YYFPRINTF (stderr, "\n");
++ }
++}
++
++# define YY_REDUCE_PRINT(Rule) \
++do { \
++ if (yydebug) \
++ yy_reduce_print (yyvsp, Rule); \
++} while (YYID (0))
++
++/* Nonzero means print parse trace. It is left uninitialized so that
++ multiple parsers can coexist. */
++int yydebug;
++#else /* !YYDEBUG */
++# define YYDPRINTF(Args)
++# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
++# define YY_STACK_PRINT(Bottom, Top)
++# define YY_REDUCE_PRINT(Rule)
++#endif /* !YYDEBUG */
++
++
++/* YYINITDEPTH -- initial size of the parser's stacks. */
++#ifndef YYINITDEPTH
++# define YYINITDEPTH 200
++#endif
++
++/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
++ if the built-in stack extension method is used).
++
++ Do not make this value too large; the results are undefined if
++ YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
++ evaluated with infinite-precision integer arithmetic. */
++
++#ifndef YYMAXDEPTH
++# define YYMAXDEPTH 10000
++#endif
++
++
++#if YYERROR_VERBOSE
++
++# ifndef yystrlen
++# if defined __GLIBC__ && defined _STRING_H
++# define yystrlen strlen
++# else
++/* Return the length of YYSTR. */
++#if (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++static YYSIZE_T
++yystrlen (const char *yystr)
++#else
++static YYSIZE_T
++yystrlen (yystr)
++ const char *yystr;
++#endif
++{
++ YYSIZE_T yylen;
++ for (yylen = 0; yystr[yylen]; yylen++)
++ continue;
++ return yylen;
++}
++# endif
++# endif
++
++# ifndef yystpcpy
++# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# define yystpcpy stpcpy
++# else
++/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
++ YYDEST. */
++#if (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++static char *
++yystpcpy (char *yydest, const char *yysrc)
++#else
++static char *
++yystpcpy (yydest, yysrc)
++ char *yydest;
++ const char *yysrc;
++#endif
++{
++ char *yyd = yydest;
++ const char *yys = yysrc;
++
++ while ((*yyd++ = *yys++) != '\0')
++ continue;
++
++ return yyd - 1;
++}
++# endif
++# endif
++
++# ifndef yytnamerr
++/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
++ quotes and backslashes, so that it's suitable for yyerror. The
++ heuristic is that double-quoting is unnecessary unless the string
++ contains an apostrophe, a comma, or backslash (other than
++ backslash-backslash). YYSTR is taken from yytname. If YYRES is
++ null, do not copy; instead, return the length of what the result
++ would have been. */
++static YYSIZE_T
++yytnamerr (char *yyres, const char *yystr)
++{
++ if (*yystr == '"')
++ {
++ YYSIZE_T yyn = 0;
++ char const *yyp = yystr;
++
++ for (;;)
++ switch (*++yyp)
++ {
++ case '\'':
++ case ',':
++ goto do_not_strip_quotes;
++
++ case '\\':
++ if (*++yyp != '\\')
++ goto do_not_strip_quotes;
++ /* Fall through. */
++ default:
++ if (yyres)
++ yyres[yyn] = *yyp;
++ yyn++;
++ break;
++
++ case '"':
++ if (yyres)
++ yyres[yyn] = '\0';
++ return yyn;
++ }
++ do_not_strip_quotes: ;
++ }
++
++ if (! yyres)
++ return yystrlen (yystr);
++
++ return yystpcpy (yyres, yystr) - yyres;
++}
++# endif
++
++/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
++ about the unexpected token YYTOKEN for the state stack whose top is
++ YYSSP.
++
++ Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
++ not large enough to hold the message. In that case, also set
++ *YYMSG_ALLOC to the required number of bytes. Return 2 if the
++ required number of bytes is too large to store. */
++static int
++yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
++ yytype_int16 *yyssp, int yytoken)
++{
++ YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
++ YYSIZE_T yysize = yysize0;
++ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
++ /* Internationalized format string. */
++ const char *yyformat = YY_NULL;
++ /* Arguments of yyformat. */
++ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
++ /* Number of reported tokens (one for the "unexpected", one per
++ "expected"). */
++ int yycount = 0;
++
++ /* There are many possibilities here to consider:
++ - Assume YYFAIL is not used. It's too flawed to consider. See
++ <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
++ for details. YYERROR is fine as it does not invoke this
++ function.
++ - If this state is a consistent state with a default action, then
++ the only way this function was invoked is if the default action
++ is an error action. In that case, don't check for expected
++ tokens because there are none.
++ - The only way there can be no lookahead present (in yychar) is if
++ this state is a consistent state with a default action. Thus,
++ detecting the absence of a lookahead is sufficient to determine
++ that there is no unexpected or expected token to report. In that
++ case, just report a simple "syntax error".
++ - Don't assume there isn't a lookahead just because this state is a
++ consistent state with a default action. There might have been a
++ previous inconsistent state, consistent state with a non-default
++ action, or user semantic action that manipulated yychar.
++ - Of course, the expected token list depends on states to have
++ correct lookahead information, and it depends on the parser not
++ to perform extra reductions after fetching a lookahead from the
++ scanner and before detecting a syntax error. Thus, state merging
++ (from LALR or IELR) and default reductions corrupt the expected
++ token list. However, the list is correct for canonical LR with
++ one exception: it will still contain any token that will not be
++ accepted due to an error action in a later state.
++ */
++ if (yytoken != YYEMPTY)
++ {
++ int yyn = yypact[*yyssp];
++ yyarg[yycount++] = yytname[yytoken];
++ if (!yypact_value_is_default (yyn))
++ {
++ /* Start YYX at -YYN if negative to avoid negative indexes in
++ YYCHECK. In other words, skip the first -YYN actions for
++ this state because they are default actions. */
++ int yyxbegin = yyn < 0 ? -yyn : 0;
++ /* Stay within bounds of both yycheck and yytname. */
++ int yychecklim = YYLAST - yyn + 1;
++ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
++ int yyx;
++
++ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
++ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
++ && !yytable_value_is_error (yytable[yyx + yyn]))
++ {
++ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
++ {
++ yycount = 1;
++ yysize = yysize0;
++ break;
++ }
++ yyarg[yycount++] = yytname[yyx];
++ {
++ YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
++ if (! (yysize <= yysize1
++ && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
++ return 2;
++ yysize = yysize1;
++ }
++ }
++ }
++ }
++
++ switch (yycount)
++ {
++# define YYCASE_(N, S) \
++ case N: \
++ yyformat = S; \
++ break
++ YYCASE_(0, YY_("syntax error"));
++ YYCASE_(1, YY_("syntax error, unexpected %s"));
++ YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
++ YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
++ YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
++ YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
++# undef YYCASE_
++ }
++
++ {
++ YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
++ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
++ return 2;
++ yysize = yysize1;
++ }
++
++ if (*yymsg_alloc < yysize)
++ {
++ *yymsg_alloc = 2 * yysize;
++ if (! (yysize <= *yymsg_alloc
++ && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
++ *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
++ return 1;
++ }
++
++ /* Avoid sprintf, as that infringes on the user's name space.
++ Don't have undefined behavior even if the translation
++ produced a string with the wrong number of "%s"s. */
++ {
++ char *yyp = *yymsg;
++ int yyi = 0;
++ while ((*yyp = *yyformat) != '\0')
++ if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
++ {
++ yyp += yytnamerr (yyp, yyarg[yyi++]);
++ yyformat += 2;
++ }
++ else
++ {
++ yyp++;
++ yyformat++;
++ }
++ }
++ return 0;
++}
++#endif /* YYERROR_VERBOSE */
++
++/*-----------------------------------------------.
++| Release the memory associated to this symbol. |
++`-----------------------------------------------*/
++
++/*ARGSUSED*/
++#if (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++static void
++yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
++#else
++static void
++yydestruct (yymsg, yytype, yyvaluep)
++ const char *yymsg;
++ int yytype;
++ YYSTYPE *yyvaluep;
++#endif
++{
++ YYUSE (yyvaluep);
++
++ if (!yymsg)
++ yymsg = "Deleting";
++ YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
++
++ YYUSE (yytype);
++}
++
++
++
++
++/*----------.
++| yyparse. |
++`----------*/
++
++#ifdef YYPARSE_PARAM
++#if (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++int
++yyparse (void *YYPARSE_PARAM)
++#else
++int
++yyparse (YYPARSE_PARAM)
++ void *YYPARSE_PARAM;
++#endif
++#else /* ! YYPARSE_PARAM */
++#if (defined __STDC__ || defined __C99__FUNC__ \
++ || defined __cplusplus || defined _MSC_VER)
++int
++yyparse (void)
++#else
++int
++yyparse ()
++
++#endif
++#endif
++{
++/* The lookahead symbol. */
++int yychar;
++
++
++#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
++/* Suppress an incorrect diagnostic about yylval being uninitialized. */
++# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
++ _Pragma ("GCC diagnostic push") \
++ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
++ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
++# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
++ _Pragma ("GCC diagnostic pop")
++#else
++/* Default value used for initialization, for pacifying older GCCs
++ or non-GCC compilers. */
++static YYSTYPE yyval_default;
++# define YY_INITIAL_VALUE(Value) = Value
++#endif
++#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
++# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
++# define YY_IGNORE_MAYBE_UNINITIALIZED_END
++#endif
++#ifndef YY_INITIAL_VALUE
++# define YY_INITIAL_VALUE(Value) /* Nothing. */
++#endif
++
++/* The semantic value of the lookahead symbol. */
++YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
++
++ /* Number of syntax errors so far. */
++ int yynerrs;
++
++ int yystate;
++ /* Number of tokens to shift before error messages enabled. */
++ int yyerrstatus;
++
++ /* The stacks and their tools:
++ `yyss': related to states.
++ `yyvs': related to semantic values.
++
++ Refer to the stacks through separate pointers, to allow yyoverflow
++ to reallocate them elsewhere. */
++
++ /* The state stack. */
++ yytype_int16 yyssa[YYINITDEPTH];
++ yytype_int16 *yyss;
++ yytype_int16 *yyssp;
++
++ /* The semantic value stack. */
++ YYSTYPE yyvsa[YYINITDEPTH];
++ YYSTYPE *yyvs;
++ YYSTYPE *yyvsp;
++
++ YYSIZE_T yystacksize;
++
++ int yyn;
++ int yyresult;
++ /* Lookahead token as an internal (translated) token number. */
++ int yytoken = 0;
++ /* The variables used to return semantic value and location from the
++ action routines. */
++ YYSTYPE yyval;
++
++#if YYERROR_VERBOSE
++ /* Buffer for error messages, and its allocated size. */
++ char yymsgbuf[128];
++ char *yymsg = yymsgbuf;
++ YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
++#endif
++
++#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
++
++ /* The number of symbols on the RHS of the reduced rule.
++ Keep to zero when no symbol should be popped. */
++ int yylen = 0;
++
++ yyssp = yyss = yyssa;
++ yyvsp = yyvs = yyvsa;
++ yystacksize = YYINITDEPTH;
++
++ YYDPRINTF ((stderr, "Starting parse\n"));
++
++ yystate = 0;
++ yyerrstatus = 0;
++ yynerrs = 0;
++ yychar = YYEMPTY; /* Cause a token to be read. */
++ goto yysetstate;
++
++/*------------------------------------------------------------.
++| yynewstate -- Push a new state, which is found in yystate. |
++`------------------------------------------------------------*/
++ yynewstate:
++ /* In all cases, when you get here, the value and location stacks
++ have just been pushed. So pushing a state here evens the stacks. */
++ yyssp++;
++
++ yysetstate:
++ *yyssp = yystate;
++
++ if (yyss + yystacksize - 1 <= yyssp)
++ {
++ /* Get the current used size of the three stacks, in elements. */
++ YYSIZE_T yysize = yyssp - yyss + 1;
++
++#ifdef yyoverflow
++ {
++ /* Give user a chance to reallocate the stack. Use copies of
++ these so that the &'s don't force the real ones into
++ memory. */
++ YYSTYPE *yyvs1 = yyvs;
++ yytype_int16 *yyss1 = yyss;
++
++ /* Each stack pointer address is followed by the size of the
++ data in use in that stack, in bytes. This used to be a
++ conditional around just the two extra args, but that might
++ be undefined if yyoverflow is a macro. */
++ yyoverflow (YY_("memory exhausted"),
++ &yyss1, yysize * sizeof (*yyssp),
++ &yyvs1, yysize * sizeof (*yyvsp),
++ &yystacksize);
++
++ yyss = yyss1;
++ yyvs = yyvs1;
++ }
++#else /* no yyoverflow */
++# ifndef YYSTACK_RELOCATE
++ goto yyexhaustedlab;
++# else
++ /* Extend the stack our own way. */
++ if (YYMAXDEPTH <= yystacksize)
++ goto yyexhaustedlab;
++ yystacksize *= 2;
++ if (YYMAXDEPTH < yystacksize)
++ yystacksize = YYMAXDEPTH;
++
++ {
++ yytype_int16 *yyss1 = yyss;
++ union yyalloc *yyptr =
++ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
++ if (! yyptr)
++ goto yyexhaustedlab;
++ YYSTACK_RELOCATE (yyss_alloc, yyss);
++ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
++# undef YYSTACK_RELOCATE
++ if (yyss1 != yyssa)
++ YYSTACK_FREE (yyss1);
++ }
++# endif
++#endif /* no yyoverflow */
++
++ yyssp = yyss + yysize - 1;
++ yyvsp = yyvs + yysize - 1;
++
++ YYDPRINTF ((stderr, "Stack size increased to %lu\n",
++ (unsigned long int) yystacksize));
++
++ if (yyss + yystacksize - 1 <= yyssp)
++ YYABORT;
++ }
++
++ YYDPRINTF ((stderr, "Entering state %d\n", yystate));
++
++ if (yystate == YYFINAL)
++ YYACCEPT;
++
++ goto yybackup;
++
++/*-----------.
++| yybackup. |
++`-----------*/
++yybackup:
++
++ /* Do appropriate processing given the current state. Read a
++ lookahead token if we need one and don't already have one. */
++
++ /* First try to decide what to do without reference to lookahead token. */
++ yyn = yypact[yystate];
++ if (yypact_value_is_default (yyn))
++ goto yydefault;
++
++ /* Not known => get a lookahead token if don't already have one. */
++
++ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
++ if (yychar == YYEMPTY)
++ {
++ YYDPRINTF ((stderr, "Reading a token: "));
++ yychar = YYLEX;
++ }
++
++ if (yychar <= YYEOF)
++ {
++ yychar = yytoken = YYEOF;
++ YYDPRINTF ((stderr, "Now at end of input.\n"));
++ }
++ else
++ {
++ yytoken = YYTRANSLATE (yychar);
++ YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
++ }
++
++ /* If the proper action on seeing token YYTOKEN is to reduce or to
++ detect an error, take that action. */
++ yyn += yytoken;
++ if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
++ goto yydefault;
++ yyn = yytable[yyn];
++ if (yyn <= 0)
++ {
++ if (yytable_value_is_error (yyn))
++ goto yyerrlab;
++ yyn = -yyn;
++ goto yyreduce;
++ }
++
++ /* Count tokens shifted since error; after three, turn off error
++ status. */
++ if (yyerrstatus)
++ yyerrstatus--;
++
++ /* Shift the lookahead token. */
++ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
++
++ /* Discard the shifted token. */
++ yychar = YYEMPTY;
++
++ yystate = yyn;
++ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
++ *++yyvsp = yylval;
++ YY_IGNORE_MAYBE_UNINITIALIZED_END
++
++ goto yynewstate;
++
++
++/*-----------------------------------------------------------.
++| yydefault -- do the default action for the current state. |
++`-----------------------------------------------------------*/
++yydefault:
++ yyn = yydefact[yystate];
++ if (yyn == 0)
++ goto yyerrlab;
++ goto yyreduce;
++
++
++/*-----------------------------.
++| yyreduce -- Do a reduction. |
++`-----------------------------*/
++yyreduce:
++ /* yyn is the number of a rule to reduce with. */
++ yylen = yyr2[yyn];
++
++ /* If YYLEN is nonzero, implement the default value of the action:
++ `$$ = $1'.
++
++ Otherwise, the following line sets YYVAL to garbage.
++ This behavior is undocumented and Bison
++ users should not rely upon it. Assigning to YYVAL
++ unconditionally makes the parser a bit smaller, and it avoids a
++ GCC warning that YYVAL may be used uninitialized. */
++ yyval = yyvsp[1-yylen];
++
++
++ YY_REDUCE_PRINT (yyn);
++ switch (yyn)
++ {
++ case 4:
++/* Line 1787 of yacc.c */
++#line 157 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyHaveTime++;
++ }
++ break;
++
++ case 5:
++/* Line 1787 of yacc.c */
++#line 160 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyHaveZone++;
++ }
++ break;
++
++ case 6:
++/* Line 1787 of yacc.c */
++#line 163 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyHaveDate++;
++ }
++ break;
++
++ case 7:
++/* Line 1787 of yacc.c */
++#line 166 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyHaveDay++;
++ }
++ break;
++
++ case 8:
++/* Line 1787 of yacc.c */
++#line 169 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyHaveRel++;
++ }
++ break;
++
++ case 10:
++/* Line 1787 of yacc.c */
++#line 175 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyHour = (yyvsp[(1) - (2)].Number);
++ VARIABLE->yyMinutes = 0;
++ VARIABLE->yySeconds = 0;
++ VARIABLE->yyMeridian = (yyvsp[(2) - (2)].Meridian);
++ }
++ break;
++
++ case 11:
++/* Line 1787 of yacc.c */
++#line 181 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyHour = (yyvsp[(1) - (2)].Number)/100;
++ VARIABLE->yyMinutes = (yyvsp[(1) - (2)].Number)%100;
++ VARIABLE->yySeconds = 0;
++ VARIABLE->yyMeridian = MER24;
++ VARIABLE->yyDSTmode = DSToff;
++ VARIABLE->yyTimezone = - ((yyvsp[(2) - (2)].Number) % 100 + ((yyvsp[(2) - (2)].Number) / 100) * 60);
++ }
++ break;
++
++ case 12:
++/* Line 1787 of yacc.c */
++#line 189 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyHour = (yyvsp[(1) - (2)].Number)/10000;
++ VARIABLE->yyMinutes = ((yyvsp[(1) - (2)].Number)/100)%100;
++ VARIABLE->yySeconds = (yyvsp[(1) - (2)].Number) % 100;
++ VARIABLE->yyMeridian = MER24;
++ VARIABLE->yyDSTmode = DSToff;
++ VARIABLE->yyTimezone = - ((yyvsp[(2) - (2)].Number) % 100 + ((yyvsp[(2) - (2)].Number) / 100) * 60);
++ }
++ break;
++
++ case 13:
++/* Line 1787 of yacc.c */
++#line 197 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyHour = (yyvsp[(1) - (4)].Number);
++ VARIABLE->yyMinutes = (yyvsp[(3) - (4)].Number);
++ VARIABLE->yySeconds = 0;
++ VARIABLE->yyMeridian = (yyvsp[(4) - (4)].Meridian);
++ }
++ break;
++
++ case 14:
++/* Line 1787 of yacc.c */
++#line 203 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyHour = (yyvsp[(1) - (4)].Number);
++ VARIABLE->yyMinutes = (yyvsp[(3) - (4)].Number);
++ VARIABLE->yyMeridian = MER24;
++ VARIABLE->yyDSTmode = DSToff;
++ VARIABLE->yyTimezone = - ((yyvsp[(4) - (4)].Number) % 100 + ((yyvsp[(4) - (4)].Number) / 100) * 60);
++ }
++ break;
++
++ case 15:
++/* Line 1787 of yacc.c */
++#line 210 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyHour = (yyvsp[(1) - (6)].Number);
++ VARIABLE->yyMinutes = (yyvsp[(3) - (6)].Number);
++ VARIABLE->yySeconds = (yyvsp[(5) - (6)].Number);
++ VARIABLE->yyMeridian = (yyvsp[(6) - (6)].Meridian);
++ }
++ break;
++
++ case 16:
++/* Line 1787 of yacc.c */
++#line 216 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyHour = (yyvsp[(1) - (6)].Number);
++ VARIABLE->yyMinutes = (yyvsp[(3) - (6)].Number);
++ VARIABLE->yySeconds = (yyvsp[(5) - (6)].Number);
++ VARIABLE->yyMeridian = MER24;
++ VARIABLE->yyDSTmode = DSToff;
++ VARIABLE->yyTimezone = - ((yyvsp[(6) - (6)].Number) % 100 + ((yyvsp[(6) - (6)].Number) / 100) * 60);
++ }
++ break;
++
++ case 17:
++/* Line 1787 of yacc.c */
++#line 226 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number);
++ VARIABLE->yyDSTmode = DSToff;
++ }
++ break;
++
++ case 18:
++/* Line 1787 of yacc.c */
++#line 230 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number);
++ VARIABLE->yyDSTmode = DSTon;
++ }
++ break;
++
++ case 19:
++/* Line 1787 of yacc.c */
++#line 235 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyTimezone = (yyvsp[(1) - (2)].Number);
++ VARIABLE->yyDSTmode = DSTon;
++ }
++ break;
++
++ case 20:
++/* Line 1787 of yacc.c */
++#line 239 "ptlib/common/getdate.y"
++ {
++ if (VARIABLE->yyHaveTime > 0) {
++ VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number);
++ VARIABLE->yyDSTmode = DSToff;
++ }
++ else
++ VARIABLE->yyHaveZone--;
++ }
++ break;
++
++ case 21:
++/* Line 1787 of yacc.c */
++#line 249 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyDayOrdinal = 1;
++ VARIABLE->yyDayNumber = (yyvsp[(1) - (1)].Number);
++ }
++ break;
++
++ case 22:
++/* Line 1787 of yacc.c */
++#line 253 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyDayOrdinal = 1;
++ VARIABLE->yyDayNumber = (yyvsp[(1) - (2)].Number);
++ }
++ break;
++
++ case 23:
++/* Line 1787 of yacc.c */
++#line 257 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyDayOrdinal = (yyvsp[(1) - (2)].Number);
++ VARIABLE->yyDayNumber = (yyvsp[(2) - (2)].Number);
++ }
++ break;
++
++ case 24:
++/* Line 1787 of yacc.c */
++#line 263 "ptlib/common/getdate.y"
++ {
++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(3) - (3)].Number), VARIABLE->yyYear);
++ }
++ break;
++
++ case 25:
++/* Line 1787 of yacc.c */
++#line 266 "ptlib/common/getdate.y"
++ {
++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (5)].Number), (yyvsp[(3) - (5)].Number), (yyvsp[(5) - (5)].Number));
++ }
++ break;
++
++ case 26:
++/* Line 1787 of yacc.c */
++#line 269 "ptlib/common/getdate.y"
++ {
++ /* ISO 8601 format. yyyy-mm-dd. */
++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (4)].Number), -(yyvsp[(2) - (4)].Number), -(yyvsp[(3) - (4)].Number));
++ }
++ break;
++
++ case 27:
++/* Line 1787 of yacc.c */
++#line 273 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100;
++ VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100;
++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000;
++ }
++ break;
++
++ case 28:
++/* Line 1787 of yacc.c */
++#line 278 "ptlib/common/getdate.y"
++ {
++ /* e.g. 17-JUN-1992. */
++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(2) - (3)].Number), -(yyvsp[(3) - (3)].Number));
++ }
++ break;
++
++ case 29:
++/* Line 1787 of yacc.c */
++#line 282 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyMonth = (yyvsp[(1) - (2)].Number);
++ if ((yyvsp[(2) - (2)].Number) > 31)
++ VARIABLE->yyYear = (yyvsp[(2) - (2)].Number);
++ else
++ VARIABLE->yyDay = (yyvsp[(2) - (2)].Number);
++ }
++ break;
++
++ case 30:
++/* Line 1787 of yacc.c */
++#line 289 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyMonth = (yyvsp[(1) - (4)].Number);
++ VARIABLE->yyDay = (yyvsp[(2) - (4)].Number);
++ VARIABLE->yyYear = (yyvsp[(4) - (4)].Number);
++ }
++ break;
++
++ case 31:
++/* Line 1787 of yacc.c */
++#line 294 "ptlib/common/getdate.y"
++ {
++ if ((yyvsp[(1) - (2)].Number) > 31)
++ VARIABLE->yyYear = (yyvsp[(1) - (2)].Number);
++ else
++ VARIABLE->yyDay = (yyvsp[(1) - (2)].Number);
++ VARIABLE->yyMonth = (yyvsp[(2) - (2)].Number);
++ }
++ break;
++
++ case 32:
++/* Line 1787 of yacc.c */
++#line 301 "ptlib/common/getdate.y"
++ {
++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(2) - (3)].Number), (yyvsp[(3) - (3)].Number));
++ }
++ break;
++
++ case 33:
++/* Line 1787 of yacc.c */
++#line 306 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyRelSeconds = -VARIABLE->yyRelSeconds;
++ VARIABLE->yyRelMonth = -VARIABLE->yyRelMonth;
++ }
++ break;
++
++ case 35:
++/* Line 1787 of yacc.c */
++#line 313 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number) * 60L;
++ }
++ break;
++
++ case 36:
++/* Line 1787 of yacc.c */
++#line 316 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number) * 60L;
++ }
++ break;
++
++ case 37:
++/* Line 1787 of yacc.c */
++#line 319 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (1)].Number) * 60L;
++ }
++ break;
++
++ case 38:
++/* Line 1787 of yacc.c */
++#line 322 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number);
++ }
++ break;
++
++ case 39:
++/* Line 1787 of yacc.c */
++#line 325 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number);
++ }
++ break;
++
++ case 40:
++/* Line 1787 of yacc.c */
++#line 328 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyRelSeconds++;
++ }
++ break;
++
++ case 41:
++/* Line 1787 of yacc.c */
++#line 331 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
++ }
++ break;
++
++ case 42:
++/* Line 1787 of yacc.c */
++#line 334 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
++ }
++ break;
++
++ case 43:
++/* Line 1787 of yacc.c */
++#line 337 "ptlib/common/getdate.y"
++ {
++ VARIABLE->yyRelMonth += (yyvsp[(1) - (1)].Number);
++ }
++ break;
++
++ case 44:
++/* Line 1787 of yacc.c */
++#line 342 "ptlib/common/getdate.y"
++ {
++ (yyval.Number) = (yyvsp[(1) - (1)].Number);
++ }
++ break;
++
++ case 45:
++/* Line 1787 of yacc.c */
++#line 345 "ptlib/common/getdate.y"
++ {
++ (yyval.Number) = (yyvsp[(1) - (1)].Number);
++ }
++ break;
++
++ case 46:
++/* Line 1787 of yacc.c */
++#line 348 "ptlib/common/getdate.y"
++ {
++ (yyval.Number) = (yyvsp[(1) - (1)].Number);
++ }
++ break;
++
++ case 47:
++/* Line 1787 of yacc.c */
++#line 353 "ptlib/common/getdate.y"
++ {
++ if (VARIABLE->yyHaveTime && VARIABLE->yyHaveDate && !VARIABLE->yyHaveRel)
++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number);
++ else {
++ if((yyvsp[(1) - (1)].Number)>240000) {
++ VARIABLE->yyHaveDate++;
++ VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100;
++ VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100;
++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000;
++ }
++ else {
++ VARIABLE->yyHaveTime++;
++ if ((yyvsp[(1) - (1)].Number) < 10000) {
++ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number) / 100;
++ VARIABLE->yyMinutes = (yyvsp[(1) - (1)].Number) % 100;
++ VARIABLE->yySeconds = 0;
++ }
++ else {
++ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/10000;
++ VARIABLE->yyMinutes = ((yyvsp[(1) - (1)].Number)/100)%100;
++ VARIABLE->yySeconds = (yyvsp[(1) - (1)].Number) % 100;
++ }
++ VARIABLE->yyMeridian = MER24;
++ }
++ }
++ }
++ break;
++
++ case 48:
++/* Line 1787 of yacc.c */
++#line 379 "ptlib/common/getdate.y"
++ {
++ if (VARIABLE->yyHaveTime && VARIABLE->yyHaveDate && !VARIABLE->yyHaveRel)
++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number);
++ else {
++ VARIABLE->yyHaveTime++;
++ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/100;
++ VARIABLE->yyMinutes = (yyvsp[(1) - (1)].Number)%100;
++ VARIABLE->yySeconds = 0;
++ VARIABLE->yyMeridian = MER24;
++ }
++ }
++ break;
++
++ case 49:
++/* Line 1787 of yacc.c */
++#line 390 "ptlib/common/getdate.y"
++ {
++ if (!VARIABLE->yyHaveDate && (yyvsp[(1) - (1)].Number)>240000) {
++ VARIABLE->yyHaveDate++;
++ VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100;
++ VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100;
++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000;
++ }
++ else if (!VARIABLE->yyHaveTime) {
++ VARIABLE->yyHaveTime++;
++ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/10000;
++ VARIABLE->yyMinutes = ((yyvsp[(1) - (1)].Number)/100)%100;
++ VARIABLE->yySeconds = (yyvsp[(1) - (1)].Number) % 100;
++ VARIABLE->yyMeridian = MER24;
++ }
++ }
++ break;
++
++ case 50:
++/* Line 1787 of yacc.c */
++#line 407 "ptlib/common/getdate.y"
++ {
++ (yyval.Meridian) = MER24;
++ }
++ break;
++
++ case 51:
++/* Line 1787 of yacc.c */
++#line 410 "ptlib/common/getdate.y"
++ {
++ (yyval.Meridian) = (yyvsp[(1) - (1)].Meridian);
++ }
++ break;
++
++
++/* Line 1787 of yacc.c */
++#line 2031 "ptlib/common/getdate.tab.c"
++ default: break;
++ }
++ /* User semantic actions sometimes alter yychar, and that requires
++ that yytoken be updated with the new translation. We take the
++ approach of translating immediately before every use of yytoken.
++ One alternative is translating here after every semantic action,
++ but that translation would be missed if the semantic action invokes
++ YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
++ if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
++ incorrect destructor might then be invoked immediately. In the
++ case of YYERROR or YYBACKUP, subsequent parser actions might lead
++ to an incorrect destructor call or verbose syntax error message
++ before the lookahead is translated. */
++ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
++
++ YYPOPSTACK (yylen);
++ yylen = 0;
++ YY_STACK_PRINT (yyss, yyssp);
++
++ *++yyvsp = yyval;
++
++ /* Now `shift' the result of the reduction. Determine what state
++ that goes to, based on the state we popped back to and the rule
++ number reduced by. */
++
++ yyn = yyr1[yyn];
++
++ yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
++ if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
++ yystate = yytable[yystate];
++ else
++ yystate = yydefgoto[yyn - YYNTOKENS];
++
++ goto yynewstate;
++
++
++/*------------------------------------.
++| yyerrlab -- here on detecting error |
++`------------------------------------*/
++yyerrlab:
++ /* Make sure we have latest lookahead translation. See comments at
++ user semantic actions for why this is necessary. */
++ yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
++
++ /* If not already recovering from an error, report this error. */
++ if (!yyerrstatus)
++ {
++ ++yynerrs;
++#if ! YYERROR_VERBOSE
++ yyerror (YY_("syntax error"));
++#else
++# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
++ yyssp, yytoken)
++ {
++ char const *yymsgp = YY_("syntax error");
++ int yysyntax_error_status;
++ yysyntax_error_status = YYSYNTAX_ERROR;
++ if (yysyntax_error_status == 0)
++ yymsgp = yymsg;
++ else if (yysyntax_error_status == 1)
++ {
++ if (yymsg != yymsgbuf)
++ YYSTACK_FREE (yymsg);
++ yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
++ if (!yymsg)
++ {
++ yymsg = yymsgbuf;
++ yymsg_alloc = sizeof yymsgbuf;
++ yysyntax_error_status = 2;
++ }
++ else
++ {
++ yysyntax_error_status = YYSYNTAX_ERROR;
++ yymsgp = yymsg;
++ }
++ }
++ yyerror (yymsgp);
++ if (yysyntax_error_status == 2)
++ goto yyexhaustedlab;
++ }
++# undef YYSYNTAX_ERROR
++#endif
++ }
++
++
++
++ if (yyerrstatus == 3)
++ {
++ /* If just tried and failed to reuse lookahead token after an
++ error, discard it. */
++
++ if (yychar <= YYEOF)
++ {
++ /* Return failure if at end of input. */
++ if (yychar == YYEOF)
++ YYABORT;
++ }
++ else
++ {
++ yydestruct ("Error: discarding",
++ yytoken, &yylval);
++ yychar = YYEMPTY;
++ }
++ }
++
++ /* Else will try to reuse lookahead token after shifting the error
++ token. */
++ goto yyerrlab1;
++
++
++/*---------------------------------------------------.
++| yyerrorlab -- error raised explicitly by YYERROR. |
++`---------------------------------------------------*/
++yyerrorlab:
++
++ /* Pacify compilers like GCC when the user code never invokes
++ YYERROR and the label yyerrorlab therefore never appears in user
++ code. */
++ if (/*CONSTCOND*/ 0)
++ goto yyerrorlab;
++
++ /* Do not reclaim the symbols of the rule which action triggered
++ this YYERROR. */
++ YYPOPSTACK (yylen);
++ yylen = 0;
++ YY_STACK_PRINT (yyss, yyssp);
++ yystate = *yyssp;
++ goto yyerrlab1;
++
++
++/*-------------------------------------------------------------.
++| yyerrlab1 -- common code for both syntax error and YYERROR. |
++`-------------------------------------------------------------*/
++yyerrlab1:
++ yyerrstatus = 3; /* Each real token shifted decrements this. */
++
++ for (;;)
++ {
++ yyn = yypact[yystate];
++ if (!yypact_value_is_default (yyn))
++ {
++ yyn += YYTERROR;
++ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
++ {
++ yyn = yytable[yyn];
++ if (0 < yyn)
++ break;
++ }
++ }
++
++ /* Pop the current state because it cannot handle the error token. */
++ if (yyssp == yyss)
++ YYABORT;
++
++
++ yydestruct ("Error: popping",
++ yystos[yystate], yyvsp);
++ YYPOPSTACK (1);
++ yystate = *yyssp;
++ YY_STACK_PRINT (yyss, yyssp);
++ }
++
++ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
++ *++yyvsp = yylval;
++ YY_IGNORE_MAYBE_UNINITIALIZED_END
++
++
++ /* Shift the error token. */
++ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
++
++ yystate = yyn;
++ goto yynewstate;
++
++
++/*-------------------------------------.
++| yyacceptlab -- YYACCEPT comes here. |
++`-------------------------------------*/
++yyacceptlab:
++ yyresult = 0;
++ goto yyreturn;
++
++/*-----------------------------------.
++| yyabortlab -- YYABORT comes here. |
++`-----------------------------------*/
++yyabortlab:
++ yyresult = 1;
++ goto yyreturn;
++
++#if !defined yyoverflow || YYERROR_VERBOSE
++/*-------------------------------------------------.
++| yyexhaustedlab -- memory exhaustion comes here. |
++`-------------------------------------------------*/
++yyexhaustedlab:
++ yyerror (YY_("memory exhausted"));
++ yyresult = 2;
++ /* Fall through. */
++#endif
++
++yyreturn:
++ if (yychar != YYEMPTY)
++ {
++ /* Make sure we have latest lookahead translation. See comments at
++ user semantic actions for why this is necessary. */
++ yytoken = YYTRANSLATE (yychar);
++ yydestruct ("Cleanup: discarding lookahead",
++ yytoken, &yylval);
++ }
++ /* Do not reclaim the symbols of the rule which action triggered
++ this YYABORT or YYACCEPT. */
++ YYPOPSTACK (yylen);
++ YY_STACK_PRINT (yyss, yyssp);
++ while (yyssp != yyss)
++ {
++ yydestruct ("Cleanup: popping",
++ yystos[*yyssp], yyvsp);
++ YYPOPSTACK (1);
++ }
++#ifndef yyoverflow
++ if (yyss != yyssa)
++ YYSTACK_FREE (yyss);
++#endif
++#if YYERROR_VERBOSE
++ if (yymsg != yymsgbuf)
++ YYSTACK_FREE (yymsg);
++#endif
++ /* Make sure YYID is used. */
++ return YYID (yyresult);
++}
++
++
++/* Line 2050 of yacc.c */
++#line 415 "ptlib/common/getdate.y"
++
++
++/* Month and day table. */
++static TABLE const MonthDayTable[] = {
++ { "january", tMONTH, 1 },
++ { "february", tMONTH, 2 },
++ { "march", tMONTH, 3 },
++ { "april", tMONTH, 4 },
++ { "may", tMONTH, 5 },
++ { "june", tMONTH, 6 },
++ { "july", tMONTH, 7 },
++ { "august", tMONTH, 8 },
++ { "september", tMONTH, 9 },
++ { "sept", tMONTH, 9 },
++ { "october", tMONTH, 10 },
++ { "november", tMONTH, 11 },
++ { "december", tMONTH, 12 },
++ { "sunday", tDAY, 0 },
++ { "monday", tDAY, 1 },
++ { "tuesday", tDAY, 2 },
++ { "tues", tDAY, 2 },
++ { "wednesday", tDAY, 3 },
++ { "wednes", tDAY, 3 },
++ { "thursday", tDAY, 4 },
++ { "thur", tDAY, 4 },
++ { "thurs", tDAY, 4 },
++ { "friday", tDAY, 5 },
++ { "saturday", tDAY, 6 },
++ { NULL }
++};
++
++/* Time units table. */
++static TABLE const UnitsTable[] = {
++ { "year", tMONTH_UNIT, 12 },
++ { "month", tMONTH_UNIT, 1 },
++ { "fortnight", tMINUTE_UNIT, 14 * 24 * 60 },
++ { "week", tMINUTE_UNIT, 7 * 24 * 60 },
++ { "day", tMINUTE_UNIT, 1 * 24 * 60 },
++ { "hour", tMINUTE_UNIT, 60 },
++ { "minute", tMINUTE_UNIT, 1 },
++ { "min", tMINUTE_UNIT, 1 },
++ { "second", tSEC_UNIT, 1 },
++ { "sec", tSEC_UNIT, 1 },
++ { NULL }
++};
++
++/* Assorted relative-time words. */
++static TABLE const OtherTable[] = {
++ { "tomorrow", tMINUTE_UNIT, 1 * 24 * 60 },
++ { "yesterday", tMINUTE_UNIT, -1 * 24 * 60 },
++ { "today", tMINUTE_UNIT, 0 },
++ { "now", tMINUTE_UNIT, 0 },
++ { "last", tUNUMBER, -1 },
++ { "this", tMINUTE_UNIT, 0 },
++ { "next", tUNUMBER, 2 },
++ { "first", tUNUMBER, 1 },
++/* { "second", tUNUMBER, 2 }, */
++ { "third", tUNUMBER, 3 },
++ { "fourth", tUNUMBER, 4 },
++ { "fifth", tUNUMBER, 5 },
++ { "sixth", tUNUMBER, 6 },
++ { "seventh", tUNUMBER, 7 },
++ { "eighth", tUNUMBER, 8 },
++ { "ninth", tUNUMBER, 9 },
++ { "tenth", tUNUMBER, 10 },
++ { "eleventh", tUNUMBER, 11 },
++ { "twelfth", tUNUMBER, 12 },
++ { "ago", tAGO, 1 },
++ { NULL }
++};
++
++/* The timezone table. */
++/* Some of these are commented out because a time_t can't store a float. */
++static TABLE const TimezoneTable[] = {
++ { "gmt", tZONE, HOUR( 0) }, /* Greenwich Mean */
++ { "ut", tZONE, HOUR( 0) }, /* Universal (Coordinated) */
++ { "utc", tZONE, HOUR( 0) },
++ { "wet", tZONE, HOUR( 0) }, /* Western European */
++ { "bst", tDAYZONE, HOUR( 0) }, /* British Summer */
++ { "wat", tZONE, HOUR( 1) }, /* West Africa */
++ { "at", tZONE, HOUR( 2) }, /* Azores */
++#if 0
++ /* For completeness. BST is also British Summer, and GST is
++ * also Guam Standard. */
++ { "bst", tZONE, HOUR( 3) }, /* Brazil Standard */
++ { "gst", tZONE, HOUR( 3) }, /* Greenland Standard */
++#endif
++#if 0
++ { "nft", tZONE, HOUR(3.5) }, /* Newfoundland */
++ { "nst", tZONE, HOUR(3.5) }, /* Newfoundland Standard */
++ { "ndt", tDAYZONE, HOUR(3.5) }, /* Newfoundland Daylight */
++#endif
++ { "ast", tZONE, HOUR( 4) }, /* Atlantic Standard */
++ { "adt", tDAYZONE, HOUR( 4) }, /* Atlantic Daylight */
++ { "est", tZONE, HOUR( 5) }, /* Eastern Standard */
++ { "edt", tDAYZONE, HOUR( 5) }, /* Eastern Daylight */
++ { "cst", tZONE, HOUR( 6) }, /* Central Standard */
++ { "cdt", tDAYZONE, HOUR( 6) }, /* Central Daylight */
++ { "mst", tZONE, HOUR( 7) }, /* Mountain Standard */
++ { "mdt", tDAYZONE, HOUR( 7) }, /* Mountain Daylight */
++ { "pst", tZONE, HOUR( 8) }, /* Pacific Standard */
++ { "pdt", tDAYZONE, HOUR( 8) }, /* Pacific Daylight */
++ { "yst", tZONE, HOUR( 9) }, /* Yukon Standard */
++ { "ydt", tDAYZONE, HOUR( 9) }, /* Yukon Daylight */
++ { "hst", tZONE, HOUR(10) }, /* Hawaii Standard */
++ { "hdt", tDAYZONE, HOUR(10) }, /* Hawaii Daylight */
++ { "cat", tZONE, HOUR(10) }, /* Central Alaska */
++ { "ahst", tZONE, HOUR(10) }, /* Alaska-Hawaii Standard */
++ { "nt", tZONE, HOUR(11) }, /* Nome */
++ { "idlw", tZONE, HOUR(12) }, /* International Date Line West */
++ { "cet", tZONE, -HOUR(1) }, /* Central European */
++ { "met", tZONE, -HOUR(1) }, /* Middle European */
++ { "mewt", tZONE, -HOUR(1) }, /* Middle European Winter */
++ { "mest", tDAYZONE, -HOUR(1) }, /* Middle European Summer */
++ { "swt", tZONE, -HOUR(1) }, /* Swedish Winter */
++ { "sst", tDAYZONE, -HOUR(1) }, /* Swedish Summer */
++ { "fwt", tZONE, -HOUR(1) }, /* French Winter */
++ { "fst", tDAYZONE, -HOUR(1) }, /* French Summer */
++ { "eet", tZONE, -HOUR(2) }, /* Eastern Europe, USSR Zone 1 */
++ { "bt", tZONE, -HOUR(3) }, /* Baghdad, USSR Zone 2 */
++#if 0
++ { "it", tZONE, -HOUR(3.5) },/* Iran */
++#endif
++ { "zp4", tZONE, -HOUR(4) }, /* USSR Zone 3 */
++ { "zp5", tZONE, -HOUR(5) }, /* USSR Zone 4 */
++#if 0
++ { "ist", tZONE, -HOUR(5.5) },/* Indian Standard */
++#endif
++ { "zp6", tZONE, -HOUR(6) }, /* USSR Zone 5 */
++#if 0
++ /* For completeness. NST is also Newfoundland Stanard, and SST is
++ * also Swedish Summer. */
++ { "nst", tZONE, -HOUR(6.5) },/* North Sumatra */
++ { "sst", tZONE, -HOUR(7) }, /* South Sumatra, USSR Zone 6 */
++#endif /* 0 */
++ { "wast", tZONE, -HOUR(7) }, /* West Australian Standard */
++ { "wadt", tDAYZONE, -HOUR(7) }, /* West Australian Daylight */
++#if 0
++ { "jt", tZONE, -HOUR(7.5) },/* Java (3pm in Cronusland!) */
++#endif
++ { "cct", tZONE, -HOUR(8) }, /* China Coast, USSR Zone 7 */
++ { "jst", tZONE, -HOUR(9) }, /* Japan Standard, USSR Zone 8 */
++#if 0
++ { "cast", tZONE, -HOUR(9.5) },/* Central Australian Standard */
++ { "cadt", tDAYZONE, -HOUR(9.5) },/* Central Australian Daylight */
++#endif
++ { "east", tZONE, -HOUR(10) }, /* Eastern Australian Standard */
++ { "eadt", tDAYZONE, -HOUR(10) }, /* Eastern Australian Daylight */
++ { "gst", tZONE, -HOUR(10) }, /* Guam Standard, USSR Zone 9 */
++ { "nzt", tZONE, -HOUR(12) }, /* New Zealand */
++ { "nzst", tZONE, -HOUR(12) }, /* New Zealand Standard */
++ { "nzdt", tDAYZONE, -HOUR(12) }, /* New Zealand Daylight */
++ { "idle", tZONE, -HOUR(12) }, /* International Date Line East */
++ { NULL }
++};
++
++/* Military timezone table. */
++static TABLE const MilitaryTable[] = {
++ { "a", tMILZONE, HOUR( 1) },
++ { "b", tMILZONE, HOUR( 2) },
++ { "c", tMILZONE, HOUR( 3) },
++ { "d", tMILZONE, HOUR( 4) },
++ { "e", tMILZONE, HOUR( 5) },
++ { "f", tMILZONE, HOUR( 6) },
++ { "g", tMILZONE, HOUR( 7) },
++ { "h", tMILZONE, HOUR( 8) },
++ { "i", tMILZONE, HOUR( 9) },
++ { "k", tMILZONE, HOUR( 10) },
++ { "l", tMILZONE, HOUR( 11) },
++ { "m", tMILZONE, HOUR( 12) },
++ { "n", tMILZONE, HOUR(- 1) },
++ { "o", tMILZONE, HOUR(- 2) },
++ { "p", tMILZONE, HOUR(- 3) },
++ { "q", tMILZONE, HOUR(- 4) },
++ { "r", tMILZONE, HOUR(- 5) },
++ { "s", tMILZONE, HOUR(- 6) },
++ { "t", tMILZONE, HOUR(- 7) },
++ { "u", tMILZONE, HOUR(- 8) },
++ { "v", tMILZONE, HOUR(- 9) },
++ { "w", tMILZONE, HOUR(-10) },
++ { "x", tMILZONE, HOUR(-11) },
++ { "y", tMILZONE, HOUR(-12) },
++ { "z", tZONE, HOUR( 0) }, /* Deliberately tZONE */
++ { NULL }
++};
++
++static int LookupWord(char * buff, YYSTYPE * yylval, struct Variables * vars)
++{
++ register char *p;
++ register char *q;
++ register const TABLE *tp;
++ int i;
++ int abbrev;
++
++ /* Make it lowercase. */
++ for (p = buff; *p != '\0'; p++)
++ *p = (char)tolower(*p);
++
++ if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) {
++ yylval->Meridian = MERam;
++ return tMERIDIAN;
++ }
++ if (strcmp(buff, "pm") == 0 || strcmp(buff, "p.m.") == 0) {
++ yylval->Meridian = MERpm;
++ return tMERIDIAN;
++ }
++
++ /* See if we have an abbreviation for a month. */
++ if (strlen(buff) == 3)
++ abbrev = 1;
++ else if (strlen(buff) == 4 && buff[3] == '.') {
++ abbrev = 1;
++ buff[3] = '\0';
++ }
++ else
++ abbrev = 0;
++
++ for (tp = MonthDayTable; tp->name; tp++) {
++ if (abbrev) {
++ if (strncmp(buff, tp->name, 3) == 0) {
++ yylval->Number = tp->value;
++ return tp->type;
++ }
++ }
++ else if (strcmp(buff, tp->name) == 0) {
++ yylval->Number = tp->value;
++ return tp->type;
++ }
++ }
++
++ for (tp = TimezoneTable; tp->name; tp++)
++ if (strcmp(buff, tp->name) == 0) {
++ yylval->Number = tp->value;
++ return tp->type;
++ }
++
++ if (strcmp(buff, "dst") == 0)
++ return tDST;
++
++ for (tp = UnitsTable; tp->name; tp++)
++ if (strcmp(buff, tp->name) == 0) {
++ yylval->Number = tp->value;
++ return tp->type;
++ }
++
++ /* Strip off any plural and try the units table again. */
++ i = strlen(buff) - 1;
++ if (buff[i] == 's') {
++ buff[i] = '\0';
++ for (tp = UnitsTable; tp->name; tp++)
++ if (strcmp(buff, tp->name) == 0) {
++ yylval->Number = tp->value;
++ return tp->type;
++ }
++ buff[i] = 's'; /* Put back for "this" in OtherTable. */
++ }
++
++ for (tp = OtherTable; tp->name; tp++)
++ if (strcmp(buff, tp->name) == 0) {
++ yylval->Number = tp->value;
++ return tp->type;
++ }
++
++ /* Avoid confusion with 'T' in RFC3339 and 't' in Military timezones */
++ if (!vars->yyHaveTime && strcmp(buff, "t") == 0)
++ return tRFC3339;
++
++ /* Military timezones. */
++ if (buff[1] == '\0' && isalpha(*buff)) {
++ for (tp = MilitaryTable; tp->name; tp++)
++ if (strcmp(buff, tp->name) == 0) {
++ yylval->Number = tp->value;
++ return tp->type;
++ }
++ }
++
++ /* Drop out any periods and try the timezone table again. */
++ for (i = 0, p = q = buff; *q; q++)
++ if (*q != '.')
++ *p++ = *q;
++ else
++ i++;
++ *p = '\0';
++ if (i)
++ for (tp = TimezoneTable; tp->name; tp++)
++ if (strcmp(buff, tp->name) == 0) {
++ yylval->Number = tp->value;
++ return tp->type;
++ }
++
++ for (i = 1; i <= 12; i++)
++ for (abbrev = 0; abbrev < 2; abbrev++)
++ if (PTimeIsMonthName(buff, i, abbrev)) {
++ yylval->Number = i;
++ return tMONTH;
++ }
++
++ for (i = 1; i <= 7; i++)
++ for (abbrev = 0; abbrev < 2; abbrev++)
++ if (PTimeIsDayName(buff, i, abbrev)) {
++ yylval->Number = i;
++ return tDAY;
++ }
++
++ return tID;
++}
++
++
++#ifdef _MSC_VER
++#pragma warning(disable:4211)
++#endif
++
++#ifndef __GNUC__
++static
++#endif
++int yylex(YYSTYPE * yylval, struct Variables * vars)
++{
++ register char *p;
++ char buff[20];
++ int Count;
++ int sign;
++ register int c = PTimeGetChar(vars->yyInput);
++
++ while (c != EOF && c != '\0' && c != '\n') {
++ while (isspace(c))
++ c = PTimeGetChar(vars->yyInput);
++
++ if (isdigit(c) || c == '-' || c == '+') {
++ if (c == '-' || c == '+') {
++ sign = c == '-' ? -1 : 1;
++ if (!isdigit(c = PTimeGetChar(vars->yyInput)))
++ /* skip the '-' sign */
++ continue;
++ }
++ else
++ sign = 0;
++ yylval->Number = 0;
++ Count = 0; /* Count number of digits */
++ while (isdigit(c)) {
++ yylval->Number = 10 * yylval->Number + c - '0';
++ c = PTimeGetChar(vars->yyInput);
++ Count++;
++ }
++ PTimeUngetChar(vars->yyInput, c);
++ if (sign < 0)
++ yylval->Number = -yylval->Number;
++ if (Count == 4)
++ return sign ? tS4DIGITNUMBER : t4DIGITNUMBER;
++ if (sign)
++ return tSNUMBER;
++ if (Count == 6)
++ return t6DIGITNUMBER;
++ if (Count == 8)
++ return t8DIGITNUMBER;
++ return tUNUMBER;
++ }
++
++ if (isalpha(c)) {
++ for (p = buff; isalpha(c) || c == '.'; c = PTimeGetChar(vars->yyInput)) {
++ if (p < &buff[sizeof(buff)-1])
++ *p++ = (char)c;
++ }
++ *p = '\0';
++ PTimeUngetChar(vars->yyInput, c);
++ return LookupWord(buff, yylval, vars);
++ }
++
++ if (c != '(')
++ return c;
++
++ Count = 0;
++ do {
++ c = PTimeGetChar(vars->yyInput);
++ if (c == '\0' || c == EOF)
++ return c;
++ if (c == '(')
++ Count++;
++ else if (c == ')')
++ Count--;
++ } while (Count > 0);
++ }
++
++ if (c == '\n')
++ PTimeUngetChar(vars->yyInput, c);
++
++ return EOF;
++}
++
++#ifdef _MSC_VER
++#pragma warning(default:4211)
++#endif
++
++
++static time_t ToSeconds(time_t Hours, time_t Minutes, time_t Seconds,
++ MERIDIAN Meridian)
++{
++ if (Minutes < 0 || Minutes > 59 || Seconds < 0 || Seconds > 59)
++ return -1;
++ switch (Meridian) {
++ case MER24:
++ if (Hours < 0 || Hours > 23)
++ return -1;
++ return (Hours * 60L + Minutes) * 60L + Seconds;
++ case MERam:
++ if (Hours < 1 || Hours > 12)
++ return -1;
++ if (Hours == 12)
++ Hours = 0;
++ return (Hours * 60L + Minutes) * 60L + Seconds;
++ case MERpm:
++ if (Hours < 1 || Hours > 12)
++ return -1;
++ if (Hours == 12)
++ Hours = 0;
++ return ((Hours + 12) * 60L + Minutes) * 60L + Seconds;
++ }
++
++ return -1;
++}
++
++
++static time_t Convert(time_t Month, time_t Day, time_t Year,
++ time_t Hours, time_t Minutes, time_t Seconds,
++ MERIDIAN Meridian, DSTMODE DSTmode, time_t yyTimezone)
++{
++ static int DaysInMonth[12] = {
++ 31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
++ };
++ time_t tod;
++ time_t Julian;
++ int i;
++
++ if (Year < 0)
++ Year = -Year;
++ if (Year < 70)
++ Year += 2000;
++ else if (Year < 100)
++ Year += 1900;
++ DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0)
++ ? 29 : 28;
++ /* Checking for 2038 bogusly assumes that time_t is 32 bits. But
++ I'm too lazy to try to check for time_t overflow in another way. */
++ if (Year < EPOCH || Year > 2038
++ || Month < 1 || Month > 12
++ /* Lint fluff: "conversion from long may lose accuracy" */
++ || Day < 1 || Day > DaysInMonth[(int)--Month])
++ return -1;
++
++ for (Julian = Day - 1, i = 0; i < Month; i++)
++ Julian += DaysInMonth[i];
++ for (i = EPOCH; i < Year; i++)
++ Julian += 365 + (i % 4 == 0);
++ Julian *= SECSPERDAY;
++ Julian += yyTimezone * 60L;
++ if ((tod = ToSeconds(Hours, Minutes, Seconds, Meridian)) < 0)
++ return -1;
++ Julian += tod;
++ if (DSTmode == DSTon
++ || (DSTmode == DSTmaybe && localtime(&Julian)->tm_isdst))
++ Julian -= 60 * 60;
++ return Julian;
++}
++
++
++static time_t DSTcorrect(time_t Start, time_t Future)
++{
++ time_t StartDay;
++ time_t FutureDay;
++
++ StartDay = (localtime(&Start)->tm_hour + 1) % 24;
++ FutureDay = (localtime(&Future)->tm_hour + 1) % 24;
++ return (Future - Start) + (StartDay - FutureDay) * 60L * 60L;
++}
++
++
++static time_t RelativeDate(time_t Start, time_t DayOrdinal, time_t DayNumber)
++{
++ struct tm *tm;
++ time_t now;
++
++ now = Start;
++ tm = localtime(&now);
++ now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7);
++ now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1);
++ return DSTcorrect(Start, now);
++}
++
++
++static time_t RelativeMonth(time_t Start, time_t RelMonth, time_t yyTimezone)
++{
++ struct tm *tm;
++ time_t Month;
++ time_t Year;
++
++ if (RelMonth == 0)
++ return 0;
++ tm = localtime(&Start);
++ Month = 12 * tm->tm_year + tm->tm_mon + RelMonth;
++ Year = Month / 12 + 1900;
++ Month = Month % 12 + 1;
++ return DSTcorrect(Start,
++ Convert(Month, (time_t)tm->tm_mday, Year,
++ (time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec,
++ MER24, DSTmaybe, yyTimezone));
++}
++
++
++static void SetPossibleDate(struct Variables * var,
++ time_t possible_day,
++ time_t possible_month,
++ time_t possible_year)
++{
++ int date_order;
++
++ if (possible_day > 31) /* test for ymd */
++ date_order = 2;
++ else if (possible_day > 12) /* test for dmy */
++ date_order = 1;
++ else if (possible_month > 12) /* test for mdy */
++ date_order = 0;
++ else
++ date_order = PTimeGetDateOrder();
++
++ switch (date_order) {
++ case 0 :
++ var->yyDay = possible_month;
++ var->yyMonth = possible_day;
++ var->yyYear = possible_year;
++ break;
++ case 1 :
++ var->yyDay = possible_day;
++ var->yyMonth = possible_month;
++ var->yyYear = possible_year;
++ break;
++ default :
++ var->yyDay = possible_year;
++ var->yyMonth = possible_month;
++ var->yyYear = possible_day;
++ }
++}
++
++
++time_t STDAPICALLTYPE PTimeParse(void * inputStream, struct tm * now, int timezone)
++{
++ time_t Start;
++ struct Variables var;
++
++
++ var.yyInput = inputStream;
++ var.yyYear = now->tm_year + 1900;
++ var.yyMonth = now->tm_mon + 1;
++ var.yyDay = now->tm_mday;
++ var.yyTimezone = -timezone;
++ var.yyDSTmode = DSTmaybe;
++ var.yyHour = 0;
++ var.yyMinutes = 0;
++ var.yySeconds = 0;
++ var.yyMeridian = MER24;
++ var.yyRelSeconds = 0;
++ var.yyRelMonth = 0;
++ var.yyHaveDate = 0;
++ var.yyHaveDay = 0;
++ var.yyHaveRel = 0;
++ var.yyHaveTime = 0;
++ var.yyHaveZone = 0;
++
++ yyparse(&var);
++
++ if (var.yyHaveTime > 1 || var.yyHaveZone > 1 ||
++ var.yyHaveDate > 1 || var.yyHaveDay > 1)
++ return -1;
++
++ if (var.yyHaveTime == 0 && var.yyHaveZone == 0 &&
++ var.yyHaveDate == 0 && var.yyHaveDay == 0 && var.yyHaveRel == 0)
++ return -1;
++
++ if (var.yyHaveDate || var.yyHaveTime || var.yyHaveDay) {
++ Start = Convert(var.yyMonth, var.yyDay, var.yyYear,
++ var.yyHour, var.yyMinutes, var.yySeconds,
++ var.yyMeridian, var.yyDSTmode, var.yyTimezone);
++ if (Start < 0)
++ return -1;
++ }
++ else {
++ time(&Start);
++ if (!var.yyHaveRel)
++ Start -= ((now->tm_hour * 60L + now->tm_min) * 60L) + now->tm_sec;
++ }
++
++ Start += var.yyRelSeconds;
++ Start += RelativeMonth(Start, var.yyRelMonth, var.yyTimezone);
++
++ if (var.yyHaveDay && !var.yyHaveDate)
++ Start += RelativeDate(Start, var.yyDayOrdinal, var.yyDayNumber);
++
++ /* Have to do *something* with a legitimate -1 so it's distinguishable
++ * from the error return value. (Alternately could set errno on error.) */
++ return Start == -1 ? 0 : Start;
++}
++
++
++#ifdef _MSC_VER
++#pragma warning(disable:4028 4100 4211)
++#endif
++
++#ifdef __GNUC__
++int yyerror(const char * s)
++{
++ return 0;
++}
++#else
++static void yyerror(const char * s)
++{
++}
++#endif
++
++#ifdef _MSC_VER
++#pragma warning(default:4028 4100 4211)
++#endif
++
++
++/* End of file ***************************************************************/
+diff -Naur ptlib-2.10.11.orig/src/ptlib/unix/svcproc.cxx ptlib-2.10.11/src/ptlib/unix/svcproc.cxx
+--- ptlib-2.10.11.orig/src/ptlib/unix/svcproc.cxx 2013-08-14 18:20:26.000000000 -0500
++++ ptlib-2.10.11/src/ptlib/unix/svcproc.cxx 2016-05-04 19:42:20.526529457 -0500
+@@ -217,7 +217,7 @@
+ pid_t pid;
+
+ {
+- ifstream pidfile(pidfilename);
++ ifstream pidfile((std::string&)pidfilename);
+ if (!pidfile.is_open()) {
+ cout << "Could not open pid file: \"" << pidfilename << "\""
+ " - " << strerror(errno) << endl;
+@@ -384,7 +384,7 @@
+ // Run as a daemon, ie fork
+
+ if (!pidfilename) {
+- ifstream pidfile(pidfilename);
++ ifstream pidfile((std::string&)pidfilename);
+ if (pidfile.is_open()) {
+ pid_t pid;
+ pidfile >> pid;
+@@ -412,7 +412,7 @@
+ cout << "Daemon started with pid " << pid << endl;
+ if (!pidfilename) {
+ // Write out the child pid to magic file in /var/run (at least for linux)
+- ofstream pidfile(pidfilename);
++ ofstream pidfile((std::string&)pidfilename);
+ if (pidfile.is_open())
+ pidfile << pid;
+ else
diff --git a/libraries/ptlib/ptlib-2.10.11-openssl11.patch b/libraries/ptlib/ptlib-2.10.11-openssl11.patch
new file mode 100644
index 0000000000..38d296eb2d
--- /dev/null
+++ b/libraries/ptlib/ptlib-2.10.11-openssl11.patch
@@ -0,0 +1,212 @@
+https://build.opensuse.org/package/view_file/network:telephony/libpt2/libpt2-openssl11.patch
+by mgorse@suse.com, see also:
+
+ - https://build.opensuse.org/request/show/518821
+ - https://bugzilla.opensuse.org/show_bug.cgi?id=1055477
+
+--- ptlib-2.10.11/src/ptclib/pssl.cxx 2013-08-14 18:20:27.000000000 -0500
++++ ptlib-2.10.11/src/ptclib/pssl.cxx.openssl11 2017-08-25 17:25:44.824287596 -0500
+@@ -140,7 +140,11 @@ PFACTORY_CREATE_SINGLETON(PProcessStartu
+ class PSSL_BIO
+ {
+ public:
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++ PSSL_BIO(const BIO_METHOD *method = BIO_s_file())
++#else
+ PSSL_BIO(BIO_METHOD *method = BIO_s_file_internal())
++#endif
+ { bio = BIO_new(method); }
+
+ ~PSSL_BIO()
+@@ -627,10 +631,18 @@ PSSLDiffieHellman::PSSLDiffieHellman(con
+ if (dh == NULL)
+ return;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000l
++ DH_set0_pqg (dh, BN_bin2bn(pData, pSize, NULL), NULL, BN_bin2bn(gData, gSize, NULL));
++ const BIGNUM *p, *g;
++ DH_get0_pqg(dh, &p, NULL, &g);
++ if (p != NULL && g != NULL)
++ return;
++#else
+ dh->p = BN_bin2bn(pData, pSize, NULL);
+ dh->g = BN_bin2bn(gData, gSize, NULL);
+ if (dh->p != NULL && dh->g != NULL)
+ return;
++#endif
+
+ DH_free(dh);
+ dh = NULL;
+@@ -805,9 +817,11 @@ void PSSLContext::Construct(Method metho
+ SSL_METHOD * meth;
+
+ switch (method) {
++#ifndef OPENSSL_NO_SSL3
+ case SSLv3:
+ meth = SSLv3_method();
+ break;
++#endif
+ case TLSv1:
+ meth = TLSv1_method();
+ break;
+@@ -1117,7 +1131,11 @@ PBoolean PSSLChannel::RawSSLRead(void *
+ //
+
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000l
++#define PSSLCHANNEL(bio) ((PSSLChannel *)(BIO_get_data (bio)))
++#else
+ #define PSSLCHANNEL(bio) ((PSSLChannel *)(bio->ptr))
++#endif
+
+ extern "C" {
+
+@@ -1130,10 +1148,16 @@ typedef long (*lfptr)();
+
+ static int Psock_new(BIO * bio)
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000l
++ BIO_set_init (bio, 0);
++ BIO_set_data (bio, NULL);; // this is really (PSSLChannel *)
++ BIO_set_flags (bio, 0);
++#else
+ bio->init = 0;
+ bio->num = 0;
+ bio->ptr = NULL; // this is really (PSSLChannel *)
+ bio->flags = 0;
++#endif
+
+ return(1);
+ }
+@@ -1144,13 +1168,23 @@ static int Psock_free(BIO * bio)
+ if (bio == NULL)
+ return 0;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000l
++ if (BIO_get_shutdown (bio)) {
++ if (BIO_get_init (bio)) {
++#else
+ if (bio->shutdown) {
+ if (bio->init) {
++#endif
+ PSSLCHANNEL(bio)->Shutdown(PSocket::ShutdownReadAndWrite);
+ PSSLCHANNEL(bio)->Close();
+ }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000l
++ BIO_set_init (bio, 0);
++ BIO_set_flags (bio, 0);
++#else
+ bio->init = 0;
+ bio->flags = 0;
++#endif
+ }
+ return 1;
+ }
+@@ -1160,11 +1194,19 @@ static long Psock_ctrl(BIO * bio, int cm
+ {
+ switch (cmd) {
+ case BIO_CTRL_SET_CLOSE:
++#if OPENSSL_VERSION_NUMBER >= 0x10100000l
++ BIO_set_shutdown (bio, (int)num);
++#else
+ bio->shutdown = (int)num;
++#endif
+ return 1;
+
+ case BIO_CTRL_GET_CLOSE:
++#if OPENSSL_VERSION_NUMBER >= 0x10100000l
++ return BIO_get_shutdown (bio);
++#else
+ return bio->shutdown;
++#endif
+
+ case BIO_CTRL_FLUSH:
+ return 1;
+@@ -1239,41 +1281,64 @@ static int Psock_puts(BIO * bio, const c
+ };
+
+
+-static BIO_METHOD methods_Psock =
+-{
+- BIO_TYPE_SOCKET,
+- "PTLib-PSSLChannel",
+-#if (OPENSSL_VERSION_NUMBER < 0x00906000)
+- (ifptr)Psock_write,
+- (ifptr)Psock_read,
+- (ifptr)Psock_puts,
+- NULL,
+- (lfptr)Psock_ctrl,
+- (ifptr)Psock_new,
+- (ifptr)Psock_free
+-#else
+- Psock_write,
+- Psock_read,
+- Psock_puts,
+- NULL,
+- Psock_ctrl,
+- Psock_new,
+- Psock_free
+-#endif
+-};
+-
+
+ PBoolean PSSLChannel::OnOpen()
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000l
++ static BIO_METHOD *methods_pSock = NULL;
++
++ if (methods_pSock == NULL) {
++ methods_pSock = BIO_meth_new (BIO_TYPE_SOCKET, "PTLib-PSSLChannel");
++ if (!methods_pSock)
++ return FALSE;
++ BIO_meth_set_write (methods_pSock, Psock_write);
++ BIO_meth_set_read (methods_pSock, Psock_read);
++ BIO_meth_set_puts (methods_pSock, Psock_puts);
++ BIO_meth_set_ctrl (methods_pSock, Psock_ctrl);
++ BIO_meth_set_create (methods_pSock, Psock_new);
++ BIO_meth_set_destroy (methods_pSock, Psock_free);
++ }
++
++ BIO * bio = BIO_new(methods_pSock);
++#else
++ static BIO_METHOD methods_Psock =
++ {
++ BIO_TYPE_SOCKET,
++ "PTLib-PSSLChannel",
++ #if (OPENSSL_VERSION_NUMBER < 0x00906000)
++ (ifptr)Psock_write,
++ (ifptr)Psock_read,
++ (ifptr)Psock_puts,
++ NULL,
++ (lfptr)Psock_ctrl,
++ (ifptr)Psock_new,
++ (ifptr)Psock_free
++ #else
++ Psock_write,
++ Psock_read,
++ Psock_puts,
++ NULL,
++ Psock_ctrl,
++ Psock_new,
++ Psock_free
++ #endif
++ };
++
+ BIO * bio = BIO_new(&methods_Psock);
++#endif
+ if (bio == NULL) {
+ SSLerr(SSL_F_SSL_SET_FD,ERR_R_BUF_LIB);
+ return PFalse;
+ }
+
+ // "Open" then bio
++#if OPENSSL_VERSION_NUMBER >= 0x10100000l
++ BIO_set_data (bio, this);
++ BIO_set_init (bio, 1);
++#else
+ bio->ptr = this;
+ bio->init = 1;
++#endif
+
+ SSL_set_bio(ssl, bio, bio);
+ return PTrue;
diff --git a/libraries/ptlib/ptlib-gcc8.patch b/libraries/ptlib/ptlib-gcc8.patch
new file mode 100644
index 0000000000..c446696532
--- /dev/null
+++ b/libraries/ptlib/ptlib-gcc8.patch
@@ -0,0 +1,12 @@
+--- ptlib-2.10.11/src/ptlib/unix/channel.cxx.orig 2018-07-23 18:25:26.300381968 +0100
++++ ptlib-2.10.11/src/ptlib/unix/channel.cxx 2018-07-23 18:26:07.244497346 +0100
+@@ -36,7 +36,8 @@
+
+ #include <ptlib.h>
+ #include <sys/ioctl.h>
+-
++#include <sys/uio.h>
++#include <unistd.h>
+
+ #include "../common/pchannel.cxx"
+
diff --git a/libraries/ptlib/ptlib.SlackBuild b/libraries/ptlib/ptlib.SlackBuild
index d2c42bd774..30dfd47045 100644
--- a/libraries/ptlib/ptlib.SlackBuild
+++ b/libraries/ptlib/ptlib.SlackBuild
@@ -68,11 +68,11 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Fix building with bison-3.0.4
-# thanks to Dan Fandrich / OpalVOIP https://sourceforge.net/p/opalvoip/patches/259/
-patch -p1 < $CWD/ptlib-2.10.10-mga-bison-parameter.patch
+patch -p1 < $CWD/ptlib-2.10.11-bison_fixes-2.patch
-# Disable SSLv3
-patch -p1 < $CWD/ssl3.patch
+patch -p1 < $CWD/ptlib-gcc8.patch
+
+patch -p1 < $CWD/ptlib-2.10.11-openssl11.patch
# The "LIBS" variable is set to fix OpenLDAP support
#
diff --git a/libraries/ptlib/ssl3.patch b/libraries/ptlib/ssl3.patch
deleted file mode 100644
index 6fdb7cabea..0000000000
--- a/libraries/ptlib/ssl3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -u -r ptlib-2.10.11/src/ptclib/pssl.cxx ptlib-2.10.11-nossl3/src/ptclib/pssl.cxx
---- ptlib-2.10.11/src/ptclib/pssl.cxx 2013-08-15 01:20:27.000000000 +0200
-+++ ptlib-2.10.11-nossl3/src/ptclib/pssl.cxx 2016-03-03 11:39:02.224835510 +0100
-@@ -805,13 +805,11 @@
- SSL_METHOD * meth;
-
- switch (method) {
-- case SSLv3:
-- meth = SSLv3_method();
-- break;
- case TLSv1:
- meth = TLSv1_method();
- break;
- case SSLv23:
-+ case SSLv3:
- default:
- meth = SSLv23_method();
- break;
-
diff --git a/libraries/python3-PyQt5/README b/libraries/python3-PyQt5/README
deleted file mode 100644
index 23ab8cbdae..0000000000
--- a/libraries/python3-PyQt5/README
+++ /dev/null
@@ -1,2 +0,0 @@
-PyQt5 is a set of Python bindings for Trolltech's Qt5 application
-framework and runs on all platforms supported by Qt5.
diff --git a/libraries/python3-PyQt5/python3-PyQt5.SlackBuild b/libraries/python3-PyQt5/python3-PyQt5.SlackBuild
deleted file mode 100644
index 9c4399e1b5..0000000000
--- a/libraries/python3-PyQt5/python3-PyQt5.SlackBuild
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for "python3-PyQt5".
-
-# Copyright 2008 Aleksandar Samardzic <asamardzic@gmail.com>
-# Copyright 2008, 2009, 2010, 2011, 2015 Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Robby Workman <rworkman@slackware.com>
-# Modified by Eric Hameleers <alien@slackware.com>
-# Adapted by Marcel Saegebarth <marc@mos6581.de>
-
-PRGNAM=python3-PyQt5
-SRCNAM=PyQt5
-VERSION=${VERSION:-5.13.2}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf ${SRCNAM}-$VERSION
-tar xvf $CWD/${SRCNAM}-$VERSION.tar.gz
-cd ${SRCNAM}-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-
-export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5
-export QT5DIR=/usr/lib${LIBDIRSUFFIX}/qt5
-
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-
-python3 configure.py \
- --confirm-license \
- --verbose \
- --qsci-api \
- -q /usr/bin/qmake-qt5 \
- --sip=/usr/bin/python3-sip \
- --sip-incdir=$(pkg-config --cflags-only-I python3 | sed -e 's/^-I//')
-
-make
-make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog LICENSE NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/python3-PyQt5/python3-PyQt5.info b/libraries/python3-PyQt5/python3-PyQt5.info
deleted file mode 100644
index 58a36728d9..0000000000
--- a/libraries/python3-PyQt5/python3-PyQt5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-PyQt5"
-VERSION="5.13.2"
-HOMEPAGE="https://riverbankcomputing.com/software/pyqt/intro/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/PyQt5-5.13.2.tar.gz"
-MD5SUM="c1023cb9c3d29a89fc109b163a0175c0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="qt5 python3-sip"
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/libraries/python3-PyQt5/slack-desc b/libraries/python3-PyQt5/slack-desc
deleted file mode 100644
index 0c57255d02..0000000000
--- a/libraries/python3-PyQt5/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python3-PyQt5: python3-PyQt5 (Python bindings for Qt)
-python3-PyQt5:
-python3-PyQt5: PyQt5 is a set of Python bindings for Trolltech's Qt5 application
-python3-PyQt5: framework and runs on all platforms supported by Qt5.
-python3-PyQt5:
-python3-PyQt5: Homepage: https://riverbankcomputing.com/software/pyqt/intro/
-python3-PyQt5:
-python3-PyQt5:
-python3-PyQt5:
-python3-PyQt5:
-python3-PyQt5:
diff --git a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild
index 4184457861..162f829df0 100644
--- a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild
+++ b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild
@@ -24,8 +24,8 @@
PRGNAM=python3-PyQtWebEngine
SRCNAM=${PRGNAM#*-}
-VERSION=${VERSION:-5.13.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.15.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -78,7 +78,7 @@ export CXXFLAGS="$SLKCFLAGS"
python3 configure.py \
--verbose \
-q /usr/bin/qmake-qt5 \
- --sip=/usr/bin/python3-sip \
+ --sip=/usr/bin/sip3 \
--sip-incdir=$(pkg-config --cflags-only-I python3 | sed -e 's/^-I//')
make
diff --git a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info
index 2a8e0f58ec..b55ffd4d4f 100644
--- a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info
+++ b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info
@@ -1,8 +1,8 @@
PRGNAM="python3-PyQtWebEngine"
-VERSION="5.13.2"
+VERSION="5.15.0"
HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/PyQtWebEngine-5.13.2.tar.gz"
-MD5SUM="0a5f156959066cf86de31ddfe973f134"
+DOWNLOAD="https://pypi.python.org/packages/source/P/PyQtWebEngine/PyQtWebEngine-5.15.0.tar.gz"
+MD5SUM="043f5b0130163ddf04faa3b0472bb0de"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="python3-PyQt5"
diff --git a/libraries/python3-pillow/README b/libraries/python3-pillow/README
deleted file mode 100644
index 8bd903c6d8..0000000000
--- a/libraries/python3-pillow/README
+++ /dev/null
@@ -1,8 +0,0 @@
-The Python Imaging Library (PIL) adds image processing capabilities to
-your Python environment. This library provides extensive file format
-support, an efficient internal representation and powerful image
-processing capabilities.
-
-NOTE - This SlackBuild provides PIL libraries with support for Python3. It
-is intended to be a complement to Slackware's default python-pillow, not to
-replace it, hence it doesn't include the scripts that would go to /usr/bin.
diff --git a/libraries/python3-pillow/python3-pillow.SlackBuild b/libraries/python3-pillow/python3-pillow.SlackBuild
deleted file mode 100644
index fca5f71d14..0000000000
--- a/libraries/python3-pillow/python3-pillow.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python3-pillow
-
-# Copyright 2015-2017 Philip Lacroix <slackph at posteo dot de>
-#
-# Based on build script for python-pillow by following authors:
-# Copyright 2009, 2010, 2013, 2014 Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2014 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2015 Brenton Earl <brent at exitstatusone dot com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python3-pillow
-SRCNAM=Pillow
-VERSION=${VERSION:-3.0.0}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Do not install scripts that would go to /usr/bin, as they
-# are already part of python-pillow.
-sed -i -e "s~.*scripts=glob.glob(\"Scripts/\*.py\"),~~" setup.py
-
-python3 setup.py install --root=$PKG
-
-# Safety check to prevent changes in the install process of a
-# different version of Pillow that might allow files in /usr/bin.
-if [ -e $PKG/usr/bin ]; then
- echo -e "\n* Warning - This package is not allowed to put files in /usr/bin,"
- echo "* as they conflict with Slackware's default python-pillow. Exiting."
- exit 1
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
- | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
-
-# Install documentation.
-mkdir -p $PRGDOC
-cat $CWD/README > $PRGDOC/README
-cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/python3-pillow/python3-pillow.info b/libraries/python3-pillow/python3-pillow.info
deleted file mode 100644
index 77117beb48..0000000000
--- a/libraries/python3-pillow/python3-pillow.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-pillow"
-VERSION="3.0.0"
-HOMEPAGE="http://python-pillow.github.io/"
-DOWNLOAD="https://pypi.python.org/packages/source/P/Pillow/Pillow-3.0.0.tar.gz"
-MD5SUM="fc8ac44e93da09678eac7e30c9b7377d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3 %README%"
-MAINTAINER="Philip Lacroix"
-EMAIL="slackph at posteo dot de"
diff --git a/libraries/python3-pillow/slack-desc b/libraries/python3-pillow/slack-desc
deleted file mode 100644
index 446cde956c..0000000000
--- a/libraries/python3-pillow/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python3-pillow: python3-pillow (Python3 support for python-pillow)
-python3-pillow:
-python3-pillow: The Python Imaging Library (PIL) adds image processing capabilities
-python3-pillow: to your Python environment. This library provides extensive file
-python3-pillow: format support, an efficient internal representation and powerful
-python3-pillow: image processing capabilities.
-python3-pillow:
-python3-pillow: This package provides the PIL libraries with support for Python3. It
-python3-pillow: is intended to be a complement to python-pillow, not to replace it.
-python3-pillow:
-python3-pillow: Homepage: https://python3-pillow.github.io/
diff --git a/libraries/qca-qt5/Add_support_for_OpenSSL_1.1.0.diff.gz b/libraries/qca-qt5/Add_support_for_OpenSSL_1.1.0.diff.gz
deleted file mode 100644
index 040439a44a..0000000000
--- a/libraries/qca-qt5/Add_support_for_OpenSSL_1.1.0.diff.gz
+++ /dev/null
Binary files differ
diff --git a/libraries/qca-qt5/README b/libraries/qca-qt5/README
deleted file mode 100644
index 83d6c42327..0000000000
--- a/libraries/qca-qt5/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Qt Cryptographic Architecture for Qt5
-
-QCA aims to provide a straightforward and cross-platform crypto API,
-using Qt datatypes and conventions. QCA separates the API from the
-implementation, using plugins known as Providers. The advantage of
-this model is to allow applications to avoid linking to or explicitly
-depending on any particular cryptographic library. This allows one
-to easily change or upgrade crypto implementations without needing
-to recompile the application.
-
-QCA was written by Justin Karneges.
diff --git a/libraries/qca-qt5/qca-qt5.SlackBuild b/libraries/qca-qt5/qca-qt5.SlackBuild
deleted file mode 100644
index 0cdf4e8823..0000000000
--- a/libraries/qca-qt5/qca-qt5.SlackBuild
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2008, 2009, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA
-# Modifications for qt5/sbo copyright 2018 Dave Woodfall <dave@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Robby Workman <rworkman@slackware.com> for qca-2.0.0
-# No additional license terms and no copyright claim
-
-PRGNAM=qca-qt5
-SRCNAM=qca
-VERSION=${VERSION:-2.1.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Support OpenSSL-1.1.x:
-zcat $CWD/Add_support_for_OpenSSL_1.1.0.diff.gz | patch -p1 --verbose
-
-mkdir build
-cd build
-
-cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DQCA_MAN_INSTALL_DIR=/usr/man \
- -DQCA_FEATURE_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX}/qt5/mkspecs/features/ \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SHARED_LINKER_FLAGS="-lstdc++" \
- -DLIB_SUFFIX="${LIBDIRSUFFIX}" \
- -DQT4_BUILD:BOOL=OFF \
- -DQT5_BUILD:BOOL=ON \
- ..
-
-make
-make install DESTDIR=$PKG
-
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
- | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- COPYING INSTALL README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/qca-qt5/qca-qt5.info b/libraries/qca-qt5/qca-qt5.info
deleted file mode 100644
index 142fb9729b..0000000000
--- a/libraries/qca-qt5/qca-qt5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="qca-qt5"
-VERSION="2.1.3"
-HOMEPAGE="https://userbase.kde.org/QCA"
-DOWNLOAD="http://download.kde.org/stable/qca/2.1.3/src/qca-2.1.3.tar.xz"
-MD5SUM="5019cc29efcf828681cd93164238ce26"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="qt5"
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/libraries/qca-qt5/qca.tlsunittest.cpp.diff.gz b/libraries/qca-qt5/qca.tlsunittest.cpp.diff.gz
deleted file mode 100644
index a555ac0335..0000000000
--- a/libraries/qca-qt5/qca.tlsunittest.cpp.diff.gz
+++ /dev/null
Binary files differ
diff --git a/libraries/qca-qt5/slack-desc b/libraries/qca-qt5/slack-desc
deleted file mode 100644
index da44da289e..0000000000
--- a/libraries/qca-qt5/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-qca-qt5: qca-qt5 (Qt Cryptographic Architecture for Qt5)
-qca-qt5:
-qca-qt5: QCA aims to provide a straightforward and cross-platform crypto API,
-qca-qt5: using Qt datatypes and conventions. QCA separates the API from the
-qca-qt5: implementation, using plugins known as Providers. The advantage of
-qca-qt5: this model is to allow applications to avoid linking to or explicitly
-qca-qt5: depending on any particular cryptographic library. This allows one
-qca-qt5: to easily change or upgrade crypto implementations without needing
-qca-qt5: to recompile the application.
-qca-qt5:
-qca-qt5: QCA was written by Justin Karneges.
diff --git a/libraries/qmltermwidget/gcc-10.patch b/libraries/qmltermwidget/gcc-10.patch
new file mode 100644
index 0000000000..f14a269712
--- /dev/null
+++ b/libraries/qmltermwidget/gcc-10.patch
@@ -0,0 +1,46 @@
+From 5cb4f9e6c86354674bd7715d947f95ac9f16a6c1 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 25 Jan 2020 12:20:37 +0000
+Subject: [PATCH] TerminalCharacterDecoder.cpp: fix build failure against
+ gcc-10
+
+gcc-10 fixed a few transitive includes and std::cwctype does not
+get included implicitly via other headers. This leads to the
+following build error:
+
+```
+lib/TerminalCharacterDecoder.cpp: In member function
+ 'virtual void Konsole::HTMLDecoder::decodeLine(const Konsole::Character*,
+ int, Konsole::LineProperty)':
+lib/TerminalCharacterDecoder.cpp:205:18:
+ error: 'iswspace' is not a member of 'std'; did you mean 'isspace'?
+ 205 | if (std::iswspace(ch))
+ | ^~~~~~~~
+ | isspace
+make: *** [Makefile:924: TerminalCharacterDecoder.o] Error 1
+```
+
+The fix is to include <cwctype> that is supposed to define 'std::iswspace'.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ lib/TerminalCharacterDecoder.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/TerminalCharacterDecoder.cpp b/lib/TerminalCharacterDecoder.cpp
+index 579dedf..5d5bfc0 100644
+--- a/lib/TerminalCharacterDecoder.cpp
++++ b/lib/TerminalCharacterDecoder.cpp
+@@ -19,6 +19,9 @@
+ 02110-1301 USA.
+ */
+
++// System
++#include <cwctype> /* std::iswspace */
++
+ // Own
+ #include "TerminalCharacterDecoder.h"
+
+--
+2.25.0
+
diff --git a/libraries/qmltermwidget/qmltermwidget.SlackBuild b/libraries/qmltermwidget/qmltermwidget.SlackBuild
index 53b47fc296..fb4ed472bc 100644
--- a/libraries/qmltermwidget/qmltermwidget.SlackBuild
+++ b/libraries/qmltermwidget/qmltermwidget.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for qmltermwidget
-# Copyright 2015-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2015-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -71,6 +71,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/gcc-10.patch
+
qmake-qt5
make
make INSTALL_ROOT=$PKG install
diff --git a/libraries/qt5-styleplugins/patches/0001-fix-build-against-Qt-5.15.patch b/libraries/qt5-styleplugins/patches/0001-fix-build-against-Qt-5.15.patch
new file mode 100644
index 0000000000..7eb7441582
--- /dev/null
+++ b/libraries/qt5-styleplugins/patches/0001-fix-build-against-Qt-5.15.patch
@@ -0,0 +1,44 @@
+From 335dbece103e2cbf6c7cf819ab6672c2956b17b3 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Thu, 28 May 2020 12:35:42 +0200
+Subject: [PATCH] fix build against Qt 5.15
+
+With 0a93db4d82c051164923a10e4382b12de9049b45 ("Unify application
+palette handling between QGuiApplication and QApplication")
+QApplicationPrivate::setSystemPalette is no longer used and necessary.
+---
+ src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++
+ src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp
+index 36169c9..2544593 100644
+--- a/src/plugins/styles/gtk2/qgtkstyle.cpp
++++ b/src/plugins/styles/gtk2/qgtkstyle.cpp
+@@ -440,7 +440,9 @@ void QGtkStyle::polish(QApplication *app)
+ // not supported as these should be entirely determined by
+ // current Gtk settings
+ if (app->desktopSettingsAware() && d->isThemeAvailable()) {
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+ QApplicationPrivate::setSystemPalette(standardPalette());
++#endif
+ QApplicationPrivate::setSystemFont(d->getThemeFont());
+ d->applyCustomPaletteHash();
+ if (!d->isKDE4Session())
+diff --git a/src/plugins/styles/gtk2/qgtkstyle_p.cpp b/src/plugins/styles/gtk2/qgtkstyle_p.cpp
+index e57b3d8..e71beb0 100644
+--- a/src/plugins/styles/gtk2/qgtkstyle_p.cpp
++++ b/src/plugins/styles/gtk2/qgtkstyle_p.cpp
+@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateTheme()
+ if (oldTheme != QGtkStylePrivate::getThemeName()) {
+ oldTheme = QGtkStylePrivate::getThemeName();
+ QPalette newPalette = qApp->style()->standardPalette();
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+ QApplicationPrivate::setSystemPalette(newPalette);
++#endif
+ QApplication::setPalette(newPalette);
+ if (!QGtkStylePrivate::instances.isEmpty()) {
+ QGtkStylePrivate::instances.last()->initGtkWidgets();
+--
+2.26.2
+
diff --git a/libraries/qt5-styleplugins/patches/0002-fix-gtk2-background.patch b/libraries/qt5-styleplugins/patches/0002-fix-gtk2-background.patch
new file mode 100644
index 0000000000..888ec0bb4b
--- /dev/null
+++ b/libraries/qt5-styleplugins/patches/0002-fix-gtk2-background.patch
@@ -0,0 +1,25 @@
+From 20b0985a77df913585628d49a3b541fb957ae366 Mon Sep 17 00:00:00 2001
+From: gamezelda
+Date: Thu, 4 Jun 2020 00:06:50 +0200
+Subject: [PATCH] fix setting background palette
+
+---
+ src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp
+index 2544593..6138bd2 100644
+--- a/src/plugins/styles/gtk2/qgtkstyle.cpp
++++ b/src/plugins/styles/gtk2/qgtkstyle.cpp
+@@ -442,6 +442,8 @@ void QGtkStyle::polish(QApplication *app)
+ if (app->desktopSettingsAware() && d->isThemeAvailable()) {
+ #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+ QApplicationPrivate::setSystemPalette(standardPalette());
++#else
++ QApplication::setPalette(standardPalette());
+ #endif
+ QApplicationPrivate::setSystemFont(d->getThemeFont());
+ d->applyCustomPaletteHash();
+--
+2.27.0
+
diff --git a/libraries/qt5-styleplugins/qt5-styleplugins.SlackBuild b/libraries/qt5-styleplugins/qt5-styleplugins.SlackBuild
index cd15a4d5a3..acc2eb3f95 100644
--- a/libraries/qt5-styleplugins/qt5-styleplugins.SlackBuild
+++ b/libraries/qt5-styleplugins/qt5-styleplugins.SlackBuild
@@ -72,6 +72,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Apply patches from Archlinux for qt-5.15.x
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+
# Force linking against Qt5DBus or build will fail
sed -i "s|2.0$|2.0 Qt5DBus|" src/plugins/platformthemes/gtk2/gtk2.pro
diff --git a/libraries/qt5-webkit/README b/libraries/qt5-webkit/README
deleted file mode 100644
index 7783fb6e68..0000000000
--- a/libraries/qt5-webkit/README
+++ /dev/null
@@ -1,3 +0,0 @@
-QtWebkit is a Qt based web browser engine.
-
-Optional dependencies: libwebp
diff --git a/libraries/qt5-webkit/doinst.sh b/libraries/qt5-webkit/doinst.sh
deleted file mode 100644
index 65c7e2eeb9..0000000000
--- a/libraries/qt5-webkit/doinst.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
diff --git a/libraries/qt5-webkit/qt5-webkit.SlackBuild b/libraries/qt5-webkit/qt5-webkit.SlackBuild
deleted file mode 100644
index 71efbc8fac..0000000000
--- a/libraries/qt5-webkit/qt5-webkit.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for qt5-webkit
-
-# Copyright 2016-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
-# All rights reserved.
-#
-# Some part of this SlackBuild is adapted from SBo and AlienBOB's qt5{-webkit} SlackBuild
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Adapted for 5.9.0 by David Woodfall <dave@slackbuilds.org>
-# Added some parts from -current build.
-
-PRGNAM=qt5-webkit
-SRCNAM=qtwebkit
-VERSION=${VERSION:-5.212.0_alpha4}
-SRCVERSION=$(echo $VERSION | tr -s '_' '-')
-BUILD=${BUILD:-3}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$SRCVERSION
-tar xvf $CWD/$SRCNAM-$SRCVERSION.tar.gz
-cd $SRCNAM-$SRCVERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
-export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5"
-export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}"
-
-mkdir -p build
-cd build
- cmake \
- -DPORT=Qt \
- -DQt5_DIR=$QTDIR \
- -DCMAKE_BUILD_TYPE=Release ..
- make
- make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE* README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/qt5-webkit/qt5-webkit.info b/libraries/qt5-webkit/qt5-webkit.info
deleted file mode 100644
index 744f377419..0000000000
--- a/libraries/qt5-webkit/qt5-webkit.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="qt5-webkit"
-VERSION="5.212.0_alpha4"
-HOMEPAGE="https://www.qt.io"
-DOWNLOAD="https://github.com/qt/qtwebkit/archive/v5.212.0-alpha4/qtwebkit-5.212.0-alpha4.tar.gz"
-MD5SUM="22e442063e7d0362439934442e269ed2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="qt5 hyphen"
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/libraries/qt5-webkit/slack-desc b/libraries/qt5-webkit/slack-desc
deleted file mode 100644
index 1642645efc..0000000000
--- a/libraries/qt5-webkit/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-qt5-webkit: qt5-webkit (Qt based web browser engine)
-qt5-webkit:
-qt5-webkit: QtWebkit is a Qt based web browser engine.
-qt5-webkit: This package contains the Qt5 based version.
-qt5-webkit:
-qt5-webkit: Homepage: https://www.qt.io
-qt5-webkit:
-qt5-webkit:
-qt5-webkit:
-qt5-webkit:
-qt5-webkit:
diff --git a/libraries/qt5/README b/libraries/qt5/README
deleted file mode 100644
index 553ecb1637..0000000000
--- a/libraries/qt5/README
+++ /dev/null
@@ -1,134 +0,0 @@
-Qt is a cross-platform C++ application framework. Qt's
-primary feature is its rich set of widgets that provide
-standard GUI functionality.
-
-The following are optional dependencies that Qt will link
-against if they are detected at build time:
-
-libwebp, opus, ffmpeg, re2, snappy, libminizip, jsoncpp,
-libinput, unixODBC, postgresql, SDL2, assimp, wayland,
-OpenAL, protobuf(3?), argon2, and perhaps more.
-
-============================================================
-
-OPTIONS
-
-To use Qt's built-in ccache option:
-
- CCACHE=yes ./qt5.SlackBuild
-
-To build the documentation:
-
- DOCS=yes ./qt5.SlackBuild
-
-(you will need the llvm package from extra/ to build
-documentation)
-
-To build the examples:
-
- EXAMPLES=yes ./qt5.SlackBuild
-
-To build support for proprietary media codecs:
-
- PROPRIETARY_CODECS=yes ./qt5.SlackBuild
-
-(this will produce a non-redistributable package in some
-countries)
-
-To disable support for pulseaudio:
-
- PULSEAUDIO=no ./qt5.SlackBuild
-
-(Qt will automatically detect if pulseaudio is not installed
-at build time and disable it if it is missing.)
-
-To NOT build qtwebengine (EXPERIMENTAL):
-
- WEBENGINE=no ./qt5.SlackBuild
-
-To use the gold linker:
-
- LDGOLD=yes ./qt5.SlackBuild
-
-This may speed up the build, but can take more RAM.
-
-Combine any or all of the above.
-
-============================================================
-
-GENERAL NOTES
-
-After upgrading Qt5 it is important to rebuild qt5ct too, if
-it is installed, or some applications may not display or
-function correctly.
-
-There is a qt5-legacy (5.9.9) SlackBuild that is available
-for older applications that do not run correctly with this
-version. However it will not coexist with this version.
-
-Please report any problems about applications that don't
-work correctly to the Qt5 maintainer or to the mailing list.
-
-============================================================
-
-NOTES ON OPTIONS
-
-* Using ccache should speed up subsequent rebuilds, but may
- be slower for first time or one-off builds.
-
-* Building the documentation and/or examples creates a
- significantly larger package.
-
-============================================================
-
-BUILDING WITHOUT WEBENGINE
-
-Building without webengine can speed up compilation.
-
-If you have no intention of using the browser code, which
-includes a chunk of 3rd party Google Chromium source, then
-it may make sense to skip it and save yourself about 2/3 of
-the build time, and knocks about 3G off the needed space.
-
-The package version has _nowebengine appended to it for
-clarity.
-
-* Successfully tested so far without webengine (VERY quick
- tests):
-
- QMPlay2
- qt5ct
- qbittorrent-qt5
- speedcrunch
- qca-qt5
- psi-plus
- sddm
-
-============================================================
-
-TROUBLESHOOTING
-
-If Qt5 fails to build, it may be worth using the following
-steps.
-
-1 Uninstall the old Qt5 package
-2 Log out of root
-3 Log back in as root
-4 Build and install the new package
-5 Log out of root
-6 Log back in as root
-7 Upgrade all other packages that depend on Qt5
-
-The reasoning behind all the log outs/ins, is because Qt5
-installs /etc/profile.d/qt5.sh that sets QT5DIR and adds
-QT5DIR/bin to your $PATH when you log in (there's a similar
-file for csh.) Even though the old Qt5 is removepkg'd, those
-settings are *still there* until you log out.
-
-You can see with a test (assuming bash or a zsh type shell):
-
-env | grep -i qt5
-
-If that command is used before step 4, you shouldn't see
-anything qt5 related in PATH and QT5DIR shouldn't exist.
-
diff --git a/libraries/qt5/README.ccache b/libraries/qt5/README.ccache
deleted file mode 100644
index 1053bcc5c9..0000000000
--- a/libraries/qt5/README.ccache
+++ /dev/null
@@ -1,46 +0,0 @@
-NOTES ON SETTING UP CCACHE
-
-Using ccache can save a lot of time when building packages,
-and this is not limited to Qt5. Ccache is installed by
-default on stock Slackware.
-
-ccache(1) has a lot of useful info on using ccache, however
-I don't recommend using its method of symlinking. Instead I
-recommend the following way:
-
-mkdir -p /usr/local/bin
-ln -s /usr/bin/ccache /usr/local/bin/cc
-ln -s /usr/bin/ccache /usr/local/bin/c++
-ln -s /usr/bin/ccache /usr/local/bin/gcc
-ln -s /usr/bin/ccache /usr/local/bin/g++
-
-Doing it this way rather than copying the ccache binary as
-the man page suggests will ensure that the ccache used is
-updated whenever the ccache package is.
-
-The cache is created in the home directory of the user using
-it, and since slackbuilds are run by root that will be in
-/root/.ccache, therefore ensure that you have enough free
-space on the root file system for it. It is possible to put
-the cache directory elsewhere though. See the man page for
-info. But it would probably be fastest when on the same
-file system as the build directory.
-
-It's also possible to host the cache on a shared NFS
-directory, but be sure to test the speed before committing
-to that. The man page has some notes on this.
-
-Since Qt5 can take a lot of build space I recommend a max
-cache size of AT LEAST 6 GB. If you intend to use it all
-the time then use as much as you can. The default size is
-5 GB. I use 20 GB on my main build box, but use 7 GB on
-workstations and servers.
-
-Handy commands:
-
-ccache -s: To show some statistics.
-ccache -M <N>: To set the max cache size to N.
-
-(use G for GB with -M.)
-
-Last updated Mon 10 Dec 03:46:41 UTC 2018
diff --git a/libraries/qt5/desktop/assistant-qt5.desktop b/libraries/qt5/desktop/assistant-qt5.desktop
deleted file mode 100644
index 86f5701e34..0000000000
--- a/libraries/qt5/desktop/assistant-qt5.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Qt5 Assistant
-Comment=Shows Qt5 documentation and examples
-Exec=/usr/lib@LIBDIR@/qt5/bin/assistant
-Icon=assistant-qt5
-Terminal=false
-Type=Application
-Categories=Qt;Development;Documentation;
diff --git a/libraries/qt5/desktop/designer-qt5.desktop b/libraries/qt5/desktop/designer-qt5.desktop
deleted file mode 100644
index 16b91b8cb0..0000000000
--- a/libraries/qt5/desktop/designer-qt5.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt5 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt5 applications
-Exec=/usr/lib@LIBDIR@/qt5/bin/designer
-Icon=designer-qt5
-MimeType=application/x-designer;
-Terminal=false
-Type=Application
-Categories=Qt;Development;
diff --git a/libraries/qt5/desktop/linguist-qt5.desktop b/libraries/qt5/desktop/linguist-qt5.desktop
deleted file mode 100644
index 9ef2f0fbcb..0000000000
--- a/libraries/qt5/desktop/linguist-qt5.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt5 Linguist
-Comment=Add translations to Qt5 applications
-Exec=/usr/lib@LIBDIR@/qt5/bin/linguist
-Icon=linguist-qt5
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Type=Application
-Categories=Qt;Development;
diff --git a/libraries/qt5/desktop/qdbusviewer-qt5.desktop b/libraries/qt5/desktop/qdbusviewer-qt5.desktop
deleted file mode 100644
index 46947f092d..0000000000
--- a/libraries/qt5/desktop/qdbusviewer-qt5.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt5 QDbusViewer
-GenericName=Qt5 D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=/usr/lib@LIBDIR@/qt5/bin/qdbusviewer
-Icon=qdbusviewer-qt5
-Terminal=false
-Type=Application
-Categories=Qt;Development;Debugger;
diff --git a/libraries/qt5/doinst.sh b/libraries/qt5/doinst.sh
deleted file mode 100644
index 65c7e2eeb9..0000000000
--- a/libraries/qt5/doinst.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
diff --git a/libraries/qt5/patches/qt5.mysql.h.diff b/libraries/qt5/patches/qt5.mysql.h.diff
deleted file mode 100644
index 1ac6faacfd..0000000000
--- a/libraries/qt5/patches/qt5.mysql.h.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h qt-everywhere-opensource-src-5.1.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h
---- qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2013-07-02 07:09:52.000000000 +0000
-+++ qt-everywhere-opensource-src-5.1.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2013-07-21 21:21:01.190172379 +0000
-@@ -60,7 +60,7 @@
- #include <QtCore/qt_windows.h>
- #endif
-
--#include <mysql.h>
-+#include <mysql/mysql.h>
-
- #ifdef QT_PLUGIN
- #define Q_EXPORT_SQLDRIVER_MYSQL
diff --git a/libraries/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch b/libraries/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch
deleted file mode 100644
index ff00e63bed..0000000000
--- a/libraries/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in.foo qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in
---- qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in.foo 2019-04-30 15:18:24.886346423 -0500
-+++ qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in 2019-04-30 15:19:48.303873296 -0500
-@@ -66,8 +66,10 @@ unset(_GL_INCDIRS)
- # Don\'t check for existence of the "_qt5gui_OPENGL_INCLUDE_DIR" because it is
- # optional.
-
-+if (NOT ${_qt5gui_OPENGL_INCLUDE_DIR} STREQUAL "/usr/include")
- list(APPEND Qt5Gui_INCLUDE_DIRS ${_qt5gui_OPENGL_INCLUDE_DIR})
- set_property(TARGET Qt5::Gui APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5gui_OPENGL_INCLUDE_DIR})
-+endif()
-
- unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE)
-
diff --git a/libraries/qt5/profile.d/qt5.csh b/libraries/qt5/profile.d/qt5.csh
deleted file mode 100644
index ec1ecd9bef..0000000000
--- a/libraries/qt5/profile.d/qt5.csh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/csh
-# Environment path variables for the Qt package:
-if ( ! $?QT5DIR ) then
- # It's best to use the generic directory to avoid
- # compiling in a version-containing path:
- if ( -d /usr/lib@LIBDIRSUFFIX@/qt5 ) then
- setenv QT5DIR /usr/lib@LIBDIRSUFFIX@/qt5
- else
- # Find the newest Qt directory and set $QT5DIR to that:
- foreach qtd ( /usr/lib@LIBDIRSUFFIX@/qt5-* )
- if ( -d $qtd ) then
- setenv QT5DIR $qtd
- endif
- end
- endif
-endif
-set path = ( $path $QT5DIR/bin )
diff --git a/libraries/qt5/profile.d/qt5.sh b/libraries/qt5/profile.d/qt5.sh
deleted file mode 100644
index 8ee075e17e..0000000000
--- a/libraries/qt5/profile.d/qt5.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# Environment variables for the Qt package.
-#
-# It's best to use the generic directory to avoid
-# compiling in a version-containing path:
-if [ -d /usr/lib@LIBDIRSUFFIX@/qt5 ]; then
- QT5DIR=/usr/lib@LIBDIRSUFFIX@/qt5
-else
- # Find the newest Qt directory and set $QT5DIR to that:
- for qtd in /usr/lib@LIBDIRSUFFIX@/qt5-* ; do
- if [ -d $qtd ]; then
- QT5DIR=$qtd
- fi
- done
-fi
-PATH="$PATH:$QT5DIR/bin"
-export QT5DIR
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
deleted file mode 100644
index 67d6e19149..0000000000
--- a/libraries/qt5/qt5.SlackBuild
+++ /dev/null
@@ -1,319 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for qt5
-
-# Copyright 2013-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Merged some ideas from Alex Sarmardzic's script for qt4 at SlackBuilds.org
-# ^^ Modified by Robby Workman <rworkman@slackware.com> for QT4 & KDE4
-
-# We're using qt-copy instead of a released qt version, as this git release
-# has at least one bugfix strongly recommended by the kde developers.
-
-# Obtained from:
-# git clone git://gitorious.org/+kde-developers/qt/kde-qt.git
-# git checkout origin/4.5.3-patched
-# git checkout origin/4.6.0-stable-patched
-# git checkout origin/4.6.1-patched
-# git checkout origin/4.7.0-patched
-#
-# Alternate method (we don't use this):
-# wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched
-#
-# Modifications 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL
-# qt 4.7.3, 4.7.4, 4.8.0, 4.8.1, 4.8.2, 4.8.4 are built from original nokia sources.
-
-# This is the highly modified version qt.SlackBuild found in Slackware
-# tailored to Qt 5. Modified by Larry Hajali.
-
-# Adapted for Qt >= 5.9.6 by Dave Woodfall <dave@slackbuilds.org>
-# Some parts thanks to alienBOB's qt5 SlackBuild.
-
-PRGNAM=qt5
-SRCNAM=${PRGNAM%%[[:digit:]]*}
-VERSION=${VERSION:-5.12.8}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-EXAMPLES=${EXAMPLES:-no}
-DOCS=${DOCS:-no}
-PROPRIETARY_CODECS=${PROPRIETARY_CODECS:-no}
-PULSEAUDIO=${PULSEAUDIO:-yes}
-CCACHE=${CCACHE:-no}
-WEBENGINE=${WEBENGINE:-yes}
-LDGOLD=${LDGOLD:-no}
-
-[ "$EXAMPLES" = "no" ] && BUILD_EXAMPLES="-nomake examples"
-[ "$PULSEAUDIO" = "no" ] && PULSE="-no-pulseaudio"
-[ "$CCACHE" = "yes" ] && USE_CCACHE="-ccache"
-[ "$LDGOLD" = "no" ] && USE_LDGOLD="-no-use-gold-linker"
-
-if [ "$WEBENGINE" = "no" ]; then
- EXCLUDE="--exclude=qtwebengine"
- PKGVERSION="${VERSION}_nowebengine"
-else
- PKGVERSION="${VERSION}"
- if [ "$PROPRIETARY_CODECS" = "yes" ]; then
- CODECS="-webengine-proprietary-codecs"
- fi
-fi
-
-printf "\n%s\n\n" "SlackBuild Options:"
-printf "%s\n" "CCACHE: $CCACHE"
-printf "%s\n" "DOCS: $DOCS"
-printf "%s\n" "EXAMPLES: $EXAMPLES"
-printf "%s\n" "PROPRIETARY_CODECS: $PROPRIETARY_CODECS"
-printf "%s\n" "PULSEAUDIO: $PULSEAUDIO"
-printf "%s\n" "WEBENGINE: $WEBENGINE"
-printf "%s\n" "LDGOLD: $LDGOLD"
-printf "\n"
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
- SLKLDFLAGS="-L/usr/lib64"
-elif [ "$ARCH" = "armv7hl" ]; then
- # To prevent "qatomic_armv6.h error: output number 2 not directly addressable"
- # More permanent solution is to patch gcc:
- # http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731
- SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields"
- LIBDIRSUFFIX=""
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-if [ -e /var/log/packages/$PRGNAM-legacy-[[:digit:]]* ]; then
- printf "%s\n%s\n%s\n" "You appear to have $PRGNAM-legacy installed." \
- "$PRGNAM will not co-exist with $PRGNAM-legacy." \
- "Please uninstall $PRGNAM-legacy and restart the SlackBuild."
- exit 1
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-echo "Removing any existing source directory. Please wait..."
-rm -rf $SRCNAM-everywhere-src-$VERSION
-tar xvf $CWD/$SRCNAM-everywhere-src-$VERSION.tar.xz $EXCLUDE
-cd $SRCNAM-everywhere-src-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
-
-# Limit -reduce-relocations to ix86 and x86_64.
-# https://bugreports.qt-project.org/browse/QTBUG-36129
-if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then
- RELOCATIONS="-reduce-relocations"
-else
- RELOCATIONS=""
-fi
-
-# Fix path to mysql header:
-cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose
-
-# CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui
-# and for it breaks KWin compilation with:
-# /usr/include/c++/9.1.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory
-# See also https://bugzilla.redhat.com/1704474
-cd qtbase
- cat $CWD/patches/qt5.qtbase_cmake_isystem_includes.patch \
- | patch -p1 --verbose || exit 1
-cd - 1>/dev/null
-
-# Use our custom compiler and linker flags:
-sed -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${SLKCFLAGS}|" \
- -i qtbase/mkspecs/common/gcc-base.conf || exit 1
-sed -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${SLKLDFLAGS}|" \
- -i qtbase/mkspecs/common/g++-unix.conf || exit 1
-
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
-export QTDIR="${TMP}/qt-everywhere-src-$VERSION"
-export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}"
-export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
-
-./configure -v \
- -confirm-license \
- -opensource \
- -prefix "/usr/lib${LIBDIRSUFFIX}/$PRGNAM" \
- -sysconfdir "/etc/xdg" \
- -headerdir "/usr/include/$PRGNAM" \
- -libdir "/usr/lib${LIBDIRSUFFIX}" \
- -docdir "/usr/doc/$PRGNAM-$VERSION" \
- -examplesdir "/usr/doc/$PRGNAM-$VERSION/examples" \
- -system-libpng \
- -system-libjpeg \
- -system-zlib \
- -system-sqlite \
- -plugin-sql-sqlite \
- -icu \
- -openssl-linked \
- -verbose \
- -dbus-linked \
- -qpa xcb \
- -xcb \
- -glib \
- -accessibility \
- -no-separate-debug-info \
- -no-pch \
- -no-rpath \
- -no-strip \
- -release \
- $USE_CCACHE \
- $CODECS \
- $PULSE \
- $RELOCATIONS \
- $BUILD_EXAMPLES \
- $USE_LDGOLD
-
-make || make -j1
-make install INSTALL_ROOT=$PKG
-
-# Install documentation. Default is not to install documentation.
-if [ "$DOCS" = "yes" ]; then
- # Recreate Makefiles in order to use the just compiled qdoc.
- for doc in $(find . -name "Makefile*" \
- | xargs egrep "^\s/usr/lib${LIBDIRSUFFIX}/qt5/bin/" | cut -d':' -f1 \
- | uniq); do
- rm -fv $doc
- done
- make docs
- make install_docs INSTALL_ROOT=$PKG
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/bin
-for BIN in $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/bin/*; do
- TMP_FILE=$(echo $BIN | sed -e "s|$PKG||")
- case $(basename $BIN) in
- syncqt.pl|fixqt4headers.pl)
- ln -s $TMP_FILE $PKG/usr/bin/$(basename $BIN)
- ;;
- *)
- ln -s $TMP_FILE $PKG/usr/bin/$(basename $BIN)-$PRGNAM
- ;;
- esac
-done
-
-# Create Environment variables
-mkdir -p $PKG/etc/profile.d
-sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.sh \
- > $PKG/etc/profile.d/$PRGNAM.sh
-sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.csh \
- > $PKG/etc/profile.d/$PRGNAM.csh
-chmod 0755 $PKG/etc/profile.d/*
-
-cat > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5.pc << EOF
-prefix=/usr/lib${LIBDIRSUFFIX}/$PRGNAM
-bindir=\${prefix}/bin
-datadir=\${prefix}
-docdir=/usr/doc/$PRGNAM-$VERSION
-archdatadir=\${prefix}
-examplesdir=\${prefix}/examples
-headerdir=/usr/include/$PRGNAM
-importdir=\${prefix}/imports
-qmldir=\${prefix}/qml
-libdir=/usr/lib${LIBDIRSUFFIX}
-libexec=\${prefix}/libexec
-moc=\${bindir}/moc
-plugindir=\${prefix}/plugins
-qmake=\${bindir}/qmake
-sysconfdir=/etc/xdg
-translationdir=\${prefix}/translations
-
-Name: Qt5
-Description: Qt5 Configuration
-Version: $VERSION
-EOF
-
-# Fix the path in prl files:
-find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-
-# One more for the road.
-sed -i "s|$PWD/qtbase|/usr/lib${LIBDIRSUFFIX}/$PRGNAM|" \
- $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-for i in $CWD/desktop/*.desktop; do
- install -D -m 0644 $i $PKG/usr/share/applications/$(basename $i)
-done
-sed -i "s|@LIBDIR@|$LIBDIRSUFFIX|" $PKG/usr/share/applications/*
-
-install -D -m 0644 qttools/src/assistant/assistant/images/assistant-128.png \
- $PKG/usr/share/icons/hicolor/128x128/apps/assistant-qt5.png
-install -D -m 0644 qttools/src/designer/src/designer/images/designer.png \
- $PKG/usr/share/icons/hicolor/128x128/apps/designer-qt5.png
-install -D -m 0644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
- $PKG/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt5.png
-for i in 16 32 48 64 128; do
- install -D -m 0644 qttools/src/linguist/linguist/images/icons/linguist-${i}-32.png \
- $PKG/usr/share/icons/hicolor/${i}x${i}/apps/linguist-qt5.png
-done
-
-# Remove executable bits from files.
-find $PKG \( -name "*.qml" -o -name "*.app" \) -perm 755 -exec chmod 644 '{}' \;
-
-# Add missing version info
-sed -i "s,set(PACKAGE_VERSION ),set(PACKAGE_VERSION $VERSION)," \
- $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt5/Qt5ConfigVersion.cmake
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- README qtbase/{header*,LICENSE*} \
- $CWD/README.ccache \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
deleted file mode 100644
index 280af26135..0000000000
--- a/libraries/qt5/qt5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="qt5"
-VERSION="5.12.8"
-HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="https://download.qt.io/official_releases/qt/5.12/5.12.8/single/qt-everywhere-src-5.12.8.tar.xz"
-MD5SUM="8ec2a0458f3b8e9c995b03df05e006e4"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libxkbcommon"
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/libraries/qt5/slack-desc b/libraries/qt5/slack-desc
deleted file mode 100644
index 99abf5c2ba..0000000000
--- a/libraries/qt5/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-qt5: qt5 (a multi-platform C++ graphical user interface toolkit)
-qt5:
-qt5: Qt is a cross-platform C++ application framework. Qt's primary feature
-qt5: is its rich set of widgets that provide standard GUI functionality.
-qt5:
-qt5: Homepage: http://qt-project.org
-qt5:
-qt5:
-qt5:
-qt5:
-qt5:
diff --git a/libraries/qtermwidget/qtermwidget.SlackBuild b/libraries/qtermwidget/qtermwidget.SlackBuild
index 55ef5af14c..255065db78 100644
--- a/libraries/qtermwidget/qtermwidget.SlackBuild
+++ b/libraries/qtermwidget/qtermwidget.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for qtermwidget
-# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2011-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=qtermwidget
-VERSION=${VERSION:-0.14.1}
+VERSION=${VERSION:-0.15.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/libraries/qtermwidget/qtermwidget.info b/libraries/qtermwidget/qtermwidget.info
index 873b7451ee..46e1f35819 100644
--- a/libraries/qtermwidget/qtermwidget.info
+++ b/libraries/qtermwidget/qtermwidget.info
@@ -1,8 +1,8 @@
PRGNAM="qtermwidget"
-VERSION="0.14.1"
+VERSION="0.15.0"
HOMEPAGE="https://github.com/lxde/qtermwidget"
-DOWNLOAD="https://github.com/lxde/qtermwidget/releases/download/0.14.1/qtermwidget-0.14.1.tar.xz"
-MD5SUM="63c389982f995a89755f4b81855fb879"
+DOWNLOAD="https://github.com/lxde/qtermwidget/releases/download/0.15.0/qtermwidget-0.15.0.tar.xz"
+MD5SUM="250c04799c458571f4e7a6c9a6b26e3a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lxqt-build-tools"
diff --git a/libraries/qwt/qwt.SlackBuild b/libraries/qwt/qwt.SlackBuild
index ed2d49c7b2..957d8cc8a0 100644
--- a/libraries/qwt/qwt.SlackBuild
+++ b/libraries/qwt/qwt.SlackBuild
@@ -41,7 +41,7 @@ else
fi
# If Qt5 is installed, assume we want to use it
-QWT_QT5="no" ; pkg-config --exists Qt5 ; if [ "$?" = "0" ]; then QWT_QT5="yes" ; fi
+QWT_QT5="no" ; pkg-config --exists Qt5Core ; if [ "$?" = "0" ]; then QWT_QT5="yes" ; fi
set -e
diff --git a/libraries/rapidjson/rapidjson.SlackBuild b/libraries/rapidjson/rapidjson.SlackBuild
index 7df09edb3c..13847be1bf 100644
--- a/libraries/rapidjson/rapidjson.SlackBuild
+++ b/libraries/rapidjson/rapidjson.SlackBuild
@@ -76,7 +76,7 @@ find -name CMakeLists.txt | xargs sed -e 's|-Werror||' -i
mkdir -p build
cd build
cmake \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=class-memaccess" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
-DCMAKE_BUILD_TYPE=Release ..
diff --git a/libraries/rudiments/rudiments.SlackBuild b/libraries/rudiments/rudiments.SlackBuild
index 5ee33033b2..ecd7377f17 100644
--- a/libraries/rudiments/rudiments.SlackBuild
+++ b/libraries/rudiments/rudiments.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=rudiments
-VERSION=${VERSION:-0.55.0}
+VERSION=${VERSION:-1.0.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/libraries/rudiments/rudiments.info b/libraries/rudiments/rudiments.info
index c3cd414a19..6e6900d699 100644
--- a/libraries/rudiments/rudiments.info
+++ b/libraries/rudiments/rudiments.info
@@ -1,8 +1,8 @@
PRGNAM="rudiments"
-VERSION="0.55.0"
+VERSION="1.0.5"
HOMEPAGE="http://sqlrelay.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/rudiments/rudiments-0.55.0.tar.gz"
-MD5SUM="1b066c718074e78c96b82f900772cf6a"
+DOWNLOAD="http://downloads.sourceforge.net/rudiments/rudiments-1.0.5.tar.gz"
+MD5SUM="c44ff4cf82f30258b85aebd8e54fc37b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/sdformat/cmake.patch b/libraries/sdformat/cmake.patch
new file mode 100644
index 0000000000..38e6b6cca6
--- /dev/null
+++ b/libraries/sdformat/cmake.patch
@@ -0,0 +1,20 @@
+diff -Naur osrf-sdformat-e5ac5aaa49f2.orig/CMakeLists.txt osrf-sdformat-e5ac5aaa49f2/CMakeLists.txt
+--- osrf-sdformat-e5ac5aaa49f2.orig/CMakeLists.txt 2016-10-10 23:51:37.000000000 +0200
++++ osrf-sdformat-e5ac5aaa49f2/CMakeLists.txt 2017-07-29 19:46:16.021921859 +0200
+@@ -186,11 +186,13 @@
+ # OS Specific initialization
+ if (UNIX)
+ sdf_setup_unix()
+-else (WIN32)
++endif ()
++if (WIN32)
+ sdf_setup_windows()
+-else (APPLE)
++endif ()
++if (APPLE)
+ sdf_setup_apple()
+-endif()
++endif ()
+
+ #################################################
+ # Print warnings and errors
diff --git a/libraries/sdformat/sdformat.SlackBuild b/libraries/sdformat/sdformat.SlackBuild
index 5dea256ef6..b412d5a10d 100644
--- a/libraries/sdformat/sdformat.SlackBuild
+++ b/libraries/sdformat/sdformat.SlackBuild
@@ -71,6 +71,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Patch for cmake >= 3.9.x
+patch -p1 < $CWD/cmake.patch
+
mkdir -p build
cd build
cmake \
diff --git a/libraries/t4k_common/916060_bugfix.patch b/libraries/t4k_common/916060_bugfix.patch
new file mode 100644
index 0000000000..e8c8a499f7
--- /dev/null
+++ b/libraries/t4k_common/916060_bugfix.patch
@@ -0,0 +1,32 @@
+Description: fix loading each frame from SVG sprites
+ rsvg_handle_get_desc returns null so next sscanf segfaults. Use instead iterating
+ up from zero for id frame%d
+Author: cdonoghu@gmail.com
+Origin: other
+Forwarded: no
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/t4k_loaders.c
++++ b/src/t4k_loaders.c
+@@ -213,14 +213,13 @@
+ new_sprite = malloc(sizeof(sprite));
+ new_sprite->default_img = render_svg_from_handle(file_handle, width, height, "#default");
+
+- /* get number of frames from description */
+- sscanf(rsvg_handle_get_desc(file_handle), "%d", &new_sprite->num_frames);
+- DEBUGMSG(debug_loaders, "load_svg_sprite(): loading %d frames\n", new_sprite->num_frames);
+-
+- for(i = 0; i < new_sprite->num_frames; i++)
+- {
+- sprintf(lay_name, "#frame%d", i);
+- new_sprite->frame[i] = render_svg_from_handle(file_handle, width, height, lay_name);
++ /* get number of frames directly. End when #frame<num> doesn't exist */
++ new_sprite->num_frames = 0;
++ while(1) {
++ sprintf(lay_name, "#frame%d", new_sprite->num_frames);
++ if ( ! (rsvg_handle_has_sub(file_handle, lay_name)) ) break;
++ new_sprite->frame[new_sprite->num_frames] = render_svg_from_handle(file_handle, width, height, lay_name);
++ new_sprite->num_frames++;
+ }
+
+ g_object_unref(file_handle);
diff --git a/libraries/t4k_common/t4k_common.SlackBuild b/libraries/t4k_common/t4k_common.SlackBuild
index 9fb0cad487..71f7238a31 100644
--- a/libraries/t4k_common/t4k_common.SlackBuild
+++ b/libraries/t4k_common/t4k_common.SlackBuild
@@ -54,6 +54,9 @@ find -L . \
# Patch for libpng16 (-current) (from Debian)
patch -p1 < $CWD/libpng.patch
+# Fix segfaults with then newer librsvg (from Debian)
+patch -p1 < $CWD/916060_bugfix.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/libraries/tcl-tls/tcl-tls.SlackBuild b/libraries/tcl-tls/tcl-tls.SlackBuild
index 7b22033726..0586ec7b73 100644
--- a/libraries/tcl-tls/tcl-tls.SlackBuild
+++ b/libraries/tcl-tls/tcl-tls.SlackBuild
@@ -23,11 +23,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=tcl-tls
-VERSION=${VERSION:-1.6.7}
+VERSION=${VERSION:-1.7.20}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-PRGBASE=tls${VERSION}
+SRCNAM=tcltls
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -61,9 +61,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGBASE
-tar xvf $CWD/$PRGBASE-src.tar.gz
-cd $PRGBASE
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libraries/tcl-tls/tcl-tls.info b/libraries/tcl-tls/tcl-tls.info
index 179b544572..4882df9db3 100644
--- a/libraries/tcl-tls/tcl-tls.info
+++ b/libraries/tcl-tls/tcl-tls.info
@@ -1,8 +1,8 @@
PRGNAM="tcl-tls"
-VERSION="1.6.7"
-HOMEPAGE="https://sourceforge.net/projects/tls"
-DOWNLOAD="https://sourceforge.net/projects/tls/files/tls/1.6.7/tls1.6.7-src.tar.gz"
-MD5SUM="2765d84a7a520c9979d82a0abebc1647"
+VERSION="1.7.20"
+HOMEPAGE="https://core.tcl-lang.org/tcltls/"
+DOWNLOAD="https://core.tcl-lang.org/tcltls/uv/tcltls-1.7.20.tar.gz"
+MD5SUM="735ce57df0dfae9c6a8fe992574525d5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/totem-pl-parser/totem-pl-parser.SlackBuild b/libraries/totem-pl-parser/totem-pl-parser.SlackBuild
index a65d1f9a4d..fcc7e06516 100644
--- a/libraries/totem-pl-parser/totem-pl-parser.SlackBuild
+++ b/libraries/totem-pl-parser/totem-pl-parser.SlackBuild
@@ -5,13 +5,13 @@
# Written by crocket (crockabiscuit@gmail.com)
PRGNAM=totem-pl-parser
-VERSION=${VERSION:-3.4.5}
+VERSION=${VERSION:-3.26.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -46,30 +46,26 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+mkdir build
+cd build
+meson setup \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --disable-static \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make V=1
-make install-strip DESTDIR=$PKG
+ --libexecdir=/usr/lib$LIBDIRSUFFIX \
+ --buildtype=release \
+ -Denable-gtk-doc=true \
+ ..
+ninja
+DESTDIR="$PKG" ninja install
+cd ..
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS COPYING.LIB ChangeLog INSTALL NEWS README \
+ AUTHORS COPYING.LIB MAINTAINERS NEWS README \
$PKG/usr/doc/$PRGNAM-$VERSION
cd $PKG/usr/doc/$PRGNAM-$VERSION
ln -sf ../../share/gtk-doc/html/$PRGNAM html
diff --git a/libraries/totem-pl-parser/totem-pl-parser.info b/libraries/totem-pl-parser/totem-pl-parser.info
index 021acd7ecc..d7c80bdfe9 100644
--- a/libraries/totem-pl-parser/totem-pl-parser.info
+++ b/libraries/totem-pl-parser/totem-pl-parser.info
@@ -1,8 +1,8 @@
PRGNAM="totem-pl-parser"
-VERSION="3.4.5"
-HOMEPAGE="ftp://ftp.gnome.org/pub/gnome/sources/totem-pl-parser"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/3.4/totem-pl-parser-3.4.5.tar.xz"
-MD5SUM="c675bb7e0195397d3870fd3c9690b220"
+VERSION="3.26.0"
+HOMEPAGE="https://git.gnome.org/browse/totem-pl-parser"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/totem-pl-parser-3.26.0.tar.xz"
+MD5SUM="a1c92d40691884ca05a70cb9993b9b9a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/ucl/ucl.SlackBuild b/libraries/ucl/ucl.SlackBuild
index d7cf336816..f11c45e090 100644
--- a/libraries/ucl/ucl.SlackBuild
+++ b/libraries/ucl/ucl.SlackBuild
@@ -71,6 +71,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+CPPFLAGS="-std=c90" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/libraries/ucommon/ucommon.SlackBuild b/libraries/ucommon/ucommon.SlackBuild
index c37d6cd1bf..fd4b20c35b 100644
--- a/libraries/ucommon/ucommon.SlackBuild
+++ b/libraries/ucommon/ucommon.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ucommon
-VERSION=${VERSION:-6.1.10}
+VERSION=${VERSION:-7.0.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/libraries/ucommon/ucommon.info b/libraries/ucommon/ucommon.info
index b90320835d..b31fa21fa4 100644
--- a/libraries/ucommon/ucommon.info
+++ b/libraries/ucommon/ucommon.info
@@ -1,8 +1,8 @@
PRGNAM="ucommon"
-VERSION="6.1.10"
+VERSION="7.0.0"
HOMEPAGE="http://www.gnu.org/software/commoncpp/"
-DOWNLOAD="http://ftp.gnu.org/gnu/commoncpp/ucommon-6.1.10.tar.gz"
-MD5SUM="a0908c7a1abad82ce9556bb59f77bedb"
+DOWNLOAD="http://ftp.gnu.org/gnu/commoncpp/ucommon-7.0.0.tar.gz"
+MD5SUM="90468af8f6692f0b6576189927414a39"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/vte2/README b/libraries/vte2/README
new file mode 100644
index 0000000000..4c78dea1a2
--- /dev/null
+++ b/libraries/vte2/README
@@ -0,0 +1,7 @@
+VTE2 is a terminal emulator widget for use with GTK+2.
+This package contains the VTE library and development files and
+a sample implementation (vte).
+
+This package can be installed side by side with vte included in
+the default Slackware installation since this package is intended
+for use with GTK+2.
diff --git a/libraries/vte2/fix_meta_alt_keybinding.patch b/libraries/vte2/fix_meta_alt_keybinding.patch
new file mode 100644
index 0000000000..bd364be584
--- /dev/null
+++ b/libraries/vte2/fix_meta_alt_keybinding.patch
@@ -0,0 +1,74 @@
+From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 15 Nov 2011 03:06:40 -0500
+Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2
+ compatibility
+
+Also, since VTE_META_MASK is now a mask with multiple bits set, code that
+compares gdk key modifiers to VTE_META_MASK by numerical equality is no
+longer guaranteed to work. Therefore, for such comparisons a new function,
+vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits
+matching matching VTE_META_MASK are set, then all are set.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663779
+---
+ src/keymap.c | 15 +++++++++++++--
+ src/keymap.h | 2 +-
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/keymap.c b/src/keymap.c
+index 9a21669..95b4c5b 100644
+--- a/src/keymap.c
++++ b/src/keymap.c
+@@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
+ {GDK_KEY (F35), _vte_keymap_GDK_F35},
+ };
+
++/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK,
++ * despite being a compound mask, is treated as indivisible. */
++GdkModifierType
++_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
++ GdkModifierType mask)
++{
++ if (modifiers & VTE_META_MASK)
++ modifiers |= VTE_META_MASK;
++ return modifiers & mask;
++}
++
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+ * a literal string or a capability name. */
+ void
+@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
+ } else {
+ fkey_mode = fkey_default;
+ }
+- modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
++ modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
+
+ /* Search for the conditions. */
+ for (i = 0; entries[i].normal_length || entries[i].special[0]; i++)
+@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
+ return;
+ }
+
+- switch (modifiers & significant_modifiers) {
++ switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) {
+ case 0:
+ modifier = 0;
+ break;
+diff --git a/src/keymap.h b/src/keymap.h
+index 243e22e..21d9b8e 100644
+--- a/src/keymap.h
++++ b/src/keymap.h
+@@ -27,7 +27,7 @@
+
+ G_BEGIN_DECLS
+
+-#define VTE_META_MASK GDK_META_MASK
++#define VTE_META_MASK (GDK_META_MASK | GDK_MOD1_MASK)
+ #define VTE_NUMLOCK_MASK GDK_MOD2_MASK
+
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+--
+1.7.8.rc3
+
diff --git a/libraries/vte2/slack-desc b/libraries/vte2/slack-desc
new file mode 100644
index 0000000000..1c583a507c
--- /dev/null
+++ b/libraries/vte2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+vte2: vte2 (gtk+2 terminal emulator widget)
+vte2:
+vte2: VTE2 is a terminal emulator widget for use with GTK+2. This package
+vte2: contains the VTE library and development files and a sample
+vte2: implementation (vte).
+vte2:
+vte2: homepage: https://github.com/GNOME/vte
+vte2:
+vte2:
+vte2:
+vte2:
diff --git a/libraries/vte2/vte.escape.cpu.usage.diff b/libraries/vte2/vte.escape.cpu.usage.diff
new file mode 100644
index 0000000000..e82cf46877
--- /dev/null
+++ b/libraries/vte2/vte.escape.cpu.usage.diff
@@ -0,0 +1,89 @@
+--- ./src/table.c.orig 2011-08-16 16:52:48.000000000 -0500
++++ ./src/table.c 2012-08-08 21:25:15.080344805 -0500
+@@ -550,7 +550,7 @@
+ if (G_UNLIKELY (*array == NULL)) {
+ *array = g_value_array_new(1);
+ }
+- g_value_set_long(&value, total);
++ g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
+ g_value_array_append(*array, &value);
+ } while (i++ < arginfo->length);
+ g_value_unset(&value);
+--- ./src/vteseq.c.orig 2011-08-16 16:52:48.000000000 -0500
++++ ./src/vteseq.c 2012-08-08 21:25:15.104344804 -0500
+@@ -557,7 +557,7 @@
+ GValueArray *params,
+ VteTerminalSequenceHandler handler)
+ {
+- vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
++ vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT);
+ }
+
+ static void
+@@ -1392,7 +1392,7 @@
+ static void
+ vte_sequence_handler_DC (VteTerminal *terminal, GValueArray *params)
+ {
+- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_dc);
++ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_dc);
+ }
+
+ /* Delete a line at the current cursor position. */
+@@ -1785,7 +1785,7 @@
+ static void
+ vte_sequence_handler_RI (VteTerminal *terminal, GValueArray *params)
+ {
+- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_nd);
++ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_nd);
+ }
+
+ /* Save cursor (position). */
+@@ -2777,8 +2777,7 @@
+ {
+ GValue *value;
+ VteScreen *screen;
+- long param, end, row;
+- int i;
++ long param, end, row, i, limit;
+ screen = terminal->pvt->screen;
+ /* The default is one. */
+ param = 1;
+@@ -2796,7 +2795,13 @@
+ } else {
+ end = screen->insert_delta + terminal->row_count - 1;
+ }
+- /* Insert the new lines at the cursor. */
++
++ /* Only allow to insert as many lines as there are between this row
++ * and the end of the scrolling region. See bug #676090.
++ */
++ limit = end - row + 1;
++ param = MIN (param, limit);
++
+ for (i = 0; i < param; i++) {
+ /* Clear a line off the end of the region and add one to the
+ * top of the region. */
+@@ -2817,8 +2822,7 @@
+ {
+ GValue *value;
+ VteScreen *screen;
+- long param, end, row;
+- int i;
++ long param, end, row, i, limit;
+
+ screen = terminal->pvt->screen;
+ /* The default is one. */
+@@ -2837,6 +2841,13 @@
+ } else {
+ end = screen->insert_delta + terminal->row_count - 1;
+ }
++
++ /* Only allow to delete as many lines as there are between this row
++ * and the end of the scrolling region. See bug #676090.
++ */
++ limit = end - row + 1;
++ param = MIN (param, limit);
++
+ /* Clear them from below the current cursor. */
+ for (i = 0; i < param; i++) {
+ /* Insert a line at the end of the region and remove one from
diff --git a/libraries/vte2/vte2.SlackBuild b/libraries/vte2/vte2.SlackBuild
new file mode 100644
index 0000000000..8d137f0f6d
--- /dev/null
+++ b/libraries/vte2/vte2.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# Slackware build script for vte2
+
+# Copyright 2017 Matteo Bernardini <ponce@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=vte2
+SRCNAM=vte
+VERSION=${VERSION:-0.28.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=663779
+patch -p1 < $CWD/fix_meta_alt_keybinding.patch
+
+# Escape sequences can cause high CPU usage (CVE-2012-2738):
+patch -p1 < $CWD/vte.escape.cpu.usage.diff
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --disable-static \
+ --disable-introspection \
+ --enable-python \
+ --enable-gnome-pty-helper \
+ --with-gtk=2.0 \
+ --with-default-emulation=xterm \
+ --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING HACKING MAINTAINERS NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
diff --git a/libraries/vte2/vte2.info b/libraries/vte2/vte2.info
new file mode 100644
index 0000000000..2ed7a7f4f6
--- /dev/null
+++ b/libraries/vte2/vte2.info
@@ -0,0 +1,10 @@
+PRGNAM="vte2"
+VERSION="0.28.2"
+HOMEPAGE="https://github.com/GNOME/vte"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/vte/0.28/vte-0.28.2.tar.xz"
+MD5SUM="497f26e457308649e6ece32b3bb142ff"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/vte3/README b/libraries/vte3/README
deleted file mode 100644
index 86da295880..0000000000
--- a/libraries/vte3/README
+++ /dev/null
@@ -1,7 +0,0 @@
-VTE3 is a terminal emulator widget for use with GTK+3. This package
-contains the VTE library and development files and a sample
-implementation (vte).
-
-This package can be installed side by side with vte included
-in default Slackware installation since this package is intended for
-use with GTK+3.
diff --git a/libraries/vte3/slack-desc b/libraries/vte3/slack-desc
deleted file mode 100644
index 7f685687da..0000000000
--- a/libraries/vte3/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-vte3: vte3 (terminal emulator widget)
-vte3:
-vte3: VTE3 is a terminal emulator widget for use with GTK+3. This package
-vte3: contains the VTE library and development files and a sample
-vte3: implementation (vte).
-vte3:
-vte3: VTE is used by XFce.
-vte3:
-vte3: homepage: https://github.com/GNOME/vte
-vte3:
-vte3:
diff --git a/libraries/vte3/vte3.SlackBuild b/libraries/vte3/vte3.SlackBuild
deleted file mode 100644
index 22767e6827..0000000000
--- a/libraries/vte3/vte3.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for vte3
-
-# Copyright 2012-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-SRCNAM=vte
-PRGNAM=vte3
-VERSION=${VERSION:-0.50.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-./autogen.sh
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-static \
- --enable-introspection \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING HACKING NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/libraries/vte3/vte3.info b/libraries/vte3/vte3.info
deleted file mode 100644
index c6411ff75b..0000000000
--- a/libraries/vte3/vte3.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="vte3"
-VERSION="0.50.2"
-HOMEPAGE="https://github.com/GNOME/vte"
-DOWNLOAD="https://github.com/GNOME/vte/archive/0.50.2/vte-0.50.2.tar.gz"
-MD5SUM="bf2dfda34b2d641c5b9b839d1abcf410"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="vala pcre2"
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/libraries/wayland/README b/libraries/wayland/README
deleted file mode 100644
index 6ae0b7eac6..0000000000
--- a/libraries/wayland/README
+++ /dev/null
@@ -1,16 +0,0 @@
-The Wayland display server
-
-Wayland is a project to define a protocol for a compositor to talk
-to its clients as well as a library implementation of the protocol.
-The compositor can be a standalone display server running on Linux
-kernel modesetting and evdev input devices, an X application, or a
-wayland client itself. The clients can be traditional applications,
-X servers (rootless or fullscreen) or other display servers.
-
-Optional Dependency
-
-Building man and html documentation is optional. If you want to build
-that, install graphviz and execute the slackbuild with
-
- GRAPHVIZ=yes ./wayland.SlackBuild
-
diff --git a/libraries/wayland/slack-desc b/libraries/wayland/slack-desc
deleted file mode 100644
index f433f282b7..0000000000
--- a/libraries/wayland/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-wayland: wayland (The Wayland display server)
-wayland:
-wayland: Wayland is a project to define a protocol for a compositor to talk
-wayland: to its clients as well as a library implementation of the protocol.
-wayland: The compositor can be a standalone display server running on Linux
-wayland: kernel modesetting and evdev input devices, an X application, or a
-wayland: wayland client itself. The clients can be traditional applications,
-wayland: X servers (rootless or fullscreen) or other display servers.
-wayland:
-wayland: Homepage: http://wayland.freedesktop.org/
-wayland:
diff --git a/libraries/wayland/wayland.SlackBuild b/libraries/wayland/wayland.SlackBuild
deleted file mode 100644
index a6630d2a36..0000000000
--- a/libraries/wayland/wayland.SlackBuild
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Wayland
-
-# Copyright 2014-2017 Diniz Bortolotto <diniz.bortolotto@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=wayland
-VERSION=${VERSION:-1.18.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Building man and html documentation is optional.
-# If you want to build that, install pre-req graphviz 2.38.0 (2.40.1 is failling)
-# and execute the slackbuild with "GRAPHVIZ=yes ./wayland.SlackBuild".
-GRAPHVIZ=${GRAPHVIZ:-no}
-case "$GRAPHVIZ" in
- no) DISABLE_DOC="--disable-documentation" ;;
- *) DISABLE_DOC="" ;;
-esac
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- $DISABLE_DOC \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-if [ -z "$DISABLE_DOC" ]; then
- find $PKG/usr/man -type f -exec gzip -9 {} \;
- for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README TODO CONTRIBUTING.md $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/wayland/wayland.info b/libraries/wayland/wayland.info
deleted file mode 100644
index 1191237ceb..0000000000
--- a/libraries/wayland/wayland.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="wayland"
-VERSION="1.18.0"
-HOMEPAGE="https://wayland.freedesktop.org/"
-DOWNLOAD="https://wayland.freedesktop.org/releases/wayland-1.18.0.tar.xz"
-MD5SUM="23317697b6e3ff2e1ac8c5ba3ed57b65"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Diniz Bortolotto"
-EMAIL="diniz.bortolotto@gmail.com"
diff --git a/libraries/webkit2gtk/webkit2gtk.SlackBuild b/libraries/webkit2gtk/webkit2gtk.SlackBuild
index d54d9bfc36..839a60cce3 100644
--- a/libraries/webkit2gtk/webkit2gtk.SlackBuild
+++ b/libraries/webkit2gtk/webkit2gtk.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=webkit2gtk
SRCNAM=webkitgtk
-VERSION=${VERSION:-2.20.5}
+VERSION=${VERSION:-2.28.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -82,8 +82,6 @@ cd build
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
-DLIBEXEC_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX}/webkit2gtk-4.0 \
- -DENABLE_MEDIA_SOURCE=NO \
- -DUSE_GSTREAMER_GL=NO \
..
make
make install DESTDIR=$PKG
diff --git a/libraries/webkit2gtk/webkit2gtk.info b/libraries/webkit2gtk/webkit2gtk.info
index 8c4164b2e7..ef04061d6a 100644
--- a/libraries/webkit2gtk/webkit2gtk.info
+++ b/libraries/webkit2gtk/webkit2gtk.info
@@ -1,10 +1,10 @@
PRGNAM="webkit2gtk"
-VERSION="2.20.5"
+VERSION="2.28.4"
HOMEPAGE="https://www.webkitgtk.org/"
-DOWNLOAD="https://www.webkitgtk.org/releases/webkitgtk-2.20.5.tar.xz"
-MD5SUM="72a05f6a4dc1c78b079590a8fd280401"
+DOWNLOAD="https://www.webkitgtk.org/releases/webkitgtk-2.28.4.tar.xz"
+MD5SUM="10e0cce27208dfbd4cf63dd68a9a47d7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="geoclue2 hyphen libwebp woff2"
+REQUIRES="bubblewrap enchant2 geoclue2 gst-plugins-bad libseccomp wpebackend-fdo xdg-dbus-proxy"
MAINTAINER="Willy Sudiarto Raharjo"
EMAIL="willysr@slackbuilds.org"
diff --git a/libraries/webkitgtk/bison-3.7.1.patch b/libraries/webkitgtk/bison-3.7.1.patch
new file mode 100644
index 0000000000..5ce6318512
--- /dev/null
+++ b/libraries/webkitgtk/bison-3.7.1.patch
@@ -0,0 +1,18 @@
+--- webkitgtk-2.4.11.orig/GNUmakefile.in 2020-08-28 22:11:51.510864558 +0800
++++ webkitgtk-2.4.11.new/GNUmakefile.in 2020-08-28 22:24:17.657842406 +0800
+@@ -82071,6 +82071,7 @@
+ $(GENSOURCES_WEBCORE)/XPathGrammar.cpp: $(WebCore)/xml/XPathGrammar.y
+ $(AM_V_GEN)
+ $(AM_V_at)perl $(WebCore)/css/makegrammar.pl --outputDir $(GENSOURCES_WEBCORE) --bison "$(BISON)" --symbolsPrefix xpathyy $<
++ $(AM_V_at)cp $(GENSOURCES_WEBCORE)/XPathGrammar.h $(GENSOURCES_WEBCORE)/XPathGrammar.hpp
+
+ # MathML tag and attribute names, and element factory
+ DerivedSources/WebCore/MathMLElementFactory.h: DerivedSources/WebCore/MathMLElementFactory.cpp
+@@ -82129,6 +82130,7 @@
+ DerivedSources/WebCore/CSSGrammar.cpp: $(WebCore)/css/CSSGrammar.y.in
+ $(AM_V_GEN)
+ $(AM_V_at)perl -I $(WebCore)/bindings/scripts $(WebCore)/css/makegrammar.pl --extraDefines "$(feature_defines)" --outputDir $(GENSOURCES_WEBCORE) --bison "$(BISON)" --symbolsPrefix cssyy $<
++ $(AM_V_at)cp $(GENSOURCES_WEBCORE)/CSSGrammar.h $(GENSOURCES_WEBCORE)/CSSGrammar.hpp
+
+ DerivedSources/WebCore/UserAgentStyleSheetsData.cpp: DerivedSources/WebCore/UserAgentStyleSheets.h
+ DerivedSources/WebCore/UserAgentStyleSheets.h: $(WebCore)/css/make-css-file-arrays.pl $(WebCore)/bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS)
diff --git a/libraries/webkitgtk/icu4c-65.1.patch b/libraries/webkitgtk/icu4c-65.1.patch
new file mode 100644
index 0000000000..841f03a07b
--- /dev/null
+++ b/libraries/webkitgtk/icu4c-65.1.patch
@@ -0,0 +1,39 @@
+diff -Naur webkitgtk-2.4.11.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.4.11/Source/WebCore/dom/Document.cpp
+--- webkitgtk-2.4.11.orig/Source/WebCore/dom/Document.cpp 2016-04-10 08:48:37.000000000 +0200
++++ webkitgtk-2.4.11/Source/WebCore/dom/Document.cpp 2019-10-07 17:41:57.798058000 +0200
+@@ -3912,12 +3912,12 @@
+ unsigned i = 0;
+
+ UChar32 c;
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!isValidNameStart(c))
+ return false;
+
+ while (i < length) {
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!isValidNamePart(c))
+ return false;
+ }
+@@ -3980,7 +3980,7 @@
+ const UChar* s = qualifiedName.deprecatedCharacters();
+ for (unsigned i = 0; i < length;) {
+ UChar32 c;
+- U16_NEXT(s, i, length, c)
++ U16_NEXT(s, i, length, c);
+ if (c == ':') {
+ if (sawColon) {
+ ec = NAMESPACE_ERR;
+diff -Naur webkitgtk-2.4.11.orig/Source/WebCore/platform/graphics/SegmentedFontData.cpp webkitgtk-2.4.11/Source/WebCore/platform/graphics/SegmentedFontData.cpp
+--- webkitgtk-2.4.11.orig/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2016-04-10 08:48:37.000000000 +0200
++++ webkitgtk-2.4.11/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2019-10-07 17:22:38.534058000 +0200
+@@ -61,7 +61,7 @@
+ {
+ UChar32 c;
+ for (int i = 0; i < length; ) {
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!containsCharacter(c))
+ return false;
+ }
diff --git a/libraries/webkitgtk/webkitgtk.SlackBuild b/libraries/webkitgtk/webkitgtk.SlackBuild
index 94991299db..42452b50a6 100644
--- a/libraries/webkitgtk/webkitgtk.SlackBuild
+++ b/libraries/webkitgtk/webkitgtk.SlackBuild
@@ -75,8 +75,14 @@ if pkg-config --exists geoclue ; then GEOCLUE="yes" ; else GEOCLUE="no" ; fi
# Fix for gcc-6.x
patch -p1 < $CWD/webkitgtk-2.4.9-abs.patch
+# https://bugs.webkit.org/show_bug.cgi?id=202600
+patch -p1 < $CWD/icu4c-65.1.patch
+
+patch -p1 < $CWD/bison-3.7.1.patch
+
+# Disable excessive warnings spam
CFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks" \
-CXXFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks -fpermissive" \
+CXXFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks -fpermissive -Wno-deprecated-declarations -Wno-deprecated-copy -Wno-expansion-to-defined -Wno-class-memaccess -Wno-ignored-qualifiers -Wno-redundant-move -Wno-misleading-indentation -Wno-cast-function-type" \
./configure \
--prefix=/usr \
--disable-static \
diff --git a/libraries/webkitgtk3/bison-3.7.1.patch b/libraries/webkitgtk3/bison-3.7.1.patch
new file mode 100644
index 0000000000..5ce6318512
--- /dev/null
+++ b/libraries/webkitgtk3/bison-3.7.1.patch
@@ -0,0 +1,18 @@
+--- webkitgtk-2.4.11.orig/GNUmakefile.in 2020-08-28 22:11:51.510864558 +0800
++++ webkitgtk-2.4.11.new/GNUmakefile.in 2020-08-28 22:24:17.657842406 +0800
+@@ -82071,6 +82071,7 @@
+ $(GENSOURCES_WEBCORE)/XPathGrammar.cpp: $(WebCore)/xml/XPathGrammar.y
+ $(AM_V_GEN)
+ $(AM_V_at)perl $(WebCore)/css/makegrammar.pl --outputDir $(GENSOURCES_WEBCORE) --bison "$(BISON)" --symbolsPrefix xpathyy $<
++ $(AM_V_at)cp $(GENSOURCES_WEBCORE)/XPathGrammar.h $(GENSOURCES_WEBCORE)/XPathGrammar.hpp
+
+ # MathML tag and attribute names, and element factory
+ DerivedSources/WebCore/MathMLElementFactory.h: DerivedSources/WebCore/MathMLElementFactory.cpp
+@@ -82129,6 +82130,7 @@
+ DerivedSources/WebCore/CSSGrammar.cpp: $(WebCore)/css/CSSGrammar.y.in
+ $(AM_V_GEN)
+ $(AM_V_at)perl -I $(WebCore)/bindings/scripts $(WebCore)/css/makegrammar.pl --extraDefines "$(feature_defines)" --outputDir $(GENSOURCES_WEBCORE) --bison "$(BISON)" --symbolsPrefix cssyy $<
++ $(AM_V_at)cp $(GENSOURCES_WEBCORE)/CSSGrammar.h $(GENSOURCES_WEBCORE)/CSSGrammar.hpp
+
+ DerivedSources/WebCore/UserAgentStyleSheetsData.cpp: DerivedSources/WebCore/UserAgentStyleSheets.h
+ DerivedSources/WebCore/UserAgentStyleSheets.h: $(WebCore)/css/make-css-file-arrays.pl $(WebCore)/bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS)
diff --git a/libraries/webkitgtk3/icu4c-65.1.patch b/libraries/webkitgtk3/icu4c-65.1.patch
new file mode 100644
index 0000000000..841f03a07b
--- /dev/null
+++ b/libraries/webkitgtk3/icu4c-65.1.patch
@@ -0,0 +1,39 @@
+diff -Naur webkitgtk-2.4.11.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.4.11/Source/WebCore/dom/Document.cpp
+--- webkitgtk-2.4.11.orig/Source/WebCore/dom/Document.cpp 2016-04-10 08:48:37.000000000 +0200
++++ webkitgtk-2.4.11/Source/WebCore/dom/Document.cpp 2019-10-07 17:41:57.798058000 +0200
+@@ -3912,12 +3912,12 @@
+ unsigned i = 0;
+
+ UChar32 c;
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!isValidNameStart(c))
+ return false;
+
+ while (i < length) {
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!isValidNamePart(c))
+ return false;
+ }
+@@ -3980,7 +3980,7 @@
+ const UChar* s = qualifiedName.deprecatedCharacters();
+ for (unsigned i = 0; i < length;) {
+ UChar32 c;
+- U16_NEXT(s, i, length, c)
++ U16_NEXT(s, i, length, c);
+ if (c == ':') {
+ if (sawColon) {
+ ec = NAMESPACE_ERR;
+diff -Naur webkitgtk-2.4.11.orig/Source/WebCore/platform/graphics/SegmentedFontData.cpp webkitgtk-2.4.11/Source/WebCore/platform/graphics/SegmentedFontData.cpp
+--- webkitgtk-2.4.11.orig/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2016-04-10 08:48:37.000000000 +0200
++++ webkitgtk-2.4.11/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2019-10-07 17:22:38.534058000 +0200
+@@ -61,7 +61,7 @@
+ {
+ UChar32 c;
+ for (int i = 0; i < length; ) {
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!containsCharacter(c))
+ return false;
+ }
diff --git a/libraries/webkitgtk3/webkitgtk3.SlackBuild b/libraries/webkitgtk3/webkitgtk3.SlackBuild
index e33636bf82..9e218aaf92 100644
--- a/libraries/webkitgtk3/webkitgtk3.SlackBuild
+++ b/libraries/webkitgtk3/webkitgtk3.SlackBuild
@@ -79,8 +79,14 @@ if pkg-config --exists geoclue ; then GEOCLUE="yes" ; else GEOCLUE="no" ; fi
# Fix for gcc-6.x
patch -p1 < $CWD/webkitgtk-2.4.9-abs.patch
+# https://bugs.webkit.org/show_bug.cgi?id=202600
+patch -p1 < $CWD/icu4c-65.1.patch
+
+patch -p1 < $CWD/bison-3.7.1.patch
+
+# Disable excessive warnings spam
CFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks -fpermissive -Wno-deprecated-declarations -Wno-deprecated-copy -Wno-expansion-to-defined -Wno-class-memaccess -Wno-ignored-qualifiers -Wno-redundant-move -Wno-misleading-indentation -Wno-cast-function-type" \
./configure \
--prefix=/usr \
--docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -88,7 +94,7 @@ CXXFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--with-gtk=3.0 \
--enable-introspection \
- --enable-webkit2 \
+ --enable-webkit2=no \
--enable-geolocation=$GEOCLUE \
--build=$ARCH-slackware-linux
diff --git a/libraries/wpebackend-fdo/README b/libraries/wpebackend-fdo/README
new file mode 100644
index 0000000000..e16c2ce9c4
--- /dev/null
+++ b/libraries/wpebackend-fdo/README
@@ -0,0 +1,7 @@
+WPE is the reference WebKit port for embedded and low-consumption
+computer devices. It has been designed from the ground-up with
+performance, small footprint, accelerated content rendering, and
+simplicity of deployment in mind, bringing the excellence of the
+WebKit engine to countless platforms and target devices.
+
+This is the freedesktop.org backend.
diff --git a/libraries/wpebackend-fdo/slack-desc b/libraries/wpebackend-fdo/slack-desc
new file mode 100644
index 0000000000..fdb6d636fe
--- /dev/null
+++ b/libraries/wpebackend-fdo/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+wpebackend-fdo: wpebackend-fdo (freedesktop.org backend for WPE WebKit)
+wpebackend-fdo:
+wpebackend-fdo: WPE is the reference WebKit port for embedded and low-consumption
+wpebackend-fdo: computer devices. It has been designed from the ground-up with
+wpebackend-fdo: performance, small footprint, accelerated content rendering, and
+wpebackend-fdo: simplicity of deployment in mind, bringing the excellence of the
+wpebackend-fdo: WebKit engine to countless platforms and target devices.
+wpebackend-fdo: This is the freedesktop.org backend.
+wpebackend-fdo:
+wpebackend-fdo: Project URL: https://wpewebkit.org/
+wpebackend-fdo:
diff --git a/libraries/wpebackend-fdo/wpebackend-fdo.SlackBuild b/libraries/wpebackend-fdo/wpebackend-fdo.SlackBuild
new file mode 100644
index 0000000000..00b4dff9f3
--- /dev/null
+++ b/libraries/wpebackend-fdo/wpebackend-fdo.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for wpebackend-fdo
+
+# Copyright 2020 Matteo Bernardini <ponce@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wpebackend-fdo
+VERSION=${VERSION:-1.4.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release ..
+ make
+ make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/wpebackend-fdo/wpebackend-fdo.info b/libraries/wpebackend-fdo/wpebackend-fdo.info
new file mode 100644
index 0000000000..d9bcd744fd
--- /dev/null
+++ b/libraries/wpebackend-fdo/wpebackend-fdo.info
@@ -0,0 +1,10 @@
+PRGNAM="wpebackend-fdo"
+VERSION="1.4.1"
+HOMEPAGE="https://wpewebkit.org"
+DOWNLOAD="https://wpewebkit.org/releases/wpebackend-fdo-1.4.1.tar.xz"
+MD5SUM="c6362491a4a38ddac42b66f140e1cff2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libwpe"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/wvstreams/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch b/libraries/wvstreams/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch
new file mode 100644
index 0000000000..3932ddb949
--- /dev/null
+++ b/libraries/wvstreams/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch
@@ -0,0 +1,50 @@
+From 32ecfa8e89306ace726f7ad14f2b09c2aa1b96c4 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Tue, 9 Feb 2016 21:02:59 +0100
+Subject: [PATCH] Use explicit cast and prevent compiler error
+
+---
+ streams/wvstream.cc | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/streams/wvstream.cc b/streams/wvstream.cc
+index 4564f3c..76565b4 100644
+--- a/streams/wvstream.cc
++++ b/streams/wvstream.cc
+@@ -907,9 +907,9 @@ void WvStream::_build_selectinfo(SelectInfo &si, time_t msec_timeout,
+
+ if (forceable)
+ {
+- si.wants.readable = readcb;
+- si.wants.writable = writecb;
+- si.wants.isexception = exceptcb;
++ si.wants.readable = static_cast<bool>(readcb);
++ si.wants.writable = static_cast<bool>(writecb);
++ si.wants.isexception = static_cast<bool>(exceptcb);
+ }
+ else
+ {
+@@ -1019,7 +1019,7 @@ bool WvStream::_select(time_t msec_timeout, bool readable, bool writable,
+
+ IWvStream::SelectRequest WvStream::get_select_request()
+ {
+- return IWvStream::SelectRequest(readcb, writecb, exceptcb);
++ return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb), static_cast<bool>(exceptcb));
+ }
+
+
+@@ -1107,7 +1107,10 @@ bool WvStream::continue_select(time_t msec_timeout)
+ // inefficient, because if the alarm was expired then pre_select()
+ // returned true anyway and short-circuited the previous select().
+ TRACE("hello-%p\n", this);
+- return !alarm_was_ticking || select(0, readcb, writecb, exceptcb);
++ return !alarm_was_ticking || select(0,
++ static_cast<bool>(readcb),
++ static_cast<bool>(writecb),
++ static_cast<bool>(exceptcb));
+ }
+
+
+--
+2.5.0
+
diff --git a/libraries/wvstreams/patches/05_gcc.diff b/libraries/wvstreams/patches/05_gcc.diff
index 8e4fd03298..616843d4ae 100644
--- a/libraries/wvstreams/patches/05_gcc.diff
+++ b/libraries/wvstreams/patches/05_gcc.diff
@@ -1,16 +1,3 @@
-Index: wvstreams-4.6.1/crypto/wvx509.cc
-===================================================================
---- wvstreams-4.6.1.orig/crypto/wvx509.cc 2011-05-20 00:02:38.119136584 +0200
-+++ wvstreams-4.6.1/crypto/wvx509.cc 2011-05-20 00:02:26.035136589 +0200
-@@ -1157,7 +1157,7 @@
-
- if (ext)
- {
-- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
-+ X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD *)X509V3_EXT_get(ext);
- if (!method)
- {
- WvDynBuf buf;
Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc
===================================================================
--- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:38.391136584 +0200
diff --git a/libraries/wvstreams/patches/openssl-buildfix.patch b/libraries/wvstreams/patches/openssl-buildfix.patch
new file mode 100644
index 0000000000..3f76e5f697
--- /dev/null
+++ b/libraries/wvstreams/patches/openssl-buildfix.patch
@@ -0,0 +1,16 @@
+diff -Naur wvstreams-4.6.1.orig/crypto/wvx509.cc wvstreams-4.6.1/crypto/wvx509.cc
+--- wvstreams-4.6.1.orig/crypto/wvx509.cc 2008-10-23 22:23:49.000000000 +0200
++++ wvstreams-4.6.1/crypto/wvx509.cc 2018-05-10 09:25:27.106684000 +0200
+@@ -1157,7 +1157,11 @@
+
+ if (ext)
+ {
+- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++ const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
++#else
++ X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD *)X509V3_EXT_get(ext);
++#endif
+ if (!method)
+ {
+ WvDynBuf buf;
diff --git a/libraries/wvstreams/wvstreams.SlackBuild b/libraries/wvstreams/wvstreams.SlackBuild
index 562bb05d11..34bf3771f4 100644
--- a/libraries/wvstreams/wvstreams.SlackBuild
+++ b/libraries/wvstreams/wvstreams.SlackBuild
@@ -59,13 +59,20 @@ patch -p1 < $CWD/patches/wvstreams-4.6.1-parallel-make.patch
patch -p1 < $CWD/patches/wvstreams-4.6.1-gcc47.patch
# another patch for gcc and glibc > 2.12.0 from debian
patch -p1 < $CWD/patches/05_gcc.diff
+# another one for gcc-6.x from fedora
+patch -p1 < $CWD/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch
+# disable a warning (just for readability during build)
+sed -i "s|_BSD_SOURCE|_DEFAULT_SOURCE|" wvrules.mk
+# Fix build against openssl
+patch -p1 < $CWD/patches/openssl-buildfix.patch
# configure doesn't support disabling static libraries
# Don't manually remove them either, as wvdial won't build then :)
# Added more flags to avoid aborting when building with gcc-4.7.x
# https://bugs.gentoo.org/show_bug.cgi?id=419971
+LIBS="-L/usr/lib${LIBDIRSUFFIX}/openssl-1.0" \
CFLAGS="$SLKCFLAGS -fno-tree-dce -fno-optimize-sibling-calls" \
-CXXFLAGS="$SLKCFLAGS -fno-tree-dce -fno-optimize-sibling-calls" \
+CXXFLAGS="$SLKCFLAGS -fno-tree-dce -fno-optimize-sibling-calls -Wno-narrowing -I/usr/include/openssl-1.0" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/libraries/wxsvg/wxsvg.SlackBuild b/libraries/wxsvg/wxsvg.SlackBuild
index e4c4268aec..f6db2729ac 100644
--- a/libraries/wxsvg/wxsvg.SlackBuild
+++ b/libraries/wxsvg/wxsvg.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for wxsvg
-# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=wxsvg
-VERSION=${VERSION:-1.5.12}
+VERSION=${VERSION:-1.5.20}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/libraries/wxsvg/wxsvg.info b/libraries/wxsvg/wxsvg.info
index cf4a40aca3..e7a353ef4a 100644
--- a/libraries/wxsvg/wxsvg.info
+++ b/libraries/wxsvg/wxsvg.info
@@ -1,8 +1,8 @@
PRGNAM="wxsvg"
-VERSION="1.5.12"
+VERSION="1.5.20"
HOMEPAGE="https://sourceforge.net/projects/wxsvg/"
-DOWNLOAD="https://downloads.sf.net/wxsvg/wxsvg-1.5.12.tar.bz2"
-MD5SUM="c822e0b7ea4a690b30e7b6711ce674fd"
+DOWNLOAD="https://downloads.sf.net/wxsvg/wxsvg-1.5.20.tar.bz2"
+MD5SUM="a56b8c6b29599e1d7404120093072ce0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ffmpeg wxGTK3"
diff --git a/libraries/xf86-input-libinput/README b/libraries/xf86-input-libinput/README
deleted file mode 100644
index 5acca28f9c..0000000000
--- a/libraries/xf86-input-libinput/README
+++ /dev/null
@@ -1,20 +0,0 @@
-A generic input driver for the X.Org X11 X server based on libinput,
-supporting all devices.
-Serves as a wrapper needed by libinput to communicate with X.Org.
-
-Note that to have libinput properly operating on a Slackware 14.2
-system, you also need this wrapper.
-
-The package automatically places a default configuration file in
-/etc/X11/xorg.conf.d/90-libinput.conf
-To make sure that the driver takes precedence over any other drivers
-that try to control your input devices, make sure that the number of
-the above file is the highest of all the numbers in the same directory.
-If you want to customize the default parameters of the driver,
-modify the above file. Do not modify the system file in
-/usr/share/X11/xorg.conf.d/90-libinput.conf
-
-WARNING: Misconfiguration of an X input driver may leave you without
-usable input devices in your X session.
-To fix the problem, boot to init level 3 (terminal, without starting X)
-and make the appropriate fixes.
diff --git a/libraries/xf86-input-libinput/slack-desc b/libraries/xf86-input-libinput/slack-desc
deleted file mode 100644
index 47a5a44bd0..0000000000
--- a/libraries/xf86-input-libinput/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-xf86-input-libinput: xf86-input-libinput (Xorg X11 libinput input driver)
-xf86-input-libinput:
-xf86-input-libinput: A generic input driver for the X.Org X11 X server based on libinput,
-xf86-input-libinput: supporting all devices. Serves as a wrapper needed by libinput to
-xf86-input-libinput: communicate with X.Org
-xf86-input-libinput:
-xf86-input-libinput:
-xf86-input-libinput: http://xorg.freedesktop.org/
-xf86-input-libinput: https://cgit.freedesktop.org/xorg/driver/xf86-input-libinput/
-xf86-input-libinput:
-xf86-input-libinput:
diff --git a/libraries/xf86-input-libinput/xf86-input-libinput.SlackBuild b/libraries/xf86-input-libinput/xf86-input-libinput.SlackBuild
deleted file mode 100644
index 532bdb2caa..0000000000
--- a/libraries/xf86-input-libinput/xf86-input-libinput.SlackBuild
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for xf86-input-libinput
-
-# Copyright 2017 Nikolay Nikolov <nikobnikolov[at]gmail[dot]com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=xf86-input-libinput
-VERSION=${VERSION:-0.28.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --sharedstatedir=/var/lib \
- --infodir=/usr/info \
- --disable-silent-rules \
- --disable-dependency-tracking \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-rm -f $PKG/usr/info/dir
-
-find $PKG -name perllocal.pod \
- -o -name ".packlist" \
- -o -name "*.bs" \
- | xargs rm -f
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mv $PKG/usr/share/X11/xorg.conf.d/*-libinput.conf $PKG/usr/share/X11/xorg.conf.d/90-libinput.conf
-mkdir -p $PKG/etc/X11/xorg.conf.d/
-cp $PKG/usr/share/X11/xorg.conf.d/90-libinput.conf $PKG/etc/X11/xorg.conf.d/
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/xf86-input-libinput/xf86-input-libinput.info b/libraries/xf86-input-libinput/xf86-input-libinput.info
deleted file mode 100644
index bdf9f216c9..0000000000
--- a/libraries/xf86-input-libinput/xf86-input-libinput.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="xf86-input-libinput"
-VERSION="0.28.0"
-HOMEPAGE="https://cgit.freedesktop.org/xorg/driver/xf86-input-libinput/"
-DOWNLOAD="https://www.x.org/releases/individual/driver/xf86-input-libinput-0.28.0.tar.bz2"
-MD5SUM="2d7519ac0e39d4c88f3be32e81a637aa"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libinput"
-MAINTAINER="Nikolay Nikolov"
-EMAIL="nikobnikolov[at]gmail[dot]com"
diff --git a/libraries/xulrunner/README b/libraries/xulrunner/README
deleted file mode 100644
index de70749144..0000000000
--- a/libraries/xulrunner/README
+++ /dev/null
@@ -1,12 +0,0 @@
-The XULRunner project is a Mozilla runtime package that can be used
-to bootstrap XUL+XPCOM applications that are as rich as Thunderbird
-and Firefox. It will provide mechanisms for installing, upgrading,
-and uninstalling these applications. XULRunner will also provide
-libxul, a solution which allows the embedding of Mozilla technologies
-in other projects and products.
-
-Note:
-If you have to install jdk you need to run ". /etc/profile" before
-trying to compile xurlrunner.
-
-Optional dependencies are avahi, gnome-vfs, libbonobo, and libgnome.
diff --git a/libraries/xulrunner/ftfntfmt.patch b/libraries/xulrunner/ftfntfmt.patch
deleted file mode 100644
index 176360f8a5..0000000000
--- a/libraries/xulrunner/ftfntfmt.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bb146548c7846ba5d14f070f4be985797d83d5ca Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh+mozilla@glandium.org>
-Date: Fri, 14 Aug 2015 08:50:38 +0900
-Subject: [PATCH] Bug 1194520 - Add a system header wrapper for
- <freetype/ftfntfmt.h>
-
----
- config/system-headers | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/config/system-headers b/config/system-headers
-index bee35da..ad1f88d 100644
---- a/config/system-headers
-+++ b/config/system-headers
-@@ -450,16 +450,17 @@ foundation/base64.h
- foundation/hexdump.h
- #endif
- fp.h
- fpieee.h
- frame/log.h
- frame/req.h
- freetype/freetype.h
- freetype/ftcache.h
-+freetype/ftfntfmt.h
- freetype/ftglyph.h
- freetype/ftsynth.h
- freetype/ftoutln.h
- freetype/ttnameid.h
- freetype/tttables.h
- freetype/t1tables.h
- freetype/ftlcdfil.h
- freetype/ftsizes.h
---
-2.5.0.3.ge81d485
-
diff --git a/libraries/xulrunner/gold/gold b/libraries/xulrunner/gold/gold
deleted file mode 100644
index 8c86d3b06b..0000000000
--- a/libraries/xulrunner/gold/gold
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/usr/bin/ld.gold "$@"
diff --git a/libraries/xulrunner/gold/ld b/libraries/xulrunner/gold/ld
deleted file mode 100644
index 8c86d3b06b..0000000000
--- a/libraries/xulrunner/gold/ld
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/usr/bin/ld.gold "$@"
diff --git a/libraries/xulrunner/slack-desc b/libraries/xulrunner/slack-desc
deleted file mode 100644
index c86823db11..0000000000
--- a/libraries/xulrunner/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-xulrunner: xulrunner (XULRunner provides the XUL Runtime environment)
-xulrunner:
-xulrunner: The XULRunner project is a Mozilla runtime package that can be used
-xulrunner: to bootstrap XUL+XPCOM applications that are as rich as Thunderbird
-xulrunner: and Firefox. It will provide mechanisms for installing, upgrading,
-xulrunner: and uninstalling these applications. XULRunner will also provide
-xulrunner: libxul, a solution which allows the embedding of Mozilla technologies
-xulrunner: in other projects and products.
-xulrunner:
-xulrunner: Homepage, http://developer.mozilla.org/en/XULRunner
-xulrunner:
diff --git a/libraries/xulrunner/xulrunner.SlackBuild b/libraries/xulrunner/xulrunner.SlackBuild
deleted file mode 100644
index ca27415be3..0000000000
--- a/libraries/xulrunner/xulrunner.SlackBuild
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for xulrunner
-
-# Written by David Somero <dsomero@hotmail.com>
-# Derived from Slackware's Slackbuilds.
-#
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA
-# Copyright 2010, 2011 David Somero (dsomero@hotmail.com) Athens, TN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-PRGNAM=xulrunner
-VERSION=${VERSION:-41.0.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS=""
- LIBDIRSUFFIX=""
- OPTIMIZE=" --enable-optimize=-O2 "
- # On IA32, use gold since GNU ld runs out of memory linking libxul.so:
- PATH="$(pwd)/gold:$PATH"
- export CC="gcc -B$(pwd)/gold"
- export CXX="g++ -B$(pwd)/gold"
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS=""
- LIBDIRSUFFIX=""
- OPTIMIZE=" --enable-optimize=-O2 "
- # On IA32, use gold since GNU ld runs out of memory linking libxul.so:
- PATH="$(pwd)/gold:$PATH"
- export CC="gcc -B$(pwd)/gold"
- export CXX="g++ -B$(pwd)/gold"
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
- OPTIMIZE=" --enable-optimize=-O2 "
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
- OPTIMIZE=" --enable-optimize=-O2 "
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf mozilla-release
-tar xvf $CWD/$PRGNAM-$VERSION.source.tar.xz
-cd mozilla-release
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
-# https://bug1194520.bmoattachments.org/attachment.cgi?id=8647805
-patch -p1 < $CWD/ftfntfmt.patch
-
-# Don't use --enable-system-cairo
-# https://bugzilla.mozilla.org/show_bug.cgi?id=722975
-OPTIONS="\
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --enable-default-toolkit=cairo-gtk2 \
- $OPTIMIZE \
- --enable-application=xulrunner \
- --enable-javaxpcom \
- --enable-libxul \
- --enable-safe-browsing \
- --enable-image-encoders=all \
- --enable-image-decoders=all \
- --enable-pulseaudio \
- --enable-system-lcms \
- --with-system-zlib \
- --with-system-bz2 \
- --enable-system-ffi \
- --disable-system-sqlite \
- --disable-crashreporter \
- --disable-debug \
- --disable-mailnews \
- --disable-installer \
- --disable-updater \
- --disable-elf-hack \
- --build=$ARCH-slackware-linux \
- --host=$ARCH-slackware-linux \
- --target=$ARCH-slackware-linux"
-
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-export MOZ_MAKE_FLAGS="$MAKEFLAGS"
-
-unset DBUS_SESSION_BUS_ADDRESS ORBIT_SOCKETDIR SESSION_MANAGER \
- XDG_SESSION_COOKIE XAUTHORITY MAKEFLAGS
-
-echo ". \$topsrcdir/browser/config/mozconfig" > .mozconfig
-
-# Mozilla devs enforce using an objdir for building
-# https://developer.mozilla.org/en/Configuring_Build_Options#Building_with_an_objdir
-mkdir obj
-echo "mk_add_options MOZ_OBJDIR=$(pwd)/obj" >> .mozconfig
-
-if [ "$MOZLOCALIZE" ]; then
- echo "mk_add_options MOZ_CO_LOCALES=\"$MOZLOCALIZE\"" >> .mozconfig
-fi
-
-# Write in it the options above
-for option in $OPTIONS; do echo "ac_add_options $option" >> .mozconfig; done
-
-echo "ac_add_options --disable-tests" >> .mozconfig
-make -f client.mk build
-
-make -f client.mk install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE LEGAL README.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/xulrunner/xulrunner.info b/libraries/xulrunner/xulrunner.info
deleted file mode 100644
index 97cd112c61..0000000000
--- a/libraries/xulrunner/xulrunner.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="xulrunner"
-VERSION="41.0.2"
-HOMEPAGE="https://developer.mozilla.org/en/Getting_started_with_XULRunner"
-DOWNLOAD="https://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/41.0.2/source/xulrunner-41.0.2.source.tar.xz"
-MD5SUM="d6889657659025de38387986cc8764e6"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jdk"
-MAINTAINER="David Somero"
-EMAIL="dsomero@hotmail.com"
diff --git a/misc/dmg2img/0001-openssl-1.1-compatibility.patch b/misc/dmg2img/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 0000000000..b5ed45d2ff
--- /dev/null
+++ b/misc/dmg2img/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- a/vfdecrypt.c
++++ b/vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+ pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096; // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+ unsigned int mdLen;
+
+ chunk_no = OSSwapHostToBigInt32(chunk_no);
+- HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+- HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+- HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++ HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++ HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++ HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+ memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+ * wrapped_key has to be 40 bytes in length. */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+- EVP_CIPHER_CTX ctx;
++ EVP_CIPHER_CTX *ctx;
+ uint8_t *TEMP1, *TEMP2, *CEKICV;
+ uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+ int outlen, tmplen, i;
+
+- EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ ctx = EVP_CIPHER_CTX_new();
++#else
++ ctx = malloc(sizeof(*ctx));
++#endif
++ if (!ctx) {
++ fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++ return(-1);
++ }
++
++ EVP_CIPHER_CTX_init(ctx);
+ /* result of the decryption operation shouldn't be bigger than ciphertext */
+ TEMP1 = malloc(wrapped_key_len);
+ TEMP2 = malloc(wrapped_key_len);
+ CEKICV = malloc(wrapped_key_len);
+ /* uses PKCS#7 padding for symmetric key operations by default */
+- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+- if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++ if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+ fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+ return(-1);
+ }
+- if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++ if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+ fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+ return(-1);
+ }
+ outlen += tmplen;
+- EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ EVP_CIPHER_CTX_reset(ctx);
++#else
++ EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+ /* reverse order of TEMP3 */
+ for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+- EVP_CIPHER_CTX_init(&ctx);
++ EVP_CIPHER_CTX_init(ctx);
+ /* uses PKCS#7 padding for symmetric key operations by default */
+- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+- if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++ if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+ fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+ return(-1);
+ }
+- if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++ if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+ fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+ return(-1);
+ }
+
+ outlen += tmplen;
+- EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ EVP_CIPHER_CTX_reset(ctx);
++#else
++ EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+ memcpy(unwrapped_key, CEKICV+4, outlen-4);
+ free(TEMP1);
+ free(TEMP2);
+ free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ EVP_CIPHER_CTX_free(ctx);
++#else
++ free(ctx);
++#endif
+ return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+ /* derived key is a 3DES-EDE key */
+ uint8_t derived_key[192/8];
+- EVP_CIPHER_CTX ctx;
++ EVP_CIPHER_CTX *ctx;
+ uint8_t *TEMP1;
+ int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ ctx = EVP_CIPHER_CTX_new();
++#else
++ ctx = malloc(sizeof(*ctx));
++#endif
++ if (!ctx) {
++ fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++ return(-1);
++ }
++
+ PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+ print_hex(derived_key, 192/8);
+
+- EVP_CIPHER_CTX_init(&ctx);
++ EVP_CIPHER_CTX_init(ctx);
+ /* result of the decryption operation shouldn't be bigger than ciphertext */
+ TEMP1 = malloc(header->encrypted_keyblob_size);
+ /* uses PKCS#7 padding for symmetric key operations by default */
+- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+- if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++ if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+ fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+ return(-1);
+ }
+- if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++ if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+ fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+ return(-1);
+ }
+ outlen += tmplen;
+- EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ EVP_CIPHER_CTX_free(ctx);
++#else
++ EVP_CIPHER_CTX_cleanup(ctx);
++ free(ctx);
++#endif
+ memcpy(aes_key, TEMP1, 16);
+ memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+ CHUNK_SIZE = v2header.blocksize;
+ }
+
+- HMAC_CTX_init(&hmacsha1_ctx);
+- HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ hmacsha1_ctx = HMAC_CTX_new();
++#else
++ hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++ if (!hmacsha1_ctx) {
++ fprintf(stderr, "Out of memory: HMAC CTX!\n");
++ exit(1);
++ }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ HMAC_CTX_reset(hmacsha1_ctx);
++#else
++ HMAC_CTX_init(hmacsha1_ctx);
++#endif
++ HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+ AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+ if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+ }
+
+ if (verbose) fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ HMAC_CTX_free(hmacsha1_ctx);
++#else
++ HMAC_CTX_cleanup(hmacsha1_ctx);
++ free(hmacsha1_ctx);
++#endif
+ return(0);
+ }
diff --git a/misc/dmg2img/dmg2img.SlackBuild b/misc/dmg2img/dmg2img.SlackBuild
index 941b7bae53..468aa42a51 100644
--- a/misc/dmg2img/dmg2img.SlackBuild
+++ b/misc/dmg2img/dmg2img.SlackBuild
@@ -71,6 +71,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Thanks Archlinux!
+patch -lp1 < $CWD/0001-openssl-1.1-compatibility.patch
+
make CFLAGS="$SLKCFLAGS"
make install DESTDIR=$PKG
diff --git a/misc/glogg/glogg.SlackBuild b/misc/glogg/glogg.SlackBuild
index 0278e2c4e8..33c808c379 100644
--- a/misc/glogg/glogg.SlackBuild
+++ b/misc/glogg/glogg.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=glogg
-VERSION=${VERSION:-1.0.2}
+VERSION=${VERSION:-1.1.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,7 +69,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-qmake
+qmake-qt5
make
make install INSTALL_ROOT=$PKG/usr
diff --git a/misc/glogg/glogg.info b/misc/glogg/glogg.info
index 61587350f7..fb8c11dd71 100644
--- a/misc/glogg/glogg.info
+++ b/misc/glogg/glogg.info
@@ -1,10 +1,10 @@
PRGNAM="glogg"
-VERSION="1.0.2"
+VERSION="1.1.4"
HOMEPAGE="http://glogg.bonnefon.org/"
-DOWNLOAD="http://glogg.bonnefon.org/files/glogg-1.0.2.tar.gz"
-MD5SUM="d6d9bb70ed50a38c5fa9114d71b52d3d"
+DOWNLOAD="http://glogg.bonnefon.org/files/glogg-1.1.4.tar.gz"
+MD5SUM="065d292411df490dcb3c6abae35ed608"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt5"
MAINTAINER="Miroslaw Turski"
EMAIL="miroslaw.turski@gmail.com"
diff --git a/misc/gourmet/gourmet.SlackBuild b/misc/gourmet/gourmet.SlackBuild
index e9a2f0f93d..0121943095 100644
--- a/misc/gourmet/gourmet.SlackBuild
+++ b/misc/gourmet/gourmet.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=gourmet
VERSION=${VERSION:-0.17.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Patch to replace removed tostring() with tobytes()
+patch -p1 < $CWD/tostring-to-tobytes.patch
+
python setup.py install --root=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/misc/gourmet/gourmet.info b/misc/gourmet/gourmet.info
index 16bbef1a65..64f0f25902 100644
--- a/misc/gourmet/gourmet.info
+++ b/misc/gourmet/gourmet.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/thinkle/gourmet/archive/0.17.4.tar.gz"
MD5SUM="937334364abc3093709a604c1d473e9f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="SQLAlchemy python-distutils-extra reportlab pygtkspell gst0-python python-elib.intl"
+REQUIRES="SQLAlchemy lxml python-distutils-extra reportlab pygtkspell gst0-python python-elib.intl pypoppler"
MAINTAINER="Erwin van Zanten"
EMAIL="e.van.zanten.evz@gmail.com"
diff --git a/misc/gourmet/slack-desc b/misc/gourmet/slack-desc
index 16eb4722a4..ae51c1b38c 100644
--- a/misc/gourmet/slack-desc
+++ b/misc/gourmet/slack-desc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-gourmet: gourmet (A Recipe organizer for Linux)
+gourmet: Gourmet (a recipe organizer for Linux)
gourmet:
gourmet: Gourmet Recipe Manager is a recipe-organizer that allows you
gourmet: to collect, search, organize, and browse your recipes.
diff --git a/misc/gourmet/tostring-to-tobytes.patch b/misc/gourmet/tostring-to-tobytes.patch
new file mode 100644
index 0000000000..e42c59403d
--- /dev/null
+++ b/misc/gourmet/tostring-to-tobytes.patch
@@ -0,0 +1,26 @@
+diff --git a/gourmet/gtk_extras/ratingWidget.py b/gourmet/gtk_extras/ratingWidget.py
+index 0e01735..efa6463 100644
+--- a/gourmet/gtk_extras/ratingWidget.py
++++ b/gourmet/gtk_extras/ratingWidget.py
+@@ -135,7 +135,7 @@ class StarGenerator:
+ if is_rgba: rowstride = 4
+ else: rowstride = 3
+ pb=gtk.gdk.pixbuf_new_from_data(
+- image.tostring(),
++ image.tobytes(),
+ gtk.gdk.COLORSPACE_RGB,
+ is_rgba,
+ 8,
+diff --git a/gourmet/plugins/browse_recipes/icon_helpers.py b/gourmet/plugins/browse_recipes/icon_helpers.py
+index 61c772c..2e7b08b 100644
+--- a/gourmet/plugins/browse_recipes/icon_helpers.py
++++ b/gourmet/plugins/browse_recipes/icon_helpers.py
+@@ -38,7 +38,7 @@ def get_pixbuf_from_image (image):
+ if is_rgba: rowstride = 4
+ else: rowstride = 3
+ pb=gtk.gdk.pixbuf_new_from_data(
+- image.tostring(),
++ image.tobytes(),
+ gtk.gdk.COLORSPACE_RGB,
+ is_rgba,
+ 8,
diff --git a/misc/ibus-unikey/ibus-unikey.SlackBuild b/misc/ibus-unikey/ibus-unikey.SlackBuild
index 3e2c7cc047..26ac340db0 100644
--- a/misc/ibus-unikey/ibus-unikey.SlackBuild
+++ b/misc/ibus-unikey/ibus-unikey.SlackBuild
@@ -60,7 +60,7 @@ patch -p1 -i $CWD/gcc-6.diff
./autogen.sh
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/misc/krename/krename.SlackBuild b/misc/krename/krename.SlackBuild
index f084711cd4..4e67905635 100644
--- a/misc/krename/krename.SlackBuild
+++ b/misc/krename/krename.SlackBuild
@@ -71,6 +71,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Fix for gcc >= 6.x
+patch -p1 < $CWD/null.patch
+
KDEPREF=$(kde4-config --prefix)
cmake \
diff --git a/misc/krename/null.patch b/misc/krename/null.patch
new file mode 100644
index 0000000000..991ebbea1c
--- /dev/null
+++ b/misc/krename/null.patch
@@ -0,0 +1,12 @@
+diff -Naur krename-r247.orig/src/batchrenamer.cpp krename-r247/src/batchrenamer.cpp
+--- krename-r247.orig/src/batchrenamer.cpp 2013-11-24 22:46:05.000000000 +0100
++++ krename-r247/src/batchrenamer.cpp 2017-06-20 14:42:57.330437870 +0200
+@@ -402,7 +402,7 @@
+ break;
+ case eRenameMode_Link:
+ // In case of link delete created file
+- job = KIO::file_delete( dstUrl, false );
++ job = KIO::file_delete( dstUrl, NULL );
+ break;
+ case eRenameMode_Copy: // no undo possible
+ // TODO: Maybe we should delete the created files
diff --git a/misc/stardict-tools/stardict-tools.SlackBuild b/misc/stardict-tools/stardict-tools.SlackBuild
index 7a681ee867..5466bff3f4 100644
--- a/misc/stardict-tools/stardict-tools.SlackBuild
+++ b/misc/stardict-tools/stardict-tools.SlackBuild
@@ -52,6 +52,9 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p0 < $CWD/stardict-tools.patch
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing -fpermissive" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/misc/xca/xca.SlackBuild b/misc/xca/xca.SlackBuild
index 15387ae802..8d6f02ac35 100644
--- a/misc/xca/xca.SlackBuild
+++ b/misc/xca/xca.SlackBuild
@@ -69,6 +69,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Hack to avoid building the html docs, broken with the newer linuxdoc-tools
+sed -i '/case "$DOCTOOL" in/i \
+DOCTOOL=true' configure
+
sed -i \
-e 's/LIBS="\${LIBS} \${OPENSSL_LIBS}\${QT_LIBS}"/LIBS="\${LIBS} \${OPENSSL_LIBS} \${QT_LIBS}"/' \
configure
diff --git a/misc/yapet/gcc6.patch b/misc/yapet/gcc6.patch
new file mode 100644
index 0000000000..a57e0c93c1
--- /dev/null
+++ b/misc/yapet/gcc6.patch
@@ -0,0 +1,11 @@
+--- yapet-1.0/yapet/cfg.h 2014-02-23 10:18:41.000000000 -0700
++++ yapet-1.0/yapet/cfg.h 2016-04-14 07:06:49.665672169 -0700
+@@ -163,7 +163,7 @@
+ locked = false;
+ }
+
+- void is_locked() const {
++ bool is_locked() const {
+ return locked;
+ }
+
diff --git a/misc/yapet/yapet.SlackBuild b/misc/yapet/yapet.SlackBuild
index 25630ffe46..91af2b8d91 100644
--- a/misc/yapet/yapet.SlackBuild
+++ b/misc/yapet/yapet.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# From upstream
+patch -p1 < $CWD/gcc6.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/misc/zinnia/zinnia-fixes-gcc6-compile.patch b/misc/zinnia/zinnia-fixes-gcc6-compile.patch
new file mode 100644
index 0000000000..848f306edb
--- /dev/null
+++ b/misc/zinnia/zinnia-fixes-gcc6-compile.patch
@@ -0,0 +1,22 @@
+Index: zinnia-0.06/trainer.cpp
+===================================================================
+--- zinnia-0.06.orig/trainer.cpp
++++ zinnia-0.06/trainer.cpp
+@@ -93,7 +93,7 @@ class TrainerImpl: public Trainer {
+
+ public:
+ bool add(const Character &character) {
+- const std::string y = character.value();
++ std::string y = character.value();
+ CHECK_FALSE(!y.empty()) << "input character is empty";
+ Features features;
+ CHECK_FALSE(features.read(character)) << "cannot read character: " << y;
+@@ -103,7 +103,7 @@ class TrainerImpl: public Trainer {
+ if (!fn) {
+ return false;
+ }
+- x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn));
++ x_.push_back(std::make_pair(y, fn));
+ return true;
+ }
+
diff --git a/misc/zinnia/zinnia.SlackBuild b/misc/zinnia/zinnia.SlackBuild
index efd04acd51..62b3c033e4 100644
--- a/misc/zinnia/zinnia.SlackBuild
+++ b/misc/zinnia/zinnia.SlackBuild
@@ -70,6 +70,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Thanks to fedora for this patch
+patch -p1 < $CWD/zinnia-fixes-gcc6-compile.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/multimedia/aegisub/aegisub.SlackBuild b/multimedia/aegisub/aegisub.SlackBuild
index 0bdf6b18bb..e6f616dba4 100644
--- a/multimedia/aegisub/aegisub.SlackBuild
+++ b/multimedia/aegisub/aegisub.SlackBuild
@@ -69,10 +69,16 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i tools/Makefile
+patch -Np1 < $CWD/boost.patch
+sed 's|gil/gil_all.hpp|gil.hpp|g' -i src/*.cpp # boost 1.69
+sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i tools/Makefile # missing link flag
+patch -Np1 < $CWD/icu.patch
+
+./autogen.sh
LDFLAGS="$LDFLAGS -lz" \
CFLAGS="$SLKCFLAGS" \
+CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1' \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/multimedia/aegisub/boost.patch b/multimedia/aegisub/boost.patch
new file mode 100644
index 0000000000..5d917f607e
--- /dev/null
+++ b/multimedia/aegisub/boost.patch
@@ -0,0 +1,34 @@
+From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 9 Jul 2018 20:15:29 +0000
+Subject: [PATCH] Keep using std::distance after Boost 1.68
+
+src/search_replace_engine.cpp:256:14: error: call to
+ 'distance' is ambiguous
+ count += distance(
+ ^~~~~~~~
+/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
+ boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
+distance(_InputIter __first, _InputIter __last)
+^
+/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
+ boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
+ distance(SinglePassIterator first, SinglePassIterator last)
+ ^
+---
+ src/search_replace_engine.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/search_replace_engine.cpp b/src/search_replace_engine.cpp
+index 594c21e5e..14c71680d 100644
+--- a/src/search_replace_engine.cpp
++++ b/src/search_replace_engine.cpp
+@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
+ if (MatchState ms = matches(&diag, 0)) {
+ auto& diag_field = diag.*get_dialogue_field(settings.field);
+ std::string const& text = diag_field.get();
+- count += distance(
++ count += std::distance(
+ boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
+ boost::u32regex_iterator<std::string::const_iterator>());
+ diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/multimedia/aegisub/icu.patch b/multimedia/aegisub/icu.patch
new file mode 100644
index 0000000000..2145140ed0
--- /dev/null
+++ b/multimedia/aegisub/icu.patch
@@ -0,0 +1,11 @@
+diff -upr aegisub-3.2.2.orig/src/utils.cpp aegisub-3.2.2/src/utils.cpp
+--- aegisub-3.2.2.orig/src/utils.cpp 2014-12-08 02:07:09.000000000 +0200
++++ aegisub-3.2.2/src/utils.cpp 2017-04-26 11:11:15.438239182 +0300
+@@ -44,6 +44,7 @@
+ #include <boost/filesystem/path.hpp>
+ #include <map>
+ #include <unicode/locid.h>
++#include <unicode/unistr.h>
+ #include <wx/clipbrd.h>
+ #include <wx/filedlg.h>
+ #include <wx/stdpaths.h>
diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild
index e1ae707bad..17d27ed112 100644
--- a/multimedia/avidemux/avidemux.SlackBuild
+++ b/multimedia/avidemux/avidemux.SlackBuild
@@ -74,6 +74,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/qt-5.15.diff
+
sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash || exit 1
sed -i 's|0.19|1.0|' avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt || exit 1
diff --git a/multimedia/avidemux/qt-5.15.diff b/multimedia/avidemux/qt-5.15.diff
new file mode 100644
index 0000000000..5ebe3753c2
--- /dev/null
+++ b/multimedia/avidemux/qt-5.15.diff
@@ -0,0 +1,11 @@
+diff -u -r avidemux_2.7.4/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp avidemux_2.7.4-fix/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp
+--- avidemux_2.7.4/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp 2019-08-15 07:25:39.000000000 +0000
++++ avidemux_2.7.4-fix/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp 2020-06-05 13:48:28.014061206 +0000
+@@ -8,6 +8,7 @@
+ ***************************************************************************///
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRubberBand>
+ #include <QBoxLayout>
+ #include <QSizeGrip>
diff --git a/multimedia/bombono-dvd/bombono-dvd.SlackBuild b/multimedia/bombono-dvd/bombono-dvd.SlackBuild
index 4ad1cf1197..831f0d46b0 100644
--- a/multimedia/bombono-dvd/bombono-dvd.SlackBuild
+++ b/multimedia/bombono-dvd/bombono-dvd.SlackBuild
@@ -83,6 +83,8 @@ patch -p1 < $CWD/patches/fix_ptr2bool_cast.patch
patch -p1 < $CWD/patches/fix_c++11_literal_warnings.patch
patch -p1 < $CWD/patches/autoptr2uniqueptr.patch
patch -p1 < $CWD/patches/boost.patch
+patch -p1 < $CWD/patches/fix_operator_ambiguity.patch
+patch -p1 < $CWD/patches/fix_throw_specifications.patch
# Fix for ffmpeg-3
patch -p1 < $CWD/patches/ffmpeg3.patch
diff --git a/multimedia/bombono-dvd/patches/fix_operator_ambiguity.patch b/multimedia/bombono-dvd/patches/fix_operator_ambiguity.patch
new file mode 100644
index 0000000000..5fcfaf0466
--- /dev/null
+++ b/multimedia/bombono-dvd/patches/fix_operator_ambiguity.patch
@@ -0,0 +1,352 @@
+diff -ruN old/src/mbase/project/serialization.h new/src/mbase/project/serialization.h
+--- old/src/mbase/project/serialization.h 2017-06-01 13:54:44.086895687 +0430
++++ new/src/mbase/project/serialization.h 2017-06-01 14:09:16.523275880 +0430
+@@ -75,7 +75,9 @@
+ template<typename T>
+ std::string MakeString(const T& t)
+ {
+- return (str::stream() << t).str();
++ str::stream ss;
++ ss << t;
++ return ss.str();
+ }
+
+ template<typename T>
+diff -ruN old/src/mgui/dvdimport.cpp new/src/mgui/dvdimport.cpp
+--- old/src/mgui/dvdimport.cpp 2017-06-01 13:54:44.086895687 +0430
++++ new/src/mgui/dvdimport.cpp 2017-06-01 14:06:42.488114237 +0430
+@@ -211,10 +211,11 @@
+ row[VF().selState] = false;
+ row[VF().name] = VobFName(vob.pos);
+ row[VF().thumbnail] = vob.aspect == af4_3 ? pix4_3 : pix16_9;
+- std::string desc = (str::stream(Mpeg::SecToHMS(vob.tmLen, true)) << ", "
+- << vob.sz.x << "x" << vob.sz.y << ", "
+- << (vob.aspect == af4_3 ? "4:3" : "16:9") << ", "
+- << std::fixed << std::setprecision(2) << vob.Count()/512. << " " << _("MB")).str();
++ str::stream ss (Mpeg::SecToHMS(vob.tmLen, true));
++ ss << ", " << vob.sz.x << "x" << vob.sz.y << ", "
++ << (vob.aspect == af4_3 ? "4:3" : "16:9") << ", "
++ << std::fixed << std::setprecision(2) << vob.Count()/512. << " " << _("MB");
++ std::string desc = ss.str();
+ row[VF().desc] = desc;
+ }
+ CompleteSelection(id, false);
+diff -ruN old/src/mbase/project/media.cpp new/src/mbase/project/media.cpp
+--- old/src/mbase/project/media.cpp 2017-06-01 14:25:09.492134844 +0430
++++ new/src/mbase/project/media.cpp 2017-06-01 14:37:53.196336367 +0430
+@@ -58,7 +58,9 @@
+
+ std::string MakeAutoName(const std::string& str, int old_sz)
+ {
+- return (str::stream() << str << " " << old_sz+1).str();
++ str::stream ss;
++ ss << str << " " << old_sz+1;
++ return ss.str();
+ }
+
+ void VideoMD::AddChapter(ChapterItem chp)
+diff -ruN old/src/mbase/project/menu.cpp new/src/mbase/project/menu.cpp
+--- old/src/mbase/project/menu.cpp 2017-06-01 14:25:09.495468141 +0430
++++ new/src/mbase/project/menu.cpp 2017-06-01 14:39:42.004331141 +0430
+@@ -166,7 +166,9 @@
+ static std::string MakeObjectPath(int idx, const char* type)
+ {
+ ASSERT( idx != NO_HNDL );
+- return (str::stream() << type << "." << idx).str();
++ str::stream ss;
++ ss << type << "." << idx;
++ return ss.str();
+ }
+
+ std::string GetMediaRef(MediaItem mi)
+@@ -197,7 +199,9 @@
+ void RefMaker::Visit(VideoChapterMD& obj)
+ {
+ refStr = GetMediaRef(obj.owner);
+- refStr += (str::stream() << "." << ChapterPosInt(&obj)).str();
++ str::stream ss;
++ ss << "." << ChapterPosInt(&obj);
++ refStr += ss.str();
+ }
+
+ std::string Media2Ref(MediaItem mi)
+@@ -233,8 +237,9 @@
+
+ std::string ThrowBadIndex(const char* prefix, int idx)
+ {
+- throw std::runtime_error(
+- (str::stream() << prefix << idx).str() );
++ str::stream ss;
++ ss << prefix << idx;
++ throw std::runtime_error(ss.str());
+ }
+
+ MediaItem TryGetMedia(int idx)
+diff -ruN old/src/mbase/project/srl-common.cpp new/src/mbase/project/srl-common.cpp
+--- old/src/mbase/project/srl-common.cpp 2017-06-01 14:25:09.495468141 +0430
++++ new/src/mbase/project/srl-common.cpp 2017-06-01 14:40:56.524722225 +0430
+@@ -36,10 +36,12 @@
+ std::string ToString(const RGBA::Pixel& pxl)
+ {
+ using Mpeg::set_hms;
+- return (str::stream("#") << std::hex
+- << set_hms() << (int)pxl.red
+- << set_hms() << (int)pxl.green
+- << set_hms() << (int)pxl.blue << (int)pxl.alpha).str();
++ str::stream ss ("#");
++ ss << std::hex
++ << set_hms() << (int)pxl.red
++ << set_hms() << (int)pxl.green
++ << set_hms() << (int)pxl.blue << (int)pxl.alpha;
++ return ss.str();
+ }
+
+ // как pango_color_parse()
+diff -ruN old/src/mgui/author/render.cpp new/src/mgui/author/render.cpp
+--- old/src/mgui/author/render.cpp 2017-06-01 14:25:09.498801438 +0430
++++ new/src/mgui/author/render.cpp 2017-06-01 14:28:08.901379890 +0430
+@@ -1307,7 +1307,9 @@
+
+ bool RenderMainPicture(const std::string& out_dir, Menu mn, int i)
+ {
+- Author::Info((str::stream() << "Rendering menu \"" << mn->mdName << "\" ...").str());
++ str::stream ss;
++ ss << "Rendering menu \"" << mn->mdName << "\" ...";
++ Author::Info(ss.str());
+ const std::string mn_dir = MakeMenuPath(out_dir, mn, i);
+
+ if( IsMotion(mn) )
+diff -ruN old/src/mgui/author/script.cpp new/src/mgui/author/script.cpp
+--- old/src/mgui/author/script.cpp 2017-06-01 14:25:09.498801438 +0430
++++ new/src/mgui/author/script.cpp 2017-06-01 14:31:23.248978018 +0430
+@@ -130,7 +130,9 @@
+ {
+ VideoItem vi = IsVideo(mi);
+ ASSERT( vi );
+- str = (str::stream() << "title " << GetAuthorNumber(vi)).str();
++ str::stream ss;
++ ss << "title " << GetAuthorNumber(vi);
++ str = ss.str();
+ }
+ return str;
+ }
+@@ -179,7 +181,9 @@
+ // Потому: Ð´Ð»Ñ ÑƒÐ´Ð¾Ñтва пользователей даем Ñоздавать нулевую главу, Ñ€Ð°Ð·Ñ€ÐµÑˆÐ°Ñ Ñто здеÑÑŒ
+ // (однако доп. нулевые главы будут приводить к ошибке Cannot jump to chapter N ... only M exist)
+ int c_num = ChapterPosInt(&obj) + (owner->List()[0]->chpTime ? 2 : 1) ;
+- res = (str::stream() << "jump title " << v_num << " chapter " << c_num << ";").str();
++ str::stream ss;
++ ss << "jump title " << v_num << " chapter " << c_num << ";";
++ res = ss.str();
+ }
+
+ static std::string MakeButtonJump(MediaItem mi, bool vts_domain)
+@@ -204,7 +208,9 @@
+ if( !fs::native(name) )
+ name = "Menu";
+
+- std::string fname = (str::stream() << idx+1 << "." << name).str();
++ str::stream ss;
++ ss << idx+1 << "." << name;
++ std::string fname = ss.str();
+ return cnv_from_utf8 ? ConvertPathFromUtf8(fname) : fname ;
+ }
+
+@@ -626,7 +632,9 @@
+ void AuthorSectionInfo(const std::string& str)
+ {
+ Author::Info("\n#", false);
+- Author::Info((str::stream() << "# " << str).str(), false);
++ str::stream ss;
++ ss << "# " << str;
++ Author::Info(ss.str(), false);
+ Author::Info("#\n", false);
+ }
+
+@@ -1082,7 +1090,9 @@
+
+ static void AuthorImpl(const std::string& out_dir)
+ {
+- AuthorSectionInfo((str::stream() << "Build DVD-Video in folder: " << out_dir).str());
++ str::stream ss;
++ ss << "Build DVD-Video in folder: " << out_dir;
++ AuthorSectionInfo(ss.str());
+ IteratePendingEvents();
+
+ IndexVideosForAuthoring();
+diff -ruN old/src/mgui/project/add.cpp new/src/mgui/project/add.cpp
+--- old/src/mgui/project/add.cpp 2017-06-01 14:25:09.498801438 +0430
++++ new/src/mgui/project/add.cpp 2017-06-01 14:33:26.303387642 +0430
+@@ -86,7 +86,9 @@
+
+ static std::string FpsToStr(const Point& frate)
+ {
+- return (str::stream() << (double)frate.x/frate.y).str();
++ str::stream ss;
++ ss << (double)frate.x/frate.y;
++ return ss.str();
+ }
+
+ static std::string TVTypeStr(bool is_ntsc)
+@@ -163,7 +165,9 @@
+ // *
+ bool is_aspect_ok = vid.sarCode == af4_3 || vid.sarCode == af16_9;
+ Point aspect = vid.SizeAspect();
+- std::string aspect_str = (str::stream() << aspect.x << ':' << aspect.y).str();
++ str::stream ss;
++ ss << aspect.x << ':' << aspect.y;
++ std::string aspect_str = ss.str();
+ SetImportError(ed, is_aspect_ok,
+ std::string(_("Aspect ratio")) + ": \t" + MarkError(aspect_str, is_aspect_ok),
+ BF_(Descriptions[2]) % tv_type % bf::stop);
+diff -ruN old/src/mgui/sdk/cairo_utils.cpp new/src/mgui/sdk/cairo_utils.cpp
+--- old/src/mgui/sdk/cairo_utils.cpp 2017-06-01 14:25:09.498801438 +0430
++++ new/src/mgui/sdk/cairo_utils.cpp 2017-06-01 14:35:20.831246046 +0430
+@@ -27,6 +27,8 @@
+ std::string MakeSVGFilename(const char* prefix)
+ {
+ static int idx = 1;
+- return (str::stream() << prefix << "-" << Mpeg::set_hms() << idx++ << ".svg" ).str();
++ str::stream ss;
++ ss << prefix << "-" << Mpeg::set_hms() << idx++ << ".svg";
++ return ss.str();
+ }
+
+diff -ruN old/src/mgui/timeline/layout.cpp new/src/mgui/timeline/layout.cpp
+--- old/src/mgui/timeline/layout.cpp 2017-06-01 14:25:09.502134734 +0430
++++ new/src/mgui/timeline/layout.cpp 2017-06-01 14:36:36.152095784 +0430
+@@ -600,8 +600,10 @@
+ void FramesToTime(std::string& str, int cnt, double fps)
+ {
+ time4_t t4 = FramesToTime(cnt, fps);
+- str = (str::stream() << Mpeg::set_hms() << t4.hh << ":" << Mpeg::set_hms() << t4.mm << ":"
+- << Mpeg::set_hms() << t4.ss << ";" << Mpeg::set_hms() << t4.ff).str();
++ str::stream ss;
++ ss << Mpeg::set_hms() << t4.hh << ":" << Mpeg::set_hms() << t4.mm << ":"
++ << Mpeg::set_hms() << t4.ss << ";" << Mpeg::set_hms() << t4.ff;
++ str = ss.str();
+ }
+
+ } // namespace TimeLine
+diff -ruN old/src/mgui/win_utils.cpp new/src/mgui/win_utils.cpp
+--- old/src/mgui/win_utils.cpp 2017-06-01 14:25:09.498801438 +0430
++++ new/src/mgui/win_utils.cpp 2017-06-01 14:26:50.898112082 +0430
+@@ -132,7 +132,9 @@
+
+ std::string ColorToString(const unsigned int rgba)
+ {
+- return (str::stream() << std::hex << (rgba >> 8)).str();
++ str::stream ss;
++ ss << std::hex << (rgba >> 8);
++ return ss.str();
+ }
+
+ CR::Color GetBGColor(Gtk::Widget& wdg)
+diff -ruN old/src/mdemux/dvdread.cpp new/src/mdemux/dvdread.cpp
+--- old/src/mdemux/dvdread.cpp 2017-06-01 14:48:30.110355679 +0430
++++ new/src/mdemux/dvdread.cpp 2017-06-01 14:50:50.141065674 +0430
+@@ -35,8 +35,10 @@
+ std::string VobFName(VobPos& pos, const std::string& suffix)
+ {
+ using Mpeg::set_hms;
+- return (str::stream("Video") << set_hms() << int(pos.Vts())
+- << "-" << set_hms() << pos.VobId() << suffix << ".vob").str();
++ str::stream ss ("Video");
++ ss << set_hms() << int(pos.Vts())
++ << "-" << set_hms() << pos.VobId() << suffix << ".vob";
++ return ss.str();
+ }
+
+ typedef boost::function<void(int, double)> VobTimeFnr;
+@@ -282,9 +284,11 @@
+ static void TryDVDReadBlocks(dvd_file_t* file, int off, size_t cnt, char* buf)
+ {
+ int real_cnt = DVDReadBlocks(file, off, cnt, (unsigned char*)buf);
+- if( (int)cnt != real_cnt )
+- throw std::runtime_error( (str::stream() << real_cnt <<
+- " != DVDReadBlocks(" << cnt << ")").str() );
++ if( (int)cnt != real_cnt ) {
++ str::stream ss;
++ ss << real_cnt << " != DVDReadBlocks(" << cnt << ")";
++ throw std::runtime_error( ss.str() );
++ }
+ }
+
+ // размер буфера должен ÑоответÑтвовать читаемому диапазону
+diff -ruN old/src/mdemux/mpeg2demux.cpp new/src/mdemux/mpeg2demux.cpp
+--- old/src/mdemux/mpeg2demux.cpp 2017-06-01 14:48:30.110355679 +0430
++++ new/src/mdemux/mpeg2demux.cpp 2017-06-01 14:55:35.784165916 +0430
+@@ -71,7 +71,9 @@
+
+ static std::string MakePESKey(int id, const char* ext)
+ {
+- return (str::stream() << id << "." << ext).str();
++ str::stream ss;
++ ss << id << "." << ext;
++ return ss.str();
+ }
+
+ static bool ReadPart(io::stream& strm, uint8_t* buf, int sz, int& len)
+@@ -110,7 +112,9 @@
+ ASSERT(0);
+ }
+
+- std::string header_str = (str::stream() << sample_rate << ":" << channels << ":" << bps << ".lpcm").str();
++ str::stream ss;
++ ss << sample_rate << ":" << channels << ":" << bps << ".lpcm";
++ std::string header_str = ss.str();
+ return MakePESKey(track, header_str.c_str());
+ }
+
+diff -ruN old/src/mdemux/seek.cpp new/src/mdemux/seek.cpp
+--- old/src/mdemux/seek.cpp 2017-06-01 14:48:30.110355679 +0430
++++ new/src/mdemux/seek.cpp 2017-06-01 14:52:09.669280234 +0430
+@@ -37,8 +37,10 @@
+ int hh = min / 60;
+ int mm = min - hh*60;
+
+- return (str::stream() << set_hms() << hh << ":"
+- << set_hms() << mm << ":" << set_hms() << ss).str();
++ str::stream strss;
++ strss << set_hms() << hh << ":"
++ << set_hms() << mm << ":" << set_hms() << ss;
++ return strss.str();
+ }
+
+ bool MediaInfo::InitBegin(VideoLine& vl)
+diff -ruN old/src/mlib/sdk/misc.cpp new/src/mlib/sdk/misc.cpp
+--- old/src/mlib/sdk/misc.cpp 2017-06-01 14:48:30.120355606 +0430
++++ new/src/mlib/sdk/misc.cpp 2017-06-01 14:53:25.504549937 +0430
+@@ -173,12 +173,16 @@
+ std::string Double2Str(double val)
+ {
+ //return boost::format("%1%") % val % bf::stop;
+- return (str::stream() << val).str();
++ str::stream ss;
++ ss << val;
++ return ss.str();
+ }
+
+ std::string Int2Str(int val)
+ {
+- return (str::stream() << val).str();
++ str::stream ss;
++ ss << val;
++ return ss.str();
+ }
+
+ static bool ICaseMatch(const std::string& str, const std::string& pat_str)
+diff -ruN old/src/mlib/sdk/system.cpp new/src/mlib/sdk/system.cpp
+--- old/src/mlib/sdk/system.cpp 2017-06-01 14:48:30.120355606 +0430
++++ new/src/mlib/sdk/system.cpp 2017-06-01 14:54:13.980777662 +0430
+@@ -28,7 +28,9 @@
+ int GetMemSize()
+ {
+ pid_t pid = getpid();
+- std::string str = (str::stream() << "/proc/" << pid << "/statm").str();
++ str::stream ss;
++ ss << "/proc/" << pid << "/statm";
++ std::string str = ss.str();
+
+ io::stream strm(str.c_str(), iof::in);
+ int mem;
diff --git a/multimedia/bombono-dvd/patches/fix_throw_specifications.patch b/multimedia/bombono-dvd/patches/fix_throw_specifications.patch
new file mode 100644
index 0000000000..f2f4c40d4f
--- /dev/null
+++ b/multimedia/bombono-dvd/patches/fix_throw_specifications.patch
@@ -0,0 +1,24 @@
+diff -ruN old/src/mbase/project/table.h new/src/mbase/project/table.h
+--- old/src/mbase/project/table.h 2017-06-01 13:54:44.086895687 +0430
++++ new/src/mbase/project/table.h 2017-06-01 13:55:58.089107253 +0430
+@@ -128,7 +128,7 @@
+ void ClearSettings();
+
+ void Load(const std::string& fname,
+- const std::string& cur_dir = std::string()) throw (std::exception);
++ const std::string& cur_dir = std::string());
+ bool Save();
+
+ bool SaveAs(const std::string& fname,
+diff -ruN old/src/mbase/project/srl-db.cpp new/src/mbase/project/srl-db.cpp
+--- old/src/mbase/project/srl-db.cpp 2017-06-01 14:25:09.495468141 +0430
++++ new/src/mbase/project/srl-db.cpp 2017-06-01 14:41:49.699901753 +0430
+@@ -102,7 +102,7 @@
+ }
+
+ void ADatabase::Load(const std::string& fname,
+- const std::string& cur_dir) throw (std::exception)
++ const std::string& cur_dir)
+ {
+ try
+ {
diff --git a/multimedia/cantata/cantata.SlackBuild b/multimedia/cantata/cantata.SlackBuild
index dc67fd6e88..9e04b66105 100644
--- a/multimedia/cantata/cantata.SlackBuild
+++ b/multimedia/cantata/cantata.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cantata
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.4.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/multimedia/cantata/cantata.info b/multimedia/cantata/cantata.info
index ef59fb5c29..1b53526d07 100644
--- a/multimedia/cantata/cantata.info
+++ b/multimedia/cantata/cantata.info
@@ -1,8 +1,8 @@
PRGNAM="cantata"
-VERSION="2.0.1"
+VERSION="2.4.1"
HOMEPAGE="https://github.com/CDrummond/cantata"
-DOWNLOAD="https://github.com/CDrummond/cantata/archive/v2.0.1/cantata-2.0.1.tar.gz"
-MD5SUM="db916af5dad5063d31e1ab43fac61ffa"
+DOWNLOAD="https://github.com/CDrummond/cantata/archive/v2.4.1/cantata-2.4.1.tar.gz"
+MD5SUM="c60dfdb23cfb4e6c2acca118e116f613"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ffmpeg"
diff --git a/multimedia/cinelerra/README b/multimedia/cinelerra/README
index 3ddd60f57e..321c71df3f 100644
--- a/multimedia/cinelerra/README
+++ b/multimedia/cinelerra/README
@@ -1,5 +1,7 @@
cinelerra (GNU/Linux Video/Audio Studio)
+5.x variant of Cinelerra by WP Morrow (aka goodguy).
+
Cinelerra CV is the most advanced non-linear video editor and compositor
for Linux. It does primarily 3 main things: capturing, compositing,
and editing audio and video with sample level accuracy.
diff --git a/multimedia/cinelerra/cinelerra.SlackBuild b/multimedia/cinelerra/cinelerra.SlackBuild
index dfc6c9308c..ccfeddad66 100644
--- a/multimedia/cinelerra/cinelerra.SlackBuild
+++ b/multimedia/cinelerra/cinelerra.SlackBuild
@@ -23,9 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cinelerra
-SRCNAM=CinelerraCV
-VERSION=${VERSION:-2.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20190930_6ca0a78}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -66,9 +65,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -77,32 +76,29 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
./autogen.sh
-LDFLAGS="-ldl" \
-CFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \
-CXXFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--libdir=/usr/lib${LIBDIRSUFFIX} \
- --with-plugindir=/usr/lib${LIBDIRSUFFIX}/cinelerra \
- --disable-static \
+ --with-plugin-dir=/usr/lib${LIBDIRSUFFIX}/cin \
--mandir=/usr/man \
- --with-pic \
- --with-x \
- --enable-opengl \
--build=$ARCH-slackware-linux \
$mmx
make
make install DESTDIR=$PKG
+rm -f $PKG/usr/share/applications/cin.desktop
+install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README* TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README* *.txt $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/multimedia/cinelerra/cinelerra.desktop b/multimedia/cinelerra/cinelerra.desktop
new file mode 100644
index 0000000000..b71239453c
--- /dev/null
+++ b/multimedia/cinelerra/cinelerra.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=cinelerra
+Comment=MultiMedia Editor
+Comment[fr]=Éditeur multimédia
+Categories=AudioVideo;AudioVideoEditing;
+Encoding=UTF-8
+Exec=cin
+Icon=/usr/share/pixmaps/cin.xpm
+Terminal=false
+Type=Application
diff --git a/multimedia/cinelerra/cinelerra.info b/multimedia/cinelerra/cinelerra.info
index e866c597cb..97c4dfcca7 100644
--- a/multimedia/cinelerra/cinelerra.info
+++ b/multimedia/cinelerra/cinelerra.info
@@ -1,8 +1,8 @@
PRGNAM="cinelerra"
-VERSION="2.3"
-HOMEPAGE="https://cinelerra-cv.org/"
-DOWNLOAD="https://gentoo.osuosl.org/distfiles/CinelerraCV-2.3.tar.xz"
-MD5SUM="a1e7bfaf9827f74900d58d25955bdf3f"
+VERSION="20190930_6ca0a78"
+HOMEPAGE="https://cinelerra-gg.org"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/cinelerra-20190930_6ca0a78.tar.xz"
+MD5SUM="f9b485a2f4c72f83de4fd12eae3346d3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="faac faad2 imlib2 libavc1394 libdv libiec61883 mjpegtools lame x264"
diff --git a/multimedia/cinelerra/slack-desc b/multimedia/cinelerra/slack-desc
index bbeb099ad8..fb333a1c70 100644
--- a/multimedia/cinelerra/slack-desc
+++ b/multimedia/cinelerra/slack-desc
@@ -8,12 +8,12 @@
|-----handy-ruler------------------------------------------------------|
cinelerra: cinelerra (GNU/Linux Video/Audio Studio)
cinelerra:
+cinelerra: 5.x variant of Cinelerra by WP Morrow (aka goodguy).
+cinelerra:
cinelerra: Cinelerra CV is the most advanced non-linear video editor
cinelerra: and compositor for Linux. It does primarily three main
cinelerra: things: capturing, compositing, and editing audio and
cinelerra: video with sample level accuracy.
cinelerra:
-cinelerra: Homepage: http://cinelerra-cv.org/
-cinelerra:
-cinelerra:
+cinelerra: Homepage: http://cinelerra-gg.org
cinelerra:
diff --git a/multimedia/dvdauthor/dvdauthor-0.7.2-imagemagick7.patch b/multimedia/dvdauthor/dvdauthor-0.7.2-imagemagick7.patch
new file mode 100644
index 0000000000..7cef5127f8
--- /dev/null
+++ b/multimedia/dvdauthor/dvdauthor-0.7.2-imagemagick7.patch
@@ -0,0 +1,74 @@
+--- dvdauthor/src/subgen-image.c 2014-01-21 00:12:37.000000000 +0100
++++ dvdauthor/src/subgen-image.c 2017-11-27 20:26:53.682914041 +0100
+@@ -30,7 +30,7 @@
+
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+ #include <stdarg.h>
+-#include <magick/api.h>
++#include <MagickWand/MagickWand.h>
+ #else
+ #include <png.h>
+ #endif
+@@ -176,18 +176,18 @@
+ {
+ Image *im;
+ ImageInfo *ii;
+- ExceptionInfo ei;
++ ExceptionInfo *ei;
+ int x,y;
+ unsigned long magickver;
+ unsigned char amask;
+
+- GetExceptionInfo(&ei);
++ ei = AcquireExceptionInfo();
+ ii=CloneImageInfo(NULL);
+ strcpy(ii->filename,s->fname);
+- im=ReadImage(ii,&ei);
++ im=ReadImage(ii,ei);
+
+ if( !im ) {
+- MagickError(ei.severity,"Unable to load file",ii->filename);
++ MagickError(ei->severity,"Unable to load file",ii->filename);
+ return -1;
+ }
+
+@@ -202,10 +202,10 @@
+ for( y=0; y<im->rows; y++ ) {
+ char pdata[MAXX*4];
+
+- if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,&ei)) {
+- fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description);
+- CatchException(&ei);
+- MagickError(ei.severity,ei.reason,ei.description);
++ if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,ei)) {
++ fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei->reason,ei->description);
++ CatchException(ei);
++ MagickError(ei->severity,ei->reason,ei->description);
+ DestroyImage(im);
+ return -1;
+ }
+@@ -219,7 +219,7 @@
+ }
+ }
+ DestroyImage(im);
+- DestroyExceptionInfo(&ei);
++ DestroyExceptionInfo(ei);
+ fprintf(stderr,"INFO: Picture %s had %d colors\n",s->fname,s->numpal);
+
+ return 0;
+@@ -1098,13 +1098,13 @@
+ void image_init()
+ {
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+- InitializeMagick(NULL);
++ MagickCoreGenesis("", MagickFalse);
+ #endif
+ }
+
+ void image_shutdown()
+ {
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+- DestroyMagick();
++ MagickCoreTerminus();
+ #endif
+ }
diff --git a/multimedia/dvdauthor/dvdauthor.SlackBuild b/multimedia/dvdauthor/dvdauthor.SlackBuild
index bf785bab21..2044823a6d 100644
--- a/multimedia/dvdauthor/dvdauthor.SlackBuild
+++ b/multimedia/dvdauthor/dvdauthor.SlackBuild
@@ -75,6 +75,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/dvdauthor-0.7.2-imagemagick7.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/multimedia/dvdstyler/dvdstyler.SlackBuild b/multimedia/dvdstyler/dvdstyler.SlackBuild
index b60c41a311..c6b120f88a 100644
--- a/multimedia/dvdstyler/dvdstyler.SlackBuild
+++ b/multimedia/dvdstyler/dvdstyler.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for dvdstyler
-# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
PRGNAM=dvdstyler
SPRGNAM=DVDStyler
-VERSION=${VERSION:-3.0.4}
+VERSION=${VERSION:-3.1.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/multimedia/dvdstyler/dvdstyler.info b/multimedia/dvdstyler/dvdstyler.info
index 69ed107c37..c6e20c260d 100644
--- a/multimedia/dvdstyler/dvdstyler.info
+++ b/multimedia/dvdstyler/dvdstyler.info
@@ -1,8 +1,8 @@
PRGNAM="dvdstyler"
-VERSION="3.0.4"
+VERSION="3.1.2"
HOMEPAGE="http://www.dvdstyler.org/"
-DOWNLOAD="http://downloads.sf.net/dvdstyler/DVDStyler-3.0.4.tar.bz2"
-MD5SUM="5008ea1488809fb0ca877b4e617ae5a7"
+DOWNLOAD="http://downloads.sf.net/dvdstyler/DVDStyler-3.1.2.tar.bz2"
+MD5SUM="8d5e977900ade9f57ae1e13c2e50b1ac"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="dvdauthor libavc1394 libmspack libquicktime mjpegtools mpgtx wxsvg"
diff --git a/multimedia/dvgrab/dvgrab.SlackBuild b/multimedia/dvgrab/dvgrab.SlackBuild
index f88b56e7ea..741b4911cd 100644
--- a/multimedia/dvgrab/dvgrab.SlackBuild
+++ b/multimedia/dvgrab/dvgrab.SlackBuild
@@ -71,7 +71,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -Wno-narrowing" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/multimedia/farsight2/farsight2.SlackBuild b/multimedia/farsight2/farsight2.SlackBuild
index e7f0d06355..8bc10ff8ff 100644
--- a/multimedia/farsight2/farsight2.SlackBuild
+++ b/multimedia/farsight2/farsight2.SlackBuild
@@ -69,7 +69,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
CXXFLAGS="$SLKCFLAGS" \
LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
./configure \
diff --git a/multimedia/farstream/README b/multimedia/farstream/README
deleted file mode 100644
index 8a038afcdf..0000000000
--- a/multimedia/farstream/README
+++ /dev/null
@@ -1,7 +0,0 @@
-The Farstream (formerly Farsight) project is an effort to create
-a framework to deal with all known audio/video conferencing
-protocols. On one side it offers a generic API that makes it possible
-to write plugins for different streaming protocols, on the other
-side it offers an API for clients to use those plugins.
-
-Optionally requires valgrind
diff --git a/multimedia/farstream/farstream.SlackBuild b/multimedia/farstream/farstream.SlackBuild
deleted file mode 100644
index 3535d165f8..0000000000
--- a/multimedia/farstream/farstream.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for farstream
-
-# Copyright 2015-2017 Thorn Inurcide USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=farstream
-VERSION=${VERSION:-0.2.8}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Check for valgrind
-pkg-config --exists valgrind && VALGRIND="--enable-valgrind"
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-introspection="yes" \
- --enable-glib-asserts="auto" \
- --enable-gobject-cast-checks="auto" \
- ${VALGRIND:-"--disable-valgrind"} \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog* COPYING NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/farstream/farstream.info b/multimedia/farstream/farstream.info
deleted file mode 100644
index ec55d941aa..0000000000
--- a/multimedia/farstream/farstream.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="farstream"
-VERSION="0.2.8"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/Farstream/"
-DOWNLOAD="https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.8.tar.gz"
-MD5SUM="a40d4c4bd0812c270069b9f97d74009b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libnice"
-MAINTAINER="Thorn Inurcide"
-EMAIL="thorn_inurcide@zoho.com"
diff --git a/multimedia/farstream/slack-desc b/multimedia/farstream/slack-desc
deleted file mode 100644
index 840ddaeed6..0000000000
--- a/multimedia/farstream/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-farstream: farstream (framework to deal with all known conferencing protocols)
-farstream:
-farstream: The Farstream (formerly Farsight) project is an effort to create
-farstream: a framework to deal with all known audio/video conferencing
-farstream: protocols. On one side it offers a generic API that makes it possible
-farstream: to write plugins for different streaming protocols, on the other
-farstream: side it offers an API for clients to use those plugins.
-farstream:
-farstream:
-farstream:
-farstream: Home: http://www.freedesktop.org/wiki/Software/Farstream/
diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README
deleted file mode 100644
index 09b08b00df..0000000000
--- a/multimedia/ffmpeg/README
+++ /dev/null
@@ -1,70 +0,0 @@
-ffmpeg (Software to record, convert and stream audio and video)
-
-FFmpeg is a complete solution to record, convert and stream audio
-and video. It includes libavcodec, the leading audio/video codec
-library.
-
-You can enable a lot of optional (not-autodetected) features by
-passing variables to the script (VAR=yes/no ./ffmpeg.SlackBuild):
-ASS=yes|no (default: no), requires libass
-BLURAY=yes|no (default: no), requires libbluray
-BS2B=yes|no (default: no), requires libbs2b
-CELT=yes|no (default: no), requires celt
-CHROMAPRINT=yes|no (default: no), requires chromaprint
-DC1394=yes|no (default: no), requires libdc1394
-DECKLINK=yes|no (default: no), requires decklink-sdk
-EBUR128=yes|no (default: no), requires libebur128
-FDK_AAC=yes|no (default: no), requires libfdk-aac (creates non-redistributable binary)
-FLITE=yes|no (default: no), requires flite
-FREI0R=yes|no (default: no), requires frei0r
-GME=yes|no (default: no), requires libgme
-GSM=yes|no (default: no), requires gsm
-IEC61883=yes|no (default: no), requires libiec61883 and libavc1394
-ILBC=yes|no (default: no), requires libilbc
-LADSPA=yes|no (default: no), requires ladspa_sdk
-LAME=yes|no (default: no), requires lame
-MODPLUG=yes|no (default: no), requires libmodplug
-NETCDF=yes|no (default: no), requires netcdf
-OPENAL=yes|no (default: no), requires OpenAL
-OPENCORE=yes|no (default: no), requires opencore-amr
-OPENCV=yes|no (default: no), requires opencv-legacy
-OPENSSL=yes|no (default: no), creates non-redistributable binary
-OPUS=yes|no (default: no), requires opus
-RTMP=yes|no (default: no), requires rtmpdump
-RUBBERBAND=yes|no (default: no), requires rubberband
-SCHROEDINGER=yes|no (default: no), requires schroedinger
-SNAPPY=yes|no (default: no), requires snappy
-SPEEX=yes|no (default: no), requires speex
-TESSERACT=yes|no (default: no), requires tesseract
-TWOLAME=yes|no (default: no), requires twolame
-VIDSTAB=yes|no (default: no), requires vid.stab
-WEBP=yes|no (default: no), requires libwebp
-X264=yes|no (default: no), requires x264
-X265=yes|no (default: no), requires x265
-XVID=yes|no (default: no), requires xvidcore
-ZMQ=yes|no (default: no), requires zeromq
-ZVBI=yes|no (default: no), requires zvbi
-
-Additional optional (autodetected) dependencies are jack and SDL2. The
-latter is needed for building ffplay.
-
-Further, there are some more features with dependencies already available
-in core Slackware. These are enabled by default, but can be disabled similar
-to the other switches above:
-CACA=yes|no (default: yes)
-FONTCONFIG=yes|no (default: yes)
-FREETYPE=yes|no (default: yes)
-FRIBIDI=yes|no (default: yes)
-GNUTLS=yes|no (default: yes)
-JP2=yes|no (default: yes)
-LIBCDIO=yes|no (default: yes)
-LIBSSH=yes|no (default: yes)
-OPENGL=yes|no (default: yes)
-PULSEAUDIO=yes|no (default: yes)
-SAMBA=yes|no (default: yes)
-THEORA=yes|no (default: yes)
-V4L2=yes|no (default: yes)
-VORBIS=yes|no (default: yes)
-VPX=yes|no (default: yes)
-WAVPACK=yes|no (default: yes)
-X11GRAB=yes|no (default: yes)
diff --git a/multimedia/ffmpeg/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch b/multimedia/ffmpeg/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch
deleted file mode 100644
index 03d831d72d..0000000000
--- a/multimedia/ffmpeg/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavcodec/libfdk-aacenc.c.orig 2017-02-10 23:25:26.000000000 +1000
-+++ libavcodec/libfdk-aacenc.c 2018-12-10 07:59:22.515000000 +1000
-@@ -286,7 +286,7 @@
- }
-
- avctx->frame_size = info.frameLength;
-- avctx->initial_padding = info.encoderDelay;
-+ avctx->initial_padding = info.nDelay;
- ff_af_queue_init(avctx, &s->afq);
-
- if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
diff --git a/multimedia/ffmpeg/ffmpeg-3.2.4-openjpeg2.3.patch b/multimedia/ffmpeg/ffmpeg-3.2.4-openjpeg2.3.patch
deleted file mode 100644
index 65e17d4449..0000000000
--- a/multimedia/ffmpeg/ffmpeg-3.2.4-openjpeg2.3.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -Naur ffmpeg-3.2.4.orig/configure ffmpeg-3.2.4/configure
---- ffmpeg-3.2.4.orig/configure 2017-02-10 14:25:25.000000000 +0100
-+++ ffmpeg-3.2.4/configure 2017-10-12 08:36:03.395867915 +0200
-@@ -1831,6 +1831,8 @@
- machine_ioctl_meteor_h
- malloc_h
- opencv2_core_core_c_h
-+ openjpeg_2_3_openjpeg_h
-+ openjpeg_2_2_openjpeg_h
- openjpeg_2_1_openjpeg_h
- openjpeg_2_0_openjpeg_h
- openjpeg_1_5_openjpeg_h
-@@ -5721,7 +5723,11 @@
- require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
- require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
--enabled libopenjpeg && { { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+enabled libopenjpeg && { { check_lib2 openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+ check_lib2 openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
-+ { check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+ check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
-+ { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
- check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
- { check_lib2 openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
- { check_lib2 openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-diff -Naur ffmpeg-3.2.4.orig/libavcodec/libopenjpegdec.c ffmpeg-3.2.4/libavcodec/libopenjpegdec.c
---- ffmpeg-3.2.4.orig/libavcodec/libopenjpegdec.c 2017-02-10 14:25:26.000000000 +0100
-+++ ffmpeg-3.2.4/libavcodec/libopenjpegdec.c 2017-10-12 08:38:20.676315554 +0200
-@@ -34,7 +34,11 @@
- #include "internal.h"
- #include "thread.h"
-
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
-+# include <openjpeg-2.3/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
-+# include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- # include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- # include <openjpeg-2.0/openjpeg.h>
-@@ -44,7 +48,7 @@
- # include <openjpeg.h>
- #endif
-
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- # define OPENJPEG_MAJOR_VERSION 2
- # define OPJ(x) OPJ_##x
- #else
-@@ -429,7 +433,7 @@
- opj_stream_set_read_function(stream, stream_read);
- opj_stream_set_skip_function(stream, stream_skip);
- opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
- opj_stream_set_user_data(stream, &reader, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- opj_stream_set_user_data(stream, &reader);
-diff -Naur ffmpeg-3.2.4.orig/libavcodec/libopenjpegenc.c ffmpeg-3.2.4/libavcodec/libopenjpegenc.c
---- ffmpeg-3.2.4.orig/libavcodec/libopenjpegenc.c 2017-02-10 14:25:26.000000000 +0100
-+++ ffmpeg-3.2.4/libavcodec/libopenjpegenc.c 2017-10-12 08:40:43.411456456 +0200
-@@ -32,7 +32,11 @@
- #include "avcodec.h"
- #include "internal.h"
-
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
-+# include <openjpeg-2.3/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
-+# include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- # include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- # include <openjpeg-2.0/openjpeg.h>
-@@ -42,7 +46,7 @@
- # include <openjpeg.h>
- #endif
-
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- # define OPENJPEG_MAJOR_VERSION 2
- # define OPJ(x) OPJ_##x
- #else
-@@ -306,7 +310,7 @@
-
- opj_set_default_encoder_parameters(&ctx->enc_params);
-
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
- switch (ctx->cinema_mode) {
- case OPJ_CINEMA2K_24:
- ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
-@@ -771,7 +775,7 @@
- opj_stream_set_write_function(stream, stream_write);
- opj_stream_set_skip_function(stream, stream_skip);
- opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
- opj_stream_set_user_data(stream, &writer, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- opj_stream_set_user_data(stream, &writer);
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
deleted file mode 100644
index 8b83fcca42..0000000000
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ /dev/null
@@ -1,261 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ffmpeg
-
-# Copyright 2010-2017 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Originally written by core (eroc@linuxmail.org)
-# Modified by Robby Workman <rworkman@slackbuilds.org>
-
-PRGNAM=ffmpeg
-VERSION=${VERSION:-3.2.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-# You can enable a lot of optional (not-autodetected) features by
-# passing variables to the script (VAR=yes/no ./ffmpeg.SlackBuild).
-# Unfortunately ffmpeg's configure doesn't support --enable-feature=yes
-# syntax, so we have to do it the complicated way :/
-# Additional optional (autodetected) dependencies are:
-# - jack
-# - libva
-# - libvdpau
-# - libX11
-# - libxcb
-# - sdl2
-# - xz
-# - zlib
-
-mp3lame="" ; [ "${LAME:-no}" != "no" ] && mp3lame="--enable-libmp3lame"
-libx264="" ; [ "${X264:-no}" != "no" ] && libx264="--enable-libx264"
-libcelt="" ; [ "${CELT:-no}" != "no" ] && libcelt="--enable-libcelt"
-libdc1394="" ; [ "${DC1394:-no}" != "no" ] && libdc1394="--enable-libdc1394"
-libfrei0r="" ; [ "${FREI0R:-no}" != "no" ] && libfrei0r="--enable-frei0r"
-libgsm="" ; [ "${GSM:-no}" != "no" ] && libgsm="--enable-libgsm"
-librtmp="" ; [ "${RTMP:-no}" != "no" ] && librtmp="--enable-librtmp"
-dirac_fast="" ; [ "${SCHROEDINGER:-no}" != "no" ] && dirac_fast="--enable-libschroedinger"
-libspeex="" ; [ "${SPEEX:-no}" != "no" ] && libspeex="--enable-libspeex"
-libxvid="" ; [ "${XVID:-no}" != "no" ] && libxvid="--enable-libxvid"
-libbluray="" ; [ "${BLURAY:-no}" != "no" ] && libbluray="--enable-libbluray"
-libass="" ; [ "${ASS:-no}" != "no" ] && libass="--enable-libass"
-libopenal="" ; [ "${OPENAL:-no}" != "no" ] && libopenal="--enable-openal"
-libiec61883=""; [ "${IEC61883:-no}" != "no" ] && libiec61883="--enable-libiec61883"
-libilbc="" ; [ "${ILBC:-no}" != "no" ] && libilbc="--enable-libilbc"
-libmodplug="" ; [ "${MODPLUG:-no}" != "no" ] && libmodplug="--enable-libmodplug"
-libopus="" ; [ "${OPUS:-no}" != "no" ] && libopus="--enable-libopus"
-libtwolame="" ; [ "${TWOLAME:-no}" != "no" ] && libtwolame="--enable-libtwolame"
-ladspa="" ; [ "${LADSPA:-no}" != "no" ] && ladspa="--enable-ladspa"
-libflite="" ; [ "${FLITE:-no}" != "no" ] && libflite="--enable-libflite"
-libvidstab="" ; [ "${VIDSTAB:-no}" != "no" ] && libvidstab="--enable-libvidstab"
-libx265="" ; [ "${X265:-no}" != "no" ] && libx265="--enable-libx265"
-libzvbi="" ; [ "${ZVBI:-no}" != "no" ] && libzvbi="--enable-libzvbi"
-libopencv="" ; [ "${OPENCV:-no}" != "no" ] && libopencv="--enable-libopencv"
-libgme="" ; [ "${GME:-no}" != "no" ] && libgme="--enable-libgme"
-libsnappy="" ; [ "${SNAPPY:-no}" != "no" ] && libsnappy="--enable-libsnappy"
-libwebp="" ; [ "${WEBP:-no}" != "no" ] && libwebp="--enable-libwebp"
-libzmq="" ; [ "${ZMQ:-no}" != "no" ] && libzmq="--enable-libzmq"
-libbs2b="" ; [ "${BS2B:-no}" != "no" ] && libbs2b="--enable-libbs2b"
-libebur128="" ; [ "${EBUR128:-no}" != "no" ] && libebur128="--enable-libebur128"
-rubberband="" ; [ "${RUBBERBAND:-no}" != "no" ] && rubberband="--enable-librubberband"
-tesseract="" ; [ "${TESSERACT:-no}" != "no" ] && tesseract="--enable-libtesseract"
-netcdf="" ; [ "${NETCDF:-no}" != "no" ] && netcdf="--enable-netcdf"
-chromaprint="" ; [ "${CHROMAPRINT:-no}" != "no" ] && chromaprint="--enable-chromaprint"
-opencore_amr="" ; [ "${OPENCORE:-no}" != "no" ] && \
- opencore_amr="--enable-libopencore-amrnb --enable-libopencore-amrwb"
-fdk="" ; [ "${FDK_AAC:-no}" != "no" ] && \
- { fdk="--enable-libfdk-aac"; non_free="--enable-nonfree" ; }
-ssl="" ; [ "${OPENSSL:-no}" != "no" ] && \
- { ssl="--enable-openssl" ; non_free="--enable-nonfree" ; }
-decklink="" ; [ "${DECKLINK:-no}" != "no" ] && \
- { decklink="--enable-decklink" ; \
- SLKCFLAGS="$SLKCFLAGS -I/usr/include/decklink" ; }
-
-# Default enabled features:
-#opencl="" ; [ "${OPENCL:-yes}" != "no" ] && opencl="--enable-opencl"
-fontconfig="" ; [ "${FONTCONFIG:-yes}" != "no" ] && fontconfig="--enable-libfontconfig"
-freetype="" ; [ "${FREETYPE:-yes}" != "no" ] && freetype="--enable-libfreetype"
-fribidi="" ; [ "${FRIBIDI:-yes}" != "no" ] && fribidi="--enable-libfribidi"
-gnutls="" ; [ "${GNUTLS:-yes}" != "no" ] && gnutls="--enable-gnutls"
-libcaca="" ; [ "${CACA:-yes}" != "no" ] && libcaca="--enable-libcaca"
-libcdio="" ; [ "${LIBCDIO:-yes}" != "no" ] && libcdio="--enable-libcdio"
-libssh="" ; [ "${LIBSSH:-yes}" != "no" ] && libssh="--enable-libssh"
-libtheora="" ; [ "${THEORA:-yes}" != "no" ] && libtheora="--enable-libtheora"
-libv4l2="" ; [ "${V4L2:-yes}" != "no" ] && libv4l2="--enable-libv4l2"
-libvorbis="" ; [ "${VORBIS:-yes}" != "no" ] && libvorbis="--enable-libvorbis"
-libvpx="" ; [ "${VPX:-yes}" != "no" ] && libvpx="--enable-libvpx"
-opengl="" ; [ "${OPENGL:-yes}" != "no" ] && opengl="--enable-opengl"
-openjpeg="" ; [ "${JP2:-yes}" != "no" ] && openjpeg="--enable-libopenjpeg"
-pulse="" ; [ "${PULSEAUDIO:-yes}" != "no" ] && pulse="--enable-libpulse"
-samba="" ; [ "${SAMBA:-yes}" != "no" ] && samba="--enable-libsmbclient"
-wavpack="" ; [ "${WAVPACK:-yes}" != "no" ] && wavpack="--enable-libwavpack"
-x11grab="" ; [ "${X11GRAB:-yes}" != "no" ] && x11grab="--enable-x11grab"
-
-# Disable patent encumbered features:
-aac="" ; [ "${AAC:-yes}" != "yes" ] && aac="--disable-encoder=aac"
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Patch for openjpeg-2.3.0
-patch -p1 < $CWD/ffmpeg-3.2.4-openjpeg2.3.patch
-
-#patch for libfdk-aac 2.0.0
-patch -p0 < $CWD/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch
-
-# Fix linking with flite:
-sed -i "s| -lflite\"| -lflite -lm -lasound\"|" \
- ./configure
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --shlibdir=/usr/lib${LIBDIRSUFFIX} \
- --docdir=/usr/doc/$PRGNAM-$VERSION/html \
- --mandir=/usr/man \
- --disable-debug \
- --enable-shared \
- --disable-static \
- --enable-gpl \
- --enable-version3 \
- --enable-avresample \
- --arch=$ARCH \
- $non_free \
- $aac \
- $chromaprint \
- $decklink \
- $dirac_fast \
- $fdk \
- $fontconfig \
- $freetype \
- $fribidi \
- $gnutls \
- $ladspa \
- $libass \
- $libbluray \
- $libbs2b \
- $libcaca \
- $libcdio \
- $libcelt \
- $libdc1394 \
- $libebur128 \
- $libflite \
- $libfrei0r \
- $libgme \
- $libgsm \
- $libiec61883 \
- $libilbc \
- $libmodplug \
- $libopenal \
- $libopencv \
- $libopus \
- $librtmp \
- $libsnappy \
- $libspeex \
- $libssh \
- $libtheora \
- $libtwolame \
- $libv4l2 \
- $libvidstab \
- $libvorbis \
- $libvpx \
- $libwebp \
- $libx264 \
- $libx265 \
- $libxvid \
- $libzmq \
- $libzvbi \
- $mp3lame \
- $netcdf \
- $opencore_amr \
- $opengl \
- $openjpeg \
- $pulse \
- $rubberband \
- $samba \
- $ssl \
- $tesseract \
- $wavpack \
- $x11grab
-
-make
-make install DESTDIR=$PKG
-make install-man DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
- grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/txt
-cp -a Changelog COPYING* CREDITS INSTALL* LICENSE* MAINTAINERS README* \
- RELEASE VERSION \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION/txt/
-find . -name "RELEASE_NOTES" -exec cp -a {} $PKG/usr/doc/$PRGNAM-$VERSION/ \;
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info
deleted file mode 100644
index f187f17aa0..0000000000
--- a/multimedia/ffmpeg/ffmpeg.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ffmpeg"
-VERSION="3.2.4"
-HOMEPAGE="http://www.ffmpeg.org"
-DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-3.2.4.tar.xz"
-MD5SUM="39fd71024ac76ba35f04397021af5606"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="%README%"
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
diff --git a/multimedia/ffmpeg/slack-desc b/multimedia/ffmpeg/slack-desc
deleted file mode 100644
index 6d47b332b4..0000000000
--- a/multimedia/ffmpeg/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-ffmpeg: ffmpeg (Software to record, convert and stream audio and video)
-ffmpeg:
-ffmpeg: FFmpeg is a complete solution to record, convert and stream audio
-ffmpeg: and video. It includes libavcodec, the leading audio/video codec
-ffmpeg: library. FFmpeg is developed under Linux, but it can compiled
-ffmpeg: under most operating systems, including Windows.
-ffmpeg:
-ffmpeg: Homepage: http://ffmpeg.mplayerhq.hu
-ffmpeg:
-ffmpeg:
-ffmpeg:
diff --git a/multimedia/ffmpeg4/README b/multimedia/ffmpeg4/README
deleted file mode 100644
index 76b26f3a96..0000000000
--- a/multimedia/ffmpeg4/README
+++ /dev/null
@@ -1,86 +0,0 @@
-ffmpeg4 (Software to record, convert and stream audio and video).
-
-ffmpeg4 should be installable alongside ffmpeg 3.x without conflict.
-
-FFmpeg is a complete solution to record, convert and stream audio
-and video. It includes libavcodec, the leading audio/video codec
-library.
-
-By default it will not build the ffmpeg binaries or man-pages, in order
-not to conflict with an ffmpeg 3.x package. You can change this by
-using the following environment variable setting:
-
- BINS=yes
-
-It can optionally link to a number of extra libraries that are available
-on SBo by setting the relevant env vars, which all default to "no":
-
- CHROMAPRINT=yes # requires chromaprint
- CUDA=yes # requires cudatoolkit & nv-codec-headers
- DECKLINK=yes # requires decklink-sdk
- FREI0R=yes # requires frei0r
- LADSPA=yes # requires ladspa_sdk
- LIBBLURAY=yes # requires libbluray
- LIBBS2B=yes # requires libbs2b
- LIBCELT=yes # requires celt
- LIBDC1394=yes # requires libdc1394
- LIBFDK_AAC=yes # requires libfdk-aac (non-redistributable)
- LIBFLITE=yes # requires flite
- LIBGME=yes # requires libgme
- LIBGSM=yes # requires gsm
- LIBIEC61883=yes # requires libiec61883 and libavc1394
- LIBILBC=yes # requires libilbc
- LIBMODPLUG=yes # requires libmodplug
- LIBMP3LAME=yes # requires lame
- LIBOPENCORE=yes # requires opencore-amr
- LIBOPENCV=yes # requires opencv
- LIBOPUS=yes # requires opus
- LIBRTMP=yes # requires rtmpdump
- LIBRUBBERBAND=yes # requires rubberband
- LIBSNAPPY=yes # requires snappy
- LIBSPEEX=yes # requires speex
- LIBTESSERACT=yes # requires tesseract
- LIBTWOLAME=yes # requires twolame
- LIBVIDSTAB=yes # requires vid.stab
- LIBXVID=yes # requires xvidcore
- LIBZMQ=yes # requires zeromq
- LIBZVBI=yes # requires zvbi
-
-By default, ffmpeg4 is built to link with openssl. This creates a non-
-redistributable binary (just like linking with libfdk-aac does). If you
-want a redistributable binary you can change from linking with openssl
-to linking with gnutls instead by setting:
-
- OPENSSL=no
- GNUTLS=yes
-
-Both of these libraries are available in Slackware itself.
-
-There are a few other libraries available in Slackware that are also
-linked to by default, and you can disable them by changing the default
-of "yes" to "no" with the following settings:
-
- LIBAOM=no
- LIBCACA=no
- LIBCDIO=no
- LIBFONTCONFIG=no
- LIBFREETYPE=no
- LIBFRIBIDI=no
- LIBOPENJPEG=no
- LIBPULSE=no
- LIBSMBCLIENT=no
- LIBSSH=no
- LIBTHEORA=no
- LIBV4L2=no
- LIBVORBIS=no
- LIBVPX=no
- LIBWAVPACK=no
- LIBWEBP=no
- LIBX264=no
- LIBX265=no
- OPENGL=no
-
-To link to this version of the ffmpeg libraries, you'll need to set
-the PKG_CONFIG_PATH to "/usr/lib${LIBDIRSUFFIX}/ffmpeg4/pkgconfig"
-where ${LIBDIRSUFFIX} is either 64 or an empty string, depending on
-your architecture.
diff --git a/multimedia/ffmpeg4/ffmpeg4.SlackBuild b/multimedia/ffmpeg4/ffmpeg4.SlackBuild
deleted file mode 100644
index 9799759324..0000000000
--- a/multimedia/ffmpeg4/ffmpeg4.SlackBuild
+++ /dev/null
@@ -1,238 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ffmpeg4
-
-# Copyright 2018 Andreas Guldstrand
-# All rights reserved.
-# Copyright (c) 2020 Christoph Willing Brisbane, Australia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=ffmpeg4
-SRCNAM=ffmpeg
-VERSION=${VERSION:-4.3.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-enable() {
- VAR="$1"; shift
- DEF="$1"; shift
- YES="$1"; shift
- NO="$1"; shift
- eval "$VAR=\${$VAR:-$DEF}"
- eval "enable_$VAR=\"$NO\""
- eval "[ \"\$$VAR\" = \"yes\" ] && enable_$VAR=\"$YES\""
-}
-
-# set "enable_$VAR" variables
- # ENV VAR DEFAULT IF YES IF NO
-enable "BINS" "no" "" "--disable-programs --disable-manpages"
-enable "CHROMAPRINT" "no" "--enable-chromaprint" ""
-enable "CUDA" "no" "--enable-nonfree --enable-cuda-sdk --enable-libnpp" ""
-enable "DECKLINK" "no" "--enable-decklink" ""
-enable "FREI0R" "no" "--enable-frei0r" ""
-enable "GNUTLS" "no" "--enable-gnutls" ""
-enable "LADSPA" "no" "--enable-ladspa" ""
-enable "LIBAOM" "yes" "--enable-libaom" ""
-enable "LIBBLURAY" "no" "--enable-libbluray" ""
-enable "LIBBS2B" "no" "--enable-libbs2b" ""
-enable "LIBCACA" "yes" "--enable-libcaca" ""
-enable "LIBCDIO" "yes" "--enable-libcdio" ""
-enable "LIBCELT" "no" "--enable-libcelt" ""
-enable "LIBDC1394" "no" "--enable-libdc1394" ""
-enable "LIBFDK_AAC" "no" "--enable-nonfree --enable-libfdk_aac" ""
-enable "LIBFLITE" "no" "--enable-libflite" ""
-enable "LIBFONTCONFIG" "yes" "--enable-libfontconfig" ""
-enable "LIBFREETYPE" "yes" "--enable-libfreetype" ""
-enable "LIBFRIBIDI" "yes" "--enable-libfribidi" ""
-enable "LIBGME" "no" "--enable-libgme" ""
-enable "LIBGSM" "no" "--enable-libgsm" ""
-enable "LIBIEC61883" "no" "--enable-libiec61883" ""
-enable "LIBILBC" "no" "--enable-libilbc" ""
-enable "LIBMODPLUG" "no" "--enable-libmodplug" ""
-enable "LIBMP3LAME" "no" "--enable-libmp3lame" ""
-enable "LIBOPENCORE" "no" "--enable-libopencore-amrnb --enable-libopencore-amrwb" ""
-enable "LIBOPENCV" "no" "--enable-libopencv" ""
-enable "LIBOPENJPEG" "yes" "--enable-libopenjpeg" ""
-enable "LIBOPUS" "no" "--enable-libopus" ""
-enable "LIBPULSE" "yes" "--enable-libpulse" ""
-enable "LIBRTMP" "no" "--enable-librtmp" ""
-enable "LIBRUBBERBAND" "no" "--enable-librubberband" ""
-enable "LIBSMBCLIENT" "yes" "--enable-libsmbclient" ""
-enable "LIBSNAPPY" "no" "--enable-libsnappy" ""
-enable "LIBSPEEX" "no" "--enable-libspeex" ""
-enable "LIBSSH" "yes" "--enable-libssh" ""
-enable "LIBTESSERACT" "no" "--enable-libtesseract" ""
-enable "LIBTHEORA" "yes" "--enable-libtheora" ""
-enable "LIBTWOLAME" "no" "--enable-libtwolame" ""
-enable "LIBV4L2" "yes" "--enable-libv4l2" ""
-enable "LIBVIDSTAB" "no" "--enable-libvidstab" ""
-enable "LIBVORBIS" "yes" "--enable-libvorbis" ""
-enable "LIBVPX" "yes" "--enable-libvpx" ""
-enable "LIBWAVPACK" "yes" "--enable-libwavpack" ""
-enable "LIBWEBP" "yes" "--enable-libwebp" ""
-enable "LIBX264" "yes" "--enable-libx264" ""
-enable "LIBX265" "yes" "--enable-libx265" ""
-enable "LIBXVID" "no" "--enable-libxvid" ""
-enable "LIBZMQ" "no" "--enable-libzmq" ""
-enable "LIBZVBI" "no" "--enable-libzvbi" ""
-enable "OPENAL" "no" "--enable-openal" ""
-enable "OPENGL" "yes" "--enable-opengl" ""
-enable "OPENSSL" "yes" "--enable-nonfree --enable-openssl" ""
-
-[ "$DECKLINK" = "yes" ] && SLKCFLAGS="$SLKCFLAGS -I/usr/include/decklink"
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX}/ffmpeg4 \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION/html \
- --incdir=/usr/include/ffmpeg4 \
- --datadir=/usr/share/ffmpeg4 \
- --enable-rpath \
- --disable-podpages \
- --disable-txtpages \
- --arch=$ARCH \
- --enable-gpl \
- --enable-version3 \
- --enable-shared \
- --disable-static \
- --disable-debug \
- --enable-libass \
- $enable_BINS \
- $enable_CHROMAPRINT \
- $enable_CUDA \
- $enable_DECKLINK \
- $enable_FREI0R \
- $enable_GNUTLS \
- $enable_LADSPA \
- $enable_LIBAOM \
- $enable_LIBBLURAY \
- $enable_LIBBS2B \
- $enable_LIBCACA \
- $enable_LIBCDIO \
- $enable_LIBCELT \
- $enable_LIBDC1394 \
- $enable_LIBFDK_AAC \
- $enable_LIBFLITE \
- $enable_LIBFONTCONFIG \
- $enable_LIBFREETYPE \
- $enable_LIBFRIBIDI \
- $enable_LIBGME \
- $enable_LIBGSM \
- $enable_LIBIEC61883 \
- $enable_LIBILBC \
- $enable_LIBMODPLUG \
- $enable_LIBMP3LAME \
- $enable_LIBOPENCORE \
- $enable_LIBOPENCV \
- $enable_LIBOPENJPEG \
- $enable_LIBOPUS \
- $enable_LIBPULSE \
- $enable_LIBRTMP \
- $enable_LIBRUBBERBAND \
- $enable_LIBSMBCLIENT \
- $enable_LIBSNAPPY \
- $enable_LIBSPEEX \
- $enable_LIBSSH \
- $enable_LIBTESSERACT \
- $enable_LIBTHEORA \
- $enable_LIBTWOLAME \
- $enable_LIBV4L2 \
- $enable_LIBVIDSTAB \
- $enable_LIBVORBIS \
- $enable_LIBVPX \
- $enable_LIBWAVPACK \
- $enable_LIBWEBP \
- $enable_LIBX264 \
- $enable_LIBX265 \
- $enable_LIBXVID \
- $enable_LIBZMQ \
- $enable_LIBZVBI \
- $enable_OPENAL \
- $enable_OPENGL \
- $enable_OPENSSL
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-if [ "$BINS" = "yes" ]; then
- find $PKG/usr/man -type f -exec gzip -9 {} \;
- for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- Changelog CONTRIBUTING.md COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 COPYING.LGPLv3 \
- CREDITS INSTALL.md LICENSE.md MAINTAINERS README.md RELEASE RELEASE_NOTES VERSION \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/ffmpeg4/ffmpeg4.info b/multimedia/ffmpeg4/ffmpeg4.info
deleted file mode 100644
index a02dc3440a..0000000000
--- a/multimedia/ffmpeg4/ffmpeg4.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ffmpeg4"
-VERSION="4.3.1"
-HOMEPAGE="https://ffmpeg.org/"
-DOWNLOAD="https://ffmpeg.org/releases/ffmpeg-4.3.1.tar.bz2"
-MD5SUM="804707549590e90880e8ecd4e5244fd8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="aom libass libwebp x264 x265"
-MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@linux.com"
diff --git a/multimedia/ffmpeg4/slack-desc b/multimedia/ffmpeg4/slack-desc
deleted file mode 100644
index 838032d34c..0000000000
--- a/multimedia/ffmpeg4/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-ffmpeg4: ffmpeg4 (Software to record, convert and stream audio and video)
-ffmpeg4:
-ffmpeg4: ffmpeg4 should be installable alongside ffmpeg 3.x without conflict.
-ffmpeg4:
-ffmpeg4: FFmpeg is a complete solution to record, convert and stream audio and
-ffmpeg4: video. It includes libavcodec, the leading audio/video codec library.
-ffmpeg4:
-ffmpeg4: Homepage: https://ffmpeg.org/
-ffmpeg4:
-ffmpeg4:
-ffmpeg4:
diff --git a/multimedia/gnash/gnash.SlackBuild b/multimedia/gnash/gnash.SlackBuild
index 99a4c07c84..af273fa898 100644
--- a/multimedia/gnash/gnash.SlackBuild
+++ b/multimedia/gnash/gnash.SlackBuild
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gnash
-VERSION=${VERSION:-0.8.10}
-BUILD=${BUILD:-7}
+VERSION=${VERSION:-20170308_8a11e60}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -78,33 +78,17 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
-chmod -R u+w,go-w,a+rX-st .
-
-# Fix compilation with GCC 4.7.
-patch -p1 < $CWD/patch/gcc47.patch
-
-# Fix a boost linking error, paths for kde plugin, and a cve patch.
-# Ripped from gentoo
-patch -p1 < $CWD/patch/gnash-0.8.10-boost-1.50.patch
-patch -p1 < $CWD/patch/gnash-0.8.10-klash.patch
-patch -p1 < $CWD/patch/gnash-0.8.10-kde4-libdir.patch
-patch -p1 < $CWD/patch/gnash-0.8.10-cve-2012-1175.patch
-
-# Fix building with giflib-5.0
-# Also ripped from gentoo :-)
-patch -p1 < $CWD/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch
-patch -p1 < $CWD/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch
-
-# Fix build with new Boost
-# Taken from ARCH
-patch -p1 < $CWD/patch/gnash-boost.patch
-
-# The FFmpeg engine doesn't compile with FFmpeg 0.11.1. Patches welcome.
-# In the meantime, set --enable-media=gst to avoid autodetecting FFmpeg.
-autoreconf -vif
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./autogen.sh
+
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -115,14 +99,14 @@ autoreconf -vif
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux \
--disable-dependency-tracking \
- --enable-media=gst \
--enable-python \
--enable-ssh \
--enable-ssl \
--enable-write \
--without-gconf \
--with-plugins-install=system \
- --with-speexdsp-incl=/usr/include/speex \
+ --with-speexdsp-incl=/usr/include \
+ --disable-npapi \
$KLASH_OPT \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/multimedia/gnash/gnash.info b/multimedia/gnash/gnash.info
index 012dd88c5f..a9525da636 100644
--- a/multimedia/gnash/gnash.info
+++ b/multimedia/gnash/gnash.info
@@ -1,10 +1,10 @@
PRGNAM="gnash"
-VERSION="0.8.10"
+VERSION="20170308_8a11e60"
HOMEPAGE="https://www.gnu.org/software/gnash/"
-DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2"
-MD5SUM="63e9f79c41d93d48c5a2fa94856548c4"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/gnash-20170308_8a11e60.tar.xz"
+MD5SUM="be7f2af072481869395d9f7f8c57cce1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="agg xulrunner"
+REQUIRES="agg"
MAINTAINER="Kyle Guinn"
EMAIL="elyk03@gmail.com"
diff --git a/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch b/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch
deleted file mode 100644
index b3242ce0d3..0000000000
--- a/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 58dcdd9338d965e54c8f03ce3d2757388d82b7a3 Mon Sep 17 00:00:00 2001
-From: gustavo <gbuschle@hotmail.com>
-Date: Thu, 11 Sep 2014 14:12:17 +0000
-Subject: Add support for giflib 5.1
-
----
-diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
-index 84b09ce..2ae5ddb 100644
---- a/libbase/GnashImageGif.cpp
-+++ b/libbase/GnashImageGif.cpp
-@@ -120,7 +120,11 @@ GifInput::GifInput(std::shared_ptr<IOChannel> in)
- GifInput::~GifInput()
- {
- // Clean up allocated data.
-- DGifCloseFile(_gif);
-+#if GIFLIB_MAJOR==5 && GIFLIB_MINOR==1
-+ DGifCloseFile(_gif, 0);
-+#else
-+ DGifCloseFile(_gif);
-+#endif
- }
-
- size_t
---
-cgit v0.9.0.2
diff --git a/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch b/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch
deleted file mode 100644
index 6e90737d51..0000000000
--- a/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cc22f2d0597f3a9547980f4786d918f8b5635472 Mon Sep 17 00:00:00 2001
-From: OBATA Akio <obata@lins.jp>
-Date: Mon, 15 Jul 2013 07:16:39 +0000
-Subject: Add support fir GIFLIB-5.0 (bug #39482)
-
-Signed-off-by: Sandro Santilli <strk@keybit.net>
----
-diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
-index eeba4b7..26865c1 100644
---- a/libbase/GnashImageGif.cpp
-+++ b/libbase/GnashImageGif.cpp
-@@ -269,7 +269,17 @@ GifInput::processRecord(GifRecordType record)
- void
- GifInput::read()
- {
-+#if GIFLIB_MAJOR >= 5
-+ int errorCode;
-+ _gif = DGifOpen(_inStream.get(), &readData, &errorCode);
-+#else
- _gif = DGifOpen(_inStream.get(), &readData);
-+#endif
-+
-+ if ( ! _gif ) {
-+ // TODO: decode errorCode if available
-+ throw ParserException("Could not open input GIF stream");
-+ }
-
- GifRecordType record;
-
---
-cgit v0.9.0.2
diff --git a/multimedia/gnash/patch/gcc47.patch b/multimedia/gnash/patch/gcc47.patch
deleted file mode 100644
index 7886b097c9..0000000000
--- a/multimedia/gnash/patch/gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/plugin/klash4/klash_part.cpp b/plugin/klash4/klash_part.cpp
---- a/plugin/klash4/klash_part.cpp
-+++ b/plugin/klash4/klash_part.cpp
-@@ -27,6 +27,7 @@
- #include <QByteArray>
- #include <QMenu>
- #include <QTimer>
-+#include <unistd.h>
-
- #include <klibloader.h>
- #include <kdebug.h>
diff --git a/multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch b/multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch
deleted file mode 100644
index 23282d1e89..0000000000
--- a/multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur a/macros/boost.m4 b/macros/boost.m4
---- a/macros/boost.m4 2012-09-03 17:11:43.000000000 +0200
-+++ b/macros/boost.m4 2012-10-16 01:58:28.000000000 +0200
-@@ -37,7 +37,7 @@
- boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp"
- dnl this is a list of *required* libraries. If any of these are missing, this
- dnl test will return a failure, and Gnash won't build.
-- boost_libs="thread program_options iostreams"
-+ boost_libs="thread program_options iostreams system"
-
- dnl this is a list of *recommended* libraries. If any of these are missing, this
- dnl test will return a warning, and Gnash will build, but testing won't work.
-diff -ur a/plugin/npapi/Makefile.am b/plugin/npapi/Makefile.am
---- a/plugin/npapi/Makefile.am 2012-09-03 17:11:43.000000000 +0200
-+++ b/plugin/npapi/Makefile.am 2012-10-16 01:58:57.000000000 +0200
-@@ -78,7 +78,7 @@
-
- libgnashplugin_la_LIBADD = \
- $(GLIB_LIBS) \
-- -lboost_iostreams \
-+ $(BOOST_LIBS) \
- $(NULL)
-
- # Scriptable plugin support
diff --git a/multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch b/multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch
deleted file mode 100644
index 9a218d9216..0000000000
--- a/multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From bb4dc77eecb6ed1b967e3ecbce3dac6c5e6f1527 Mon Sep 17 00:00:00 2001
-From: Benjamin Wolsey <bwy@benjaminwolsey.de>
-Date: Sat, 10 Mar 2012 14:52:50 +0000
-Subject: Fix crash in GnashImage.cpp
-
----
-diff --git a/libbase/GnashImage.cpp b/libbase/GnashImage.cpp
-index 11c6956..03a6939 100644
---- a/libbase/GnashImage.cpp
-+++ b/libbase/GnashImage.cpp
-@@ -26,6 +26,7 @@
- #include <boost/scoped_array.hpp>
- #include <boost/shared_ptr.hpp>
- #include <algorithm>
-+#include <cassert>
-
- #ifdef USE_PNG
- # include "GnashImagePng.h"
-@@ -44,6 +45,21 @@ namespace image {
-
- namespace {
- void processAlpha(GnashImage::iterator imageData, size_t pixels);
-+ bool checkValidSize(size_t width, size_t height, size_t channels) {
-+
-+ if (width == 0 || height == 0) return false;
-+
-+ assert(channels > 0);
-+
-+ boost::uint32_t maxSize = std::numeric_limits<boost::int32_t>::max();
-+ if (width >= maxSize || height >= maxSize) return false;
-+
-+ maxSize /= channels;
-+ maxSize /= width;
-+ maxSize /= height;
-+
-+ return maxSize > 0;
-+ }
- }
-
- GnashImage::GnashImage(iterator data, size_t width, size_t height,
-@@ -55,6 +71,8 @@ GnashImage::GnashImage(iterator data, size_t width, size_t height,
- _height(height),
- _data(data)
- {
-+ // Callers should check dimensions
-+ assert(checkValidSize(_width, _height, channels()));
- }
-
- /// Create an image allocating a buffer of height*pitch bytes
-@@ -66,8 +84,9 @@ GnashImage::GnashImage(size_t width, size_t height, ImageType type,
- _width(width),
- _height(height)
- {
-- const size_t max = std::numeric_limits<boost::int32_t>::max();
-- if (size() > max) {
-+ // Constructed from external input, so restrict dimensions to avoid
-+ // overflow in size calculations
-+ if (!checkValidSize(_width, _height, channels())) {
- throw std::bad_alloc();
- }
- _data.reset(new value_type[size()]);
---
-cgit v0.9.0.2
diff --git a/multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch b/multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch
deleted file mode 100644
index b3279441d2..0000000000
--- a/multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/macros/kde4.m4 b/macros/kde4.m4
---- a/macros/kde4.m4 2011-02-26 19:11:08.000000000 +0100
-+++ b/macros/kde4.m4 2011-11-25 18:09:25.000000000 +0100
-@@ -198,7 +198,7 @@
- if test -d ${KDE4_PREFIX}/lib64 -a -f /etc/redhat-release; then
- KDE4_PLUGINDIR="${KDE4_PREFIX}/lib64/kde4"
- else
-- KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
-+ KDE4_PLUGINDIR="${KDE4_PREFIX}/${acl_libdirstem}/kde4"
- fi
- fi
- if test x"${with_kde4_servicesdir}" != x ; then
diff --git a/multimedia/gnash/patch/gnash-0.8.10-klash.patch b/multimedia/gnash/patch/gnash-0.8.10-klash.patch
deleted file mode 100644
index e6afec04d2..0000000000
--- a/multimedia/gnash/patch/gnash-0.8.10-klash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/macros/kde4.m4 b/macros/kde4.m4
---- a/macros/kde4.m4 2011-02-26 19:11:08.000000000 +0100
-+++ b/macros/kde4.m4 2011-03-21 00:04:38.845997945 +0100
-@@ -210,7 +210,7 @@
- KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
- fi
- if test x"${KDE4_APPSDATADIR}" = x ; then
-- KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
-+ KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash"
- fi
-
- if test x"${ac_cv_path_kde4_incl}" != x ; then
diff --git a/multimedia/gnash/patch/gnash-boost.patch b/multimedia/gnash/patch/gnash-boost.patch
deleted file mode 100644
index 55208f1ae3..0000000000
--- a/multimedia/gnash/patch/gnash-boost.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnash-0.8.10/libbase/accumulator.h.orig 2016-02-08 02:56:17.059694787 +0700
-+++ gnash-0.8.10/libbase/accumulator.h 2016-02-08 02:57:58.375615249 +0700
-@@ -61,6 +61,11 @@
- virtual unsigned min_tokens() const { return 0; }
- virtual unsigned max_tokens() const { return 0; }
-
-+ #if BOOST_VERSION >= 105900
-+ /// There are no tokens, so this is indifferent.
-+ virtual bool adjacent_tokens_only() const { return false; }
-+ #endif
-+
- /// Accumulating from different sources is silly.
- virtual bool is_composing() const { return false; }
-
diff --git a/multimedia/gpac/gpac-ffmpeg-4.0.patch b/multimedia/gpac/gpac-ffmpeg-4.0.patch
new file mode 100644
index 0000000000..05132e19e8
--- /dev/null
+++ b/multimedia/gpac/gpac-ffmpeg-4.0.patch
@@ -0,0 +1,42 @@
+diff -rupN gpac-0.7.1.orig/applications/dashcast/video_encoder.c gpac-0.7.1/applications/dashcast/video_encoder.c
+--- gpac-0.7.1.orig/applications/dashcast/video_encoder.c 2018-04-26 09:19:52.938118328 +0200
++++ gpac-0.7.1/applications/dashcast/video_encoder.c 2018-04-26 09:20:03.165170164 +0200
+@@ -144,7 +144,7 @@ int dc_video_encoder_open(VideoOutputFil
+ }
+
+ //the global header gives access to the extradata (SPS/PPS)
+- video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ video_output_file->vstream_idx = 0;//video_stream->index;
+
+diff -rupN gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
+--- gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c 2018-04-26 09:19:53.034788555 +0200
++++ gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c 2018-04-26 09:30:09.739463486 +0200
+@@ -49,7 +49,7 @@
+ static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) {
+ uint8_t * buffer;
+ /* Size of buffer must be larger, see avcodec_decode_video2 documentation */
+- u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + size);
++ u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + size);
+ if (oldBuffer)
+ gf_free(oldBuffer);
+ buffer = (uint8_t*)gf_malloc( allocatedSz );
+@@ -577,7 +577,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
+ capability->cap.valueInt = 1;
+ return GF_OK;
+ case GF_CODEC_PADDING_BYTES:
+- capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
++ capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
+ return GF_OK;
+ case GF_CODEC_REORDER:
+ capability->cap.valueInt = 1;
+@@ -669,7 +669,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
+ break;
+
+ case GF_CODEC_PADDING_BYTES:
+- capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
++ capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
+ break;
+ default:
+ capability->cap.valueInt = 0;
diff --git a/multimedia/gpac/gpac.SlackBuild b/multimedia/gpac/gpac.SlackBuild
index 396ceae938..c7cd430d33 100644
--- a/multimedia/gpac/gpac.SlackBuild
+++ b/multimedia/gpac/gpac.SlackBuild
@@ -88,6 +88,12 @@ find -L . \
# configure doesn't have --libdir option.
sed -i "s/^libdir=\".*\"$/libdir=\"lib$LIBDIRSUFFIX\"/" configure
+# remove this to let it build against openssl-1.1.x
+sed -i "/SSLeay_add_all_algorithms/d" src/utils/downloader.c
+
+# patch for ffmpeg-4.x
+patch -p1 < $CWD/gpac-ffmpeg-4.0.patch
+
./configure \
--prefix=/usr \
--mandir=/usr/man \
diff --git a/multimedia/gst-libav/README b/multimedia/gst-libav/README
deleted file mode 100644
index eca4522c85..0000000000
--- a/multimedia/gst-libav/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This module contains a GStreamer plugin for libav, as well as an
-internal copy of the libav source code.
diff --git a/multimedia/gst-libav/gst-libav.SlackBuild b/multimedia/gst-libav/gst-libav.SlackBuild
deleted file mode 100644
index ed629a2f96..0000000000
--- a/multimedia/gst-libav/gst-libav.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for gst-libav
-
-# Copyright (C) 2010 Juan Valencia <jvalenciae@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=gst-libav
-VERSION=${VERSION:-1.6.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
-cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/gst-libav/gst-libav.info b/multimedia/gst-libav/gst-libav.info
deleted file mode 100644
index ab38270126..0000000000
--- a/multimedia/gst-libav/gst-libav.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="gst-libav"
-VERSION="1.6.2"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.6.2.tar.xz"
-MD5SUM="09644a38827d233f53edeac815dd0ec0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
diff --git a/multimedia/gst-libav/slack-desc b/multimedia/gst-libav/slack-desc
deleted file mode 100644
index 352ee23dbd..0000000000
--- a/multimedia/gst-libav/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-gst-libav: gst-libav (A GStreamer libav/ffmpeg plugin)
-gst-libav:
-gst-libav: This module contains a GStreamer plugin for libav as well as an
-gst-libav: internal copy of the libav source code.
-gst-libav:
-gst-libav: http://gstreamer.freedesktop.org/
-gst-libav:
-gst-libav:
-gst-libav:
-gst-libav:
-gst-libav:
diff --git a/multimedia/gst-plugins-bad/README b/multimedia/gst-plugins-bad/README
index d71085b6fc..451f8b2f79 100644
--- a/multimedia/gst-plugins-bad/README
+++ b/multimedia/gst-plugins-bad/README
@@ -3,8 +3,14 @@ to the rest. They might be close to being good quality, but they're missing
something - be it a good code review, some documentation, a set of tests,
a real live maintainer, or some actual wide use.
-This optionally depends on OpenAL, TiMidity++, amrnb, amrwb, celt, faac,
-faad2, flite, fluidsynth, gsm, libass, libcdaudio, libdc1394, libdca,
-libkate, liblrdf, libmimic, libmodplug, libmusicbrainz, libofa,
-libquicktime, libwebp, lv2, musepack-tools, opencv, rtmpdump,
-schroedinger, soundtouch, swfdec, and xvidcore.
+This optionally depends on TiMidity++, amrnb, amrwb, celt, faac, faad2
+flite, gsm, libass, libcdaudio, libdc1394, libdca, libfdk-aac, libkate,
+liblrdf, libmimic, libmodplug, libmusicbrainz, libofa, libquicktime,
+lv2, musepack-tools, opencv, rtmpdump, schroedinger, soundtouch, swfdec
+nvidia*driver, and xvidcore.
+
+Note that if you have any version of the nvidia drivers installed the
+script will autodetect them and will try to build its nvdec support,
+requiring the presence on the system of cudatoolkit too: as cudatoolkit
+is *huge*, cuda support is disabled by default but it can be explicitly
+enabled passing the script the variable CUDA=yes
diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild
index c9cfb68a14..49fddddc53 100644
--- a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild
+++ b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for gst-plugins-bad
-# Copyright 2013-2015 Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2013-2020 Robby Workman, Tuscaloosa, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gst-plugins-bad
-VERSION=${VERSION:-1.6.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.18.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -54,6 +54,12 @@ else
LIBDIRSUFFIX=""
fi
+if [ "${CUDA:-no}" != "no" ]; then
+ cuda=""
+else
+ cuda="--disable-cuda --disable-nvdec --disable-nvenc"
+fi
+
set -e
rm -rf $PKG
@@ -69,26 +75,29 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -std=c++11" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir build
+cd build
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ meson .. \
+ --buildtype=release \
+ --infodir=/usr/info \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ -Dexamples=disabled
+ ninja
+ DESTDIR=$PKG ninja install
+cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS COPYING* ChangeLog INSTALL NEWS RE* \
+ AUTHORS COPYING* ChangeLog NEWS RE* \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.info b/multimedia/gst-plugins-bad/gst-plugins-bad.info
index 553c0edef7..65e04c93c8 100644
--- a/multimedia/gst-plugins-bad/gst-plugins-bad.info
+++ b/multimedia/gst-plugins-bad/gst-plugins-bad.info
@@ -1,8 +1,8 @@
PRGNAM="gst-plugins-bad"
-VERSION="1.6.2"
+VERSION="1.18.0"
HOMEPAGE="https://gstreamer.freedesktop.org/"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.2.tar.xz"
-MD5SUM="7c73bec1d389f0e184ebbbbb9e9f883d"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.0.tar.xz"
+MD5SUM="c1b5f2fb2d76ace6a3d04df73a8c72ea"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
index a4e113d47c..b85641af13 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for gst-plugins-ugly
-# Copyright 2013-2015 Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2013-2020 Robby Workman, Tuscaloosa, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gst-plugins-ugly
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.18.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,26 +69,29 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir build
+cd build
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ meson .. \
+ --buildtype=release \
+ --infodir=/usr/info \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ -Dexamples=disabled
+ ninja
+ DESTDIR=$PKG ninja install
+cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS COPYING* ChangeLog INSTALL NEWS RE* \
+ AUTHORS COPYING* ChangeLog NEWS RE* \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
index 1fc6a4908f..5d002d1d93 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
@@ -1,8 +1,8 @@
PRGNAM="gst-plugins-ugly"
-VERSION="1.6.2"
+VERSION="1.18.0"
HOMEPAGE="https://gstreamer.freedesktop.org/"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.2.tar.xz"
-MD5SUM="0f0e30336e3155443cd5bfec5c215d56"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.0.tar.xz"
+MD5SUM="01d3a24152cfd5eb27b1787d44b524c6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild b/multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild
index bf58d16c6d..eb15077724 100644
--- a/multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild
+++ b/multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild
@@ -71,6 +71,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/orc-0.4.30.patch
+
# Fix for gcc-4.7.x
sed -i -e 's/"g"/"rm"/' gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c
diff --git a/multimedia/gst0-ffmpeg/orc-0.4.30.patch b/multimedia/gst0-ffmpeg/orc-0.4.30.patch
new file mode 100644
index 0000000000..8ad9796c07
--- /dev/null
+++ b/multimedia/gst0-ffmpeg/orc-0.4.30.patch
@@ -0,0 +1,26 @@
+https://anonhg.netbsd.org/pkgsrc/rev/b7ba46cae228
+
+diff -Naur gst-ffmpeg-0.10.13.orig/ext/libpostproc/gstpostproc.c gst-ffmpeg-0.10.13/ext/libpostproc/gstpostproc.c
+--- gst-ffmpeg-0.10.13.orig/ext/libpostproc/gstpostproc.c 2011-07-12 16:35:27.000000000 +0200
++++ gst-ffmpeg-0.10.13/ext/libpostproc/gstpostproc.c 2019-11-17 20:04:03.283000000 +0100
+@@ -299,7 +299,7 @@
+ ppflags = (mmx_flags & ORC_TARGET_MMX_MMX ? PP_CPU_CAPS_MMX : 0)
+ | (mmx_flags & ORC_TARGET_MMX_MMXEXT ? PP_CPU_CAPS_MMX2 : 0)
+ | (mmx_flags & ORC_TARGET_MMX_3DNOW ? PP_CPU_CAPS_3DNOW : 0)
+- | (altivec_flags & ORC_TARGET_ALTIVEC_ALTIVEC ? PP_CPU_CAPS_ALTIVEC :
++ | (altivec_flags & ORC_TARGET_POWERPC_ALTIVEC ? PP_CPU_CAPS_ALTIVEC :
+ 0);
+ #else
+ mmx_flags = 0;
+diff -Naur gst-ffmpeg-0.10.13.orig/ext/libswscale/gstffmpegscale.c gst-ffmpeg-0.10.13/ext/libswscale/gstffmpegscale.c
+--- gst-ffmpeg-0.10.13.orig/ext/libswscale/gstffmpegscale.c 2011-11-02 14:04:05.000000000 +0100
++++ gst-ffmpeg-0.10.13/ext/libswscale/gstffmpegscale.c 2019-11-17 20:05:18.947000000 +0100
+@@ -638,7 +638,7 @@
+ swsflags = (mmx_flags & ORC_TARGET_MMX_MMX ? SWS_CPU_CAPS_MMX : 0)
+ | (mmx_flags & ORC_TARGET_MMX_MMXEXT ? SWS_CPU_CAPS_MMX2 : 0)
+ | (mmx_flags & ORC_TARGET_MMX_3DNOW ? SWS_CPU_CAPS_3DNOW : 0)
+- | (altivec_flags & ORC_TARGET_ALTIVEC_ALTIVEC ? SWS_CPU_CAPS_ALTIVEC : 0);
++ | (altivec_flags & ORC_TARGET_POWERPC_ALTIVEC ? SWS_CPU_CAPS_ALTIVEC : 0);
+ #else
+ mmx_flags = 0;
+ altivec_flags = 0;
diff --git a/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild b/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild
index c06474d672..1083e93c41 100644
--- a/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild
+++ b/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild
@@ -79,6 +79,8 @@ patch -p1 < $CWD/libmodplug-include.patch
# Fix build against libvpx 1.4.0.
patch -p1 < $CWD/drop-vpx-compat-defines.patch
+CPPFLAGS="-I/usr/include/openssl-1.0" \
+LIBS="-L/usr/lib$LIBDIRSUFFIX/openssl-1.0" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/multimedia/kdenlive/kdenlive.SlackBuild b/multimedia/kdenlive/kdenlive.SlackBuild
index 9304f04db7..7327a58c3e 100644
--- a/multimedia/kdenlive/kdenlive.SlackBuild
+++ b/multimedia/kdenlive/kdenlive.SlackBuild
@@ -101,6 +101,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Needed for gcc >= 6.x
+sed -i "s|\ abs(| fabs(|" src/scopes/audioscopes/spectrogram.cpp
+
mkdir build
cd build
cmake \
diff --git a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
index 173fe0b26d..6514247007 100644
--- a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
+++ b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=mkvtoolnix
-VERSION=${VERSION:-34.0.0}
+VERSION=${VERSION:-46.0.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/multimedia/mkvtoolnix/mkvtoolnix.info b/multimedia/mkvtoolnix/mkvtoolnix.info
index 7dfe9e7827..33fd3ef0c8 100644
--- a/multimedia/mkvtoolnix/mkvtoolnix.info
+++ b/multimedia/mkvtoolnix/mkvtoolnix.info
@@ -1,8 +1,8 @@
PRGNAM="mkvtoolnix"
-VERSION="34.0.0"
+VERSION="46.0.0"
HOMEPAGE="https://mkvtoolnix.download/"
-DOWNLOAD="https://mkvtoolnix.download/sources/mkvtoolnix-34.0.0.tar.xz"
-MD5SUM="f8cdbcd2d9f87c21309eacf5f6ff7642"
+DOWNLOAD="https://mkvtoolnix.download/sources/mkvtoolnix-46.0.0.tar.xz"
+MD5SUM="915a321d6901673002a884054d597ba6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="cmark"
diff --git a/multimedia/mlt/mlt.SlackBuild b/multimedia/mlt/mlt.SlackBuild
index f2f9273682..28b265ab9b 100644
--- a/multimedia/mlt/mlt.SlackBuild
+++ b/multimedia/mlt/mlt.SlackBuild
@@ -74,14 +74,14 @@ OUTPUT=${OUTPUT:-/tmp}
# Autodetect which SWIG Languages bindings to build
# according to what's installed on the system:
-if [ -f "$(which javac)" ]; then java="java"; else java=""; fi
+java="" # if [ -f "$(which javac)" ]; then java="java"; else java=""; fi
if [ -f "$(which lua)" ]; then lua="lua"; else lua=""; fi
if [ -f "$(which perl)" ]; then perl="perl"; else perl=""; fi
-if [ -f "$(which php)" ]; then php="php"; else php=""; fi
+php="" # if [ -f "$(which php)" ]; then php="php"; else php=""; fi
if [ -f "$(which python)" ]; then python="python"; else python=""; fi
if [ -h "$(which tclsh)" ]; then tcl="tcl"; else tcl=""; fi
if [ -f "$(which csharp)" ]; then csharp="csharp"; else csharp=""; fi
-if [ -f "$(which ruby)" ]; then ruby="ruby"; else ruby=""; fi
+ruby="" # if [ -f "$(which ruby)" ]; then ruby="ruby"; else ruby=""; fi
# Use qt5 if present, otherwise system default
if pkg-config --exists Qt5 ; then
diff --git a/multimedia/mythtv/libvpxenc.patch b/multimedia/mythtv/libvpxenc.patch
deleted file mode 100644
index e8c21288cb..0000000000
--- a/multimedia/mythtv/libvpxenc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001
-From: James Zern <jzern@google.com>
-Date: Mon, 19 Oct 2015 22:44:11 -0700
-Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings
-
-VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
-from libvpx and the remaining values were never used here
-
-Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
-Signed-off-by: James Zern <jzern@google.com>
----
- libavcodec/libvpxenc.c | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
-index 5f39783..992122c 100644
---- a/libavcodec/libvpxenc.c
-+++ b/libavcodec/libvpxenc.c
-@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext {
-
- /** String mappings for enum vp8e_enc_control_id */
- static const char *const ctlidstr[] = {
-- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
-- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
-- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
-- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
-- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
-- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
- [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
- [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
- [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
-- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
- [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
- [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
-- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
- [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
- [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
- [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",
---
-1.7.10.4
-
-
diff --git a/multimedia/mythtv/mythtv.SlackBuild b/multimedia/mythtv/mythtv.SlackBuild
index 35b9780127..34b8f8dce5 100644
--- a/multimedia/mythtv/mythtv.SlackBuild
+++ b/multimedia/mythtv/mythtv.SlackBuild
@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=mythtv
-VERSION=${VERSION:-0.27.6}
+VERSION=${VERSION:-29.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -65,7 +65,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -80,9 +80,6 @@ sed -i \
-e"s|--without-documentation|--without-documentation --libdir=/usr/lib$LIBDIRSUFFIX|" \
configure
-# Thanks to ARCH Linux
-patch -d external/FFmpeg -p1 < $CWD/libvpxenc.patch
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -103,7 +100,6 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-nonfree \
--enable-opengl-video \
--enable-libmp3lame \
- --enable-libfaac \
--enable-libx264 \
--enable-libvpx \
--enable-libxvid \
diff --git a/multimedia/mythtv/mythtv.info b/multimedia/mythtv/mythtv.info
index d364c7f70b..8e3236dbfe 100644
--- a/multimedia/mythtv/mythtv.info
+++ b/multimedia/mythtv/mythtv.info
@@ -1,10 +1,10 @@
PRGNAM="mythtv"
-VERSION="0.27.6"
+VERSION="29.0"
HOMEPAGE="https://www.mythtv.org/"
-DOWNLOAD="https://github.com/MythTV/mythtv/archive/v0.27.6.tar.gz"
-MD5SUM="30dce5263a03687a14ff34331ea537ad"
+DOWNLOAD="https://github.com/MythTV/mythtv/archive/v29.0/mythtv-29.0.tar.gz"
+MD5SUM="b76210627050e1adaabf8d7180f3402b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="libass faac lame MySQL-python lxml urlgrabber perl-http-message libwww-perl perl-Net-UPnP perl-IO-Socket-INET6 x264 xvidcore"
+REQUIRES="libass faac lame MySQL-python lxml urlgrabber perl-http-message libwww-perl perl-Net-UPnP perl-IO-Socket-INET6 qt5 x264 xvidcore"
MAINTAINER="David Somero"
EMAIL="dsomero@hotmail.com"
diff --git a/multimedia/oggvideotools/oggvideotools.SlackBuild b/multimedia/oggvideotools/oggvideotools.SlackBuild
index d284d00cae..7f06b2c20f 100644
--- a/multimedia/oggvideotools/oggvideotools.SlackBuild
+++ b/multimedia/oggvideotools/oggvideotools.SlackBuild
@@ -83,7 +83,7 @@ cd build
CXXFLAGS="$SLKCFLAGS" \
cmake .. \
-DCMAKE_INSTALL_PREFIX:STRING="/usr" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=narrowing" \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE"
make
diff --git a/multimedia/rtmpdump/rtmpdump.SlackBuild b/multimedia/rtmpdump/rtmpdump.SlackBuild
index 7728e656d5..bb3e9064f2 100644
--- a/multimedia/rtmpdump/rtmpdump.SlackBuild
+++ b/multimedia/rtmpdump/rtmpdump.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for rtmpdump
-# Copyright 2013-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -74,6 +74,12 @@ find -L . \
# patch makefiles for shared library install
patch -p1 < $CWD/librtmp-makefile.patch
+# use gnutls instead of openssl
+sed -i \
+ -e 's/^CRYPTO=OPENSSL/#CRYPTO=OPENSSL/' \
+ -e 's/#CRYPTO=GNUTLS/CRYPTO=GNUTLS/' \
+ Makefile librtmp/Makefile
+
XCFLAGS="$SLKCFLAGS" \
make \
prefix=/usr \
diff --git a/multimedia/smpeg/smpeg.SlackBuild b/multimedia/smpeg/smpeg.SlackBuild
index 19a3a4f6c6..b2560d4b2b 100644
--- a/multimedia/smpeg/smpeg.SlackBuild
+++ b/multimedia/smpeg/smpeg.SlackBuild
@@ -69,9 +69,11 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i "s|^gtv_LDADD.*|gtv_LDADD = @GTK_LIBS@ libsmpeg.la -lX11|" Makefile.am
+
./autogen.sh
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=narrowing" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/multimedia/subtitleeditor/subtitleeditor.SlackBuild b/multimedia/subtitleeditor/subtitleeditor.SlackBuild
index 4d941c98c8..1d4ab89f2a 100644
--- a/multimedia/subtitleeditor/subtitleeditor.SlackBuild
+++ b/multimedia/subtitleeditor/subtitleeditor.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for subtitleeditor
# Copyright (C) 2010 Georgy Shepelev <geo.shepelev@gmail.com>
+# Copyright (C) 2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=subtitleeditor
-VERSION=${VERSION:-0.52.1}
+VERSION=${VERSION:-20191130_4c215f4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,13 +70,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# https://gna.org/bugs/?23714
-patch -p0 < $CWD/fix-23714-cxx11-v2.patch
-
-autoreconf -fi
-
CFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
diff --git a/multimedia/subtitleeditor/subtitleeditor.info b/multimedia/subtitleeditor/subtitleeditor.info
index b553c7d07f..fc9e2d5068 100644
--- a/multimedia/subtitleeditor/subtitleeditor.info
+++ b/multimedia/subtitleeditor/subtitleeditor.info
@@ -1,8 +1,8 @@
PRGNAM="subtitleeditor"
-VERSION="0.52.1"
-HOMEPAGE="https://launchpad.net/subtitleeditor"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/subtitleeditor-0.52.1.tar.gz"
-MD5SUM="d25a3f6966f4d6355485d3dfbcfb437a"
+VERSION="20191130_4c215f4"
+HOMEPAGE="http://kitone.github.io/subtitleeditor/"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/subtitleeditor-20191130_4c215f4.tar.xz"
+MD5SUM="3a29d641369031b32f93536f9e59fcd5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="gstreamermm libxml++"
diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch
new file mode 100644
index 0000000000..9ad765e1c3
--- /dev/null
+++ b/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch
@@ -0,0 +1,508 @@
+Index: transcode-1.1.7/encode/encode_lavc.c
+===================================================================
+--- transcode-1.1.7.orig/encode/encode_lavc.c
++++ transcode-1.1.7/encode/encode_lavc.c
+@@ -77,6 +77,13 @@ struct tclavcconfigdata_ {
+ int luma_elim_threshold;
+ int chroma_elim_threshold;
+ int quantizer_noise_shaping;
++ int inter_quant_bias;
++ int intra_quant_bias;
++ int scenechange_factor;
++ int rc_strategy;
++ float rc_initial_cplx;
++ float rc_qsquish;
++ float border_masking;
+
+ /* same as above for flags */
+ struct {
+@@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc
+ switch (vob->divxmultipass) {
+ case 1:
+ CAN_DO_MULTIPASS(multipass_flag);
+- pd->ff_vcontext.flags |= CODEC_FLAG_PASS1;
++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1;
+ pd->stats_file = fopen(vob->divxlogfile, "w");
+ if (pd->stats_file == NULL) {
+ tc_log_error(MOD_NAME, "could not create 2pass log file"
+@@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc
+ break;
+ case 2:
+ CAN_DO_MULTIPASS(multipass_flag);
+- pd->ff_vcontext.flags |= CODEC_FLAG_PASS2;
++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2;
+ pd->stats_file = fopen(vob->divxlogfile, "r");
+ if (pd->stats_file == NULL){
+ tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\""
+@@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc
+ break;
+ case 3:
+ /* fixed qscale :p */
+- pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE;
++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE;
+ pd->ff_venc_frame.quality = vob->divxbitrate;
+ break;
+ }
+@@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa
+ pd->confdata.rc_buffer_size = 0;
+ pd->confdata.lmin = 2;
+ pd->confdata.lmax = 31;
+- pd->confdata.me_method = ME_EPZS;
++ pd->confdata.me_method = 0;
+
+ memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags));
+ pd->confdata.turbo_setup = 0;
+@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa
+ pd->ff_vcontext.me_range = 0;
+ pd->ff_vcontext.mb_decision = 0;
+ pd->ff_vcontext.scenechange_threshold = 0;
+- pd->ff_vcontext.scenechange_factor = 1;
++ pd->confdata.scenechange_factor = 1;
+ pd->ff_vcontext.b_frame_strategy = 0;
+ pd->ff_vcontext.b_sensitivity = 40;
+ pd->ff_vcontext.brd_scale = 0;
+ pd->ff_vcontext.bidir_refine = 0;
+- pd->ff_vcontext.rc_strategy = 2;
++ pd->confdata.rc_strategy = 2;
+ pd->ff_vcontext.b_quant_factor = 1.25;
+ pd->ff_vcontext.i_quant_factor = 0.8;
+ pd->ff_vcontext.b_quant_offset = 1.25;
+@@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa
+ pd->ff_vcontext.qblur = 0.5;
+ pd->ff_vcontext.qcompress = 0.5;
+ pd->ff_vcontext.mpeg_quant = 0;
+- pd->ff_vcontext.rc_initial_cplx = 0.0;
+- pd->ff_vcontext.rc_qsquish = 1.0;
++ pd->confdata.rc_initial_cplx = 0.0;
++ pd->confdata.rc_qsquish = 1.0;
+ pd->confdata.luma_elim_threshold = 0;
+ pd->confdata.chroma_elim_threshold = 0;
+ pd->ff_vcontext.strict_std_compliance = 0;
+@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa
+ pd->ff_vcontext.temporal_cplx_masking = 0.0;
+ pd->ff_vcontext.spatial_cplx_masking = 0.0;
+ pd->ff_vcontext.p_masking = 0.0;
+- pd->ff_vcontext.border_masking = 0.0;
++ pd->confdata.border_masking = 0.0;
+ pd->ff_vcontext.me_pre_cmp = 0;
+ pd->ff_vcontext.me_cmp = 0;
+ pd->ff_vcontext.me_sub_cmp = 0;
+@@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa
+ pd->ff_vcontext.pre_me = 1;
+ pd->ff_vcontext.me_subpel_quality = 8;
+ pd->ff_vcontext.refs = 1;
+- pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
+- pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
+ pd->ff_vcontext.noise_reduction = 0;
+ pd->confdata.quantizer_noise_shaping = 0;
+ pd->ff_vcontext.flags = 0;
+@@ -1044,19 +1049,19 @@ static void tc_lavc_config_defaults(TCLa
+ */
+ static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd)
+ {
++ char buf[1024];
+ /* some translation... */
+ pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000;
+ pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000;
+ pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000;
+ pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024;
+- pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5);
+- pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5);
+- pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method;
++ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5));
++ av_dict_set(&(pd->ff_opts), "lmin", buf, 0);
++ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5));
++ av_dict_set(&(pd->ff_opts), "lmax", buf, 0);
+
+ pd->ff_vcontext.flags = 0;
+- SET_FLAG(pd, mv0);
+ SET_FLAG(pd, qpel);
+- SET_FLAG(pd, naq);
+ SET_FLAG(pd, ilme);
+ SET_FLAG(pd, ildct);
+ SET_FLAG(pd, aic);
+@@ -1077,8 +1082,8 @@ static void tc_lavc_dispatch_settings(TC
+ }
+ if (pd->interlacing.active) {
+ /* enforce interlacing */
+- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
+- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT;
++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME;
+ }
+ if (pd->confdata.flags.alt) {
+ av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
+@@ -1095,15 +1100,31 @@ static void tc_lavc_dispatch_settings(TC
+ if (pd->confdata.flags.cbp) {
+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
+ }
++ if (pd->confdata.flags.mv0) {
++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0);
++ }
++ if (pd->confdata.flags.naq) {
++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0);
++ }
+
+- char buf[1024];
+ #define set_dict_opt(val, opt) \
+ snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
+ av_dict_set(&(pd->ff_opts), opt, buf, 0)
++#define set_dict_float_opt(val, opt) \
++ snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\
++ av_dict_set(&(pd->ff_opts), opt, buf, 0)
+
+ set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
+ set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
+ set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
++ set_dict_opt(inter_quant_bias, "pbias");
++ set_dict_opt(intra_quant_bias, "ibias");
++ set_dict_opt(me_method, "me_method");
++ set_dict_opt(scenechange_factor, "sc_factor");
++ set_dict_opt(rc_strategy, "rc_strategy");
++ set_dict_float_opt(rc_initial_cplx, "rc_init_cplx");
++ set_dict_float_opt(rc_qsquish, "qsquish");
++ set_dict_float_opt(border_masking, "border_mask");
+ }
+
+ #undef SET_FLAG
+@@ -1159,12 +1180,12 @@ static int tc_lavc_read_config(TCLavcPri
+ { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+ { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+ { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
+- { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES },
++ { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX },
+ { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, },
+ { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 },
+ { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
+ { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 },
+- { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
++ { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
+ { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
+ { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 },
+ { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
+@@ -1175,7 +1196,7 @@ static int tc_lavc_read_config(TCLavcPri
+ { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
+ { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
+ { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 },
+- { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
++ { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
+ { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
+ { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
+ { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 },
+@@ -1185,9 +1206,9 @@ static int tc_lavc_read_config(TCLavcPri
+ { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ // { "vrc_eq", }, // not yet supported
+ { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 },
+- { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
++ { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
+ // { "vrc_init_occupancy", }, // not yet supported
+- { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
++ { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
+ { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+ { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+ { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+@@ -1199,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri
+ { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
+ { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
+ { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
+- { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
++ { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
+ { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 },
+ { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
+ { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
+@@ -1212,37 +1233,37 @@ static int tc_lavc_read_config(TCLavcPri
+ { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+ { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 },
+ { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 },
+- { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+- { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
++ { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
++ { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+ { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+ { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
+ { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
+ { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
+
+- { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
++ { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
+- { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
++ { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL },
+ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
+- { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
+- { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
+- { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
++ { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME },
++ { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT },
++ { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
+ #else
+- { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
++ { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED },
+ #endif
+ { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
+- { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
++ { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
+ #else
+ { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ #endif
+- { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY },
+- { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV },
+- { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP },
++ { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY },
++ { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV },
++ { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP },
+
+ // { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet supported
+ /* End of the config file */
+Index: transcode-1.1.7/export/export_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/export/export_ffmpeg.c
++++ transcode-1.1.7/export/export_ffmpeg.c
+@@ -831,14 +831,11 @@ MOD_init
+
+ lavc_venc_context->bit_rate = vob->divxbitrate * 1000;
+ lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
+- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
+- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
+ lavc_venc_context->max_qdiff = lavc_param_vqdiff;
+ lavc_venc_context->qcompress = lavc_param_vqcompress;
+ lavc_venc_context->qblur = lavc_param_vqblur;
+ lavc_venc_context->max_b_frames = lavc_param_vmax_b_frames;
+ lavc_venc_context->b_quant_factor = lavc_param_vb_qfactor;
+- lavc_venc_context->rc_strategy = lavc_param_vrc_strategy;
+ lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy;
+ lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset;
+
+@@ -846,8 +843,23 @@ MOD_init
+ #define set_dict_opt(val, opt) \
+ snprintf(buf, sizeof(buf), "%i", val); \
+ av_dict_set(&lavc_venc_opts, opt, buf, 0)
++#define set_dict_float_opt(val, opt) \
++ snprintf(buf, sizeof(buf), "%f", val); \
++ av_dict_set(&lavc_venc_opts, opt, buf, 0)
+ set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
+ set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
++ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin");
++ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax");
++ set_dict_opt(lavc_param_vrc_strategy, "rc_strategy");
++ set_dict_float_opt(lavc_param_rc_qsquish, "qsquish");
++ set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp");
++ set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq");
++ set_dict_opt(lavc_param_rc_eq, "rc_eq");
++ set_dict_opt(lavc_param_vme, "me_method");
++ set_dict_opt(lavc_param_ibias, "ibias");
++ set_dict_opt(lavc_param_pbias, "pbias");
++ set_dict_float_opt(lavc_param_rc_buffer_aggressivity, "rc_buf_aggressivity");
++ set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx");
+ lavc_venc_context->rtp_payload_size = lavc_param_packet_size;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ if (lavc_param_packet_size)
+@@ -856,15 +868,9 @@ MOD_init
+ lavc_venc_context->strict_std_compliance= lavc_param_strict;
+ lavc_venc_context->i_quant_factor = lavc_param_vi_qfactor;
+ lavc_venc_context->i_quant_offset = lavc_param_vi_qoffset;
+- lavc_venc_context->rc_qsquish = lavc_param_rc_qsquish;
+- lavc_venc_context->rc_qmod_amp = lavc_param_rc_qmod_amp;
+- lavc_venc_context->rc_qmod_freq = lavc_param_rc_qmod_freq;
+- lavc_venc_context->rc_eq = lavc_param_rc_eq;
+ lavc_venc_context->rc_max_rate = lavc_param_rc_max_rate * 1000;
+ lavc_venc_context->rc_min_rate = lavc_param_rc_min_rate * 1000;
+ lavc_venc_context->rc_buffer_size = lavc_param_rc_buffer_size * 1024;
+- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity;
+- lavc_venc_context->rc_initial_cplx = lavc_param_rc_initial_cplx;
+ lavc_venc_context->debug = lavc_param_debug;
+ lavc_venc_context->last_predictor_count= lavc_param_last_pred;
+ lavc_venc_context->pre_me = lavc_param_pre_me;
+@@ -872,8 +878,6 @@ MOD_init
+ lavc_venc_context->pre_dia_size = lavc_param_pre_dia_size;
+ lavc_venc_context->me_subpel_quality = lavc_param_me_subpel_quality;
+ lavc_venc_context->me_range = lavc_param_me_range;
+- lavc_venc_context->intra_quant_bias = lavc_param_ibias;
+- lavc_venc_context->inter_quant_bias = lavc_param_pbias;
+ lavc_venc_context->coder_type = lavc_param_coder;
+ lavc_venc_context->context_model = lavc_param_context;
+ lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
+@@ -1079,6 +1083,8 @@ MOD_init
+ lavc_venc_context->flags |= lavc_param_mv0;
+ if(lavc_param_qp_rd)
+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
++ if (lavc_param_normalize_aqp)
++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0);
+ lavc_venc_context->flags |= lavc_param_ilme;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ lavc_venc_context->flags |= lavc_param_trell;
+@@ -1087,9 +1093,7 @@ MOD_init
+ #endif
+
+ if (lavc_param_gray)
+- lavc_venc_context->flags |= CODEC_FLAG_GRAY;
+- if (lavc_param_normalize_aqp)
+- lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP;
++ lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY;
+
+ switch(vob->encode_fields) {
+ case TC_ENCODE_FIELDS_TOP_FIRST:
+@@ -1107,9 +1111,9 @@ MOD_init
+ }
+
+ lavc_venc_context->flags |= interlacing_active ?
+- CODEC_FLAG_INTERLACED_DCT : 0;
++ AV_CODEC_FLAG_INTERLACED_DCT : 0;
+ lavc_venc_context->flags |= interlacing_active ?
+- CODEC_FLAG_INTERLACED_ME : 0;
++ AV_CODEC_FLAG_INTERLACED_ME : 0;
+
+ lavc_venc_context->flags |= lavc_param_psnr;
+ do_psnr = lavc_param_psnr;
+@@ -1156,7 +1160,7 @@ MOD_init
+ "encoding.");
+ return TC_EXPORT_ERROR;
+ }
+- lavc_venc_context->flags |= CODEC_FLAG_PASS1;
++ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1;
+ stats_file = fopen(vob->divxlogfile, "w");
+ if (stats_file == NULL){
+ tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".",
+@@ -1170,7 +1174,7 @@ MOD_init
+ "encoding.");
+ return TC_EXPORT_ERROR;
+ }
+- lavc_venc_context->flags |= CODEC_FLAG_PASS2;
++ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2;
+ stats_file= fopen(vob->divxlogfile, "r");
+ if (stats_file==NULL){
+ tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for "
+@@ -1201,12 +1205,11 @@ MOD_init
+ break;
+ case 3:
+ /* fixed qscale :p */
+- lavc_venc_context->flags |= CODEC_FLAG_QSCALE;
++ lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE;
+ lavc_venc_frame->quality = vob->divxbitrate;
+ break;
+ }
+
+- lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+
+ /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
+ if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
+Index: transcode-1.1.7/export/ffmpeg_cfg.c
+===================================================================
+--- transcode-1.1.7.orig/export/ffmpeg_cfg.c
++++ transcode-1.1.7/export/ffmpeg_cfg.c
+@@ -93,8 +93,8 @@ int lavc_param_last_pred= 0;
+ int lavc_param_pre_me= 1;
+ int lavc_param_me_subpel_quality= 8;
+ int lavc_param_me_range=0;
+-int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS;
+-int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS;
++int lavc_param_ibias=0;
++int lavc_param_pbias=0;
+ int lavc_param_coder=0;
+ int lavc_param_context=0;
+ char *lavc_param_intra_matrix = NULL;
+@@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={
+ {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000},
+ {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9},
+- {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV},
++ {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV},
+ {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5},
+ // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+@@ -147,7 +147,7 @@ TCConfigEntry lavcopts_conf[]={
+ {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
+ {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
+ {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
+- {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES},
++ {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX},
+ // {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
+ {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
+ {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
+@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={
+ {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
+ {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
+ // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
+- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
++ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY},
+ {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
+ {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
+@@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={
+ {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 20},
+ {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0},
+ {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
+- {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR},
++ {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR},
+ {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+ {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+ {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+@@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={
+ {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+ {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
+ {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
+- {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL},
++ {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL},
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+- {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT},
++ {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRELLIS_QUANT},
+ #else
+ {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1},
+ #endif
+@@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={
+ {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8},
+ {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000},
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC},
++ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_H263P_AIC},
+ #else
+- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
++ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED},
+ #endif
+ {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
+@@ -215,20 +215,20 @@ TCConfigEntry lavcopts_conf[]={
+ {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+ {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
+- {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
++ {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
+ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
+- {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
++ {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME},
+ {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+ {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+ {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1},
+- {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC},
+- {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED},
+- {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP},
++ {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1},
++ {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRUNCATED},
++ {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP},
+ {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16},
+ {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
+ {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
+Index: transcode-1.1.7/import/import_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/import/import_ffmpeg.c
++++ transcode-1.1.7/import/import_ffmpeg.c
+@@ -361,7 +361,7 @@ do_avi:
+ lavc_dec_context->width = x_dim;
+ lavc_dec_context->height = y_dim;
+
+- if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY;
++ if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ lavc_dec_context->error_resilience = 2;
+ #else
diff --git a/multimedia/transcode/transcode-imagemagick7.patch b/multimedia/transcode/transcode-imagemagick7.patch
new file mode 100644
index 0000000000..b9f1476646
--- /dev/null
+++ b/multimedia/transcode/transcode-imagemagick7.patch
@@ -0,0 +1,794 @@
+http://git.pld-linux.org/?p=packages/transcode.git;a=blob_plain;f=imagemagick7.patch;h=8411f89b843764eff8f4aaddb314d7773d1bcec8;hb=HEAD
+
+--- transcode-1.1.7/configure.in
++++ transcode-1.1.7/configure.in
+@@ -1105,8 +1105,8 @@
+ dnl ImageMagick
+ dnl
+ IMAGEMAGICK_EXTRA_LIBS="$IMAGEMAGICK_EXTRA_LIBS $($PKG_CONFIG --libs ImageMagick)"
+-TC_PKG_CHECK(imagemagick, no, IMAGEMAGICK, no, [magick/api.h],
+- none, InitializeMagick, Wand, [http://www.imagemagick.org/])
++TC_PKG_CHECK(imagemagick, no, IMAGEMAGICK, no, [MagickWand/MagickWand.h],
++ none, InitializeMagick, MagickWand, [http://www.imagemagick.org/])
+ TC_PKG_HAVE(imagemagick, IMAGEMAGICK)
+ if test x"$have_imagemagick" = x"yes" ; then
+ SAVE_CPPFLAGS="$CPPFLAGS"
+@@ -1114,6 +1114,7 @@
+ AC_CHECK_HEADER([wand/magick-wand.h],
+ [AC_DEFINE([HAVE_BROKEN_WAND], [1], ["have old wand header"])])
+ CPPFLAGS="$SAVE_CPPFLAGS"
++ IMAGEMAGICK_CFLAGS="$IMAGEMAGICK_CFLAGS $($PKG_CONFIG --cflags ImageMagick)"
+ fi
+
+ dnl
+--- transcode-1.1.7/export/export_im.c
++++ transcode-1.1.7/export/export_im.c
+@@ -23,7 +23,7 @@
+
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+ * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -82,7 +82,7 @@
+
+ codec = (vob->im_v_codec == CODEC_YUV) ? CODEC_YUV : CODEC_RGB;
+
+- InitializeMagick("");
++ MagickCoreGenesis("", MagickFalse);
+
+ image_info=CloneImageInfo((ImageInfo *) NULL);
+
+@@ -169,8 +169,8 @@
+ MOD_encode
+ {
+
+- ExceptionInfo exception_info;
+- char *out_buffer = param->buffer;
++ ExceptionInfo *exception_info;
++ unsigned char *out_buffer = param->buffer;
+ Image *image=NULL;
+ int res;
+
+@@ -179,7 +179,7 @@
+
+ if(param->flag == TC_VIDEO) {
+
+- GetExceptionInfo(&exception_info);
++ exception_info = AcquireExceptionInfo();
+
+ res = tc_snprintf(buf2, PATH_MAX, "%s%06d.%s", prefix, counter++, type);
+ if (res < 0) {
+@@ -193,11 +193,11 @@
+ out_buffer = tmp_buffer;
+ }
+
+- image=ConstituteImage (width, height, "RGB", CharPixel, out_buffer, &exception_info);
++ image=ConstituteImage (width, height, "RGB", CharPixel, out_buffer, exception_info);
+
+ strlcpy(image->filename, buf2, MaxTextExtent);
+
+- WriteImage(image_info, image);
++ WriteImage(image_info, image, exception_info);
+ DestroyImage(image);
+
+ return(0);
+@@ -220,8 +220,7 @@
+
+ if(param->flag == TC_VIDEO) {
+ DestroyImageInfo(image_info);
+- ConstituteComponentTerminus();
+- DestroyMagick();
++ MagickCoreTerminus();
+
+ free(tmp_buffer);
+ tmp_buffer = NULL;
+--- transcode-1.1.7/filter/filter_compare.c
++++ transcode-1.1.7/filter/filter_compare.c
+@@ -24,7 +24,7 @@
+
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+ * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -111,9 +111,9 @@
+ Image *pattern, *resized, *orig = 0;
+ ImageInfo *image_info;
+
+- PixelPacket *pixel_packet;
++ Quantum *pixel_quantum;
+ pixelsMask *pixel_last;
+- ExceptionInfo exception_info;
++ ExceptionInfo *exception_info;
+
+ if(ptr->tag & TC_FILTER_GET_CONFIG) {
+ char buf[128];
+@@ -139,7 +139,7 @@
+ if(ptr->tag & TC_FILTER_INIT)
+ {
+
+- unsigned int t,r,index;
++ unsigned int t,r;
+ pixelsMask *temp;
+
+ compare[instance] = tc_malloc(sizeof(compareData));
+@@ -190,22 +190,22 @@
+ tc_log_perror(MOD_NAME, "could not open file for writing");
+ }
+
+- InitializeMagick("");
++ MagickCoreGenesis("", MagickFalse);
+ if (verbose > 1)
+ tc_log_info(MOD_NAME, "Magick Initialized successfully");
+
+- GetExceptionInfo(&exception_info);
++ exception_info = AcquireExceptionInfo();
+ image_info = CloneImageInfo ((ImageInfo *) NULL);
+ strlcpy(image_info->filename, pattern_name, MaxTextExtent);
+ if (verbose > 1)
+ tc_log_info(MOD_NAME, "Trying to open image");
+ orig = ReadImage(image_info,
+- &exception_info);
++ exception_info);
+
+ if (orig == (Image *) NULL) {
+- MagickWarning(exception_info.severity,
+- exception_info.reason,
+- exception_info.description);
++ MagickWarning(exception_info->severity,
++ exception_info->reason,
++ exception_info->description);
+ strlcpy(pattern_name, "/dev/null", sizeof(pattern_name));
+ }else{
+ if (verbose > 1)
+@@ -228,42 +228,41 @@
+ if (orig != NULL){
+ // Flip and resize
+ if (compare[instance]->vob->im_v_codec == CODEC_YUV)
+- TransformRGBImage(orig,YCbCrColorspace);
++ TransformImageColorspace(orig, YCbCrColorspace, exception_info);
+ if (verbose > 1) tc_log_info(MOD_NAME, "Resizing the Image");
+ resized = ResizeImage(orig,
+ compare[instance]->width,
+ compare[instance]->height,
+ GaussianFilter,
+- 1,
+- &exception_info);
++ exception_info);
+ if (verbose > 1)
+ tc_log_info(MOD_NAME, "Flipping the Image");
+- pattern = FlipImage(resized, &exception_info);
++ pattern = FlipImage(resized, exception_info);
+ if (pattern == (Image *) NULL) {
+- MagickError (exception_info.severity,
+- exception_info.reason,
+- exception_info.description);
++ MagickError (exception_info->severity,
++ exception_info->reason,
++ exception_info->description);
+ }
+
+ // Filling the matrix with the pixels values not
+ // alpha
+
+ if (verbose > 1) tc_log_info(MOD_NAME, "GetImagePixels");
+- pixel_packet = GetImagePixels(pattern,0,0,
++ pixel_quantum = GetAuthenticPixels(pattern,0,0,
+ pattern->columns,
+- pattern->rows);
++ pattern->rows,
++ exception_info);
+
+ if (verbose > 1) tc_log_info(MOD_NAME, "Filling the Image matrix");
+ for (t = 0; t < pattern->rows; t++)
+ for (r = 0; r < pattern->columns; r++){
+- index = t*pattern->columns + r;
+- if (pixel_packet[index].opacity == 0){
++ if (GetPixelAlpha(pattern, pixel_quantum) == QuantumRange) {
+ temp=tc_malloc(sizeof(struct pixelsMask));
+ temp->row=t;
+ temp->col=r;
+- temp->r = (uint8_t)ScaleQuantumToChar(pixel_packet[index].red);
+- temp->g = (uint8_t)ScaleQuantumToChar(pixel_packet[index].green);
+- temp->b = (uint8_t)ScaleQuantumToChar(pixel_packet[index].blue);
++ temp->r = (uint8_t)ScaleQuantumToChar(GetPixelRed(pattern, pixel_quantum));
++ temp->g = (uint8_t)ScaleQuantumToChar(GetPixelGreen(pattern, pixel_quantum));
++ temp->b = (uint8_t)ScaleQuantumToChar(GetPixelBlue(pattern, pixel_quantum));
+ temp->next=NULL;
+
+ if (pixel_last == NULL){
+@@ -274,6 +273,7 @@
+ pixel_last = temp;
+ }
+ }
++ pixel_quantum += GetPixelChannels(pattern);
+ }
+
+ if (verbose)
+@@ -297,7 +297,7 @@
+ fclose(compare[instance]->results);
+ free(compare[instance]);
+ }
+- DestroyMagick();
++ MagickCoreTerminus();
+ compare[instance]=NULL;
+
+ return(0);
+--- transcode-1.1.7/filter/filter_logoaway.c
++++ transcode-1.1.7/filter/filter_logoaway.c
+@@ -70,7 +70,7 @@
+
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+ * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -103,10 +103,10 @@
+
+ int alpha;
+
+- ExceptionInfo exception_info;
++ ExceptionInfo *exception_info;
+ Image *image;
+ ImageInfo *image_info;
+- PixelPacket *pixel_packet;
++ Quantum *pixel_packet;
+
+ int dump;
+ char *dump_buf;
+@@ -174,7 +174,7 @@
+ * instance filter instance
+ * @return void nothing
+ *********************************************************/
+-static void work_with_rgb_frame(logoaway_data *LD, char *buffer, int width, int height)
++static void work_with_rgb_frame(logoaway_data *LD, unsigned char *buffer, int width, int height)
+ {
+ int row, col, i;
+ int xdistance, ydistance, distance_west, distance_north;
+@@ -201,10 +201,10 @@
+ }
+ }
+
+- LD->dumpimage = ConstituteImage(LD->width-LD->xpos, LD->height-LD->ypos, "RGB", CharPixel, LD->dump_buf, &LD->exception_info);
++ LD->dumpimage = ConstituteImage(LD->width-LD->xpos, LD->height-LD->ypos, "RGB", CharPixel, LD->dump_buf, LD->exception_info);
+ tc_snprintf(LD->dumpimage->filename, MaxTextExtent, "dump[%d].png", LD->id);
+
+- WriteImage(LD->dumpimage_info, LD->dumpimage);
++ WriteImage(LD->dumpimage_info, LD->dumpimage, LD->exception_info);
+ }
+
+ switch(LD->mode) {
+@@ -218,27 +218,28 @@
+ for(row=LD->ypos; row<LD->height; ++row) {
+ for(col=LD->xpos; col<LD->width; ++col) {
+
++ Quantum *pixel = LD->pixel_packet + (row*LD->width+col)*GetPixelChannels(LD->image);
+ buf_off = ((height-row)*width+col) * 3;
+ pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
+ /* R */
+ if (!LD->alpha) {
+ buffer[buf_off +0] = LD->rcolor;
+ } else {
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel));
+ buffer[buf_off +0] = alpha_blending(buffer[buf_off +0], LD->rcolor, alpha_px);
+ }
+ /* G */
+ if (!LD->alpha) {
+ buffer[buf_off +1] = LD->gcolor;
+ } else {
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].green);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelGreen(LD->image, pixel));
+ buffer[buf_off +1] = alpha_blending(buffer[buf_off +1], LD->gcolor, alpha_px);
+ }
+ /* B */
+ if (!LD->alpha) {
+ buffer[buf_off +2] = LD->bcolor;
+ } else {
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].blue);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelBlue(LD->image, pixel));
+ buffer[buf_off +2] = alpha_blending(buffer[buf_off +2], LD->bcolor, alpha_px);
+ }
+ }
+@@ -268,6 +269,7 @@
+ buf_off = ((height-row)*width+col) * 3;
+
+ pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
++ Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image);
+
+ /* R */
+ hcalc = alpha_blending(buffer[buf_off_xpos +0], buffer[buf_off_width +0], alpha_hori);
+@@ -276,7 +278,7 @@
+ if (!LD->alpha) {
+ buffer[buf_off +0] = new_px;
+ } else {
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel));
+ buffer[buf_off +0] = alpha_blending(buffer[buf_off +0], new_px, alpha_px);
+ }
+ /* G */
+@@ -286,7 +288,7 @@
+ if (!LD->alpha) {
+ buffer[buf_off +1] = new_px;
+ } else {
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].green);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelGreen(LD->image, pixel));
+ buffer[buf_off +1] = alpha_blending(buffer[buf_off +1], new_px, alpha_px);
+ }
+ /* B */
+@@ -296,7 +298,7 @@
+ if (!LD->alpha) {
+ buffer[buf_off +2] = new_px;
+ } else {
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelBlue(LD->image, pixel));
+ buffer[buf_off +2] = alpha_blending(buffer[buf_off +2], new_px, alpha_px);
+ }
+ }
+@@ -327,28 +329,28 @@
+ buf_off_height = ((height-LD->height)*width+col) * 3;
+
+ i = 0;
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i)*GetPixelChannels(LD->image)));
+ while ((alpha_px != 255) && (col-i>LD->xpos))
+ i++;
+ buf_off_xpos = ((height-row)*width + col-i) * 3;
+ i = 0;
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i)*GetPixelChannels(LD->image)));
+ while ((alpha_px != 255) && (col+i<LD->width))
+ i++;
+ buf_off_width = ((height-row)*width + col+i) * 3;
+
+ i = 0;
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i*(LD->width-LD->xpos)].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+ while ((alpha_px != 255) && (row-i>LD->ypos))
+ i++;
+ buf_off_ypos = (height*width*3)-((row-i)*width - col) * 3;
+ i = 0;
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i*(LD->width-LD->xpos)].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+ while ((alpha_px != 255) && (row+i<LD->height))
+ i++;
+ buf_off_height = (height*width*3)-((row+i)*width - col) * 3;
+
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + pkt_off*GetPixelChannels(LD->image)));
+ /* R */
+ hcalc = alpha_blending(buffer[buf_off_xpos +0], buffer[buf_off_width +0], alpha_hori);
+ vcalc = alpha_blending(buffer[buf_off_ypos +0], buffer[buf_off_height +0], alpha_vert);
+@@ -405,7 +407,7 @@
+ * instance filter instance
+ * @return void nothing
+ *********************************************************/
+-static void work_with_yuv_frame(logoaway_data *LD, char *buffer, int width, int height)
++static void work_with_yuv_frame(logoaway_data *LD, unsigned char *buffer, int width, int height)
+ {
+ int row, col, i;
+ int craddr, cbaddr;
+@@ -431,10 +433,11 @@
+
+ buf_off = row*width+col;
+ pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
++ Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image);
+ if (!LD->alpha) {
+ buffer[buf_off] = LD->ycolor;
+ } else {
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel));
+ buffer[buf_off] = alpha_blending(buffer[buf_off], LD->ycolor, alpha_px);
+ }
+ }
+@@ -446,8 +449,9 @@
+
+ buf_off = row*width/2+col;
+ pkt_off = (row*2-LD->ypos) * (LD->width-LD->xpos) + (col*2-LD->xpos);
++ Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image);
+ /* sic */
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel));
+ if (!LD->alpha) {
+ buffer[craddr + buf_off] = LD->ucolor;
+ buffer[cbaddr + buf_off] = LD->vcolor;
+@@ -483,10 +487,11 @@
+ buf_off_height = LD->height*width+col;
+
+ pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
++ Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image);
+
+ hcalc = alpha_blending(buffer[buf_off_xpos], buffer[buf_off_width], alpha_hori);
+ vcalc = alpha_blending(buffer[buf_off_ypos], buffer[buf_off_height], alpha_vert);
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel));
+ new_px = (hcalc*LD->xweight + vcalc*LD->yweight)/100;
+ if (!LD->alpha) {
+ buffer[buf_off] = new_px;
+@@ -517,7 +522,8 @@
+ buf_off_height = LD->height/2*width/2+col;
+
+ pkt_off = (row*2-LD->ypos) * (LD->width-LD->xpos) + (col*2-LD->xpos);
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++ Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel));
+ /* sic, reuse red alpha_px */
+
+ hcalc = alpha_blending(buffer[craddr + buf_off_xpos], buffer[craddr + buf_off_width], alpha_hori);
+@@ -560,30 +566,30 @@
+ pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
+
+ i = 0;
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i)*GetPixelChannels(LD->image)));
+ while ((alpha_px != 255) && (col-i>LD->xpos))
+ i++;
+ buf_off_xpos = (row*width + col-i);
+ i = 0;
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i)*GetPixelChannels(LD->image)));
+ while ((alpha_px != 255) && (col+i<LD->width))
+ i++;
+ buf_off_width = (row*width + col+i);
+
+ i = 0;
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i*(LD->width-LD->xpos)].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+ while ((alpha_px != 255) && (row-i>LD->ypos))
+ i++;
+ buf_off_ypos = ((row-i)*width + col);
+ i = 0;
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i*(LD->width-LD->xpos)].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+ while ((alpha_px != 255) && (row+i<LD->height))
+ i++;
+ buf_off_height = ((row+i)*width + col);
+
+ hcalc = alpha_blending( buffer[buf_off_xpos], buffer[buf_off_width], alpha_hori );
+ vcalc = alpha_blending( buffer[buf_off_ypos], buffer[buf_off_height], alpha_vert );
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + pkt_off*GetPixelChannels(LD->image)));
+ new_px = (hcalc*LD->xweight + vcalc*LD->yweight)/100;
+ buffer[buf_off] = alpha_blending(buffer[buf_off], new_px, alpha_px);
+ }
+@@ -603,23 +609,23 @@
+ alpha_hori = xdistance * distance_west;
+
+ i = 0;
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i)*GetPixelChannels(LD->image)));
+ while ((alpha_px != 255) && (col-i>LD->xpos))
+ i++;
+ buf_off_xpos = (row*width/2 + col-i);
+ i = 0;
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i)*GetPixelChannels(LD->image)));
+ while ((alpha_px != 255) && (col+i<LD->width))
+ i++;
+ buf_off_width = (row*width/2 + col+i);
+
+ i = 0;
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i*(LD->width-LD->xpos)].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+ while ((alpha_px != 255) && (row-i>LD->ypos))
+ i++;
+ buf_off_ypos = ((row-i)*width/2 + col);
+ i = 0;
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i*(LD->width-LD->xpos)].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+ while ((alpha_px != 255) && (row+i<LD->height))
+ i++;
+ buf_off_height = ((row+i)*width/2 + col);
+@@ -630,7 +636,7 @@
+
+ pkt_off = (row*2-LD->ypos) * (LD->width-LD->xpos) + (col*2-LD->xpos);
+
+- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + pkt_off*GetPixelChannels(LD->image)));
+ /* sic: reuse the red component */
+ hcalc = alpha_blending(buffer[craddr + buf_off_xpos], buffer[craddr + buf_off_width], alpha_hori);
+ vcalc = alpha_blending(buffer[craddr + buf_off_ypos], buffer[craddr + buf_off_height], alpha_vert);
+@@ -815,17 +821,17 @@
+ }
+
+ if((data[instance]->alpha) || (data[instance]->dump)) {
+- InitializeMagick("");
+- GetExceptionInfo(&data[instance]->exception_info);
++ MagickCoreGenesis("", MagickFalse);
++ data[instance]->exception_info = AcquireExceptionInfo();
+
+ if(data[instance]->alpha) {
+ data[instance]->image_info = CloneImageInfo((ImageInfo *) NULL);
+
+ strlcpy(data[instance]->image_info->filename, data[instance]->file, MaxTextExtent);
+- data[instance]->image = ReadImage(data[instance]->image_info, &data[instance]->exception_info);
++ data[instance]->image = ReadImage(data[instance]->image_info, data[instance]->exception_info);
+ if (data[instance]->image == (Image *) NULL) {
+ tc_log_error(MOD_NAME, "\n");
+- MagickWarning (data[instance]->exception_info.severity, data[instance]->exception_info.reason, data[instance]->exception_info.description);
++ MagickWarning (data[instance]->exception_info->severity, data[instance]->exception_info->reason, data[instance]->exception_info->description);
+ return TC_ERROR;
+ }
+
+@@ -835,7 +841,7 @@
+ return TC_ERROR;
+ }
+
+- data[instance]->pixel_packet = GetImagePixels(data[instance]->image, 0, 0, data[instance]->image->columns, data[instance]->image->rows);
++ data[instance]->pixel_packet = GetAuthenticPixels(data[instance]->image, 0, 0, data[instance]->image->columns, data[instance]->image->rows, data[instance]->exception_info);
+ }
+ if(data[instance]->dump) {
+ if((data[instance]->dump_buf = tc_malloc ((data[instance]->width-data[instance]->xpos)*(data[instance]->height-data[instance]->ypos)*3)) == NULL)
+@@ -865,10 +871,9 @@
+ if (data[instance]->dumpimage != (Image *)NULL) {
+ DestroyImage(data[instance]->dumpimage);
+ DestroyImageInfo(data[instance]->dumpimage_info);
+- ConstituteComponentTerminus();
+ }
+- DestroyExceptionInfo(&data[instance]->exception_info);
+- DestroyMagick();
++ DestroyExceptionInfo(data[instance]->exception_info);
++ MagickCoreTerminus();
+
+ if(data[instance]->dump_buf) free(data[instance]->dump_buf);
+ if(data[instance]) free(data[instance]);
+--- transcode-1.1.7/filter/filter_logo.c
++++ transcode-1.1.7/filter/filter_logo.c
+@@ -36,7 +36,7 @@
+
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+ * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -227,7 +227,8 @@
+ ImageFormat ifmt,
+ int do_rgbswap)
+ {
+- PixelPacket *pixel_packet;
++ ExceptionInfo *exception_info;
++ Quantum *pixel_packet;
+ uint8_t *dst_ptr = dst;
+
+ int row, col;
+@@ -246,16 +247,17 @@
+ }
+ g_off = 1;
+
+- pixel_packet = GetImagePixels(src, 0, 0, width, height);
++ exception_info = AcquireExceptionInfo();
++ pixel_packet = GetAuthenticPixels(src, 0, 0, width, height, exception_info);
+
+ for (row = 0; row < height; row++) {
+ for (col = 0; col < width; col++) {
+- *(dst_ptr + r_off) = (uint8_t)ScaleQuantumToChar(pixel_packet->red);
+- *(dst_ptr + g_off) = (uint8_t)ScaleQuantumToChar(pixel_packet->green);
+- *(dst_ptr + b_off) = (uint8_t)ScaleQuantumToChar(pixel_packet->blue);
++ *(dst_ptr + r_off) = (uint8_t)ScaleQuantumToChar(GetPixelRed(src, pixel_packet));
++ *(dst_ptr + g_off) = (uint8_t)ScaleQuantumToChar(GetPixelGreen(src, pixel_packet));
++ *(dst_ptr + b_off) = (uint8_t)ScaleQuantumToChar(GetPixelBlue(src, pixel_packet));
+
+ dst_ptr += 3;
+- pixel_packet++;
++ pixel_packet += GetPixelChannels(src);
+ }
+ }
+
+@@ -310,7 +312,7 @@
+ Image *timg;
+ Image *nimg;
+ ImageInfo *image_info;
+- ExceptionInfo exception_info;
++ ExceptionInfo *exception_info;
+
+ int rgb_off = 0;
+
+@@ -376,19 +378,19 @@
+ * semaphore.
+ */
+ magick_usecount++;
+- if (!IsMagickInstantiated()) {
+- InitializeMagick("");
++ if (!IsMagickCoreInstantiated()) {
++ MagickCoreGenesis("", MagickFalse);
+ }
+
+- GetExceptionInfo(&exception_info);
++ exception_info = AcquireExceptionInfo();
+ image_info = CloneImageInfo((ImageInfo *) NULL);
+ strlcpy(image_info->filename, mfd->file, MaxTextExtent);
+
+- mfd->image = ReadImage(image_info, &exception_info);
++ mfd->image = ReadImage(image_info, exception_info);
+ if (mfd->image == (Image *) NULL) {
+- MagickWarning(exception_info.severity,
+- exception_info.reason,
+- exception_info.description);
++ MagickWarning(exception_info->severity,
++ exception_info->reason,
++ exception_info->description);
+ strlcpy(mfd->file, "/dev/null", PATH_MAX);
+ return 0;
+ }
+@@ -413,11 +415,11 @@
+
+ while (mfd->images != (Image *)NULL) {
+ if (mfd->flip || flip) {
+- timg = FlipImage(mfd->images, &exception_info);
++ timg = FlipImage(mfd->images, exception_info);
+ if (timg == (Image *) NULL) {
+- MagickError(exception_info.severity,
+- exception_info.reason,
+- exception_info.description);
++ MagickError(exception_info->severity,
++ exception_info->reason,
++ exception_info->description);
+ return -1;
+ }
+ AppendImageToList(&nimg, timg);
+@@ -573,7 +575,7 @@
+ /* Set up image/video coefficient lookup tables */
+ if (img_coeff_lookup[0] < 0) {
+ int i;
+- float maxrgbval = (float)MaxRGB; // from ImageMagick
++ float maxrgbval = (float)QuantumRange; // from ImageMagick
+
+ for (i = 0; i <= MAX_UINT8_VAL; i++) {
+ float x = (float)ScaleCharToQuantum(i);
+@@ -615,8 +617,8 @@
+ }
+
+ magick_usecount--;
+- if (magick_usecount == 0 && IsMagickInstantiated()) {
+- DestroyMagick();
++ if (magick_usecount == 0 && IsMagickCoreInstantiated()) {
++ MagickCoreTerminus();
+ }
+
+ return 0;
+@@ -638,7 +640,8 @@
+ && (ptr->tag & TC_VIDEO)
+ && !(ptr->attributes & TC_FRAME_IS_SKIPPED)
+ ) {
+- PixelPacket *pixel_packet;
++ ExceptionInfo *exception_info;
++ Quantum *pixel_packet;
+ uint8_t *video_buf;
+
+ int do_fade = 0;
+@@ -647,6 +650,7 @@
+
+ /* Note: ImageMagick defines opacity = 0 as fully visible, and
+ * opacity = MaxRGB as fully transparent.
++ * alpha rather than opacity (0 transparent; QuantumRange opaque).
+ */
+ Quantum opacity;
+
+@@ -682,9 +686,11 @@
+ mfd->cur_delay = mfd->images->delay * vob->fps/100;
+ }
+
+- pixel_packet = GetImagePixels(mfd->images, 0, 0,
++ exception_info = AcquireExceptionInfo();
++ pixel_packet = GetAuthenticPixels(mfd->images, 0, 0,
+ mfd->images->columns,
+- mfd->images->rows);
++ mfd->images->rows,
++ exception_info);
+
+ if (vob->im_v_codec == CODEC_RGB) {
+ unsigned long r_off, g_off, b_off;
+@@ -702,30 +708,30 @@
+ video_buf = ptr->video_buf + 3 * ((row + mfd->posy) * vob->ex_v_width + mfd->posx);
+
+ for (col = 0; col < mfd->image->columns; col++) {
+- opacity = pixel_packet->opacity;
++ opacity = QuantumRange - GetPixelAlpha(mfd->images, pixel_packet);
+
+ if (do_fade)
+- opacity += (Quantum)((MaxRGB - opacity) * fade_coeff);
++ opacity += (Quantum)((QuantumRange - opacity) * fade_coeff);
+
+ if (opacity == 0) {
+- *(video_buf + r_off) = ScaleQuantumToChar(pixel_packet->red);
+- *(video_buf + g_off) = ScaleQuantumToChar(pixel_packet->green);
+- *(video_buf + b_off) = ScaleQuantumToChar(pixel_packet->blue);
+- } else if (opacity < MaxRGB) {
++ *(video_buf + r_off) = ScaleQuantumToChar(GetPixelRed(mfd->images, pixel_packet));
++ *(video_buf + g_off) = ScaleQuantumToChar(GetPixelGreen(mfd->images, pixel_packet));
++ *(video_buf + b_off) = ScaleQuantumToChar(GetPixelBlue(mfd->images, pixel_packet));
++ } else if (opacity < QuantumRange) {
+ unsigned char opacity_uchar = ScaleQuantumToChar(opacity);
+ img_coeff = img_coeff_lookup[opacity_uchar];
+ vid_coeff = vid_coeff_lookup[opacity_uchar];
+
+ *(video_buf + r_off) = (uint8_t)((*(video_buf + r_off)) * vid_coeff)
+- + (uint8_t)(ScaleQuantumToChar(pixel_packet->red) * img_coeff);
++ + (uint8_t)(ScaleQuantumToChar(GetPixelRed(mfd->images, pixel_packet)) * img_coeff);
+ *(video_buf + g_off) = (uint8_t)((*(video_buf + g_off)) * vid_coeff)
+- + (uint8_t)(ScaleQuantumToChar(pixel_packet->green) * img_coeff);
++ + (uint8_t)(ScaleQuantumToChar(GetPixelGreen(mfd->images, pixel_packet)) * img_coeff);
+ *(video_buf + b_off) = (uint8_t)((*(video_buf + b_off)) * vid_coeff)
+- + (uint8_t)(ScaleQuantumToChar(pixel_packet->blue) * img_coeff);
++ + (uint8_t)(ScaleQuantumToChar(GetPixelBlue(mfd->images, pixel_packet)) * img_coeff);
+ }
+
+ video_buf += 3;
+- pixel_packet++;
++ pixel_packet += GetPixelChannels(mfd->images);
+ }
+ }
+ } else { /* !RGB */
+@@ -745,10 +751,10 @@
+ vid_pixel_V = vid_pixel_U + vid_size/4;
+ for (col = 0; col < mfd->images->columns; col++) {
+ int do_UV_pixels = (mfd->grayout == 0 && !(row % 2) && !(col % 2)) ? 1 : 0;
+- opacity = pixel_packet->opacity;
++ opacity = QuantumRange - GetPixelAlpha(mfd->images, pixel_packet);
+
+ if (do_fade)
+- opacity += (Quantum)((MaxRGB - opacity) * fade_coeff);
++ opacity += (Quantum)((QuantumRange - opacity) * fade_coeff);
+
+ if (opacity == 0) {
+ *vid_pixel_Y = *img_pixel_Y;
+@@ -756,7 +762,7 @@
+ *vid_pixel_U = *img_pixel_U;
+ *vid_pixel_V = *img_pixel_V;
+ }
+- } else if (opacity < MaxRGB) {
++ } else if (opacity < QuantumRange) {
+ unsigned char opacity_uchar = ScaleQuantumToChar(opacity);
+ img_coeff = img_coeff_lookup[opacity_uchar];
+ vid_coeff = vid_coeff_lookup[opacity_uchar];
+--- transcode-1.1.7/import/import_im.c
++++ transcode-1.1.7/import/import_im.c
+@@ -34,9 +34,9 @@
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+ * we can undefine the PACKAGE_* symbols it splats into our namespace */
+ #ifdef HAVE_BROKEN_WAND
+-#include <wand/magick-wand.h>
++#include <MagickWand/MagickWand.h>
+ #else /* we have a SANE wand header */
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #endif /* HAVE_BROKEN_WAND */
+
+ #undef PACKAGE_BUGREPORT
+--- transcode-1.1.7/import/import_imlist.c
++++ transcode-1.1.7/import/import_imlist.c
+@@ -34,9 +34,9 @@
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+ * we can undefine the PACKAGE_* symbols it splats into our namespace */
+ #ifdef HAVE_BROKEN_WAND
+-#include <wand/magick-wand.h>
++#include <MagickWand/MagickWand.h>
+ #else /* we have a SANE wand header */
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #endif /* HAVE_BROKEN_WAND */
+
+ #undef PACKAGE_BUGREPORT
+--- transcode-1.1.7/import/probe_im.c
++++ transcode-1.1.7/import/probe_im.c
+@@ -40,9 +40,9 @@
+ # undef PACKAGE_VERSION
+
+ # ifdef HAVE_BROKEN_WAND
+-# include <wand/magick-wand.h>
++# include <MagickWand/MagickWand.h>
+ # else /* we have a SANE wand header */
+-# include <wand/MagickWand.h>
++# include <MagickWand/MagickWand.h>
+ # endif /* HAVE_BROKEN_WAND */
+
+ # undef PACKAGE_BUGREPORT
diff --git a/multimedia/transcode/transcode.SlackBuild b/multimedia/transcode/transcode.SlackBuild
index 1c07cbc57e..22d8cf101e 100644
--- a/multimedia/transcode/transcode.SlackBuild
+++ b/multimedia/transcode/transcode.SlackBuild
@@ -80,8 +80,13 @@ patch -p1 -i $CWD/transcode-1.1.7-preset-force.patch
patch -p1 -i $CWD/transcode-1.1.7-ffmpeg2.patch
patch -p1 -i $CWD/transcode-1.1.7-ffmpeg24.patch
patch -p1 -i $CWD/transcode-1.1.7-ffmpeg29.patch
+patch -p1 -i $CWD/transcode-1.1.7-ffmpeg4.patch
+# ...and with the newer imagemagick
+patch -p1 < $CWD/transcode-imagemagick7.patch
-CFLAGS="$SLKCFLAGS" \
+autoreconf -vif
+
+CFLAGS="$SLKCFLAGS -fcommon" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/multimedia/tvheadend/tvheadend.SlackBuild b/multimedia/tvheadend/tvheadend.SlackBuild
index 623f21723f..eafdedb449 100644
--- a/multimedia/tvheadend/tvheadend.SlackBuild
+++ b/multimedia/tvheadend/tvheadend.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=tvheadend
-VERSION=${VERSION:-3.4patch1}
+VERSION=${VERSION:-20170619_14bd7eb}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -69,7 +69,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/multimedia/tvheadend/tvheadend.info b/multimedia/tvheadend/tvheadend.info
index ad7caed7c3..43e370d966 100644
--- a/multimedia/tvheadend/tvheadend.info
+++ b/multimedia/tvheadend/tvheadend.info
@@ -1,8 +1,8 @@
PRGNAM="tvheadend"
-VERSION="3.4patch1"
+VERSION="20170619_14bd7eb"
HOMEPAGE="https://tvheadend.org"
-DOWNLOAD="https://github.com/tvheadend/tvheadend/archive/3.4patch1.tar.gz"
-MD5SUM="86d1be0ad6e02bd2aecd3d529a026797"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/tvheadend-20170619_14bd7eb.tar.xz"
+MD5SUM="29d6ad6e10ef3eb8a96f1e947bec3c1d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/multimedia/tvtime/tvtime.SlackBuild b/multimedia/tvtime/tvtime.SlackBuild
index ed2d612d24..c065c9ff79 100644
--- a/multimedia/tvtime/tvtime.SlackBuild
+++ b/multimedia/tvtime/tvtime.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=tvtime
-VERSION=${VERSION:-1.0.7}
+VERSION=${VERSION:-1.0.11}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,16 +40,15 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-# The INSTALL file recommends avoiding the use of the "-march" flag,
-# and -fPIC on x86_64 results in failure
-if [ "$ARCH" = "i486" ]; then
+# The INSTALL file recommends avoiding the use of the "-march" flag
+if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2"
+ SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
@@ -69,7 +68,7 @@ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -87,13 +86,11 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
# Let's not clobber the config file
mv $PKG/etc/tvtime/tvtime.xml $PKG/etc/tvtime/tvtime.xml.new
@@ -101,7 +98,7 @@ mv $PKG/etc/tvtime/tvtime.xml $PKG/etc/tvtime/tvtime.xml.new
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README docs/html \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/multimedia/tvtime/tvtime.info b/multimedia/tvtime/tvtime.info
index 366e36ce63..04126667b2 100644
--- a/multimedia/tvtime/tvtime.info
+++ b/multimedia/tvtime/tvtime.info
@@ -1,8 +1,8 @@
PRGNAM="tvtime"
-VERSION="1.0.7"
+VERSION="1.0.11"
HOMEPAGE="http://tvtime.sourceforge.net/"
-DOWNLOAD="http://linuxtv.org/downloads/tvtime/tvtime-1.0.7.tar.gz"
-MD5SUM="d3cea3053ce8ff0d555da82fad138b44"
+DOWNLOAD="http://linuxtv.org/downloads/tvtime/tvtime-1.0.11.tar.gz"
+MD5SUM="f4adba831376a8baad92dbda49056138"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/multimedia/vcdimager/vcdimager.SlackBuild b/multimedia/vcdimager/vcdimager.SlackBuild
index c56f5c2779..0a9d9f55f7 100644
--- a/multimedia/vcdimager/vcdimager.SlackBuild
+++ b/multimedia/vcdimager/vcdimager.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=vcdimager
-VERSION=${VERSION:-0.7.24}
+VERSION=${VERSION:-2.0.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -65,8 +65,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 400 -o -perm 440 \) -exec chmod 644 {} \; -o \
- \( -perm 777 -o -perm 775 -o -perm 511 -o -perm 711 -o -perm 555 \) -exec chmod 755 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/multimedia/vcdimager/vcdimager.info b/multimedia/vcdimager/vcdimager.info
index 05ec47da33..66be249cdb 100644
--- a/multimedia/vcdimager/vcdimager.info
+++ b/multimedia/vcdimager/vcdimager.info
@@ -1,8 +1,8 @@
PRGNAM="vcdimager"
-VERSION="0.7.24"
+VERSION="2.0.1"
HOMEPAGE="http://www.gnu.org/software/vcdimager/"
-DOWNLOAD="http://mirrors.kernel.org/gnu/vcdimager/vcdimager-0.7.24.tar.gz"
-MD5SUM="3af22978fd79c79d5fda6513b6811145"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/vcdimager/vcdimager-2.0.1.tar.gz"
+MD5SUM="3890d73da62d0607c87962c41cd33a29"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/multimedia/vlc/README b/multimedia/vlc/README
index 48a30411a4..6452b33095 100644
--- a/multimedia/vlc/README
+++ b/multimedia/vlc/README
@@ -34,9 +34,12 @@ security feature may be side stepped by building vlc with the RUNASROOT
environment variable set e.g.
RUNASROOT=yes sh vlc.SlackBuild
-Playing of AV1 encoded video is supported when either of SBo's
-multimedia/aom or libraries/dav1d packages is detected when vlc is built.
-One of these is expected to become required in a future release.
+Some versions of the automatically deteced optional libaom package are
+incompatible with this version of vlc (the build will fail with an
+incompatible libaom). Such an incompatible libaom may be ignored
+during building by setting the LIBAOM environmant variable to "no"
+e.g.
+ LIBAOM=no sh vlc.SlackBuild
Please advise the maintainer to suggest support for any further options.
@@ -44,7 +47,3 @@ Please advise the maintainer to suggest support for any further options.
*NOTES*
- the qt4 interface seems not to be working ATM so the qt5 one is
enabled by default: this means qt5 is a new mandatory dependency
-- you *need* to version-bump the libva and libva-intel-driver in
- Slackware to versions 1.7.3 for VAAPI support: as we suppose
- a standard install, "--enable-libva=no" is added between the
- configure options, instead
diff --git a/multimedia/vlc/qt-5.15.patch b/multimedia/vlc/qt-5.15.patch
new file mode 100644
index 0000000000..c61299a48d
--- /dev/null
+++ b/multimedia/vlc/qt-5.15.patch
@@ -0,0 +1,38 @@
+https://build.opensuse.org/package/view_file/openSUSE:Factory/vlc/fix-missing-includes-with-qt-5.15.patch
+
+Index: vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp
+===================================================================
+--- vlc-3.0.8.orig/modules/gui/qt/util/timetooltip.hpp
++++ vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp
+@@ -25,6 +25,7 @@
+ #include "qt.hpp"
+
+ #include <QWidget>
++#include <QPainterPath>
+
+ class TimeTooltip : public QWidget
+ {
+Index: vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp
+===================================================================
+--- vlc-3.0.8.orig/modules/gui/qt/components/playlist/views.cpp
++++ vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp
+@@ -27,6 +27,7 @@
+ #include "input_manager.hpp" /* THEMIM */
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRect>
+ #include <QStyleOptionViewItem>
+ #include <QFontMetrics>
+Index: vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp
+===================================================================
+--- vlc-3.0.8.orig/modules/gui/qt/dialogs/plugins.cpp
++++ vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp
+@@ -53,6 +53,7 @@
+ #include <QListView>
+ #include <QListWidget>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStyleOptionViewItem>
+ #include <QKeyEvent>
+ #include <QPushButton>
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index 3e47a3fc4c..e9abb3fcce 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -81,10 +81,13 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
+sed -i '/DEPRECATED/s:^://:' modules/text_renderer/freetype/text_layout.c
+
patch -p0 < $CWD/patch-dvdread-503.diff
patch -p0 < $CWD/patch-dvdnav-503.diff
patch -p0 < $CWD/patch-projectM-fontpath.diff
patch -p0 < $CWD/patch_vlc_cache_gen.diff
+patch -p1 < $CWD/qt-5.15.patch
opencv=""
if [ "${OPENCV:-yes}" != "yes" ]; then
@@ -105,6 +108,9 @@ fi
# Enable vlc to be run as root
runasroot=""; [ "${RUNASROOT:-no}" != "no" ] && runasroot="--enable-run-as-root"
+# Disable use of libaom
+libaom=""; [ "${LIBAOM:-yes}" = "no" ] && libaom="--disable-aom"
+
autoreconf -fiv
chown -R root:root .
@@ -127,10 +133,10 @@ LDFLAGS="$SLKLDFLAGS" \
--build=$ARCH-slackware-linux \
$qtversion \
$wayland \
- $opencv \
$runasroot \
+ $libaom \
+ --disable-opencv \
--enable-merge-ffmpeg \
- --enable-libva=no \
--with-kde-solid=no \
make
@@ -139,8 +145,7 @@ make DESTDIR=$PKG install
mkdir -p $PKG/usr/man/man1
gzip -9c doc/vlc.1 > $PKG/usr/man/man1/vlc.1.gz
-mkdir -p $PKG/$(cd /usr/share/vim/vim*/syntax ; pwd)
-cp extras/analyser/vlc.vim $PKG/$(cd /usr/share/vim/vim*/syntax ; pwd)/
+install -D -m0644 extras/analyser/vlc.vim $PKG/usr/share/vim/vimfiles/syntax/vlc.vim
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/MEGAsync/MEGAsync.SlackBuild b/network/MEGAsync/MEGAsync.SlackBuild
index d15a188abf..abc655a6c3 100644
--- a/network/MEGAsync/MEGAsync.SlackBuild
+++ b/network/MEGAsync/MEGAsync.SlackBuild
@@ -24,8 +24,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=MEGAsync
-VERSION=${VERSION:-3.7.1.0}
-SDK=${SDK:-ce7b5f0b390a02ffd1fbfbac741deb5294f7a5df}
+VERSION=${VERSION:-4.2.5.0}
+SDK=${SDK:-3.6.2b}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -73,6 +73,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/fix-double-declaration-of-tgkill.patch
+
cd src/MEGASync/mega
./autogen.sh
CFLAGS="$SLKCFLAGS" \
diff --git a/network/MEGAsync/MEGAsync.info b/network/MEGAsync/MEGAsync.info
index dca63a1e20..cc4f6713ca 100644
--- a/network/MEGAsync/MEGAsync.info
+++ b/network/MEGAsync/MEGAsync.info
@@ -1,10 +1,10 @@
PRGNAM="MEGAsync"
-VERSION="3.7.1.0"
+VERSION="4.2.5.0"
HOMEPAGE="https://github.com/meganz/MEGAsync/"
-DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v3.7.1.0_Linux/MEGAsync-3.7.1.0_Linux.tar.gz \
- https://github.com/meganz/sdk/archive/ce7b5f0/sdk-ce7b5f0b390a02ffd1fbfbac741deb5294f7a5df.tar.gz"
-MD5SUM="d44da5216693efc7f63ba85b477ea46c \
- e7716ddf00b1b3f0166cfb8f222d8550"
+DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.2.5.0_Linux/MEGAsync-4.2.5.0_Linux.tar.gz \
+ https://github.com/meganz/sdk/archive/v3.6.2b/sdk-3.6.2b.tar.gz"
+MD5SUM="19fc192b091d94e171e130443ad3bede \
+ 205a78d8e98bb67ebfc7c840388ace73"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libuv libsodium cryptopp FreeImage c-ares libmediainfo"
diff --git a/network/MEGAsync/fix-double-declaration-of-tgkill.patch b/network/MEGAsync/fix-double-declaration-of-tgkill.patch
new file mode 100644
index 0000000000..beeea5d1b4
--- /dev/null
+++ b/network/MEGAsync/fix-double-declaration-of-tgkill.patch
@@ -0,0 +1,26 @@
+diff --git a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc
+index 48f91682..1b7ed059 100644
+--- a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc
++++ b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc
+@@ -103,12 +103,6 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+
+-// A wrapper for the tgkill syscall: send a signal to a specific thread.
+-static int tgkill(pid_t tgid, pid_t tid, int sig) {
+- return syscall(__NR_tgkill, tgid, tid, sig);
+- return 0;
+-}
+-
+ namespace google_breakpad {
+
+ namespace {
+@@ -347,7 +341,7 @@ void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) {
+ // In order to retrigger it, we have to queue a new signal by calling
+ // kill() ourselves. The special case (si_pid == 0 && sig == SIGABRT) is
+ // due to the kernel sending a SIGABRT from a user request via SysRQ.
+- if (tgkill(getpid(), syscall(__NR_gettid), sig) < 0) {
++ if (sys_tgkill(getpid(), syscall(__NR_gettid), sig) < 0) {
+ // If we failed to kill ourselves (e.g. because a sandbox disallows us
+ // to do so), we instead resort to terminating our process. This will
+ // result in an incorrect exit code.
diff --git a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
index 4185c2c967..e1e2ea87b9 100644
--- a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
+++ b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
@@ -87,6 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
+ --without-libnm-glib \
--build=$ARCH-slackware-linux
make
diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild b/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
deleted file mode 100644
index 46b08ddac2..0000000000
--- a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for NetworkManager-openvpn
-
-# Copyright 2010-2017 Robby Workman, Tuscaloosa, Alabama, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=NetworkManager-openvpn
-VERSION=${VERSION:-1.2.10}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-# Bail out if user or group isn't valid on your system
-# For slackbuilds.org, assigned nm-openvpn uid/gid are 320/320
-# See http://slackbuilds.org/uid_gid.txt
-if ! getent group nm-openvpn 2>&1 > /dev/null; then
- echo " You must have a \"nm-openvpn\" group to run this script."
- echo " # groupadd -g 320 nm-openvpn"
- exit 1
-elif ! getent passwd nm-openvpn 2>&1 > /dev/null; then
- echo " You must have a \"nm-openvpn\" user to run this script."
- echo " # useradd -u 320 -g nm-openvpn -d /var/lib/openvpn/chroot -s /bin/false nm-openvpn"
- exit 1
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-# Create the chroot directory
-# From src/nm-openvpn-service-defines.h
-# /* User name and group to run nm-openvpn-service under */
-# #define NM_OPENVPN_USER "nm-openvpn"
-# #define NM_OPENVPN_GROUP "nm-openvpn"
-# #define NM_OPENVPN_CHROOT LOCALSTATEDIR "/lib/openvpn/chroot"
-mkdir -p $PKG/var/lib/openvpn/chroot
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS COPYING ChangeLog NEWS README \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.info b/network/NetworkManager-openvpn/NetworkManager-openvpn.info
deleted file mode 100644
index 85a02339c8..0000000000
--- a/network/NetworkManager-openvpn/NetworkManager-openvpn.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="NetworkManager-openvpn"
-VERSION="1.2.10"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-DOWNLOAD="https://download.gnome.org/sources/NetworkManager-openvpn/1.2/NetworkManager-openvpn-1.2.10.tar.xz"
-MD5SUM="f118226ed2bfbacfd64ac4d1e0bd0383"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
diff --git a/network/NetworkManager-openvpn/README b/network/NetworkManager-openvpn/README
deleted file mode 100644
index f93df9233b..0000000000
--- a/network/NetworkManager-openvpn/README
+++ /dev/null
@@ -1,5 +0,0 @@
-NetworkManager-openvpn (OpenVPN Support for NetworkManager)
-
-You will need an "nm-openvpn" user and group to use this. Suggested:
-# groupadd -g 320 nm-openvpn
-# useradd -u 320 -g nm-openvpn -d /var/lib/openvpn/chroot -s /bin/false nm-openvpn
diff --git a/network/NetworkManager-openvpn/slack-desc b/network/NetworkManager-openvpn/slack-desc
deleted file mode 100644
index 2393b7b408..0000000000
--- a/network/NetworkManager-openvpn/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-NetworkManager-openvpn: NetworkManager-openvpn (OpenVPN Support for NetworkManager)
-NetworkManager-openvpn:
-NetworkManager-openvpn: OpenVPN support for NetworkManager
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
diff --git a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild
index 325758ed3b..5f83125cfd 100644
--- a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild
+++ b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=NetworkManager-pptp
-VERSION=${VERSION:-1.2.8}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20200716_382a8a2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -72,6 +72,9 @@ find -L . \
# Find the version number for pppd, used to specify the plugin directory:
PPPD=$(echo /usr/lib${LIBDIRSUFFIX}/pppd/?.?.? | rev | cut -f 1 -d / | rev)
+intltoolize --automake --copy
+autoreconf -vif
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -82,7 +85,6 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/$PPPD \
- --without-gnome \
--build=$ARCH-slackware-linux
make
diff --git a/network/NetworkManager-pptp/NetworkManager-pptp.info b/network/NetworkManager-pptp/NetworkManager-pptp.info
index a02a65fe28..d2a6ef0e1b 100644
--- a/network/NetworkManager-pptp/NetworkManager-pptp.info
+++ b/network/NetworkManager-pptp/NetworkManager-pptp.info
@@ -1,8 +1,8 @@
PRGNAM="NetworkManager-pptp"
-VERSION="1.2.8"
+VERSION="20200716_382a8a2"
HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.8.tar.xz"
-MD5SUM="305e31d6aac41813d735f27891fce6d8"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/NetworkManager-pptp-20200716_382a8a2.tar.xz"
+MD5SUM="2991e9bdb94255c8215a02ebe590adc9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="pptp"
diff --git a/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild b/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild
index 139ccd3286..7f79571594 100644
--- a/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild
+++ b/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=NetworkManager-vpnc
-VERSION=${VERSION:-1.2.4}
+VERSION=${VERSION:-1.2.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -78,6 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
+ --without-libnm-glib \
--build=$ARCH-slackware-linux
make
diff --git a/network/NetworkManager-vpnc/NetworkManager-vpnc.info b/network/NetworkManager-vpnc/NetworkManager-vpnc.info
index 1aa961eebb..5f7354fdae 100644
--- a/network/NetworkManager-vpnc/NetworkManager-vpnc.info
+++ b/network/NetworkManager-vpnc/NetworkManager-vpnc.info
@@ -1,8 +1,8 @@
PRGNAM="NetworkManager-vpnc"
-VERSION="1.2.4"
+VERSION="1.2.6"
HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.4.tar.xz"
-MD5SUM="b482a231f25d3857fd320d7c0b25c785"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.6.tar.xz"
+MD5SUM="4e88a3bde38e3921c2adb9983fb9d09f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="vpnc"
diff --git a/network/aMule/aMule.SlackBuild b/network/aMule/aMule.SlackBuild
index c9a7b6a33b..95866506e3 100644
--- a/network/aMule/aMule.SlackBuild
+++ b/network/aMule/aMule.SlackBuild
@@ -5,7 +5,7 @@
# Maintained by Ozan Türkyılmaz ozan.turkyilmaz@gmial.com
PRGNAM=aMule
-VERSION=${VERSION:-r11003}
+VERSION=${VERSION:-r11055}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -55,62 +55,62 @@ fi
if [ "$CMD" = "yes" ]; then
AMULE_CMD="enable"
- else
+else
AMULE_CMD="disable"
fi
if [ "$WEBSERVER" = "yes" ]; then
AMULE_WEBSERVER="enable"
- else
+else
AMULE_WEBSERVER="disable"
fi
if [ "$ALC" = "yes" ]; then
AMULE_ALC="enable"
- else
+else
AMULE_ALC="disable"
fi
if [ "$ALCC" = "yes" ]; then
AMULE_ALCC="enable"
- else
+else
AMULE_ALCC="disable"
fi
if [ "$XAS" = "yes" ]; then
AMULE_XAS="enable"
- else
+else
AMULE_XAS="disable"
fi
if [ "$GEOIP" = "yes" ]; then
AMULE_GEOIP="enable"
- else
+else
AMULE_GEOIP="disable"
fi
if [ "$MMAP" = "yes" ]; then
AMULE_MMAP="enable"
- else
+else
AMULE_MMAP="disable"
fi
if [ "$OPTIMIZE" = "yes" ]; then
AMULE_OPTIMIZE="enable"
- else
+else
AMULE_OPTIMIZE="disable"
fi
if [ "$PLASMAMULE" = "yes" ]; then
AMULE_PLASMAMULE="enable"
- else
+else
AMULE_PLASMAMULE="disable"
fi
if [ "$GUI" = "yes" ]; then
- AMULE_GUI="enable"
- else
- AMULE_GUI="disable"
+ AMULE_GUI="enable"
+else
+ AMULE_GUI="disable"
fi
diff --git a/network/aMule/aMule.info b/network/aMule/aMule.info
index 4bdfb50f66..aa193247bf 100644
--- a/network/aMule/aMule.info
+++ b/network/aMule/aMule.info
@@ -1,8 +1,8 @@
PRGNAM="aMule"
-VERSION="r11003"
+VERSION="r11055"
HOMEPAGE="http://www.amule.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/aMule-r11003.tar.xz"
-MD5SUM="83e46e574fc5355da4b531c369211a0a"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/aMule-r11055.tar.xz"
+MD5SUM="4d4dbf14b0eb29786ad2bc17c1276aec"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="cryptopp wxPython"
diff --git a/network/bip/bip.SlackBuild b/network/bip/bip.SlackBuild
index 93d6aac4df..e4a191a06c 100644
--- a/network/bip/bip.SlackBuild
+++ b/network/bip/bip.SlackBuild
@@ -72,7 +72,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=duplicate-decl-specifier" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/network/bitcoin/bitcoin.SlackBuild b/network/bitcoin/bitcoin.SlackBuild
index d800b5c8c3..d594ceadc1 100644
--- a/network/bitcoin/bitcoin.SlackBuild
+++ b/network/bitcoin/bitcoin.SlackBuild
@@ -72,6 +72,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i '/^#include <QPainter>$/a #include <QPainterPath>' src/qt/trafficgraphwidget.cpp
+
# build bitcoin-core
[ -f autogen.sh ] && sh autogen.sh
CFLAGS="$SLKCFLAGS" \
diff --git a/network/bwm-ng/bwm-ng.SlackBuild b/network/bwm-ng/bwm-ng.SlackBuild
index e9eb39918c..80297935f6 100644
--- a/network/bwm-ng/bwm-ng.SlackBuild
+++ b/network/bwm-ng/bwm-ng.SlackBuild
@@ -70,6 +70,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Thanks opensuse
+patch -p0 < $CWD/fix_gcc7_inline.patch
+
CFLAGS="$SLKCFLAGS" \
./autogen.sh \
--prefix=/usr \
diff --git a/network/bwm-ng/fix_gcc7_inline.patch b/network/bwm-ng/fix_gcc7_inline.patch
new file mode 100644
index 0000000000..dec44a7d66
--- /dev/null
+++ b/network/bwm-ng/fix_gcc7_inline.patch
@@ -0,0 +1,40 @@
+--- src/bwm-ng.c.orig 2017-06-12 03:15:08.731964116 +0200
++++ src/bwm-ng.c 2017-06-12 03:15:21.492001798 +0200
+@@ -26,7 +26,7 @@
+
+ /* handle interrupt signal */
+ void sigint(int sig) FUNCATTR_NORETURN;
+-inline void init(void);
++static inline void init(void);
+
+ /* clear stuff and exit */
+ #ifdef __STDC__
+@@ -98,7 +98,7 @@
+ deinit(0, NULL);
+ }
+
+-inline void init(void) {
++static inline void init(void) {
+ if_count=0;
+ delay=500;
+ #if EXTENDED_STATS
+--- src/options.c.orig 2017-06-12 03:11:33.659353656 +0200
++++ src/options.c 2017-06-12 03:14:36.535870677 +0200
+@@ -34,7 +34,7 @@
+ #if EXTENDED_STATS
+ inline int str2output_type(char *optarg);
+ #endif
+-inline int str2out_method(char *optarg);
++static inline int str2out_method(char *optarg);
+ inline int str2in_method(char *optarg);
+
+ #ifdef CONFIG_FILE
+@@ -87,7 +87,7 @@
+ }
+ #endif
+
+-inline int str2out_method(char *optarg) {
++static inline int str2out_method(char *optarg) {
+ if (optarg) {
+ if (!strcasecmp(optarg,"plain")) return PLAIN_OUT;
+ #ifdef HAVE_CURSES
diff --git a/network/ccnet/ccnet.SlackBuild b/network/ccnet/ccnet.SlackBuild
index a357b3a0f4..c42b6cd7b9 100644
--- a/network/ccnet/ccnet.SlackBuild
+++ b/network/ccnet/ccnet.SlackBuild
@@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ccnet
-VERSION=${VERSION:-4.4.6}
+VERSION=${VERSION:-6.1.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -61,9 +61,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION-server
-tar xvf $CWD/$PRGNAM-$VERSION-server.tar.gz
-cd $PRGNAM-$VERSION-server
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -93,7 +93,7 @@ make
make install-strip DESTDIR=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYRIGHT HACKING LICENCE.txt README.markdown \
+cp -a HACKING LICENSE.txt README.markdown \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/ccnet/ccnet.info b/network/ccnet/ccnet.info
index a796b40262..524485246b 100644
--- a/network/ccnet/ccnet.info
+++ b/network/ccnet/ccnet.info
@@ -1,8 +1,8 @@
PRGNAM="ccnet"
-VERSION="4.4.6"
+VERSION="6.1.8"
HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/ccnet/archive/v4.4.6-server/ccnet-4.4.6-server.tar.gz"
-MD5SUM="bff067e61d0af043b761027fdd840314"
+DOWNLOAD="https://github.com/haiwen/ccnet/archive/v6.1.8/ccnet-6.1.8.tar.gz"
+MD5SUM="4bab2537f68070d5af226fc80b79c859"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libsearpc vala libzdb"
diff --git a/network/cherokee/cherokee.SlackBuild b/network/cherokee/cherokee.SlackBuild
index ee57d2b98a..cf4dc146fb 100644
--- a/network/cherokee/cherokee.SlackBuild
+++ b/network/cherokee/cherokee.SlackBuild
@@ -5,13 +5,13 @@
# Written by Pablo Hernan Saro (pablosaro@gmail.com)
PRGNAM=cherokee
-VERSION=${VERSION:-20131105_d91c9c1}
+VERSION=${VERSION:-20180709_9a75e65}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/network/cherokee/cherokee.info b/network/cherokee/cherokee.info
index a3526ecc64..87c519de3a 100644
--- a/network/cherokee/cherokee.info
+++ b/network/cherokee/cherokee.info
@@ -1,8 +1,8 @@
PRGNAM="cherokee"
-VERSION="20131105_d91c9c1"
+VERSION="20180709_9a75e65"
HOMEPAGE="http://www.cherokee-project.com"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/cherokee-20131105_d91c9c1.tar.xz"
-MD5SUM="845ed7bdb3b038d277607a47288aaec1"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/cherokee-20180709_9a75e65.tar.xz"
+MD5SUM="2f08188ca102fd6a7ad2ea3cc1c26f84"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/dobbscoin/dobbscoin.SlackBuild b/network/dobbscoin/dobbscoin.SlackBuild
index defc639fc5..a3d5048c13 100644
--- a/network/dobbscoin/dobbscoin.SlackBuild
+++ b/network/dobbscoin/dobbscoin.SlackBuild
@@ -31,7 +31,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -83,6 +83,9 @@ patch -p1 < $CWD/miniupnpc-1.9-api.patch
./autogen.sh
+export CC=clang
+export CXX=clang++
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/dovecot/README b/network/dovecot/README
deleted file mode 100644
index f81559ff43..0000000000
--- a/network/dovecot/README
+++ /dev/null
@@ -1,27 +0,0 @@
-dovecot (open source IMAP and POP3 server)
-
-Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like
-systems, written with security primarily in mind. Dovecot is an excellent
-choice for both small and large installations. It's fast, simple to set
-up, requires no special administration and it uses very little memory.
-
-This script builds dovecot with support for SSL. As such, you must
-have openssl installed - openssl-solibs is not enough in itself to meet
-this requirement.
-
-By default, MySQL database is selected, switch to PostgreSQL with:
-
- DATABASE=pgsql ./dovecot.SlackBuild
-
-See the documentation in /usr/doc/dovecot-*/ to get started.
-
-
-Groupnames and Usernames
-
-You must have both 'dovecot' and 'dovenull' users and groups to run this
-script, for example:
-
- groupadd -g 202 dovecot
- useradd -d /dev/null -s /bin/false -u 202 -g 202 dovecot
- groupadd -g 248 dovenull
- useradd -d /dev/null -s /bin/false -u 248 -g 248 dovenull
diff --git a/network/dovecot/doinst.sh b/network/dovecot/doinst.sh
deleted file mode 100644
index 03c21fc848..0000000000
--- a/network/dovecot/doinst.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- if [ -e $OLD ]; then
- cp -a $OLD ${NEW}.incoming
- cat $NEW > ${NEW}.incoming
- mv ${NEW}.incoming $NEW
- fi
- config $NEW
-}
-
-preserve_perms etc/rc.d/rc.dovecot.new
-
diff --git a/network/dovecot/dovecot.SlackBuild b/network/dovecot/dovecot.SlackBuild
deleted file mode 100644
index a69de55eb3..0000000000
--- a/network/dovecot/dovecot.SlackBuild
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2010 Alan Hicks, Lizella, GA
-# Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Mario Preksavec, Zagreb, Croatia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=dovecot
-VERSION=${VERSION:-2.3.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-# Build with MySQL database support by default
-case $DATABASE in
- pgsql) : ;;
- *) DATABASE=mysql ;;
-esac
-
-bailout() {
- echo " You must have both dovecot and dovenull users and groups:"
- echo " # groupadd -g 202 dovecot"
- echo " # useradd -d /dev/null -s /bin/false -u 202 -g 202 dovecot"
- echo " # groupadd -g 248 dovenull"
- echo " # useradd -d /dev/null -s /bin/false -u 248 -g 248 dovenull"
- exit 1
-}
-
-# Bail if user isn't valid on your system
-if ! getent group dovecot 1>/dev/null 2>/dev/null ; then
- bailout
-elif ! getent passwd dovecot 1>/dev/null 2>/dev/null ; then
- bailout
-fi
-
-set -e
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Add -ldl to LDFLAGS for sqlite
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="-ldl" \
-./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --localstatedir=/var \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --mandir=/usr/man \
- --with-notify=inotify \
- --without-pam \
- --with-ldap=plugin \
- --with-lucene \
- --with-$DATABASE \
- --with-sqlite \
- --with-libcap \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.dovecot > $PKG/etc/rc.d/rc.dovecot.new
-chmod 0755 $PKG/etc/rc.d/rc.dovecot.new
-
-gzip -9 $PKG/usr/man/man?/*.?
-
-cp -a \
- AUTHORS COPYING* ChangeLog NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/dovecot.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/dovecot.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/dovecot/dovecot.info b/network/dovecot/dovecot.info
deleted file mode 100644
index eb0eb93f65..0000000000
--- a/network/dovecot/dovecot.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dovecot"
-VERSION="2.3.4"
-HOMEPAGE="http://www.dovecot.org/"
-DOWNLOAD="http://www.dovecot.org/releases/2.3/dovecot-2.3.4.tar.gz"
-MD5SUM="00eebc835a8793e8a167a616a78f4753"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mario Preksavec"
-EMAIL="mario at slackware dot hr"
diff --git a/network/dovecot/rc.dovecot b/network/dovecot/rc.dovecot
deleted file mode 100644
index 8d68312ab7..0000000000
--- a/network/dovecot/rc.dovecot
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# Copyright 2006, Alan Hicks, Lizella, GA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-dovecot_start()
-{
- echo "Firing up dovecot."
- dovecot
-}
-
-dovecot_stop()
-{
- echo "Shutting down dovecot."
- killall dovecot
-}
-
-dovecot_restart()
-{
- dovecot_stop
- sleep 3 # Give it time to clean-up if it needs it.
- dovecot_start
-}
-
-case $1 in
-'start')
- dovecot_start
- ;;
-'stop')
- dovecot_stop
- ;;
-'restart')
- dovecot_restart
- ;;
-*)
- echo "usage $0 start|stop|restart"
-esac
-
diff --git a/network/dovecot/slack-desc b/network/dovecot/slack-desc
deleted file mode 100644
index 29a273bade..0000000000
--- a/network/dovecot/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-dovecot: dovecot (open source IMAP and POP3 server)
-dovecot:
-dovecot: Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like
-dovecot: systems, written with security primarily in mind. Although it's
-dovecot: written in C, it uses several coding techniques to avoid most of the
-dovecot: common pitfalls.
-dovecot: Dovecot can work with standard mbox and Maildir formats and it's
-dovecot: fully compatible with UW-IMAP and Courier IMAP servers'
-dovecot: implementation of them, as well as mail clients accessing the
-dovecot: mailboxes directly.
-dovecot:
diff --git a/network/dsniff/24_Fix-OpenSSL1.1.0-Build.patch b/network/dsniff/24_Fix-OpenSSL1.1.0-Build.patch
new file mode 100644
index 0000000000..db7739ee34
--- /dev/null
+++ b/network/dsniff/24_Fix-OpenSSL1.1.0-Build.patch
@@ -0,0 +1,202 @@
+Description: Fix build with OpenSSL 1.1.0
+Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+
+--- a/ssh.c
++++ b/ssh.c
+@@ -234,7 +234,10 @@
+ u_char *p, cipher, cookie[8], msg[1024];
+ u_int32_t num;
+ int i;
+-
++
++ const BIGNUM *servkey_e, *servkey_n;
++ const BIGNUM *hostkey_e, *hostkey_n;
++
+ /* Generate anti-spoofing cookie. */
+ RAND_bytes(cookie, sizeof(cookie));
+
+@@ -243,11 +246,13 @@
+ *p++ = SSH_SMSG_PUBLIC_KEY; /* type */
+ memcpy(p, cookie, 8); p += 8; /* cookie */
+ num = 768; PUTLONG(num, p); /* servkey bits */
+- put_bn(ssh->ctx->servkey->e, &p); /* servkey exponent */
+- put_bn(ssh->ctx->servkey->n, &p); /* servkey modulus */
++ RSA_get0_key(ssh->ctx->servkey, &servkey_n, &servkey_e, NULL);
++ put_bn(servkey_e, &p); /* servkey exponent */
++ put_bn(servkey_n, &p); /* servkey modulus */
+ num = 1024; PUTLONG(num, p); /* hostkey bits */
+- put_bn(ssh->ctx->hostkey->e, &p); /* hostkey exponent */
+- put_bn(ssh->ctx->hostkey->n, &p); /* hostkey modulus */
++ RSA_get0_key(ssh->ctx->hostkey, &hostkey_n, &hostkey_e, NULL);
++ put_bn(hostkey_e, &p); /* hostkey exponent */
++ put_bn(hostkey_n, &p); /* hostkey modulus */
+ num = 0; PUTLONG(num, p); /* protocol flags */
+ num = ssh->ctx->encmask; PUTLONG(num, p); /* ciphers */
+ num = ssh->ctx->authmask; PUTLONG(num, p); /* authmask */
+@@ -298,7 +303,7 @@
+ SKIP(p, i, 4);
+
+ /* Decrypt session key. */
+- if (BN_cmp(ssh->ctx->servkey->n, ssh->ctx->hostkey->n) > 0) {
++ if (BN_cmp(servkey_n, hostkey_n) > 0) {
+ rsa_private_decrypt(enckey, enckey, ssh->ctx->servkey);
+ rsa_private_decrypt(enckey, enckey, ssh->ctx->hostkey);
+ }
+@@ -318,8 +323,8 @@
+ BN_clear_free(enckey);
+
+ /* Derive real session key using session id. */
+- if ((p = ssh_session_id(cookie, ssh->ctx->hostkey->n,
+- ssh->ctx->servkey->n)) == NULL) {
++ if ((p = ssh_session_id(cookie, hostkey_n,
++ servkey_n)) == NULL) {
+ warn("ssh_session_id");
+ return (-1);
+ }
+@@ -328,10 +333,8 @@
+ }
+ /* Set cipher. */
+ if (cipher == SSH_CIPHER_3DES) {
+- ssh->estate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+- ssh->dstate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+- ssh->encrypt = des3_encrypt;
+- ssh->decrypt = des3_decrypt;
++ warnx("cipher 3des no longer supported");
++ return (-1);
+ }
+ else if (cipher == SSH_CIPHER_BLOWFISH) {
+ ssh->estate = blowfish_init(ssh->sesskey,sizeof(ssh->sesskey));
+@@ -357,7 +360,10 @@
+ u_char *p, cipher, cookie[8], msg[1024];
+ u_int32_t num;
+ int i;
+-
++
++ BIGNUM *servkey_n, *servkey_e;
++ BIGNUM *hostkey_n, *hostkey_e;
++
+ /* Get public key. */
+ if ((i = SSH_recv(ssh, pkt, sizeof(pkt))) <= 0) {
+ warn("SSH_recv");
+@@ -379,21 +385,23 @@
+
+ /* Get servkey. */
+ ssh->ctx->servkey = RSA_new();
+- ssh->ctx->servkey->n = BN_new();
+- ssh->ctx->servkey->e = BN_new();
++ servkey_n = BN_new();
++ servkey_e = BN_new();
++ RSA_set0_key(ssh->ctx->servkey, servkey_n, servkey_e, NULL);
+
+ SKIP(p, i, 4);
+- get_bn(ssh->ctx->servkey->e, &p, &i);
+- get_bn(ssh->ctx->servkey->n, &p, &i);
++ get_bn(servkey_e, &p, &i);
++ get_bn(servkey_n, &p, &i);
+
+ /* Get hostkey. */
+ ssh->ctx->hostkey = RSA_new();
+- ssh->ctx->hostkey->n = BN_new();
+- ssh->ctx->hostkey->e = BN_new();
++ hostkey_n = BN_new();
++ hostkey_e = BN_new();
++ RSA_set0_key(ssh->ctx->hostkey, hostkey_n, hostkey_e, NULL);
+
+ SKIP(p, i, 4);
+- get_bn(ssh->ctx->hostkey->e, &p, &i);
+- get_bn(ssh->ctx->hostkey->n, &p, &i);
++ get_bn(hostkey_e, &p, &i);
++ get_bn(hostkey_n, &p, &i);
+
+ /* Get cipher, auth masks. */
+ SKIP(p, i, 4);
+@@ -405,8 +413,8 @@
+ RAND_bytes(ssh->sesskey, sizeof(ssh->sesskey));
+
+ /* Obfuscate with session id. */
+- if ((p = ssh_session_id(cookie, ssh->ctx->hostkey->n,
+- ssh->ctx->servkey->n)) == NULL) {
++ if ((p = ssh_session_id(cookie, hostkey_n,
++ servkey_n)) == NULL) {
+ warn("ssh_session_id");
+ return (-1);
+ }
+@@ -422,7 +430,7 @@
+ else BN_add_word(bn, ssh->sesskey[i]);
+ }
+ /* Encrypt session key. */
+- if (BN_cmp(ssh->ctx->servkey->n, ssh->ctx->hostkey->n) < 0) {
++ if (BN_cmp(servkey_n, hostkey_n) < 0) {
+ rsa_public_encrypt(bn, bn, ssh->ctx->servkey);
+ rsa_public_encrypt(bn, bn, ssh->ctx->hostkey);
+ }
+@@ -470,10 +478,8 @@
+ ssh->decrypt = blowfish_decrypt;
+ }
+ else if (cipher == SSH_CIPHER_3DES) {
+- ssh->estate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+- ssh->dstate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+- ssh->encrypt = des3_encrypt;
+- ssh->decrypt = des3_decrypt;
++ warnx("cipher 3des no longer supported");
++ return (-1);
+ }
+ /* Get server response. */
+ if ((i = SSH_recv(ssh, pkt, sizeof(pkt))) <= 0) {
+--- a/sshcrypto.c
++++ b/sshcrypto.c
+@@ -28,10 +28,12 @@
+ u_char iv[8];
+ };
+
++#if 0
+ struct des3_state {
+ des_key_schedule k1, k2, k3;
+ des_cblock iv1, iv2, iv3;
+ };
++#endif
+
+ void
+ rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key)
+@@ -39,10 +41,12 @@
+ u_char *inbuf, *outbuf;
+ int len, ilen, olen;
+
+- if (BN_num_bits(key->e) < 2 || !BN_is_odd(key->e))
++ const BIGNUM *n, *e;
++ RSA_get0_key(key, &n, &e, NULL);
++ if (BN_num_bits(e) < 2 || !BN_is_odd(e))
+ errx(1, "rsa_public_encrypt() exponent too small or not odd");
+
+- olen = BN_num_bytes(key->n);
++ olen = BN_num_bytes(n);
+ outbuf = malloc(olen);
+
+ ilen = BN_num_bytes(in);
+@@ -71,7 +75,9 @@
+ u_char *inbuf, *outbuf;
+ int len, ilen, olen;
+
+- olen = BN_num_bytes(key->n);
++ const BIGNUM *n;
++ RSA_get0_key(key, &n, NULL, NULL);
++ olen = BN_num_bytes(n);
+ outbuf = malloc(olen);
+
+ ilen = BN_num_bytes(in);
+@@ -146,6 +152,7 @@
+ swap_bytes(dst, dst, len);
+ }
+
++#if 0
+ /* XXX - SSH1's weirdo 3DES... */
+ void *
+ des3_init(u_char *sesskey, int len)
+@@ -194,3 +201,4 @@
+ des_ncbc_encrypt(dst, dst, len, dstate->k2, &dstate->iv2, DES_ENCRYPT);
+ des_ncbc_encrypt(dst, dst, len, dstate->k1, &dstate->iv1, DES_DECRYPT);
+ }
++#endif
diff --git a/network/dsniff/dsniff.SlackBuild b/network/dsniff/dsniff.SlackBuild
index 3fe080fd8b..e1d017c37b 100644
--- a/network/dsniff/dsniff.SlackBuild
+++ b/network/dsniff/dsniff.SlackBuild
@@ -73,6 +73,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/24_Fix-OpenSSL1.1.0-Build.patch
+
zcat $CWD/dsniff_2.4b1+debian-18.diff.gz | patch -p1
for i in debian/patches/*.dpatch; do
patch -N < "$i"
diff --git a/network/ekiga/ekiga-4.0.1-boost-signals2.patch b/network/ekiga/ekiga-4.0.1-boost-signals2.patch
new file mode 100644
index 0000000000..026495cdf5
--- /dev/null
+++ b/network/ekiga/ekiga-4.0.1-boost-signals2.patch
@@ -0,0 +1,2179 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for Ekiga 4.0.1, which backports
+the following upstream commits (with some minor downstream-only changes to get the
+Ekiga building) for Boost.Signals2 support:
+
+ - https://github.com/GNOME/ekiga/commit/12641b735a9886a080949465d4da6d4569822ed2
+ - https://github.com/GNOME/ekiga/commit/44ef7c66d055d01bede6627a8b31e4135f54f807
+ - https://github.com/GNOME/ekiga/commit/95e2daa3953355118abec5a30fb2642a105705b2
+ - https://github.com/GNOME/ekiga/commit/aabf103dcf7f0e61ed1903bc4f37f1dd549fb2ef
+ - https://github.com/GNOME/ekiga/commit/b8ea1fe8c15a4fa6a8bfde5e8b51febc74f8e529
+
+This backport makes sense, because unfortunately upstream didn't release anything
+after Ekiga 4.0.1, while 8c954b8ab3a771900f125375ba652afaf1966d19 just immediately
+ends with a segmentation fault (which is the latest Git commit as of writing). And
+openSUSE uses 8c954b8ab3a771900f125375ba652afaf1966d19 from a few months after the
+Ekiga 4.0.1 release, but with Boost.Signals2 support. While this Git commit leads
+even to a starting Ekiga, a not picked up inbound ringing phone call leads sooner
+or later to a segmentation fault (the caller needs to hit the correct point before
+hanging up and it thus takes sometimes 2-3 tries until it crashes). Aside of that,
+there are graphical glitches in the popup/dialog when actually having a call. And
+finally quitting Ekiga sometimes also ends with yet another segmentation fault...
+
+While I fortunately didn't see any of the above mentioned issues with Ekiga 4.0.1
+and this Boost.Signals2 backport patch, any before existing old Ekiga 4.0.1 issues
+will exist further on for sure...
+
+--- ekiga-4.0.1/configure.ac 2019-05-16 20:32:30.610373983 +0200
++++ ekiga-4.0.1/configure.ac.boost-signals2 2019-05-16 22:11:08.958062692 +0200
+@@ -173,15 +173,16 @@
+ dnl ###############################
+ dnl Mandatory BOOST support
+ dnl ###############################
+-AX_BOOST_BASE([1.34])
+-AX_BOOST_SIGNALS
++AX_BOOST_BASE([1.53])
+
+-if test "x${ax_cv_boost_signals}" == "xno"; then
+- AC_MSG_ERROR([You need the boost signals library to compile Ekiga])
+-fi
++CPPFLAGS_save="$CPPFLAGS"
++CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
++AC_CHECK_HEADER(boost/signals2.hpp,, found_signals2=no)
++CPPFLAGS="$CPPFLAGS_save"
+
+-BOOST_LIBS="${BOOST_SIGNALS_LIB}"
+-AC_SUBST(BOOST_LIBS)
++if test "x$found_signals2" = "xno"; then
++ AC_MSG_ERROR([Could not find BOOST signals2 headers])
++fi
+
+
+ dnl ###############################
+@@ -722,6 +723,13 @@
+ AC_MSG_ERROR([You need ptlib expat support to compile ekiga])
+ fi
+
++# Make sure ptlib and opal don't force no-exceptions,
++# as we need them for boost's signals2
++PTLIB_CFLAGS="$PTLIB_CFLAGS -fexceptions"
++AC_SUBST(PTLIB_CFLAGS)
++OPAL_CFLAGS="$OPAL_CFLAGS -fexceptions"
++AC_SUBST(OPAL_CFLAGS)
++
+ SUFFIX=
+ AC_ARG_ENABLE([opal-debug],
+ [AS_HELP_STRING([--enable-opal-debug],[link to debug versions of opal and ptlib (opal_d and ptlib_d) (default is disabled)])],
+--- ekiga-4.0.1/lib/engine/account/account-core.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/account/account-core.h.boost-signals2 2019-05-16 20:34:25.949622624 +0200
+@@ -106,26 +106,26 @@
+
+ /** This signal is emitted when a bank has been added to the core
+ */
+- boost::signal1<void, BankPtr> bank_added;
++ boost::signals2::signal<void(BankPtr)> bank_added;
+
+ /** This signal is emitted when a bank has been removed from the core
+ */
+- boost::signal1<void, BankPtr> bank_removed;
++ boost::signals2::signal<void(BankPtr)> bank_removed;
+
+ /** This signal is emitted when a account has been added to one of
+ * the banks
+ */
+- boost::signal2<void, BankPtr, AccountPtr> account_added;
++ boost::signals2::signal<void(BankPtr, AccountPtr)> account_added;
+
+ /** This signal is emitted when a account has been removed from one of
+ * the banks
+ */
+- boost::signal2<void, BankPtr, AccountPtr> account_removed;
++ boost::signals2::signal<void(BankPtr, AccountPtr)> account_removed;
+
+ /** This signal is emitted when a account has been updated in one of
+ * the banks
+ */
+- boost::signal2<void, BankPtr, AccountPtr> account_updated;
++ boost::signals2::signal<void(BankPtr, AccountPtr)> account_updated;
+
+ private:
+
+@@ -147,7 +147,7 @@
+ /** This signal is emitted when the AccountCore Service has been
+ * updated.
+ */
+- boost::signal0<void> updated;
++ boost::signals2::signal<void(void)> updated;
+
+
+ /** This chain allows the AccountCore to present forms to the user
+--- ekiga-4.0.1/lib/engine/account/bank.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/account/bank.h.boost-signals2 2019-05-16 20:35:52.157810900 +0200
+@@ -74,15 +74,15 @@
+
+ /** This signal is emitted when a account has been added.
+ */
+- boost::signal1<void, AccountPtr> account_added;
++ boost::signals2::signal<void(AccountPtr)> account_added;
+
+ /** This signal is emitted when a account has been removed.
+ */
+- boost::signal1<void, AccountPtr> account_removed;
++ boost::signals2::signal<void(AccountPtr)> account_removed;
+
+ /** This signal is emitted when a account has been updated.
+ */
+- boost::signal1<void, AccountPtr> account_updated;
++ boost::signals2::signal<void(AccountPtr)> account_updated;
+
+ /** This chain allows the BankImpl to present forms to the user
+ */
+--- ekiga-4.0.1/lib/engine/account/bank-impl.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/account/bank-impl.h.boost-signals2 2019-05-16 20:34:41.093655548 +0200
+@@ -74,7 +74,7 @@
+ template<class AccountType = Account>
+ class BankImpl:
+ public Bank,
+- public boost::signals::trackable,
++ public boost::signals2::trackable,
+ protected RefLister<AccountType>
+ {
+
+--- ekiga-4.0.1/lib/engine/addressbook/book.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/addressbook/book.h.boost-signals2 2019-05-16 20:36:30.212894662 +0200
+@@ -92,17 +92,17 @@
+
+ /** This signal is emitted when a Contact has been added to the Book.
+ */
+- boost::signal1<void, ContactPtr > contact_added;
++ boost::signals2::signal<void(ContactPtr)> contact_added;
+
+
+ /** This signal is emitted when a Contact has been removed from the Book.
+ */
+- boost::signal1<void, ContactPtr > contact_removed;
++ boost::signals2::signal<void(ContactPtr)> contact_removed;
+
+
+ /** This signal is emitted when a Contact has been updated in the Book.
+ */
+- boost::signal1<void, ContactPtr > contact_updated;
++ boost::signals2::signal<void(ContactPtr)> contact_updated;
+ };
+
+ typedef boost::shared_ptr<Book> BookPtr;
+--- ekiga-4.0.1/lib/engine/addressbook/contact-core.cpp 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/addressbook/contact-core.cpp.boost-signals2 2019-05-16 21:26:27.190245510 +0200
+@@ -50,7 +50,7 @@
+
+ Ekiga::ContactCore::~ContactCore ()
+ {
+- for (std::list<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
++ for (std::list<boost::signals2::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
+ iter->disconnect ();
+ }
+
+--- ekiga-4.0.1/lib/engine/addressbook/contact-core.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/addressbook/contact-core.h.boost-signals2 2019-05-16 21:26:20.542228371 +0200
+@@ -118,37 +118,37 @@
+ /** This signal is emitted when a Ekiga::Source has been
+ * added to the ContactCore Service.
+ */
+- boost::signal1<void, SourcePtr > source_added;
++ boost::signals2::signal<void(SourcePtr)> source_added;
+
+ /** This signal is emitted when a book has been added to one of
+ * the sources
+ */
+- boost::signal2<void, SourcePtr, BookPtr > book_added;
++ boost::signals2::signal<void(SourcePtr, BookPtr )> book_added;
+
+ /** This signal is emitted when a book has been removed from one of
+ * the sources
+ */
+- boost::signal2<void, SourcePtr, BookPtr > book_removed;
++ boost::signals2::signal<void(SourcePtr, BookPtr )> book_removed;
+
+ /** This signal is emitted when a book has been updated in one of
+ * the sources
+ */
+- boost::signal2<void, SourcePtr, BookPtr > book_updated;
++ boost::signals2::signal<void(SourcePtr, BookPtr )> book_updated;
+
+ /** This signal is emitted when a contact has been added to one of
+ * the book of one of the sources
+ */
+- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_added;
++ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_added;
+
+ /** This signal is emitted when a contact has been removed from one of
+ * the book of one of the sources
+ */
+- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_removed;
++ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_removed;
+
+ /** This signal is emitted when a contact has been updated in one of
+ * the book of one of the sources
+ */
+- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_updated;
++ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_updated;
+
+ private:
+
+@@ -174,7 +174,7 @@
+ std::list<boost::shared_ptr<ContactDecorator> > contact_decorators;
+
+ /*** Misc stuff ***/
+- std::list<boost::signals::connection> conns;
++ std::list<boost::signals2::connection> conns;
+ };
+
+ /**
+--- ekiga-4.0.1/lib/engine/addressbook/source.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/addressbook/source.h.boost-signals2 2019-05-16 20:38:37.038176631 +0200
+@@ -63,32 +63,32 @@
+
+ /** This signal is emitted when a Book has been added to the Source.
+ */
+- boost::signal1<void, BookPtr > book_added;
++ boost::signals2::signal<void(BookPtr)> book_added;
+
+
+ /** This signal is emitted when a Book has been updated in the Source.
+ */
+- boost::signal1<void, BookPtr > book_updated;
++ boost::signals2::signal<void(BookPtr)> book_updated;
+
+
+ /** This signal is emitted when a Book has been removed in the Source.
+ */
+- boost::signal1<void, BookPtr > book_removed;
++ boost::signals2::signal<void(BookPtr)> book_removed;
+
+ /** This signal is emitted when a Contact has been added to a book in
+ * this source.
+ */
+- boost::signal2<void, BookPtr, ContactPtr > contact_added;
++ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_added;
+
+ /** This signal is emitted when a Contact has been removed from a book in
+ * this source.
+ */
+- boost::signal2<void, BookPtr, ContactPtr > contact_removed;
++ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_removed;
+
+ /** This signal is emitted when a Contact has been updated in a book in
+ * this source
+ */
+- boost::signal2<void, BookPtr, ContactPtr > contact_updated;
++ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_updated;
+ };
+
+ typedef boost::shared_ptr<Source> SourcePtr;
+--- ekiga-4.0.1/lib/engine/audioinput/audioinput-core.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/audioinput/audioinput-core.h.boost-signals2 2019-05-16 20:39:25.511285526 +0200
+@@ -136,7 +136,7 @@
+ /** This signal is emitted when a Ekiga::AudioInputManager has been
+ * added to the AudioInputCore Service.
+ */
+- boost::signal1<void, AudioInputManager &> manager_added;
++ boost::signals2::signal<void(AudioInputManager &)> manager_added;
+
+
+ /*** AudioInput Device Management ***/
+@@ -254,23 +254,23 @@
+
+ /** See audioinput-manager.h for the API
+ */
+- boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputSettings&> device_opened;
+- boost::signal2<void, AudioInputManager &, AudioInputDevice &> device_closed;
+- boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes> device_error;
++ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputSettings&)> device_opened;
++ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &)> device_closed;
++ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes)> device_error;
+
+ /** This signal is emitted when an audio device input has been added to the system.
+ * This signal will be emitted if add_device was called with a device name and
+ * a manager claimed support for this device.
+ * @param device the audio input device that was added.
+ */
+- boost::signal2<void, AudioInputDevice, bool> device_added;
++ boost::signals2::signal<void(AudioInputDevice, bool)> device_added;
+
+ /** This signal is emitted when an audio input device has been removed from the system.
+ * This signal will be emitted if remove_device was called with a device name and
+ * a manager claimed support for this device.
+ * @param device the audio input device that was removed.
+ */
+- boost::signal2<void, AudioInputDevice, bool> device_removed;
++ boost::signals2::signal<void(AudioInputDevice, bool)> device_removed;
+
+ private:
+ void on_set_device (const AudioInputDevice & device);
+--- ekiga-4.0.1/lib/engine/audioinput/audioinput-manager.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/audioinput/audioinput-manager.h.boost-signals2 2019-05-16 20:40:06.093377163 +0200
+@@ -39,7 +39,7 @@
+ #define __AUDIOINPUT_MANAGER_H__
+
+ #include <vector>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include "audioinput-info.h"
+@@ -148,18 +148,18 @@
+ * @param device the audio input device that was opened.
+ * @param config the current audio input device configuration (current volume, etc.).
+ */
+- boost::signal2<void, AudioInputDevice, AudioInputSettings> device_opened;
++ boost::signals2::signal<void(AudioInputDevice, AudioInputSettings)> device_opened;
+
+ /** This signal is emitted when an audio input device is closed.
+ * @param device the audio input device that was closed.
+ */
+- boost::signal1<void, AudioInputDevice> device_closed;
++ boost::signals2::signal<void(AudioInputDevice)> device_closed;
+
+ /** This signal is emitted when an error occurs when opening a audio input device.
+ * @param device the audio input device that caused the error.
+ * @param error_code the audio input device error code.
+ */
+- boost::signal2<void, AudioInputDevice, AudioInputErrorCodes> device_error;
++ boost::signals2::signal<void(AudioInputDevice, AudioInputErrorCodes)> device_error;
+
+
+ protected:
+--- ekiga-4.0.1/lib/engine/audiooutput/audiooutput-core.h 2013-02-18 22:37:04.000000000 +0100
++++ ekiga-4.0.1/lib/engine/audiooutput/audiooutput-core.h.boost-signals2 2019-05-16 20:40:58.822496863 +0200
+@@ -128,7 +128,7 @@
+ /** This signal is emitted when a Ekiga::AudioOutputManager has been
+ * added to the AudioOutputCore Service.
+ */
+- boost::signal1<void, AudioOutputManager &> manager_added;
++ boost::signals2::signal<void(AudioOutputManager &)> manager_added;
+
+
+ /** Get a list of all devices supported by all managers registered to the core.
+@@ -299,23 +299,23 @@
+
+ /** See audiooutput-manager.h for the API
+ */
+- boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&> device_opened;
+- boost::signal3<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&> device_closed;
+- boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes> device_error;
++ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&)> device_opened;
++ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&)> device_closed;
++ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes)> device_error;
+
+ /** This signal is emitted when an audio output device has been added to the system.
+ * This signal will be emitted if add_device was called with a device name and
+ * a manager claimed support for this device.
+ * @param device the audio output device that was added.
+ */
+- boost::signal2<void, AudioOutputDevice, bool> device_added;
++ boost::signals2::signal<void(AudioOutputDevice, bool)> device_added;
+
+ /** This signal is emitted when an audio output device has been removed from the system.
+ * This signal will be emitted if remove_device was called with a device name and
+ * a manager claimed support for this device.
+ * @param device the audio output device that was removed.
+ */
+- boost::signal2<void, AudioOutputDevice, bool> device_removed;
++ boost::signals2::signal<void(AudioOutputDevice, bool)> device_removed;
+
+ private:
+ void on_set_device (const AudioOutputDevice & device);
+--- ekiga-4.0.1/lib/engine/audiooutput/audiooutput-manager.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/audiooutput/audiooutput-manager.h.boost-signals2 2019-05-16 20:41:41.638594580 +0200
+@@ -39,7 +39,7 @@
+ #define __AUDIOOUTPUT_MANAGER_H__
+
+ #include <vector>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include "audiooutput-info.h"
+@@ -152,20 +152,20 @@
+ * @param device the audio output device that was opened.
+ * @param config the current audio output device configuration (current volume, etc.).
+ */
+- boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputSettings> device_opened;
++ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputSettings)> device_opened;
+
+ /** This signal is emitted when an audio output device is closed.
+ * @param prim whether the primary or secondary audio output device was closed.
+ * @param device the audio output device that was closed.
+ */
+- boost::signal2<void, AudioOutputPS, AudioOutputDevice> device_closed;
++ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice)> device_closed;
+
+ /** This signal is emitted when an error occurs when opening an audio output device.
+ * @param prim whether the primary or secondary audio output device caused the error.
+ * @param device the audio output device that caused the error.
+ * @param error_code the audio output device error code.
+ */
+- boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes> device_error;
++ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes)> device_error;
+
+ protected:
+ typedef struct ManagerState {
+--- ekiga-4.0.1/lib/engine/chat/chat-core.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/chat/chat-core.h.boost-signals2 2019-05-16 20:42:03.614644914 +0200
+@@ -100,7 +100,7 @@
+ /** This signal is emitted when an Ekiga::Dialect has been added to
+ * the ChatCore service.
+ */
+- boost::signal1<void, DialectPtr > dialect_added;
++ boost::signals2::signal<void(DialectPtr)> dialect_added;
+
+ private:
+
+@@ -116,7 +116,7 @@
+
+ /** This signal is emitted when the ChatCore service has been updated.
+ */
+- boost::signal0<void> updated;
++ boost::signals2::signal<void(void)> updated;
+
+ /** This chain allows the ChatCore to present forms to the user
+ */
+--- ekiga-4.0.1/lib/engine/chat/chat.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/chat/chat.h.boost-signals2 2019-05-16 20:42:45.038740118 +0200
+@@ -37,7 +37,7 @@
+ #define __CHAT_H__
+
+ #include <string>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include <boost/smart_ptr.hpp>
+@@ -113,15 +113,15 @@
+
+ /** This signal is emitted when the Chat has been updated.
+ */
+- boost::signal0<void> updated;
++ boost::signals2::signal<void(void)> updated;
+
+ /** This signal is emitted when the user requested to see this Chat
+ */
+- boost::signal0<void> user_requested;
++ boost::signals2::signal<void(void)> user_requested;
+
+ /** This signal is emitted when the Chat has been removed.
+ */
+- boost::signal0<void> removed;
++ boost::signals2::signal<void(void)> removed;
+
+ /** Feed possible actions on this Chat to the given MenuBuilder
+ * @param A MenuBuilder object to populate.
+--- ekiga-4.0.1/lib/engine/chat/dialect.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/chat/dialect.h.boost-signals2 2019-05-16 20:43:23.359828571 +0200
+@@ -72,12 +72,12 @@
+ /** This signal is emitted when an Ekiga::SimpleChat has been added to
+ * the dialect.
+ */
+- boost::signal1<void, SimpleChatPtr> simple_chat_added;
++ boost::signals2::signal<void(SimpleChatPtr)> simple_chat_added;
+
+ /** This signal is emitted when an Ekiga::MultipleChat has been added to
+ * the dialect.
+ */
+- boost::signal1<void, MultipleChatPtr> multiple_chat_added;
++ boost::signals2::signal<void(MultipleChatPtr)> multiple_chat_added;
+
+ /** This chain allows the Dialect to present forms to the user.
+ */
+--- ekiga-4.0.1/lib/engine/chat/dialect-impl.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/chat/dialect-impl.h.boost-signals2 2019-05-16 21:27:11.112358866 +0200
+@@ -47,7 +47,7 @@
+ typename MultipleChatType = MultipleChat>
+ class DialectImpl:
+ public Dialect,
+- public boost::signals::trackable
++ public boost::signals2::trackable
+ {
+ public:
+
+@@ -75,10 +75,10 @@
+
+ /* More STL-like ways to access the chats within this Ekiga::DialectImpl
+ */
+- typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_iterator;
+- typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_const_iterator;
+- typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_iterator;
+- typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_const_iterator;
++ typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_iterator;
++ typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_const_iterator;
++ typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_iterator;
++ typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_const_iterator;
+
+ simple_iterator simple_begin ();
+ simple_iterator simple_end ();
+@@ -116,8 +116,8 @@
+
+ private:
+
+- std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > simple_chats;
+- std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > multiple_chats;
++ std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > simple_chats;
++ std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > multiple_chats;
+
+ void on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat);
+
+@@ -133,22 +133,22 @@
+ template<typename SimpleChatType, typename MultipleChatType>
+ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::~DialectImpl ()
+ {
+- for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::iterator iter = simple_chats.begin ();
++ for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::iterator iter = simple_chats.begin ();
+ iter != simple_chats.end ();
+ iter++) {
+
+- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
++ for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
+ conn_iter != iter->second.end ();
+ ++conn_iter) {
+
+ conn_iter->disconnect ();
+ }
+ }
+- for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::iterator iter = multiple_chats.begin ();
++ for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::iterator iter = multiple_chats.begin ();
+ iter != multiple_chats.end ();
+ iter++) {
+
+- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
++ for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
+ conn_iter != iter->second.end ();
+ ++conn_iter) {
+
+@@ -163,7 +163,7 @@
+ {
+ bool go_on = true;
+
+- for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::const_iterator iter = simple_chats.begin ();
++ for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = simple_chats.begin ();
+ go_on && iter != simple_chats.end ();
+ iter++) {
+
+@@ -177,7 +177,7 @@
+ {
+ bool go_on = true;
+
+- for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::const_iterator iter = multiple_chats.begin ();
++ for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = multiple_chats.begin ();
+ go_on && iter != multiple_chats.end ();
+ iter++) {
+
+@@ -275,7 +275,7 @@
+ void
+ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat)
+ {
+- for (typename std::list<boost::signals::connection>::iterator iter = simple_chats[chat].begin ();
++ for (typename std::list<boost::signals2::connection>::iterator iter = simple_chats[chat].begin ();
+ iter != simple_chats[chat].end ();
+ ++iter) {
+
+@@ -288,7 +288,7 @@
+ void
+ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_multiple_chat_removed (boost::shared_ptr<MultipleChatType> chat)
+ {
+- for (typename std::list<boost::signals::connection>::iterator iter = multiple_chats[chat].begin ();
++ for (typename std::list<boost::signals2::connection>::iterator iter = multiple_chats[chat].begin ();
+ iter != multiple_chats[chat].end ();
+ ++iter) {
+
+--- ekiga-4.0.1/lib/engine/components/call-history/history-book.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/components/call-history/history-book.h.boost-signals2 2019-05-16 20:43:58.286909503 +0200
+@@ -53,7 +53,7 @@
+
+ class Book:
+ public Ekiga::Book,
+- public boost::signals::trackable
++ public boost::signals2::trackable
+ {
+ public:
+
+@@ -86,7 +86,7 @@
+
+ void clear ();
+
+- boost::signal0<void> cleared;
++ boost::signals2::signal<void(void)> cleared;
+
+ private:
+
+--- ekiga-4.0.1/lib/engine/components/call-history/history-contact.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/components/call-history/history-contact.h.boost-signals2 2019-05-16 20:44:24.678970855 +0200
+@@ -61,7 +61,7 @@
+
+ class Contact:
+ public Ekiga::Contact,
+- public boost::signals::trackable
++ public boost::signals2::trackable
+ {
+ public:
+
+--- ekiga-4.0.1/lib/engine/components/local-roster/local-cluster.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/components/local-roster/local-cluster.h.boost-signals2 2019-05-16 20:45:18.111095580 +0200
+@@ -51,7 +51,7 @@
+ class Cluster :
+ public Ekiga::ClusterImpl<Heap>,
+ public Ekiga::Trigger,
+- public boost::signals::trackable
++ public boost::signals2::trackable
+ {
+ public:
+
+--- ekiga-4.0.1/lib/engine/components/local-roster/local-presentity.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/components/local-roster/local-presentity.h.boost-signals2 2019-05-16 20:45:33.511131655 +0200
+@@ -162,7 +162,7 @@
+ * This signal makes the Local::Heap know that the XML tree changed
+ * and hence should be saved
+ */
+- boost::signal0<void> trigger_saving;
++ boost::signals2::signal<void(void)> trigger_saving;
+
+
+ private:
+--- ekiga-4.0.1/lib/engine/components/opal/opal-account.h 2013-02-18 22:37:04.000000000 +0100
++++ ekiga-4.0.1/lib/engine/components/opal/opal-account.h.boost-signals2 2019-05-16 20:45:50.751172106 +0200
+@@ -153,7 +153,7 @@
+
+ const std::string as_string () const;
+
+- boost::signal0<void> trigger_saving;
++ boost::signals2::signal<void(void)> trigger_saving;
+
+ /*
+ * This is because an opal account is an Ekiga::PresencePublisher
+--- ekiga-4.0.1/lib/engine/components/opal/opal-call.h 2013-02-18 22:37:04.000000000 +0100
++++ ekiga-4.0.1/lib/engine/components/opal/opal-call.h.boost-signals2 2019-05-16 20:46:08.255213249 +0200
+@@ -55,7 +55,7 @@
+ class Call
+ : public OpalCall,
+ public Ekiga::Call,
+- public boost::signals::trackable
++ public boost::signals2::trackable
+ {
+
+ public:
+--- ekiga-4.0.1/lib/engine/components/opal/opal-gmconf-bridge.cpp 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/components/opal/opal-gmconf-bridge.cpp.boost-signals2 2019-05-16 20:46:26.119255313 +0200
+@@ -35,7 +35,7 @@
+ */
+
+ #include <iostream>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include "config.h"
+--- ekiga-4.0.1/lib/engine/framework/chain-of-responsibility.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/framework/chain-of-responsibility.h.boost-signals2 2019-05-16 21:15:28.782572221 +0200
+@@ -36,7 +36,7 @@
+ #ifndef __CHAIN_OF_RESPONSIBILITY_H__
+ #define __CHAIN_OF_RESPONSIBILITY_H__
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ /* This code uses boost signals to implement the "chain of responsibility"
+@@ -117,9 +117,8 @@
+
+ template<typename T_request>
+ struct ChainOfResponsibility:
+- public boost::signal1<bool,
+- T_request,
+- responsibility_accumulator>
++ public boost::signals2::signal<bool(T_request),
++ responsibility_accumulator>
+ {
+ };
+ };
+--- ekiga-4.0.1/lib/engine/framework/form-request-simple.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/framework/form-request-simple.h.boost-signals2 2019-05-16 20:48:12.632507659 +0200
+@@ -36,7 +36,7 @@
+ #ifndef __FORM_REQUEST_SIMPLE_H__
+ #define __FORM_REQUEST_SIMPLE_H__
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include "form-builder.h"
+--- ekiga-4.0.1/lib/engine/framework/gmconf-bridge.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/framework/gmconf-bridge.h.boost-signals2 2019-05-16 20:48:33.432557242 +0200
+@@ -38,7 +38,7 @@
+ #define __GMCONF_BRIDGE_H__
+
+ #include <vector>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include "gmconf.h"
+@@ -94,7 +94,7 @@
+ * @param key is the GmConf key whose value changed
+ * @param entry is the new GmConf entry
+ */
+- boost::signal2<void, std::string /*key*/, GmConfEntry * /*entry*/> property_changed;
++ boost::signals2::signal<void(std::string /*key*/, GmConfEntry * /*entry*/)> property_changed;
+
+ protected :
+ Ekiga::Service & service;
+--- ekiga-4.0.1/lib/engine/framework/live-object.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/framework/live-object.h.boost-signals2 2019-05-16 20:48:53.280604647 +0200
+@@ -62,12 +62,12 @@
+
+ /** This signal is emitted when the object has been updated.
+ */
+- boost::signal0<void> updated;
++ boost::signals2::signal<void(void)> updated;
+
+
+ /** This signal is emitted when the object has been removed.
+ */
+- boost::signal0<void> removed;
++ boost::signals2::signal<void(void)> removed;
+
+ /** This chain allows the object to present forms to the user
+ */
+--- ekiga-4.0.1/lib/engine/framework/menu-builder.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/framework/menu-builder.h.boost-signals2 2019-05-16 20:49:09.399643212 +0200
+@@ -37,7 +37,7 @@
+ #define __MENU_BUILDER_H__
+
+ #include <string>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+
+--- ekiga-4.0.1/lib/engine/framework/personal-details.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/framework/personal-details.h.boost-signals2 2019-05-16 20:49:31.152695349 +0200
+@@ -37,7 +37,7 @@
+ #define __PERSONAL_DETAILS_H__
+
+ #include <string>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include "services.h"
+@@ -66,7 +66,7 @@
+ virtual void set_presence_info (const std::string presence,
+ const std::string status) = 0;
+
+- boost::signal0<void> updated;
++ boost::signals2::signal<void(void)> updated;
+ };
+ };
+
+--- ekiga-4.0.1/lib/engine/framework/reflister.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/framework/reflister.h.boost-signals2 2019-05-16 20:50:53.592893897 +0200
+@@ -37,7 +37,7 @@
+ #ifndef __REFLISTER_H__
+ #define __REFLISTER_H__
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+ #include <list>
+
+@@ -55,7 +55,7 @@
+ {
+ protected:
+
+- typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals::connection> > container_type;
++ typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals2::connection> > container_type;
+ typedef Ekiga::map_key_iterator<container_type> iterator;
+ typedef Ekiga::map_key_const_iterator<container_type> const_iterator;
+
+@@ -66,7 +66,7 @@
+ void add_object (boost::shared_ptr<ObjectType> obj);
+
+ void add_connection (boost::shared_ptr<ObjectType> obj,
+- boost::signals::connection connection);
++ boost::signals2::connection connection);
+
+ void remove_object (boost::shared_ptr<ObjectType> obj);
+
+@@ -78,9 +78,9 @@
+ const_iterator begin () const;
+ const_iterator end () const;
+
+- boost::signal1<void, boost::shared_ptr<ObjectType> > object_added;
+- boost::signal1<void, boost::shared_ptr<ObjectType> > object_removed;
+- boost::signal1<void, boost::shared_ptr<ObjectType> > object_updated;
++ boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_added;
++ boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_removed;
++ boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_updated;
+
+ private:
+ container_type objects;
+@@ -95,7 +95,7 @@
+ iter != objects.end ();
+ ++iter) {
+
+- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
++ for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
+ conn_iter != iter->second.end ();
+ ++conn_iter) {
+
+@@ -130,7 +130,7 @@
+ template<typename ObjectType>
+ void
+ Ekiga::RefLister<ObjectType>::add_connection (boost::shared_ptr<ObjectType> obj,
+- boost::signals::connection connection)
++ boost::signals2::connection connection)
+ {
+ objects[obj].push_back (connection);
+ }
+@@ -139,8 +139,8 @@
+ void
+ Ekiga::RefLister<ObjectType>::remove_object (boost::shared_ptr<ObjectType> obj)
+ {
+- std::list<boost::signals::connection> connections = objects[obj];
+- for (std::list<boost::signals::connection>::iterator iter = connections.begin ();
++ std::list<boost::signals2::connection> connections = objects[obj];
++ for (std::list<boost::signals2::connection>::iterator iter = connections.begin ();
+ iter != connections.end ();
+ ++iter)
+ iter->disconnect ();
+--- ekiga-4.0.1/lib/engine/framework/runtime.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/framework/runtime.h.boost-signals2 2019-05-16 21:15:48.437621428 +0200
+@@ -34,7 +34,7 @@
+ *
+ */
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #ifndef __RUNTIME_H__
+--- ekiga-4.0.1/lib/engine/framework/services.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/framework/services.h.boost-signals2 2019-05-16 20:51:40.904008518 +0200
+@@ -45,7 +45,7 @@
+
+ #include <list>
+ #include <string>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ namespace Ekiga
+@@ -101,7 +101,7 @@
+
+ void dump (std::ostream &stream) const;
+
+- boost::signal1<void, ServicePtr> service_added;
++ boost::signals2::signal<void(ServicePtr)> service_added;
+
+ private:
+
+--- ekiga-4.0.1/lib/engine/gui/gtk-core/codecsbox.cpp 2013-02-18 22:37:04.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-core/codecsbox.cpp.boost-signals2 2019-05-16 20:52:02.689061460 +0200
+@@ -38,6 +38,8 @@
+ #include "config.h"
+ #include "codecsbox.h"
+
++#include <sstream>
++
+ #include "gmconf.h"
+ #include "codec-description.h"
+
+--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/accounts-window.cpp 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/accounts-window.cpp.boost-signals2 2019-05-16 20:52:22.872110600 +0200
+@@ -62,7 +62,7 @@
+ GtkAccelGroup *accel;
+
+ Ekiga::ServiceCore &core;
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+
+ std::string presence;
+
+@@ -502,7 +502,7 @@
+ {
+ AccountsWindow *self = ACCOUNTS_WINDOW (obj);
+
+- for (std::vector<boost::signals::connection>::iterator iter
++ for (std::vector<boost::signals2::connection>::iterator iter
+ = self->priv->connections.begin ();
+ iter != self->priv->connections.end ();
+ iter++)
+@@ -535,7 +535,7 @@
+ {
+ AccountsWindow *self = NULL;
+
+- boost::signals::connection conn;
++ boost::signals2::connection conn;
+
+ GtkWidget *vbox = NULL;
+ GtkWidget *menu_bar = NULL;
+--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/addressbook-window.cpp 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/addressbook-window.cpp.boost-signals2 2019-05-16 20:52:40.184152821 +0200
+@@ -52,7 +52,7 @@
+ _AddressBookWindowPrivate (Ekiga::ContactCore & _core):core (_core) { }
+
+ Ekiga::ContactCore & core;
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+ GtkWidget *tree_view;
+ GtkWidget *notebook;
+ GtkTreeSelection *selection;
+@@ -579,7 +579,7 @@
+ {
+ AddressBookWindow *self = ADDRESSBOOK_WINDOW (obj);
+
+- for (std::vector<boost::signals::connection>::iterator iter
++ for (std::vector<boost::signals2::connection>::iterator iter
+ = self->priv->connections.begin ();
+ iter != self->priv->connections.end ();
+ iter++)
+@@ -613,7 +613,7 @@
+ {
+ AddressBookWindow *self = NULL;
+
+- boost::signals::connection conn;
++ boost::signals2::connection conn;
+
+ GtkWidget *menu_bar = NULL;
+ GtkWidget *frame = NULL;
+--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/book-view-gtk.cpp 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/book-view-gtk.cpp.boost-signals2 2019-05-16 21:25:50.824151811 +0200
+@@ -62,7 +62,7 @@
+ GtkWidget *scrolled_window;
+
+ Ekiga::BookPtr book;
+- std::list<boost::signals::connection> connections;
++ std::list<boost::signals2::connection> connections;
+ };
+
+
+@@ -447,7 +447,7 @@
+
+ view = BOOK_VIEW_GTK (obj);
+
+- for (std::list<boost::signals::connection>::iterator iter
++ for (std::list<boost::signals2::connection>::iterator iter
+ = view->priv->connections.begin ();
+ iter != view->priv->connections.end ();
+ ++iter)
+--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp.boost-signals2 2019-05-16 20:53:08.385221735 +0200
+@@ -56,7 +56,7 @@
+ boost::shared_ptr<History::Book> book;
+ GtkListStore* store;
+ GtkTreeView* tree;
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+ };
+
+ /* this is what we put in the view */
+@@ -229,7 +229,7 @@
+
+ view = CALL_HISTORY_VIEW_GTK (obj);
+
+- for (std::vector<boost::signals::connection>::iterator iter
++ for (std::vector<boost::signals2::connection>::iterator iter
+ = view->priv->connections.begin ();
+ iter != view->priv->connections.end ();
+ iter++)
+@@ -314,7 +314,7 @@
+ GtkCellRenderer *renderer = NULL;
+ GtkTreeSelection *selection = NULL;
+
+- boost::signals::connection conn;
++ boost::signals2::connection conn;
+
+ g_return_val_if_fail (book, (GtkWidget*)NULL);
+
+--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-window.cpp 2013-02-18 22:37:04.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-window.cpp.boost-signals2 2019-05-16 20:53:23.457258635 +0200
+@@ -181,7 +181,7 @@
+
+ GtkWidget *transfer_call_popup;
+
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+ };
+
+ /* properties */
+@@ -2207,7 +2207,7 @@
+ static void
+ ekiga_call_window_connect_engine_signals (EkigaCallWindow *cw)
+ {
+- boost::signals::connection conn;
++ boost::signals2::connection conn;
+
+ g_return_if_fail (EKIGA_IS_CALL_WINDOW (cw));
+
+--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-area.cpp 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-area.cpp.boost-signals2 2019-05-16 20:53:39.069296908 +0200
+@@ -58,7 +58,7 @@
+ struct _ChatAreaPrivate
+ {
+ Ekiga::Chat* chat;
+- boost::signals::connection connection;
++ boost::signals2::connection connection;
+ boost::shared_ptr<ChatAreaHelper> helper;
+ GmTextBufferEnhancer* enhancer;
+ GtkWidget* smiley_menu;
+--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-window.cpp 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-window.cpp.boost-signals2 2019-05-16 21:25:41.264127202 +0200
+@@ -54,7 +54,7 @@
+ {}
+
+ Ekiga::ServiceCore& core;
+- std::list<boost::signals::connection> connections;
++ std::list<boost::signals2::connection> connections;
+
+ GtkWidget* notebook;
+ };
+@@ -405,7 +405,7 @@
+
+ self = CHAT_WINDOW (obj);
+
+- for (std::list<boost::signals::connection>::iterator iter
++ for (std::list<boost::signals2::connection>::iterator iter
+ = self->priv->connections.begin ();
+ iter != self->priv->connections.end ();
+ ++iter)
+--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/heap-view.cpp 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/heap-view.cpp.boost-signals2 2019-05-16 20:53:55.041336117 +0200
+@@ -47,7 +47,7 @@
+ struct _HeapViewPrivate
+ {
+ Ekiga::HeapPtr heap;
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+
+ GtkTreeStore* store;
+ GtkTreeView* view;
+@@ -454,7 +454,7 @@
+ {
+ if (self->priv->heap) {
+
+- for (std::vector<boost::signals::connection>::iterator iter
++ for (std::vector<boost::signals2::connection>::iterator iter
+ = self->priv->connections.begin ();
+ iter != self->priv->connections.end ();
+ iter++)
+@@ -465,7 +465,7 @@
+
+ if (heap) {
+
+- boost::signals::connection conn;
++ boost::signals2::connection conn;
+
+ conn = heap->removed.connect (boost::bind (&on_heap_removed, self));
+ self->priv->connections.push_back (conn);
+--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/preferences-window.cpp 2013-02-18 22:37:04.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/preferences-window.cpp.boost-signals2 2019-05-16 20:54:24.433408410 +0200
+@@ -88,7 +88,7 @@
+ GtkWidget *iface;
+ GtkWidget *fsbutton;
+ Ekiga::ServiceCore *core;
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+ } GmPreferencesWindow;
+
+ #define GM_PREFERENCES_WINDOW(x) (GmPreferencesWindow *) (x)
+@@ -1357,7 +1357,7 @@
+
+ gm_window_hide_on_delete (window);
+
+- boost::signals::connection conn;
++ boost::signals2::connection conn;
+ boost::shared_ptr<Ekiga::VideoInputCore> videoinput_core = core.get<Ekiga::VideoInputCore> ("videoinput-core");
+ boost::shared_ptr<Ekiga::AudioInputCore> audioinput_core = core.get<Ekiga::AudioInputCore> ("audioinput-core");
+ boost::shared_ptr<Ekiga::AudioOutputCore> audiooutput_core = core.get<Ekiga::AudioOutputCore> ("audiooutput-core");
+--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/presentity-view.cpp 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/presentity-view.cpp.boost-signals2 2019-05-16 20:54:36.777438826 +0200
+@@ -40,8 +40,8 @@
+ struct _PresentityViewPrivate
+ {
+ Ekiga::Presentity* presentity;
+- boost::signals::connection updated_conn;
+- boost::signals::connection removed_conn;
++ boost::signals2::connection updated_conn;
++ boost::signals2::connection removed_conn;
+
+ /* we contain those, so no need to unref them */
+ GtkWidget* presence_image;
+--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp 2013-02-18 22:37:04.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp.boost-signals2 2019-05-16 20:54:50.449472550 +0200
+@@ -60,7 +60,7 @@
+ {
+ boost::shared_ptr<Ekiga::PresenceCore> core;
+
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+ GtkTreeStore *store;
+ GtkTreeView *tree_view;
+ GSList *folded_groups;
+@@ -1382,7 +1382,7 @@
+ {
+ if (self->priv->core) {
+
+- for (std::vector<boost::signals::connection>::iterator iter
++ for (std::vector<boost::signals2::connection>::iterator iter
+ = self->priv->connections.begin ();
+ iter != self->priv->connections.end ();
+ iter++)
+@@ -1393,7 +1393,7 @@
+
+ if (core) {
+
+- boost::signals::connection conn;
++ boost::signals2::connection conn;
+
+ conn = core->cluster_added.connect (boost::bind (&on_cluster_added, self, _1));
+ self->priv->connections.push_back (conn);
+--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.cpp 2013-02-18 22:37:04.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.cpp.boost-signals2 2019-05-16 20:55:08.249516515 +0200
+@@ -68,7 +68,7 @@
+ GtkWidget *popup_menu;
+ gboolean has_message;
+
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+
+ int blink_id;
+ std::string status;
+@@ -174,7 +174,7 @@
+ if (self->priv->blink_image)
+ g_free (self->priv->blink_image);
+
+- for (std::vector<boost::signals::connection>::iterator iter = self->priv->connections.begin () ;
++ for (std::vector<boost::signals2::connection>::iterator iter = self->priv->connections.begin () ;
+ iter != self->priv->connections.end ();
+ iter++)
+ iter->disconnect ();
+@@ -548,7 +548,7 @@
+ if (!statusicon_should_run ())
+ return self;
+
+- boost::signals::connection conn;
++ boost::signals2::connection conn;
+
+ self = STATUSICON (g_object_new (STATUSICON_TYPE, NULL));
+ self->priv = new StatusIconPrivate (core);
+--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.h.boost-signals2 2019-05-16 20:55:28.249565992 +0200
+@@ -42,7 +42,7 @@
+
+ #include <gtk/gtk.h>
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ G_BEGIN_DECLS
+--- ekiga-4.0.1/lib/engine/hal/hal-core.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/hal/hal-core.h.boost-signals2 2019-05-16 20:56:59.929793841 +0200
+@@ -40,7 +40,7 @@
+
+ #include "services.h"
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include <set>
+@@ -114,24 +114,24 @@
+ /** This signal is emitted when an Ekiga::HalManager has been
+ * added to the HalCore Service.
+ */
+- boost::signal1<void, HalManager &> manager_added;
++ boost::signals2::signal<void(HalManager &)> manager_added;
+
+
+ /*** API to act on HAL events ***/
+
+ /** See hal-manager.h for the API
+ */
+- boost::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_added;
+- boost::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_removed;
++ boost::signals2::signal<void(const std::string &, const std::string &, unsigned, HalManager*)> videoinput_device_added;
++ boost::signals2::signal<void(const std::string &, const std::string &, unsigned, HalManager*)> videoinput_device_removed;
+
+- boost::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_added;
+- boost::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_removed;
++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audioinput_device_added;
++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audioinput_device_removed;
+
+- boost::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_added;
+- boost::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_removed;
++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audiooutput_device_added;
++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audiooutput_device_removed;
+
+- boost::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_up;
+- boost::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_down;
++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> network_interface_up;
++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> network_interface_down;
+
+ private:
+
+--- ekiga-4.0.1/lib/engine/hal/hal-manager.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/hal/hal-manager.h.boost-signals2 2019-05-16 20:58:32.322025169 +0200
+@@ -75,50 +75,50 @@
+ * @param device the device name.
+ * @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux).
+ */
+- boost::signal3<void, std::string, std::string, unsigned> videoinput_device_added;
++ boost::signals2::signal<void(std::string, std::string, unsigned)> videoinput_device_added;
+
+ /** This signal is emitted when a video input device is removed from the system.
+ * @param source the video input framework (e.g. video4linux, etc.).
+ * @param device the device name.
+ * @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux).
+ */
+- boost::signal3<void, std::string, std::string, unsigned> videoinput_device_removed;
++ boost::signals2::signal<void(std::string, std::string, unsigned)> videoinput_device_removed;
+
+ /** This signal is emitted when an audio input device is added to the system.
+ * @param source the audio input framework (e.g. alsa, oss, etc.).
+ * @param device the device name.
+ */
+- boost::signal2<void, std::string, std::string> audioinput_device_added;
++ boost::signals2::signal<void(std::string, std::string)> audioinput_device_added;
+
+ /** This signal is emitted when an audio input device is removed from the system.
+ * @param source the audio input framework (e.g. alsa, oss, etc.).
+ * @param device the device name.
+ */
+- boost::signal2<void, std::string, std::string> audioinput_device_removed;
++ boost::signals2::signal<void(std::string, std::string)> audioinput_device_removed;
+
+ /** This signal is emitted when an audio output device is added to the system.
+ * @param source the audio output framework (e.g. alsa, oss, etc.).
+ * @param device the device name.
+ */
+- boost::signal2<void, std::string, std::string> audiooutput_device_added;
++ boost::signals2::signal<void(std::string, std::string)> audiooutput_device_added;
+
+ /** This signal is emitted when an audio output device is removed from the system.
+ * @param source the audio output framework (e.g. alsa, oss, etc.).
+ * @param device the device name.
+ */
+- boost::signal2<void, std::string, std::string> audiooutput_device_removed;
++ boost::signals2::signal<void(std::string, std::string)> audiooutput_device_removed;
+
+ /** This signal is emitted when a network device comes up.
+ * @param interface_name the interface name (e.g. eth0, etc.).
+ * @param ip4_address the IPv4 address (e.g. "192.168.0.1").
+ */
+- boost::signal2<void, std::string, std::string> network_interface_up;
++ boost::signals2::signal<void(std::string, std::string)> network_interface_up;
+
+ /** This signal is emitted when a network device goes down.
+ * @param interface_name the interface name (e.g. eth0, etc.).
+ * @param ip4_address the IPv4 address (e.g. "192.168.0.1").
+ */
+- boost::signal2<void, std::string, std::string> network_interface_down;
++ boost::signals2::signal<void(std::string, std::string)> network_interface_down;
+ };
+
+ /**
+--- ekiga-4.0.1/lib/engine/notification/notification-core.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/notification/notification-core.h.boost-signals2 2019-05-16 20:58:55.762084125 +0200
+@@ -77,7 +77,7 @@
+ void action_trigger ()
+ { if (action_callback) action_callback (); }
+
+- boost::signal0<void> removed;
++ boost::signals2::signal<void(void)> removed;
+
+ private:
+
+@@ -109,7 +109,7 @@
+ void push_notification (boost::shared_ptr<Notification> notification)
+ { notification_added (notification); }
+
+- boost::signal1<void, boost::shared_ptr<Notification> > notification_added;
++ boost::signals2::signal<void(boost::shared_ptr<Notification>)> notification_added;
+ };
+ };
+
+--- ekiga-4.0.1/lib/engine/presence/cluster.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/presence/cluster.h.boost-signals2 2019-05-16 20:59:44.537207148 +0200
+@@ -66,16 +66,16 @@
+ * from the Cluster.
+ * @param The Heap in question.
+ */
+- boost::signal1<void, HeapPtr > heap_added;
+- boost::signal1<void, HeapPtr > heap_removed;
++ boost::signals2::signal<void(HeapPtr)> heap_added;
++ boost::signals2::signal<void(HeapPtr)> heap_removed;
+
+ /** Those signals are forwarded from the given Heap
+ * @param The Heap in question.
+ */
+- boost::signal1<void, HeapPtr > heap_updated;
+- boost::signal2<void, HeapPtr , PresentityPtr > presentity_added;
+- boost::signal2<void, HeapPtr , PresentityPtr > presentity_updated;
+- boost::signal2<void, HeapPtr , PresentityPtr > presentity_removed;
++ boost::signals2::signal<void(HeapPtr)> heap_updated;
++ boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_added;
++ boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_updated;
++ boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_removed;
+ };
+
+ typedef boost::shared_ptr<Cluster> ClusterPtr;
+--- ekiga-4.0.1/lib/engine/presence/heap.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/presence/heap.h.boost-signals2 2019-05-16 21:00:10.299272312 +0200
+@@ -83,15 +83,15 @@
+
+ /** This signal is emitted when a Presentity has been added to the Heap.
+ */
+- boost::signal1<void, PresentityPtr > presentity_added;
++ boost::signals2::signal<void(PresentityPtr)> presentity_added;
+
+ /** This signal is emitted when a Presentity has been updated in the Heap.
+ */
+- boost::signal1<void, PresentityPtr > presentity_updated;
++ boost::signals2::signal<void(PresentityPtr)> presentity_updated;
+
+ /** This signal is emitted when a Presentity has been removed from the Heap.
+ */
+- boost::signal1<void, PresentityPtr > presentity_removed;
++ boost::signals2::signal<void(PresentityPtr)> presentity_removed;
+ };
+
+ typedef boost::shared_ptr<Heap> HeapPtr;
+--- ekiga-4.0.1/lib/engine/presence/presence-core.cpp 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/presence/presence-core.cpp.boost-signals2 2019-05-16 21:25:58.111170575 +0200
+@@ -49,7 +49,7 @@
+
+ Ekiga::PresenceCore::~PresenceCore ()
+ {
+- for (std::list<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
++ for (std::list<boost::signals2::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
+ iter->disconnect ();
+ }
+
+--- ekiga-4.0.1/lib/engine/presence/presence-core.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/presence/presence-core.h.boost-signals2 2019-05-16 21:26:09.582200124 +0200
+@@ -97,8 +97,8 @@
+ * presence information about an uri it was required to handle.
+ * The information is given as a pair of strings (uri, data).
+ */
+- boost::signal2<void, std::string, std::string> presence_received;
+- boost::signal2<void, std::string, std::string> status_received;
++ boost::signals2::signal<void(std::string, std::string)> presence_received;
++ boost::signals2::signal<void(std::string, std::string)> status_received;
+ };
+
+ class PresencePublisher
+@@ -180,22 +180,22 @@
+ /** This signal is emitted when an Ekiga::Cluster has been added
+ * to the PresenceCore Service.
+ */
+- boost::signal1<void, ClusterPtr > cluster_added;
++ boost::signals2::signal<void(ClusterPtr)> cluster_added;
+
+ /** Those signals are forwarding the heap_added, heap_updated
+ * and heap_removed from the given Cluster.
+ *
+ */
+- boost::signal2<void, ClusterPtr , HeapPtr > heap_added;
+- boost::signal2<void, ClusterPtr , HeapPtr > heap_updated;
+- boost::signal2<void, ClusterPtr , HeapPtr > heap_removed;
++ boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_added;
++ boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_updated;
++ boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_removed;
+
+ /** Those signals are forwarding the presentity_added, presentity_updated
+ * and presentity_removed from the given Heap of the given Cluster.
+ */
+- boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_added;
+- boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_updated;
+- boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_removed;
++ boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_added;
++ boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_updated;
++ boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_removed;
+
+ private:
+
+@@ -256,8 +256,8 @@
+ /** Those signals are emitted whenever information has been received
+ * about an uri ; the information is a pair of strings (uri, information).
+ */
+- boost::signal2<void, std::string, std::string> presence_received;
+- boost::signal2<void, std::string, std::string> status_received;
++ boost::signals2::signal<void(std::string, std::string)> presence_received;
++ boost::signals2::signal<void(std::string, std::string)> status_received;
+
+ private:
+
+@@ -321,7 +321,7 @@
+
+ private:
+
+- std::list<boost::signals::connection> conns;
++ std::list<boost::signals2::connection> conns;
+ };
+
+ /**
+--- ekiga-4.0.1/lib/engine/presence/uri-presentity.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/presence/uri-presentity.h.boost-signals2 2019-05-16 21:01:39.841499790 +0200
+@@ -60,7 +60,7 @@
+ */
+ class URIPresentity:
+ public Ekiga::Presentity,
+- public boost::signals::trackable
++ public boost::signals2::trackable
+ {
+ public:
+
+--- ekiga-4.0.1/lib/engine/protocol/call-core.cpp 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/protocol/call-core.cpp.boost-signals2 2019-05-16 21:27:24.447393322 +0200
+@@ -48,7 +48,7 @@
+
+ CallCore::~CallCore ()
+ {
+- for (std::list<boost::signals::connection>::iterator iter = manager_connections.begin ();
++ for (std::list<boost::signals2::connection>::iterator iter = manager_connections.begin ();
+ iter != manager_connections.end ();
+ ++iter)
+ iter->disconnect ();
+@@ -103,7 +103,7 @@
+
+ void CallCore::add_call (boost::shared_ptr<Call> call, boost::shared_ptr<CallManager> manager)
+ {
+- std::list<boost::signals::connection> conns;
++ std::list<boost::signals2::connection> conns;
+
+ conns.push_back (call->ringing.connect (boost::bind (&CallCore::on_ringing_call, this, call, manager)));
+ conns.push_back (call->setup.connect (boost::bind (&CallCore::on_setup_call, this, call, manager)));
+@@ -124,7 +124,7 @@
+
+ void CallCore::remove_call (boost::shared_ptr<Call> call)
+ {
+- for (std::list<boost::signals::connection>::iterator iter2 = call_connections [call->get_id ()].begin ();
++ for (std::list<boost::signals2::connection>::iterator iter2 = call_connections [call->get_id ()].begin ();
+ iter2 != call_connections [call->get_id ()].end ();
+ ++iter2)
+ iter2->disconnect ();
+--- ekiga-4.0.1/lib/engine/protocol/call-core.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/protocol/call-core.h.boost-signals2 2019-05-16 21:04:18.066905414 +0200
+@@ -45,7 +45,7 @@
+ #include "call-protocol-manager.h"
+ #include <boost/smart_ptr.hpp>
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+ #include <set>
+ #include <map>
+@@ -126,7 +126,7 @@
+ /** This signal is emitted when a Ekiga::CallManager has been
+ * added to the CallCore Service.
+ */
+- boost::signal1<void, boost::shared_ptr<CallManager> > manager_added;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>)> manager_added;
+
+
+ /*** Call Management ***/
+@@ -141,21 +141,21 @@
+
+ /** See call.h for the API
+ */
+- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > ringing_call;
+- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > setup_call;
+- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > missed_call;
+- boost::signal3<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string> cleared_call;
+- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > established_call;
+- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > held_call;
+- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > retrieved_call;
+- boost::signal5<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType, bool> stream_opened;
+- boost::signal5<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType, bool> stream_closed;
+- boost::signal4<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType> stream_paused;
+- boost::signal4<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType> stream_resumed;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> ringing_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> setup_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> missed_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string)> cleared_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> established_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> held_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> retrieved_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType, bool)> stream_opened;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType, bool)> stream_closed;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType)> stream_paused;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType)> stream_resumed;
+
+ /*** Misc ***/
+- boost::signal1<void, boost::shared_ptr<CallManager> > manager_ready;
+- boost::signal0<void> ready;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>)> manager_ready;
++ boost::signals2::signal<void(void)> ready;
+
+ /** This chain allows the CallCore to report errors to the user
+ */
+@@ -186,8 +186,8 @@
+
+
+ std::set<boost::shared_ptr<CallManager> > managers;
+- std::list<boost::signals::connection> manager_connections;
+- std::map<std::string, std::list<boost::signals::connection> > call_connections;
++ std::list<boost::signals2::connection> manager_connections;
++ std::map<std::string, std::list<boost::signals2::connection> > call_connections;
+ unsigned nr_ready;
+ };
+
+--- ekiga-4.0.1/lib/engine/protocol/call.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/protocol/call.h.boost-signals2 2019-05-16 21:06:43.219275173 +0200
+@@ -38,7 +38,7 @@
+ #ifndef __CALL_H__
+ #define __CALL_H__
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+ #include <string>
+
+@@ -198,69 +198,69 @@
+
+ /* Signal emitted when the call is established
+ */
+- boost::signal0<void> established;
++ boost::signals2::signal<void(void)> established;
+
+ /* Signal emitted when an established call is cleared
+ * @param: a string describing why the call was cleared
+ */
+- boost::signal1<void, std::string> cleared;
++ boost::signals2::signal<void(std::string)> cleared;
+
+ /* Signal emitted when the call is missed, ie cleared
+ * without having been established
+ */
+- boost::signal0<void> missed;
++ boost::signals2::signal<void(void)> missed;
+
+ /* Signal emitted when the call is forwarded
+ */
+- boost::signal0<void> forwarded;
++ boost::signals2::signal<void(void)> forwarded;
+
+ /* Signal emitted when the call is held
+ */
+- boost::signal0<void> held;
++ boost::signals2::signal<void(void)> held;
+
+ /* Signal emitted when the call is retrieved
+ */
+- boost::signal0<void> retrieved;
++ boost::signals2::signal<void(void)> retrieved;
+
+ /* Signal emitted when the call is being setup
+ */
+- boost::signal0<void> setup;
++ boost::signals2::signal<void(void)> setup;
+
+ /* Signal emitted when the remote party is ringing
+ */
+- boost::signal0<void> ringing;
++ boost::signals2::signal<void(void)> ringing;
+
+ /* Signal emitted when a stream is opened
+ * @param the stream name
+ * @param the stream type
+ * @param transmission or reception
+ */
+- boost::signal3<void, std::string, StreamType, bool> stream_opened;
++ boost::signals2::signal<void(std::string, StreamType, bool)> stream_opened;
+
+ /* Signal emitted when a stream is closed
+ * @param the stream name
+ * @param the stream type
+ * @param transmission or reception
+ */
+- boost::signal3<void, std::string, StreamType, bool> stream_closed;
++ boost::signals2::signal<void(std::string, StreamType, bool)> stream_closed;
+
+ /* Signal emitted when a transmitted stream is paused
+ * @param the stream name
+ * @param the stream type
+ * @param transmission or reception
+ */
+- boost::signal2<void, std::string, StreamType> stream_paused;
++ boost::signals2::signal<void(std::string, StreamType)> stream_paused;
+
+ /* Signal emitted when a transmitted stream is resumed
+ * @param the stream name
+ * @param the stream type
+ * @param transmission or reception
+ */
+- boost::signal2<void, std::string, StreamType> stream_resumed;
++ boost::signals2::signal<void(std::string, StreamType)> stream_resumed;
+
+ /** This signal is emitted when the Call is removed.
+ */
+- boost::signal0<void> removed;
++ boost::signals2::signal<void(void)> removed;
+
+ };
+
+--- ekiga-4.0.1/lib/engine/protocol/call-manager.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/protocol/call-manager.h.boost-signals2 2019-05-16 21:04:48.498983953 +0200
+@@ -40,7 +40,7 @@
+ #define __CALL_MANAGER_H__
+
+ #include <set>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include <boost/smart_ptr.hpp>
+@@ -99,7 +99,7 @@
+ /** This signal is emitted when a Ekiga::CallProtocolManager has been
+ * added to the CallManager.
+ */
+- boost::signal1<void, boost::shared_ptr<CallProtocolManager> > manager_added;
++ boost::signals2::signal<void(boost::shared_ptr<CallProtocolManager>)> manager_added;
+
+
+ /*
+@@ -213,7 +213,7 @@
+ /*
+ * MISC
+ */
+- boost::signal0<void> ready;
++ boost::signals2::signal<void(void)> ready;
+
+ private:
+ std::set<boost::shared_ptr<CallProtocolManager> > managers;
+--- ekiga-4.0.1/lib/engine/videoinput/videoinput-core.h 2013-02-19 07:11:02.000000000 +0100
++++ ekiga-4.0.1/lib/engine/videoinput/videoinput-core.h.boost-signals2 2019-05-16 21:07:34.924401112 +0200
+@@ -45,7 +45,7 @@
+ #include "videoinput-manager.h"
+ #include "videoinput-gmconf-bridge.h"
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+ #include <glib.h>
+ #include <set>
+@@ -146,7 +146,7 @@
+ /** This signal is emitted when a Ekiga::VideoInputManager has been
+ * added to the VideoInputCore Service.
+ */
+- boost::signal1<void, VideoInputManager &> manager_added;
++ boost::signals2::signal<void(VideoInputManager &)> manager_added;
+
+
+ /*** VideoInput Device Management ***/
+@@ -277,23 +277,23 @@
+
+ /** See videoinput-manager.h for the API
+ */
+- boost::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputSettings&> device_opened;
+- boost::signal2<void, VideoInputManager &, VideoInputDevice &> device_closed;
+- boost::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes> device_error;
++ boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &, VideoInputSettings&)> device_opened;
++ boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &)> device_closed;
++ boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes)> device_error;
+
+ /** This signal is emitted when a video input has been added to the system.
+ * This signal will be emitted if add_device was called with a device name and
+ * a manager claimed support for this device.
+ * @param device the video input device that was added.
+ */
+- boost::signal2<void, VideoInputDevice, bool> device_added;
++ boost::signals2::signal<void(VideoInputDevice, bool)> device_added;
+
+ /** This signal is emitted when a video input has been removed from the system.
+ * This signal will be emitted if remove_device was called with a device name and
+ * a manager claimed support for this device.
+ * @param device the video input device that was removed.
+ */
+- boost::signal2<void, VideoInputDevice, bool> device_removed;
++ boost::signals2::signal<void(VideoInputDevice, bool)> device_removed;
+
+ private:
+ void on_set_device (const VideoInputDevice & device);
+--- ekiga-4.0.1/lib/engine/videoinput/videoinput-manager.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/videoinput/videoinput-manager.h.boost-signals2 2019-05-16 21:08:07.020479478 +0200
+@@ -39,7 +39,7 @@
+ #define __VIDEOINPUT_MANAGER_H__
+
+ #include <vector>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include "videoinput-info.h"
+@@ -159,18 +159,18 @@
+ * @param device the video input device that was opened.
+ * @param config the current video input device configuration (current brightness, colour, etc.).
+ */
+- boost::signal2<void, VideoInputDevice, VideoInputSettings> device_opened;
++ boost::signals2::signal<void(VideoInputDevice, VideoInputSettings)> device_opened;
+
+ /** This signal is emitted when a video input device is closed.
+ * @param device the video input device that was closed.
+ */
+- boost::signal1<void, VideoInputDevice> device_closed;
++ boost::signals2::signal<void(VideoInputDevice)> device_closed;
+
+ /** This signal is emitted when an error occurs when opening a video input device.
+ * @param device the video input device that caused the error.
+ * @param error_code the video input device error code.
+ */
+- boost::signal2<void, VideoInputDevice, VideoInputErrorCodes> device_error;
++ boost::signals2::signal<void(VideoInputDevice, VideoInputErrorCodes)> device_error;
+
+ protected:
+ typedef struct ManagerState {
+--- ekiga-4.0.1/lib/engine/videooutput/videooutput-core.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/lib/engine/videooutput/videooutput-core.h.boost-signals2 2019-05-16 22:08:08.535773653 +0200
+@@ -42,7 +42,7 @@
+ #include "videooutput-gmconf-bridge.h"
+ #include "videooutput-manager.h"
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+ #include <set>
+ #include <map>
+@@ -116,7 +116,7 @@
+ /** This signal is emitted when a Ekiga::VideoOutputManager has been
+ * added to the VideoOutputCore Service.
+ */
+- boost::signal1<void, VideoOutputManager &> manager_added;
++ boost::signals2::signal<void(VideoOutputManager &)> manager_added;
+
+
+ /*** Videooutput Management ***/
+@@ -165,11 +165,11 @@
+
+ /** See videooutput-manager.h for the API
+ */
+- boost::signal6<void, VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool> device_opened;
+- boost::signal1<void, VideoOutputManager &> device_closed;
+- boost::signal2<void, VideoOutputManager &, VideoOutputErrorCodes> device_error;
+- boost::signal2<void, VideoOutputManager &, VideoOutputFSToggle> fullscreen_mode_changed;
+- boost::signal3<void, VideoOutputManager &, unsigned, unsigned> size_changed;
++ boost::signals2::signal<void(VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool)> device_opened;
++ boost::signals2::signal<void(VideoOutputManager &)> device_closed;
++ boost::signals2::signal<void(VideoOutputManager &, VideoOutputErrorCodes)> device_error;
++ boost::signals2::signal<void(VideoOutputManager &, VideoOutputFSToggle)> fullscreen_mode_changed;
++ boost::signals2::signal<void(VideoOutputManager &, unsigned, unsigned)> size_changed;
+
+
+ private:
+--- ekiga-4.0.1/lib/engine/videooutput/videooutput-manager.h 2013-02-19 07:11:02.000000000 +0100
++++ ekiga-4.0.1/lib/engine/videooutput/videooutput-manager.h.boost-signals2 2019-05-16 22:07:52.271747906 +0200
+@@ -38,7 +38,7 @@
+ #ifndef __VIDEOOUTPUT_MANAGER_H__
+ #define __VIDEOOUTPUT_MANAGER_H__
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include "videooutput-info.h"
+@@ -108,16 +108,16 @@
+ * @param both_streams if a frame from both local and remote stream has been received.
+ * @param ext_stream if a frame from an extended video stream has been received.
+ */
+- boost::signal5<void, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool> device_opened;
++ boost::signals2::signal<void(VideoOutputAccel, VideoOutputMode, unsigned, bool, bool)> device_opened;
+
+ /** This signal is emitted when a video output device is closed.
+ */
+- boost::signal0<void> device_closed;
++ boost::signals2::signal<void(void)> device_closed;
+
+ /** This signal is emitted when an error occurs when opening a video output device.
+ * @param error_code the video output device error code.
+ */
+- boost::signal1<void, VideoOutputErrorCodes> device_error;
++ boost::signals2::signal<void(VideoOutputErrorCodes)> device_error;
+
+ /** This signal is emitted when a manager switches autonomously into or out of fullscreen mode.
+ * Some managers like DX and XV allow the user to switch between FS
+@@ -127,7 +127,7 @@
+ * or when it is being zoomed in or out.
+ * @param toggle VO_FS_ON or VO_FS_OFF depending on whether FS was activated or deactivated.
+ */
+- boost::signal1<void, VideoOutputFSToggle> fullscreen_mode_changed;
++ boost::signals2::signal<void(VideoOutputFSToggle)> fullscreen_mode_changed;
+
+ /** This signal is emitted the video output size has changed.
+ * This signal is called whenever the size of the widget carrying the video signal
+@@ -136,7 +136,7 @@
+ * @param width the new width of the widget.
+ * @param height the new height of the widget.
+ */
+- boost::signal2<void, unsigned, unsigned> size_changed;
++ boost::signals2::signal<void(unsigned, unsigned)> size_changed;
+
+ protected:
+ virtual void get_display_info (DisplayInfo &) { };
+--- ekiga-4.0.1/plugins/avahi/avahi-cluster.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/plugins/avahi/avahi-cluster.h.boost-signals2 2019-05-16 21:10:04.107766569 +0200
+@@ -53,7 +53,7 @@
+ class Cluster:
+ public Ekiga::Service,
+ public Ekiga::ClusterImpl<Heap>,
+- public boost::signals::trackable
++ public boost::signals2::trackable
+ {
+ public:
+
+--- ekiga-4.0.1/plugins/avahi/avahi-heap.h 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/plugins/avahi/avahi-heap.h.boost-signals2 2019-05-16 21:10:12.088786207 +0200
+@@ -60,7 +60,7 @@
+ class Heap:
+ public Ekiga::PresenceFetcher,
+ public Ekiga::HeapImpl<Ekiga::URIPresentity>,
+- public boost::signals::trackable
++ public boost::signals2::trackable
+ {
+ public:
+
+--- ekiga-4.0.1/plugins/ldap/ldap-book.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/plugins/ldap/ldap-book.h.boost-signals2 2019-05-16 21:10:28.275826062 +0200
+@@ -124,7 +124,7 @@
+
+ xmlNodePtr get_node ();
+
+- boost::signal0<void> trigger_saving;
++ boost::signals2::signal<void(void)> trigger_saving;
+
+ bool is_ekiga_net_book () const;
+
+--- ekiga-4.0.1/plugins/libnotify/libnotify-main.cpp 2013-02-18 22:37:04.000000000 +0100
++++ ekiga-4.0.1/plugins/libnotify/libnotify-main.cpp.boost-signals2 2019-05-16 21:10:54.060889621 +0200
+@@ -51,7 +51,7 @@
+
+ class LibNotify:
+ public Ekiga::Service,
+- public boost::signals::trackable
++ public boost::signals2::trackable
+ {
+ public:
+
+@@ -77,7 +77,7 @@
+ boost::shared_ptr<Ekiga::Call> call);
+ void on_call_notification_closed (gpointer self);
+
+- typedef std::map<boost::shared_ptr<Ekiga::Notification>, std::pair<boost::signals::connection, boost::shared_ptr<NotifyNotification> > > container_type;
++ typedef std::map<boost::shared_ptr<Ekiga::Notification>, std::pair<boost::signals2::connection, boost::shared_ptr<NotifyNotification> > > container_type;
+ container_type live;
+ };
+
+@@ -234,10 +234,10 @@
+ notify_action_cb, notification.get (), NULL);
+
+ g_signal_connect (notif, "closed", G_CALLBACK (on_notif_closed), notification.get ());
+- boost::signals::connection conn = notification->removed.connect (boost::bind (&LibNotify::on_notification_removed,
++ boost::signals2::connection conn = notification->removed.connect (boost::bind (&LibNotify::on_notification_removed,
+ this, notification));
+
+- live[notification] = std::pair<boost::signals::connection, boost::shared_ptr<NotifyNotification> > (conn, boost::shared_ptr<NotifyNotification> (notif, g_object_unref));
++ live[notification] = std::pair<boost::signals2::connection, boost::shared_ptr<NotifyNotification> > (conn, boost::shared_ptr<NotifyNotification> (notif, g_object_unref));
+
+ notify_notification_show (notif, NULL);
+ }
+--- ekiga-4.0.1/plugins/loudmouth/loudmouth-account.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/plugins/loudmouth/loudmouth-account.h.boost-signals2 2019-05-16 21:11:10.299929695 +0200
+@@ -70,7 +70,7 @@
+
+ xmlNodePtr get_node () const;
+
+- boost::signal0<void> trigger_saving;
++ boost::signals2::signal<void(void)> trigger_saving;
+
+ const std::string get_name () const;
+
+--- ekiga-4.0.1/plugins/loudmouth/loudmouth-heap-roster.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/plugins/loudmouth/loudmouth-heap-roster.h.boost-signals2 2019-05-16 21:11:24.771965439 +0200
+@@ -46,7 +46,7 @@
+ class HeapRoster:
+ public Ekiga::HeapImpl<Presentity>,
+ public LM::Handler,
+- public boost::signals::trackable
++ public boost::signals2::trackable
+ {
+ public:
+
+--- ekiga-4.0.1/plugins/loudmouth/loudmouth-helpers.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/plugins/loudmouth/loudmouth-helpers.h.boost-signals2 2019-05-16 21:11:41.572006967 +0200
+@@ -37,7 +37,7 @@
+ #define __LOUDMOUTH_HELPERS_H__
+
+ #include <boost/smart_ptr.hpp>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+
+ #include <loudmouth/loudmouth.h>
+
+--- ekiga-4.0.1/plugins/loudmouth/loudmouth-presentity.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/plugins/loudmouth/loudmouth-presentity.h.boost-signals2 2019-05-16 21:11:53.612036752 +0200
+@@ -78,7 +78,7 @@
+
+ bool has_chat;
+
+- boost::signal0<void> chat_requested;
++ boost::signals2::signal<void(void)> chat_requested;
+
+ private:
+ LmConnection* connection;
+--- ekiga-4.0.1/plugins/resource-list/rl-heap.cpp 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/plugins/resource-list/rl-heap.cpp.boost-signals2 2019-05-16 21:12:26.773118885 +0200
+@@ -185,7 +185,7 @@
+ {
+ bool go_on = true;
+
+- for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
++ for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
+ iter = presentities.begin ();
+ go_on && iter != presentities.end ();
+ ++iter)
+@@ -254,7 +254,7 @@
+ while ( !presentities.empty ()) {
+
+ presentities.begin()->first->removed ();
+- for (std::list<boost::signals::connection>::const_iterator iter2
++ for (std::list<boost::signals2::connection>::const_iterator iter2
+ = presentities.begin()->second.begin ();
+ iter2 != presentities.begin()->second.end ();
+ ++iter2)
+@@ -366,7 +366,7 @@
+ && xmlStrEqual (BAD_CAST ("entry"), child->name)) {
+
+ PresentityPtr presentity(new Presentity (services, path, doc, child, writable));
+- std::list<boost::signals::connection> conns;
++ std::list<boost::signals2::connection> conns;
+ conns.push_back (presentity->updated.connect (boost::bind (boost::ref (presentity_updated), presentity)));
+ conns.push_back (presentity->removed.connect (boost::bind(boost::ref (presentity_removed),presentity)));
+ conns.push_back (presentity->trigger_reload.connect (boost::bind (&RL::Heap::refresh, this)));
+@@ -381,7 +381,7 @@
+ RL::Heap::push_presence (const std::string uri_,
+ const std::string presence)
+ {
+- for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
++ for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
+ iter = presentities.begin ();
+ iter != presentities.end ();
+ ++iter) {
+@@ -395,7 +395,7 @@
+ RL::Heap::push_status (const std::string uri_,
+ const std::string status)
+ {
+- for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
++ for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
+ iter = presentities.begin ();
+ iter != presentities.end ();
+ ++iter) {
+@@ -514,7 +514,7 @@
+ "contact on a remote server"));
+
+ std::set<std::string> all_groups;
+- for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
++ for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
+ iter = presentities.begin ();
+ iter != presentities.end ();
+ ++iter) {
+--- ekiga-4.0.1/plugins/resource-list/rl-heap.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/plugins/resource-list/rl-heap.h.boost-signals2 2019-05-16 21:12:47.397170040 +0200
+@@ -90,7 +90,7 @@
+ void push_status (const std::string uri,
+ const std::string status);
+
+- boost::signal0<void> trigger_saving;
++ boost::signals2::signal<void(void)> trigger_saving;
+
+ private:
+
+@@ -106,7 +106,7 @@
+ boost::shared_ptr<xmlDoc> doc;
+ xmlNodePtr list_node;
+
+- std::map<PresentityPtr, std::list<boost::signals::connection> > presentities;
++ std::map<PresentityPtr, std::list<boost::signals2::connection> > presentities;
+
+ void refresh ();
+
+--- ekiga-4.0.1/plugins/resource-list/rl-list.cpp 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/plugins/resource-list/rl-list.cpp.boost-signals2 2019-05-16 21:13:38.853297909 +0200
+@@ -94,9 +94,9 @@
+
+ void publish () const;
+
+- boost::signal1<void, boost::shared_ptr<Entry> > entry_added;
+- boost::signal1<void, boost::shared_ptr<Entry> > entry_updated;
+- boost::signal1<void, boost::shared_ptr<Entry> > entry_removed;
++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_added;
++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_updated;
++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_removed;
+
+
+ /* data for its children */
+@@ -104,7 +104,7 @@
+
+ std::list<ChildType> ordering;
+ std::list<boost::shared_ptr<List> > lists;
+- std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > > entries;
++ std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > > entries;
+ };
+
+
+@@ -235,12 +235,12 @@
+ (*iter)->flush ();
+ lists.clear ();
+
+- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::iterator iter = entries.begin ();
++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::iterator iter = entries.begin ();
+ iter != entries.end ();
+ ++iter) {
+
+ iter->first->removed ();
+- for (std::list<boost::signals::connection>::iterator conn_iter
++ for (std::list<boost::signals2::connection>::iterator conn_iter
+ = iter->second.begin ();
+ conn_iter != iter->second.end ();
+ ++conn_iter)
+@@ -342,10 +342,10 @@
+ entry_pos,
+ display_name,
+ doc, child));
+- std::list<boost::signals::connection> conns;
++ std::list<boost::signals2::connection> conns;
+ conns.push_back (entry->updated.connect (boost::bind (boost::ref (entry_updated), entry)));
+ conns.push_back (entry->removed.connect (boost::bind (boost::ref (entry_removed), entry)));
+- entries.push_back (std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > (entry, conns));
++ entries.push_back (std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > (entry, conns));
+ ordering.push_back (ENTRY);
+ entry_pos++;
+ entry_added (entry);
+@@ -363,7 +363,7 @@
+ ++iter)
+ (*iter)->push_presence (uri_, presence);
+
+- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
+ iter != entries.end ();
+ ++iter) {
+
+@@ -381,7 +381,7 @@
+ ++iter)
+ (*iter)->push_status (uri_, status);
+
+- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
+ iter != entries.end ();
+ ++iter) {
+
+@@ -400,7 +400,7 @@
+ ++iter)
+ go_on = (*iter)->visit_presentities (visitor);
+
+- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
+ go_on && iter != entries.end ();
+ ++iter) {
+
+@@ -418,7 +418,7 @@
+ ++iter)
+ (*iter)->publish ();
+
+- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
+ iter != entries.end ();
+ ++iter) {
+
+--- ekiga-4.0.1/plugins/resource-list/rl-list.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/plugins/resource-list/rl-list.h.boost-signals2 2019-05-16 21:14:05.516364301 +0200
+@@ -74,9 +74,9 @@
+
+ void publish () const;
+
+- boost::signal1<void, boost::shared_ptr<Entry> > entry_added;
+- boost::signal1<void, boost::shared_ptr<Entry> > entry_updated;
+- boost::signal1<void, boost::shared_ptr<Entry> > entry_removed;
++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_added;
++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_updated;
++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_removed;
+
+ /* this method orders the list to get rid of all its children */
+ void flush ();
+--- ekiga-4.0.1/plugins/resource-list/rl-presentity.h 2012-11-07 21:43:51.000000000 +0100
++++ ekiga-4.0.1/plugins/resource-list/rl-presentity.h.boost-signals2 2019-05-16 21:14:16.140390781 +0200
+@@ -79,7 +79,7 @@
+
+ bool populate_menu (Ekiga::MenuBuilder &);
+
+- boost::signal0<void> trigger_reload;
++ boost::signals2::signal<void(void)> trigger_reload;
+
+ private:
+
+--- ekiga-4.0.1/src/gui/assistant.cpp 2013-02-18 22:37:04.000000000 +0100
++++ ekiga-4.0.1/src/gui/assistant.cpp.boost-signals2 2019-05-16 21:27:53.400468197 +0200
+@@ -95,7 +95,7 @@
+ gint last_active_page;
+
+ GtkListStore *summary_model;
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+ };
+
+ /* presenting the network connection type to the user */
+@@ -1679,7 +1679,7 @@
+ g_signal_connect (assistant, "key-press-event",
+ G_CALLBACK (ekiga_assistant_key_press_cb), NULL);
+
+- boost::signals::connection conn;
++ boost::signals2::connection conn;
+ assistant->priv->videoinput_core = service_core.get<Ekiga::VideoInputCore> ("videoinput-core");
+ assistant->priv->audioinput_core = service_core.get<Ekiga::AudioInputCore> ("audioinput-core");
+ assistant->priv->audiooutput_core = service_core.get<Ekiga::AudioOutputCore> ("audiooutput-core");
+--- ekiga-4.0.1/src/gui/main_window.cpp 2013-02-18 22:36:51.000000000 +0100
++++ ekiga-4.0.1/src/gui/main_window.cpp.boost-signals2 2019-05-16 21:27:43.064441457 +0200
+@@ -129,7 +129,7 @@
+ unsigned calling_state;
+
+ gulong roster_selection_connection_id;
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+ };
+
+ /* properties */
+@@ -1706,7 +1706,7 @@
+ static void
+ ekiga_main_window_connect_engine_signals (EkigaMainWindow *mw)
+ {
+- boost::signals::connection conn;
++ boost::signals2::connection conn;
+
+ g_return_if_fail (EKIGA_IS_MAIN_WINDOW (mw));
+
+--- ekiga-4.0.1/src/gui/statusmenu.cpp 2013-02-18 22:37:04.000000000 +0100
++++ ekiga-4.0.1/src/gui/statusmenu.cpp.boost-signals2 2019-05-16 21:27:34.032418100 +0200
+@@ -51,7 +51,7 @@
+ struct _StatusMenuPrivate
+ {
+ boost::shared_ptr<Ekiga::PersonalDetails> personal_details;
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+
+ GtkListStore *list_store; // List store storing the menu
+ GtkWindow *parent; // Parent window
+@@ -796,7 +796,7 @@
+ {
+ StatusMenu *self = NULL;
+
+- boost::signals::connection conn;
++ boost::signals2::connection conn;
+ GtkCellRenderer *renderer = NULL;
+ GSList *custom_status_array [NUM_STATUS_TYPES];
+
diff --git a/network/ekiga/ekiga-4.0.1-libresolv.patch b/network/ekiga/ekiga-4.0.1-libresolv.patch
new file mode 100644
index 0000000000..7754eeb185
--- /dev/null
+++ b/network/ekiga/ekiga-4.0.1-libresolv.patch
@@ -0,0 +1,13 @@
+diff -up ekiga-4.0.1/configure.ac.libresolv ekiga-4.0.1/configure.ac
+--- ekiga-4.0.1/configure.ac.libresolv 2017-02-23 02:30:42.051227852 -0600
++++ ekiga-4.0.1/configure.ac 2017-02-23 02:32:04.609519837 -0600
+@@ -324,7 +324,8 @@ if test "x$enable_ldap" = "xyes"; then
+
+ dnl Checking for libresolv
+ if test ${gm_platform} = "linux" ; then
+- AC_CHECK_LIB(resolv, res_gethostbyaddr, [LIBS="-lresolv $LIBS"], AC_MSG_ERROR([You need the libresolv library to compile Ekiga]), -lresolv)
++ # AC_CHECK_LIB(resolv, res_gethostbyaddr, [LIBS="-lresolv $LIBS"], AC_MSG_ERROR([You need the libresolv library to compile Ekiga]), -lresolv)
++ AC_WARNING([Just adding libresolv to LDAP_LIBS, without checking anything])
+ LDAP_LIBS="${LDAP_LIBS} -lresolv"
+ fi
+ found_ldap="yes"
diff --git a/network/ekiga/ekiga.SlackBuild b/network/ekiga/ekiga.SlackBuild
index d22a4ee14d..a4a5bd1c9a 100644
--- a/network/ekiga/ekiga.SlackBuild
+++ b/network/ekiga/ekiga.SlackBuild
@@ -107,10 +107,12 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/ekiga-4.0.1-libresolv.patch
+patch -p1 < $CWD/ekiga-4.0.1-boost-signals2.patch
# Fix for -current (20150722 dbs)
sed -e 's/gnome-icon-theme/adwaita-icon-theme/g' -i configure.ac
-autoconf
+autoreconf -vif
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/emacs-w3m/emacs-w3m.SlackBuild b/network/emacs-w3m/emacs-w3m.SlackBuild
index 622024e9ed..baca2f789c 100644
--- a/network/emacs-w3m/emacs-w3m.SlackBuild
+++ b/network/emacs-w3m/emacs-w3m.SlackBuild
@@ -5,7 +5,7 @@
# Written by Felix Pfeifer (pfeifer[dot]felix[at]googlemail[dot]com
PRGNAM=emacs-w3m
-VERSION=${VERSION:-cvs_1.4.400_0.20100725}
+VERSION=${VERSION:-cvs_1.4.569_0.20170110}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -41,9 +41,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/w3m-el-snapshot_1.4.400+0.20100725.orig.tar.gz
-cd $PRGNAM
+rm -rf w3m-el-snapshot-1.4.569+0.20170110.orig
+tar xvf $CWD/w3m-el-snapshot_1.4.569+0.20170110.orig.tar.gz
+cd w3m-el-snapshot-1.4.569+0.20170110.orig
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/network/emacs-w3m/emacs-w3m.info b/network/emacs-w3m/emacs-w3m.info
index 92b7823263..10349a11bc 100644
--- a/network/emacs-w3m/emacs-w3m.info
+++ b/network/emacs-w3m/emacs-w3m.info
@@ -1,8 +1,8 @@
PRGNAM="emacs-w3m"
-VERSION="cvs_1.4.400_0.20100725"
+VERSION="cvs_1.4.569_0.20170110"
HOMEPAGE="http://emacs-w3m.namazu.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/w3m-el-snapshot_1.4.400+0.20100725.orig.tar.gz"
-MD5SUM="0c5da2a83ea6502bcf7b589b8c4daed8"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/w3m-el-snapshot_1.4.569+0.20170110.orig.tar.gz"
+MD5SUM="f8bb143de0b009038d6fc73295af40c7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="w3m"
diff --git a/network/falkon/falkon.SlackBuild b/network/falkon/falkon.SlackBuild
index df6df2e5ae..89b55005c1 100644
--- a/network/falkon/falkon.SlackBuild
+++ b/network/falkon/falkon.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for falkon
-# Copyright 2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2018,2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=falkon
-VERSION=${VERSION:-3.0.1}
+VERSION=${VERSION:-3.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/qt-5.14.patch
+patch -p1 < $CWD/qt-5.15.patch
+
# Handling this directory requires the KDE5 Framework
rm -fR po
diff --git a/network/falkon/falkon.info b/network/falkon/falkon.info
index 39afba46f1..08489ab024 100644
--- a/network/falkon/falkon.info
+++ b/network/falkon/falkon.info
@@ -1,8 +1,8 @@
PRGNAM="falkon"
-VERSION="3.0.1"
+VERSION="3.1.0"
HOMEPAGE="https://www.falkon.org"
-DOWNLOAD="https://download.kde.org/stable/falkon/3.0.1/falkon-3.0.1.tar.xz"
-MD5SUM="c6fb6433ac0f228667e2f763c02317c5"
+DOWNLOAD="https://download.kde.org/stable/falkon/3.1/falkon-3.1.0.tar.xz"
+MD5SUM="9255fb335d3ba361dea44b7b297ddf7d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="extra-cmake-modules qt5"
diff --git a/network/falkon/qt-5.14.patch b/network/falkon/qt-5.14.patch
new file mode 100644
index 0000000000..b87eb31fd3
--- /dev/null
+++ b/network/falkon/qt-5.14.patch
@@ -0,0 +1,24 @@
+From bbde5c6955c43bc744ed2c4024598495de908f2a Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 2 Dec 2019 13:30:36 +0100
+Subject: Add missing include in last qt5.14
+
+---
+ src/plugins/VerticalTabs/verticaltabsplugin.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/plugins/VerticalTabs/verticaltabsplugin.cpp b/src/plugins/VerticalTabs/verticaltabsplugin.cpp
+index c1cfac4..d179bb1 100644
+--- a/src/plugins/VerticalTabs/verticaltabsplugin.cpp
++++ b/src/plugins/VerticalTabs/verticaltabsplugin.cpp
+@@ -30,6 +30,7 @@
+ #include "../config.h"
+
+ #include <QSettings>
++#include <QFile>
+
+ VerticalTabsPlugin::VerticalTabsPlugin()
+ : QObject()
+--
+cgit v1.1
+
diff --git a/network/falkon/qt-5.15.patch b/network/falkon/qt-5.15.patch
new file mode 100644
index 0000000000..2b2bb38a26
--- /dev/null
+++ b/network/falkon/qt-5.15.patch
@@ -0,0 +1,26 @@
+From 2ca83509dbc72dfdfa9cc7103c2b29db31e07f3a Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Sun, 29 Mar 2020 12:53:00 +0200
+Subject: [PATCH] Fix build with Qt 5.15
+
+QPainterPath is no longer included via qtransform.h (since
+5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
+---
+ src/lib/tools/qztools.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp
+index 499b22503..04f19b715 100644
+--- a/src/lib/tools/qztools.cpp
++++ b/src/lib/tools/qztools.cpp
+@@ -25,6 +25,7 @@
+ #include <QByteArray>
+ #include <QPixmap>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QBuffer>
+ #include <QFile>
+ #include <QDir>
+--
+GitLab
+
diff --git a/network/fcgiwrap/fcgiwrap.SlackBuild b/network/fcgiwrap/fcgiwrap.SlackBuild
index 9d64052b68..b5e6f5b0a2 100644
--- a/network/fcgiwrap/fcgiwrap.SlackBuild
+++ b/network/fcgiwrap/fcgiwrap.SlackBuild
@@ -70,7 +70,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
autoreconf -i
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=implicit-fallthrough=" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/network/filezilla/filezilla.SlackBuild b/network/filezilla/filezilla.SlackBuild
index 02ef99af3e..da75f5d132 100644
--- a/network/filezilla/filezilla.SlackBuild
+++ b/network/filezilla/filezilla.SlackBuild
@@ -21,7 +21,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=filezilla
-VERSION=${VERSION:-3.42.1}
+VERSION=${VERSION:-3.48.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -76,6 +76,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Needed for gcc >= 10.x
+patch -p1 < $CWD/interface_Mainfrm_h_include_list.patch
+
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/network/filezilla/filezilla.info b/network/filezilla/filezilla.info
index bcc1154e2f..e507474f4b 100644
--- a/network/filezilla/filezilla.info
+++ b/network/filezilla/filezilla.info
@@ -1,8 +1,8 @@
PRGNAM="filezilla"
-VERSION="3.42.1"
+VERSION="3.48.0"
HOMEPAGE="https://filezilla-project.org/"
-DOWNLOAD="https://download.filezilla-project.org/client/FileZilla_3.42.1_src.tar.bz2"
-MD5SUM="00e2f8ff0c1ad9802c0eed6488c3565a"
+DOWNLOAD="https://download.filezilla-project.org/client/FileZilla_3.48.0_src.tar.bz2"
+MD5SUM="3abc4b9f308587847f10070fbf860517"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="wxGTK3 libfilezilla"
diff --git a/network/filezilla/interface_Mainfrm_h_include_list.patch b/network/filezilla/interface_Mainfrm_h_include_list.patch
new file mode 100644
index 0000000000..3977ba657c
--- /dev/null
+++ b/network/filezilla/interface_Mainfrm_h_include_list.patch
@@ -0,0 +1,12 @@
+Index: filezilla-3.47.2.1/src/interface/Mainfrm.h
+===================================================================
+--- filezilla-3.47.2.1.orig/src/interface/Mainfrm.h
++++ filezilla-3.47.2.1/src/interface/Mainfrm.h
+@@ -6,6 +6,7 @@
+ #include "notification.h"
+ #include "serverdata.h"
+
++#include <list>
+ #include <wx/timer.h>
+
+ #ifndef __WXMAC__
diff --git a/network/fqterm/fqterm.SlackBuild b/network/fqterm/fqterm.SlackBuild
index b90004e147..1af9f50ecf 100644
--- a/network/fqterm/fqterm.SlackBuild
+++ b/network/fqterm/fqterm.SlackBuild
@@ -5,14 +5,13 @@
# Written by vvoody <vvoodywang@gmail.com>
PRGNAM=fqterm
-VERSION=${VERSION:-0.9.8.2}
-SVNVER=svn1076
+VERSION=${VERSION:-0.9.8.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -23,18 +22,14 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
fi
set -e
@@ -42,15 +37,15 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION-$SVNVER.tar.gz
-cd $PRGNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
mkdir build
cd build
@@ -58,17 +53,16 @@ cd build
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX:PATH="/usr" \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
..
make
make install DESTDIR=$PKG
cd -
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE INSTALL.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE INSTALL.txt README* $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/network/fqterm/fqterm.info b/network/fqterm/fqterm.info
index 787760d96c..c948f08484 100644
--- a/network/fqterm/fqterm.info
+++ b/network/fqterm/fqterm.info
@@ -1,8 +1,8 @@
PRGNAM="fqterm"
-VERSION="0.9.8.2"
+VERSION="0.9.8.4"
HOMEPAGE="https://github.com/mytbk/fqterm"
-DOWNLOAD="http://ftp1.fr.freebsd.org/pub/frugalware/frugalware-stable/source/xlib-extra/fqterm/fqterm-0.9.8.2-svn1076.tar.gz"
-MD5SUM="eaf7b51c1e3e0f13351f9f5678996d51"
+DOWNLOAD="https://github.com/mytbk/fqterm/archive/0.9.8.4/fqterm-0.9.8.4.tar.gz"
+MD5SUM="d7d9500806055def62456550fe33173e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/freerdp/freerdp.SlackBuild b/network/freerdp/freerdp.SlackBuild
index 3b9edaa061..8b1386b761 100644
--- a/network/freerdp/freerdp.SlackBuild
+++ b/network/freerdp/freerdp.SlackBuild
@@ -85,7 +85,7 @@ find -L . \
mkdir -p build
cd build
cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $(pkg-config --cflags gstreamer-base-1.0)" \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $(pkg-config --cflags gstreamer-base-1.0) -fcommon" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_CUPS=ON \
-DWITH_FFMPEG=$WITH_FFMPEG \
diff --git a/network/grsync/grsync.SlackBuild b/network/grsync/grsync.SlackBuild
index c4d09274d1..92f7490f77 100644
--- a/network/grsync/grsync.SlackBuild
+++ b/network/grsync/grsync.SlackBuild
@@ -71,7 +71,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/network/hping3/hping3.SlackBuild b/network/hping3/hping3.SlackBuild
index 10f08e77c6..d685005449 100644
--- a/network/hping3/hping3.SlackBuild
+++ b/network/hping3/hping3.SlackBuild
@@ -88,7 +88,7 @@ MANPATH=/usr/man ./configure \
# From Arch Linux - Adds DESTDIR to Makefile
patch -p1 --verbose < $CWD/patches/Makefile.patch
-make CCOPT="$SLKCFLAGS -DUSE_TCL"
+make CCOPT="$SLKCFLAGS -DUSE_TCL -fcommon"
make install DESTDIR=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/network/httrack/httrack.SlackBuild b/network/httrack/httrack.SlackBuild
index d5976ddd12..bfdbec4b74 100644
--- a/network/httrack/httrack.SlackBuild
+++ b/network/httrack/httrack.SlackBuild
@@ -9,7 +9,7 @@
# without any warranty.
PRGNAM=httrack
-VERSION=${VERSION:-3.47.21}
+VERSION=${VERSION:-3.49.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/httrack/httrack.info b/network/httrack/httrack.info
index 597ebcc033..07b38b7399 100644
--- a/network/httrack/httrack.info
+++ b/network/httrack/httrack.info
@@ -1,8 +1,8 @@
PRGNAM="httrack"
-VERSION="3.47.21"
+VERSION="3.49.2"
HOMEPAGE="http://www.httrack.com"
-DOWNLOAD="http://mirror.httrack.com/historical/httrack-3.47.21.tar.gz"
-MD5SUM="2296de7b3b0be24758d4bbea8c0ebb20"
+DOWNLOAD="http://mirror.httrack.com/historical/httrack-3.49.2.tar.gz"
+MD5SUM="1fd1ab9953432f0474a66b67a71d6381"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/hylafax/gcc.patch b/network/hylafax/gcc.patch
new file mode 100644
index 0000000000..ed9817abfe
--- /dev/null
+++ b/network/hylafax/gcc.patch
@@ -0,0 +1,12 @@
+diff -Naur hylafax-6.0.6.orig/libhylafax/FaxRecvInfo.c++ hylafax-6.0.6/libhylafax/FaxRecvInfo.c++
+--- hylafax-6.0.6.orig/libhylafax/FaxRecvInfo.c++ 2012-06-06 02:58:38.000000000 +0200
++++ hylafax-6.0.6/libhylafax/FaxRecvInfo.c++ 2017-06-03 19:51:39.491707130 +0200
+@@ -112,7 +112,7 @@
+ if (cp == NULL || cp[1] != ',' || cp[2] != '"')
+ return (false);
+ u_int i = 0;
+- while (cp+2 != '\0') {
++ while (*(cp+2) != '\0') {
+ callid[i] = cp+3; // +1 for "/+1 for ,/+1 for "
+ if (*cp == '\"') break;
+ callid[i].resize(callid[i].next(0,'"'));
diff --git a/network/hylafax/hylafax.SlackBuild b/network/hylafax/hylafax.SlackBuild
index f2663427e6..e4abfd8ba7 100644
--- a/network/hylafax/hylafax.SlackBuild
+++ b/network/hylafax/hylafax.SlackBuild
@@ -73,6 +73,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+patch -p1 < $CWD/gcc.patch
+
# Copy our source for the correct configuration
sed "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" \
< $CWD/config.local.in \
diff --git a/network/ifstatus/README b/network/ifstatus/README
deleted file mode 100644
index 9dead8790d..0000000000
--- a/network/ifstatus/README
+++ /dev/null
@@ -1,10 +0,0 @@
-IFStatus was developed for Linux users that are usually in console mode.
-It is a simple, easy to use program for displaying commonly needed / wanted
-statistcs in real time about ingoing and outgoing traffic of multiple network
-interfaces that is usually hard to find, with a simple and effecient view.
-
-The configuration file for IFStatus is automatically created in
-~/.ifstatus/ifstatus.cfg
-
-Please read http://ifstatus.sourceforge.net/graphic/informations.html
-for information on various configuration options.
diff --git a/network/ifstatus/ifstatus.SlackBuild b/network/ifstatus/ifstatus.SlackBuild
deleted file mode 100644
index 135ee6b9e8..0000000000
--- a/network/ifstatus/ifstatus.SlackBuild
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for cgdb
-
-# Copyright 2009-2010 Sean Donner (sean.donner@gmail.com)
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=ifstatus
-VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-
-# 'v' needed due to poor tarball naming
-tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
-
-cd $PRGNAM
-chown root:root . -R
-
-# This will not compile on gcc 4.3 or 4.4 without patch,
-# as all .cc files are missing '#include <cstdlib>'
-patch -p1 < $CWD/ifstatus.patch
-
-make \
- CFLAGS="$SLKCFLAGS" \
- CXXFLAGS="$SLKCFLAGS"
-
-# We can't use the 'install' target in the Makefile as it
-# hardcodes the destination directory to /usr/local/bin
-install -D -m 0755 ./ifstatus $PKG/usr/bin/ifstatus
-strip --strip-unneeded $PKG/usr/bin/ifstatus
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ifstatus/ifstatus.info b/network/ifstatus/ifstatus.info
deleted file mode 100644
index f4021d55cc..0000000000
--- a/network/ifstatus/ifstatus.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ifstatus"
-VERSION="1.1.0"
-HOMEPAGE="http://ifstatus.sourceforge.net"
-DOWNLOAD="http://ifstatus.sourceforge.net/download/ifstatus-v1.1.0.tar.gz"
-MD5SUM="f4d413f880754fd6677290160f8bc5d7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Sean Donner"
-EMAIL="sean.donner@gmail.com"
diff --git a/network/ifstatus/ifstatus.patch b/network/ifstatus/ifstatus.patch
deleted file mode 100644
index 75bc3befd5..0000000000
--- a/network/ifstatus/ifstatus.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for ifstatus >= 1.1.0,
-which adds a few missing #include lines to not violate the C++ standards
-and to build successfully with G++ version 4.3 and 4.4.
-
---- ifstatus/IFStatus.cc 2006-01-17 00:18:46.000000000 +0100
-+++ ifstatus/IFStatus.cc.gcc44 2009-04-14 00:42:04.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Main.h"
- #include "IFStatus.h"
- #include "Graph.h"
---- ifstatus/GraphDecorator.cc 2006-01-17 01:00:59.000000000 +0100
-+++ ifstatus/GraphDecorator.cc.gcc44 2009-04-14 00:41:38.000000000 +0200
-@@ -21,7 +21,8 @@
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
--
-+
-+#include <cstdlib>
- #include "GraphDecorator.h"
- #include "Config.h"
-
---- ifstatus/Interface.cc 2006-01-17 02:48:27.000000000 +0100
-+++ ifstatus/Interface.cc.gcc44 2009-04-14 00:42:23.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Interface.h"
- #include "Config.h"
-
---- ifstatus/Config.cc 2005-02-26 12:54:51.000000000 +0100
-+++ ifstatus/Config.cc.gcc44 2009-04-14 00:40:13.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Main.h"
- #include "Config.h"
- #include "Util.h"
---- ifstatus/Email.cc 2005-02-26 12:54:51.000000000 +0100
-+++ ifstatus/Email.cc.gcc44 2009-04-14 00:40:44.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Email.h"
- #include "Config.h"
-
---- ifstatus/Interfaces.cc 2006-01-16 23:45:33.000000000 +0100
-+++ ifstatus/Interfaces.cc.gcc44 2009-04-14 00:42:45.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Interfaces.h"
- #include "Config.h"
- #include "Util.h"
diff --git a/network/ifstatus/slack-desc b/network/ifstatus/slack-desc
deleted file mode 100644
index a0f087dfc8..0000000000
--- a/network/ifstatus/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-ifstatus: ifstatus (A curses network traffic monitor)
-ifstatus:
-ifstatus: IFStatus was developed for Linux users that are usually in console
-ifstatus: mode. It is a simple, easy to use program for displaying commonly
-ifstatus: needed / wanted statistcs in real time about ingoing and outgoing
-ifstatus: traffic of multiple network interfaces that is usually hard to find,
-ifstatus: with a simple and effecient view.
-ifstatus:
-ifstatus:
-ifstatus:
-ifstatus:
diff --git a/network/iperf/iperf.SlackBuild b/network/iperf/iperf.SlackBuild
index f8c40ab1e8..d4c970ca8b 100644
--- a/network/iperf/iperf.SlackBuild
+++ b/network/iperf/iperf.SlackBuild
@@ -8,13 +8,13 @@
# http://www.slackwiki.org/Writing_A_SlackBuild_Script
PRGNAM=iperf
-VERSION=${VERSION:-2.0.5}
+VERSION=${VERSION:-2.0.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -25,8 +25,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -49,10 +49,15 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Thanks fedora for these
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+
+autoreconf -fi
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -68,13 +73,11 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS ChangeLog COPYING INSTALL README doc/index.html $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/iperf/iperf.info b/network/iperf/iperf.info
index fbb6e24fa4..730b096a3b 100644
--- a/network/iperf/iperf.info
+++ b/network/iperf/iperf.info
@@ -1,8 +1,8 @@
PRGNAM="iperf"
-VERSION="2.0.5"
+VERSION="2.0.8"
HOMEPAGE="https://sourceforge.net/projects/iperf/"
-DOWNLOAD="https://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz"
-MD5SUM="44b5536b67719f4250faed632a3cd016"
+DOWNLOAD="https://downloads.sourceforge.net/iperf2/iperf-2.0.8.tar.gz"
+MD5SUM="e5887f799d8dc64a974c6c2f2e5cc339"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch b/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch
new file mode 100644
index 0000000000..2a3ad246ee
--- /dev/null
+++ b/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch
@@ -0,0 +1,17 @@
+diff -NarpU5 iperf-2.0.8/configure.ac iperf-2.0.8.debuginfo/configure.ac
+--- iperf-2.0.8/configure.ac 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.debuginfo/configure.ac 2015-04-10 10:11:33.287445003 -0400
+@@ -42,13 +42,11 @@ AC_ARG_ENABLE(kalman, AC_HELP_STRING([--
+ dnl ===================================================================
+ dnl Checks for programs
+ dnl ===================================================================
+
+ AC_PROG_CXX
+-CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+ AC_PROG_CC
+-CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+ AC_ISC_POSIX
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ AC_LANG(C)
diff --git a/network/iperf/patches/1_iperf-2.0.8-bindfail.patch b/network/iperf/patches/1_iperf-2.0.8-bindfail.patch
new file mode 100644
index 0000000000..b18b2cffed
--- /dev/null
+++ b/network/iperf/patches/1_iperf-2.0.8-bindfail.patch
@@ -0,0 +1,42 @@
+diff -NarpU5 iperf-2.0.8/src/Client.cpp iperf-2.0.8.bindfail/src/Client.cpp
+--- iperf-2.0.8/src/Client.cpp 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.bindfail/src/Client.cpp 2015-04-10 10:05:38.279936555 -0400
+@@ -701,20 +701,20 @@ void Client::Connect( ) {
+ AF_INET
+ #endif
+ : AF_INET);
+
+ mSettings->mSock = socket( domain, type, 0 );
+- WARN_errno( mSettings->mSock == INVALID_SOCKET, "socket" );
++ FAIL_errno( mSettings->mSock == INVALID_SOCKET, "socket", mSettings );
+
+ SetSocketOptions( mSettings );
+
+ SockAddr_localAddr( mSettings );
+ if ( mSettings->mLocalhost != NULL ) {
+ // bind socket to local address
+ rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local,
+ SockAddr_get_sizeof_sockaddr( &mSettings->local ) );
+- WARN_errno( rc == SOCKET_ERROR, "bind" );
++ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
+ }
+ // connect socket
+ rc = connect( mSettings->mSock, (sockaddr*) &mSettings->peer,
+ SockAddr_get_sizeof_sockaddr( &mSettings->peer ));
+ FAIL_errno( rc == SOCKET_ERROR, "connect", mSettings );
+diff -NarpU5 iperf-2.0.8/src/Listener.cpp iperf-2.0.8.bindfail/src/Listener.cpp
+--- iperf-2.0.8/src/Listener.cpp 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.bindfail/src/Listener.cpp 2015-04-10 10:06:23.279699885 -0400
+@@ -342,11 +342,11 @@ void Listener::Listen( ) {
+ WARN_errno( rc == SOCKET_ERROR, "WSAJoinLeaf (aka bind)" );
+ } else
+ #endif
+ {
+ rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local, mSettings->size_local );
+- WARN_errno( rc == SOCKET_ERROR, "bind" );
++ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
+ }
+ // listen for connections (TCP only).
+ // default backlog traditionally 5
+ if ( !isUDP( mSettings ) ) {
+ rc = listen( mSettings->mSock, 5 );
diff --git a/network/iperf/patches/2_iperf-2.0.8-math.patch b/network/iperf/patches/2_iperf-2.0.8-math.patch
new file mode 100644
index 0000000000..1a943f5f2c
--- /dev/null
+++ b/network/iperf/patches/2_iperf-2.0.8-math.patch
@@ -0,0 +1,75 @@
+diff -NarU5 a/include/headers.h b/include/headers.h
+--- a/include/headers.h 2015-04-02 16:51:48.000000000 -0400
++++ b/include/headers.h 2016-03-16 14:52:14.386853750 -0400
+@@ -80,11 +80,10 @@
+ #include <assert.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <time.h>
+-#include <math.h>
+ #include <float.h>
+ #include <sys/types.h>
+
+ #ifdef WIN32
+
+diff -NarU5 a/src/Client.cpp b/src/Client.cpp
+--- a/src/Client.cpp 2015-04-02 16:51:48.000000000 -0400
++++ b/src/Client.cpp 2016-03-16 14:52:14.387853701 -0400
+@@ -50,10 +50,11 @@
+ * A client thread initiates a connect to the server and handles
+ * sending and receiving data, then closes the socket.
+ * ------------------------------------------------------------------- */
+
+ #include <time.h>
++#include <cmath>
+ #include "headers.h"
+ #include "Client.hpp"
+ #include "Thread.h"
+ #include "SocketAddr.h"
+ #include "PerfSocket.hpp"
+diff -NarU5 a/src/ReportDefault.c b/src/ReportDefault.c
+--- a/src/ReportDefault.c 2015-04-02 16:51:49.000000000 -0400
++++ b/src/ReportDefault.c 2016-03-16 14:52:14.387853701 -0400
+@@ -47,10 +47,11 @@
+ * ReportDefault.c
+ * by Kevin Gibbs <kgibbs@nlanr.net>
+ *
+ * ________________________________________________________________ */
+
++#include <math.h>
+ #include "headers.h"
+ #include "Settings.hpp"
+ #include "util.h"
+ #include "Reporter.h"
+ #include "report_default.h"
+diff -NarU5 a/src/Reporter.c b/src/Reporter.c
+--- a/src/Reporter.c 2015-04-02 16:51:49.000000000 -0400
++++ b/src/Reporter.c 2016-03-16 14:52:14.388853652 -0400
+@@ -47,10 +47,11 @@
+ * Reporter.c
+ * by Kevin Gibbs <kgibbs@nlanr.net>
+ *
+ * ________________________________________________________________ */
+
++#include <math.h>
+ #include "headers.h"
+ #include "Settings.hpp"
+ #include "util.h"
+ #include "Reporter.h"
+ #include "Thread.h"
+diff -NarU5 a/src/Server.cpp b/src/Server.cpp
+--- a/src/Server.cpp 2015-04-02 16:51:49.000000000 -0400
++++ b/src/Server.cpp 2016-03-16 14:52:14.388853652 -0400
+@@ -52,10 +52,11 @@
+ * Handles sending and receiving data, and then closes socket.
+ * Changes to this version : The server can be run as a daemon
+ * ------------------------------------------------------------------- */
+
+ #define HEADERS()
++#include <cmath>
+ #include "headers.h"
+ #include "Server.hpp"
+ #include "List.h"
+ #include "Extractor.h"
+ #include "Reporter.h"
diff --git a/network/jigdo/jigdo-0.7.3-gcc7.patch b/network/jigdo/jigdo-0.7.3-gcc7.patch
new file mode 100644
index 0000000000..d5f0c8a4d0
--- /dev/null
+++ b/network/jigdo/jigdo-0.7.3-gcc7.patch
@@ -0,0 +1,39 @@
+diff -Naur jigdo-0.7.3.orig/src/mkimage.cc jigdo-0.7.3/src/mkimage.cc
+--- jigdo-0.7.3.orig/src/mkimage.cc 2005-07-09 21:14:46.000000000 +0200
++++ jigdo-0.7.3/src/mkimage.cc 2017-02-17 14:47:12.884488507 +0100
+@@ -285,27 +285,27 @@
+ //______________________________________________________________________
+
+ namespace {
+- const int SIZE_WIDTH = 12;
++ const int size_width = 12;
+ }
+
+ ostream& JigdoDesc::ImageInfo::put(ostream& s) const {
+- s << "image-info " << setw(SIZE_WIDTH) << size() << " "
++ s << "image-info " << setw(size_width) << size() << " "
+ << md5() << ' ' << blockLength() << '\n';
+ return s;
+ }
+ ostream& JigdoDesc::UnmatchedData::put(ostream& s) const {
+- s << "in-template " << setw(SIZE_WIDTH) << offset() << ' '
+- << setw(SIZE_WIDTH) << size() << '\n';
++ s << "in-template " << setw(size_width) << offset() << ' '
++ << setw(size_width) << size() << '\n';
+ return s;
+ }
+ ostream& JigdoDesc::MatchedFile::put(ostream& s) const {
+- s << "need-file " << setw(SIZE_WIDTH) << offset() << ' '
+- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
++ s << "need-file " << setw(size_width) << offset() << ' '
++ << setw(size_width) << size() << ' ' << md5() << ' ' << rsync() << '\n';
+ return s;
+ }
+ ostream& JigdoDesc::WrittenFile::put(ostream& s) const {
+- s << "have-file " << setw(SIZE_WIDTH) << offset() << ' '
+- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
++ s << "have-file " << setw(size_width) << offset() << ' '
++ << setw(size_width) << size() << ' ' << md5() << ' ' << rsync() << '\n';
+ return s;
+ }
+
diff --git a/network/jigdo/jigdo.SlackBuild b/network/jigdo/jigdo.SlackBuild
index 67e467dde2..ef17522f77 100644
--- a/network/jigdo/jigdo.SlackBuild
+++ b/network/jigdo/jigdo.SlackBuild
@@ -73,6 +73,9 @@ find -L . \
# apply some patches from debian
zcat $CWD/jigdo_0.7.3-3.diff.gz | patch -p1
+# Fic for gcc-7.x, thanks fedora!
+patch -p1 < $CWD/jigdo-0.7.3-gcc7.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/jitsi/jitsi.SlackBuild b/network/jitsi/jitsi.SlackBuild
index dea951b97a..636e19af35 100644
--- a/network/jitsi/jitsi.SlackBuild
+++ b/network/jitsi/jitsi.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=jitsi
-VERSION=${VERSION:-2.8}
+VERSION=${VERSION:-5633}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,8 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-src-$VERSION.5426.zip
-mv $PRGNAM $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -70,8 +69,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-sed -i "s/0.build.by.SVN/5426/g" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
-
ant rebuild
mkdir -p $PKG/usr/bin
@@ -86,9 +83,9 @@ mkdir -p $PKG/usr/share/jitsi/lib/native
cp resources/install/resources/splash.gif $PKG/usr/share/jitsi
cp lib/{felix.client.run.properties,felix.jar,jitsi-defaults.properties,logging.properties} $PKG/usr/share/jitsi/lib
if [ "$ARCH" = "x86_64" ]; then
- cp -a lib/native/linux-64/*.so $PKG/usr/share/jitsi/lib/native
+ cp -a lib/native/linux-64/*.so $PKG/usr/share/jitsi/lib/native
else
- cp -a lib/native/linux/*.so $PKG/usr/share/jitsi/lib/native
+ cp -a lib/native/linux/*.so $PKG/usr/share/jitsi/lib/native
fi
cp lib/bundle/{commons-logging.jar,log4j.jar} $PKG/usr/share/jitsi/lib/bundle
@@ -113,7 +110,6 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
-sed 's#_PACKAGE_NAME_#jitsi#' resources/install/debian/changelog.tmpl | sed 's#_VERSION_#2.8.5426-1#' | sed 's#_DATE_#Thu, 19 Mar 2015 02:20:44 -0400#' > $PKG/usr/doc/$PRGNAM-$VERSION/changelog
cp resources/install/debian/copyright $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/jitsi/jitsi.info b/network/jitsi/jitsi.info
index 8d2c254e97..bb50a7a694 100644
--- a/network/jitsi/jitsi.info
+++ b/network/jitsi/jitsi.info
@@ -1,10 +1,10 @@
PRGNAM="jitsi"
-VERSION="2.8"
+VERSION="5633"
HOMEPAGE="https://jitsi.org/"
-DOWNLOAD="https://download.jitsi.org/jitsi/src/jitsi-src-2.8.5426.zip"
-MD5SUM="db86aa3c754e54e774257c09e7c474d2"
+DOWNLOAD="https://github.com/jitsi/jitsi/archive/5633/jitsi-5633.tar.gz"
+MD5SUM="0844dc46176c7940cdeac075559d38e6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="openjdk7"
+REQUIRES="apache-ant jdk"
MAINTAINER="Furry Monster"
EMAIL="furrymonster at gmx dot com"
diff --git a/network/kmess/README b/network/kmess/README
deleted file mode 100644
index f04f2e181b..0000000000
--- a/network/kmess/README
+++ /dev/null
@@ -1,5 +0,0 @@
-KMess is an alternative Live Messenger chat client for Linux.
-It allows Linux users to chat with friends who use Live Messenger in
-Windows or Mac OS. The strength of KMess is it's integration with the
-KDE desktop environment, it focus on Messenger-specific features, and
-an easy-to-use interface.
diff --git a/network/kmess/doinst.sh b/network/kmess/doinst.sh
deleted file mode 100644
index 4a25de5e6f..0000000000
--- a/network/kmess/doinst.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
-
diff --git a/network/kmess/giflib-5.0.patch b/network/kmess/giflib-5.0.patch
deleted file mode 100644
index cc568fdf8a..0000000000
--- a/network/kmess/giflib-5.0.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- contrib/isf-qt/src/isfqt.cpp.orig 2014-06-11 13:10:43.137321400 +0000
-+++ contrib/isf-qt/src/isfqt.cpp 2014-06-11 13:12:23.123474616 +0000
-@@ -249,7 +249,7 @@
- qWarning() << "Couldn't initialize GIF library!";
- }
-
-- DGifCloseFile( gifImage );
-+ DGifCloseFile( gifImage, NULL );
- gifData.close();
- */
-
-@@ -484,12 +484,13 @@
- int width = isfImage.width();
- int numColors = 0;
- bool gifError = true;
-+ int gifErrCode;
-
- // Convert the image to GIF using libgif
-
- // Open the gif file
- gifData.open( QIODevice::WriteOnly );
-- gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray );
-+ gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray, &gifErrCode );
- if( gifImage == 0 )
- {
- qWarning() << "Couldn't initialize gif library!";
-@@ -503,7 +504,7 @@
- numColors = 256;
- }
-
-- cmap = MakeMapObject( numColors, NULL );
-+ cmap = GifMakeMapObject( numColors, NULL );
- if( cmap == 0 && isfImage.numColors() > 1 )
- {
- qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!";
-@@ -576,7 +577,7 @@
- else
- {
- // Write the extension
-- if( EGifPutExtensionFirst( gifImage, COMMENT_EXT_FUNC_CODE, MAX_GIF_BYTE, isfData.left( MAX_GIF_BYTE ).data() ) == GIF_ERROR )
-+ if( EGifPutExtensionLeader( gifImage, COMMENT_EXT_FUNC_CODE) == GIF_ERROR )
- {
- qWarning() << "EGifPutExtensionFirst failed!";
- goto writeError;
-@@ -590,9 +591,9 @@
- // Write all the full data blocks
- while( length >= MAX_GIF_BYTE )
- {
-- if( EGifPutExtensionNext( gifImage, 0, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
-+ if( EGifPutExtensionBlock( gifImage, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
- {
-- qWarning() << "EGifPutExtensionNext failed!";
-+ qWarning() << "EGifPutExtensionBlock failed!";
- goto writeError;
- }
-
-@@ -603,17 +604,17 @@
- // Write the last block
- if( length > 0 )
- {
-- if( EGifPutExtensionLast( gifImage, 0, length, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
-+ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR )
- {
-- qWarning() << "EGifPutExtensionLast (n) failed!";
-+ qWarning() << "EGifPutExtensionTrailer (n) failed!";
- goto writeError;
- }
- }
- else
- {
-- if( EGifPutExtensionLast( gifImage, 0, 0, 0 ) == GIF_ERROR )
-+ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR )
- {
-- qWarning() << "EGifPutExtensionLast (0) failed!";
-+ qWarning() << "EGifPutExtensionTrailer (0) failed!";
- goto writeError;
- }
- }
-@@ -623,13 +624,13 @@
-
- writeError:
- // Clean up the GIF converter etc
-- EGifCloseFile( gifImage );
-- FreeMapObject( cmap );
-+ EGifCloseFile( gifImage, NULL );
-+ GifFreeMapObject( cmap );
- gifData.close();
-
- if( gifError )
- {
-- qWarning() << "GIF error code:" << GifLastError();
-+ qWarning() << "GIF error code:" << GifErrorString(gifErrCode);
- }
- else
- {
diff --git a/network/kmess/kmess.SlackBuild b/network/kmess/kmess.SlackBuild
deleted file mode 100644
index 27c6a9e73b..0000000000
--- a/network/kmess/kmess.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for kmess
-
-# Copyright 2008-2009 Tarantino Antonino <metrofox9@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=kmess
-VERSION=${VERSION:-2.0.6.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -fr $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Fix for building with new giflib (thanks to Arch)
-patch -p1 contrib/isf-qt/src/isfqt.cpp < $CWD/giflib-5.0.patch
-
-mkdir -p build
-cd build
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DCMAKE_BUILD_TYPE=Release ..
- make
- make install DESTDIR=$PKG
-cd ..
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS COPYING ChangeLog FEATURES INSTALL NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/kmess/kmess.info b/network/kmess/kmess.info
deleted file mode 100644
index 51a7e19d01..0000000000
--- a/network/kmess/kmess.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="kmess"
-VERSION="2.0.6.2"
-HOMEPAGE="http://kmess.org/"
-DOWNLOAD="http://downloads.sourceforge.net/kmess/kmess-2.0.6.2.tar.bz2"
-MD5SUM="a2e57911713308bef81b9347135cc5dd"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Tarantino Antonino"
-EMAIL="metrofox9@gmail.com"
diff --git a/network/kmess/slack-desc b/network/kmess/slack-desc
deleted file mode 100644
index 7bced9d9c3..0000000000
--- a/network/kmess/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-kmess: kmess (MSN Messenger client)
-kmess:
-kmess: KMess is a MSN Messenger client for Linux. It enables Linux users
-kmess: to chat with friends online who are using MSN Messenger in Windows
-kmess: or Mac OS. The strength of KMess is it's integration with the KDE
-kmess: desktop environment, focus on MSN Messenger specific features and
-kmess: an easy-to-use interface.
-kmess:
-kmess:
-kmess:
-kmess:
diff --git a/network/knock/knock.SlackBuild b/network/knock/knock.SlackBuild
index eeb481a019..bc5a0d98b1 100644
--- a/network/knock/knock.SlackBuild
+++ b/network/knock/knock.SlackBuild
@@ -5,13 +5,13 @@
# Written by Joey Trungale joey@trungale.net
PRGNAM=knock
-VERSION=${VERSION:-0.5}
+VERSION=${VERSION:-0.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -46,10 +46,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -63,16 +63,14 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README ChangeLog TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md ChangeLog TODO $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
cat $PKG/etc/knockd.conf > $PKG/usr/doc/$PRGNAM-$VERSION/knockd.conf
mv $PKG/etc/knockd.conf $PKG/etc/knockd.conf.new
diff --git a/network/knock/knock.info b/network/knock/knock.info
index 8274f4fce1..6845299aa4 100644
--- a/network/knock/knock.info
+++ b/network/knock/knock.info
@@ -1,8 +1,8 @@
PRGNAM="knock"
-VERSION="0.5"
+VERSION="0.7"
HOMEPAGE="http://www.zeroflux.org"
-DOWNLOAD="http://www.zeroflux.org/proj/knock/files/knock-0.5.tar.gz"
-MD5SUM="ca09d61458974cff90a700aba6120891"
+DOWNLOAD="http://www.zeroflux.org/proj/knock/files/knock-0.7.tar.gz"
+MD5SUM="cb6373fd4ccb42eeca3ff406b7fdb8a7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/krb5/EXPORT b/network/krb5/EXPORT
deleted file mode 100644
index d868a9e27e..0000000000
--- a/network/krb5/EXPORT
+++ /dev/null
@@ -1,13 +0,0 @@
-EXPORT LAW WARNINGS:
-
- * Export of this software from the United States of America may be
-subject to the Export Administration Regulations of the United States
-Department of Commerce, currently (October 2003) codified as Title 15
-CFR Parts 730-774.
- * You are responsible for complying with all applicable export
-regulations, including obtaining an export license if required.
- * You may not download this software if you are located in, or are
-a citizen or national of, any country for which the US government
-prohibits the export of encryption source code, currently (October
-2003) Cuba, Iran, Iraq, Libya, North Korea, Sudan, or Syria. (15 CFR
-Sections 734(b)(3), 740.13(e)(4))
diff --git a/network/krb5/README b/network/krb5/README
deleted file mode 100644
index 2058088316..0000000000
--- a/network/krb5/README
+++ /dev/null
@@ -1,10 +0,0 @@
-Kerberos is a network authentication protocol. It is designed to
-provide strong authentication for client/server applications by using
-secret-key cryptography. A free implementation of this protocol is
-available from the Massachusetts Institute of Technology. Kerberos is
-available in many commercial products as well.
-
-Note:
-We provide 2 RC scripts that you can use for your own usage:
-- rc.kadmind: Kerberos KADM5 administration server init script
-- rc.krb5kdc: Kerberos V5 KDC init script
diff --git a/network/krb5/README.krb5 b/network/krb5/README.krb5
deleted file mode 100644
index 72c522b6a7..0000000000
--- a/network/krb5/README.krb5
+++ /dev/null
@@ -1,52 +0,0 @@
-Kerberos is a network authentication protocol. It is designed to
-provide strong authentication for client/server applications by using
-secret-key cryptography. A free implementation of this protocol is
-available from the Massachusetts Institute of Technology. Kerberos is
-available in many commercial products as well.
-
-The Internet is an insecure place. Many of the protocols used in the
-Internet do not provide any security. Tools to "sniff" passwords off
-of the network are in common use by malicious hackers. Thus,
-applications which send an unencrypted password over the network are
-extremely vulnerable. Worse yet, other client/server applications rely
-on the client program to be "honest" about the identity of the user
-who is using it. Other applications rely on the client to restrict its
-activities to those which it is allowed to do, with no other
-enforcement by the server.
-
-Some sites attempt to use firewalls to solve their network security
-problems. Unfortunately, firewalls assume that "the bad guys" are on
-the outside, which is often a very bad assumption. Most of the really
-damaging incidents of computer crime are carried out by insiders.
-Firewalls also have a significant disadvantage in that they restrict
-how your users can use the Internet. (After all, firewalls are simply
-a less extreme example of the dictum that there is nothing more secure
-then a computer which is not connected to the network --- and powered
-off!) In many places, these restrictions are simply unrealistic and
-unacceptable.
-
-Kerberos was created by MIT as a solution to these network security
-problems. The Kerberos protocol uses strong cryptography so that a
-client can prove its identity to a server (and vice versa) across an
-insecure network connection. After a client and server has used
-Kerberos to prove their identity, they can also encrypt all of their
-communications to assure privacy and data integrity as they go about
-their business.
-
-Kerberos is freely available from MIT, under copyright permissions
-very similar those used for the BSD operating system and the X Window
-System. MIT provides Kerberos in source form so that anyone who wishes
-to use it may look over the code for themselves and assure themselves
-that the code is trustworthy. In addition, for those who prefer to
-rely on a professionally supported product, Kerberos is available as a
-product from many different vendors.
-
-In summary, Kerberos is a solution to your network security problems.
-It provides the tools of authentication and strong cryptography over
-the network to help you secure your information systems across your
-entire enterprise. We hope you find Kerberos as useful as it has been
-to us. At MIT, Kerberos has been invaluable to our
-Information/Technology architecture.
-
-Additional information is available from the MIT Kerberos website:
-http://web.mit.edu/kerberos/
diff --git a/network/krb5/doinst.sh b/network/krb5/doinst.sh
deleted file mode 100644
index db0a05b7e2..0000000000
--- a/network/krb5/doinst.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
- NEW="$1"
- OLD="$(dirname ${NEW})/$(basename ${NEW} .new)"
- if [ -e ${OLD} ]; then
- cp -a ${OLD} ${NEW}.incoming
- cat ${NEW} > ${NEW}.incoming
- mv ${NEW}.incoming ${NEW}
- fi
- config ${NEW}
-}
-
-preserve_perms etc/rc.d/rc.krb5kdc.new
-preserve_perms etc/rc.d/rc.kadmind.new
diff --git a/network/krb5/krb5.SlackBuild b/network/krb5/krb5.SlackBuild
deleted file mode 100644
index cce13e060f..0000000000
--- a/network/krb5/krb5.SlackBuild
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for krb5
-
-# Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA
-# Copyright 2015-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=krb5
-VERSION=${VERSION:-1.18.2}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-
-sed -i "/KRB5ROOT=/s/\/local//" src/util/ac_check_krb5.m4
-
-cd src
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-CPPFLAGS+=" -I/usr/include/et" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --enable-dns-for-realm \
- --with-ldap \
- --with-system-et \
- --with-system-ss \
- --enable-pkinit \
- --with-tls-impl=openssl \
- --with-system-verto=no \
- --with-prng-alg=os \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Add init scripts
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.krb5kdc > $PKG/etc/rc.d/rc.krb5kdc.new
-cat $CWD/rc.kadmind > $PKG/etc/rc.d/rc.kadmind.new
-
-rm -rf $PKG/usr/man/cat{1,5,8}
-rm -f $PKG/usr/man/man5/.*.5
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $CWD/README $CWD/README.krb5 $CWD/EXPORT $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc
-find $PKG/usr/doc -type f -exec chmod 0644 {} \;
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/krb5/krb5.info b/network/krb5/krb5.info
deleted file mode 100644
index 4b1ee9202e..0000000000
--- a/network/krb5/krb5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="krb5"
-VERSION="1.18.2"
-HOMEPAGE="http://web.mit.edu/kerberos/"
-DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.18/krb5-1.18.2.tar.gz"
-MD5SUM="fd9087eaa43589a2480c2e22da91a17e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/network/krb5/rc.kadmind b/network/krb5/rc.kadmind
deleted file mode 100644
index 5a5633f1ee..0000000000
--- a/network/krb5/rc.kadmind
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# Kerberos KADM5 administration server init script
-#
-# Copyright (C) 2017 Jason Graham <jgraha8@gmail.com>
-#
-
-# Start kadmind:
-kadmind_start() {
- CMDLINE="/usr/sbin/kadmind"
- echo -n "Starting kadmind: $CMDLINE"
- $CMDLINE
- echo
-}
-
-# Stop kadmind:
-kadmind_stop() {
- echo "Stopping kadmind..."
- killall -e -q kadmind
-}
-
-# Restart kadmind:
-kadmind_restart() {
- kadmind_stop
- sleep 1
- kadmind_start
-}
-
-# Check if kadmind is running
-kadmind_status() {
- if [ ! -z "$(ps -e -o command | grep -E -w [/]usr/sbin/kadmind)" ]; then
- echo "kadmind is running."
- else
- echo "kadmind is stopped."
- exit 1
- fi
-}
-
-case "$1" in
- 'start')
- kadmind_start
- ;;
- 'stop')
- kadmind_stop
- ;;
- 'restart')
- kadmind_restart
- ;;
- 'status')
- kadmind_status
- ;;
- *)
- echo "usage $0 start|stop|restart|status"
-esac
diff --git a/network/krb5/rc.krb5kdc b/network/krb5/rc.krb5kdc
deleted file mode 100644
index 6829e12ab5..0000000000
--- a/network/krb5/rc.krb5kdc
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# Kerberos V5 KDC init script
-#
-# Copyright (C) 2017 Jason Graham <jgraha8@gmail.com>
-#
-
-# Start krb5kdc:
-krb5kdc_start() {
- CMDLINE="/usr/sbin/krb5kdc"
- echo -n "Starting krb5kdc: $CMDLINE"
- $CMDLINE
- echo
-}
-
-# Stop krb5kdc:
-krb5kdc_stop() {
- echo "Stopping krb5kdc..."
- killall -e -q krb5kdc
-}
-
-# Restart krb5kdc:
-krb5kdc_restart() {
- krb5kdc_stop
- sleep 1
- krb5kdc_start
-}
-
-# Check if krb5kdc is running
-krb5kdc_status() {
- if [ ! -z "$(ps -e -o command | grep -E -w [/]usr/sbin/krb5kdc)" ]; then
- echo "krb5kdc is running."
- else
- echo "krb5kdc is stopped."
- exit 1
- fi
-}
-
-case "$1" in
- 'start')
- krb5kdc_start
- ;;
- 'stop')
- krb5kdc_stop
- ;;
- 'restart')
- krb5kdc_restart
- ;;
- 'status')
- krb5kdc_status
- ;;
- *)
- echo "usage $0 start|stop|restart|status"
-esac
diff --git a/network/krb5/slack-desc b/network/krb5/slack-desc
deleted file mode 100644
index 6b5ce3e43e..0000000000
--- a/network/krb5/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-krb5: krb5 (network authentication protocol)
-krb5:
-krb5: Kerberos is a network authentication protocol. It is designed to
-krb5: provide strong authentication for client/server applications by using
-krb5: secret-key cryptography. A free implementation of this protocol is
-krb5: available from the Massachusetts Institute of Technology. Kerberos is
-krb5: available in many commercial products as well.
-krb5:
-krb5: Homepage: http://web.mit.edu/kerberos/
-krb5:
-krb5:
diff --git a/network/leechcraft/README b/network/leechcraft/README
deleted file mode 100644
index 22782597c3..0000000000
--- a/network/leechcraft/README
+++ /dev/null
@@ -1,26 +0,0 @@
-LeechCraft is a full-featured modular "Internet client" application,
-currently including plugins for a web browser, news feed reader,
-BitTorrent client, FTP client, and many more. Plugins are easily added
-and integrated with each other with no effort.
-
-Currently it includes following plugins:
-* Aggregator, news feed reader * BitTorrent, the BitTorrent client
-* Chatter, the IRC client * CSTP, simple HTTP implementation
-* DBusManager, D-Bus for the LeechCraft * DeadLyrics, LyricWiki.org API
-* HistoryHolder, downloads history * LCFTP, FTP implementation client
-* LMP, simple media player with streaming support
-* NetworkMonitor, which monitors for HTTP requests
-* Poshuku, the web browser * Poshuku CleanWeb, AdBlock+-compatible ad blocker
-* Poshuku FileScheme, support for the file:// browsing
-* Poshuku FUA, which allows to set fake user agents per domain
-* SeekThru, client for OpenSearch-aware web sites
-
-The following variables default to ON, but you can disable building any of
-them by passing NAME_OF_VARIABLE=OFF to the build script:
- ENABLE_SUMMARY ENABLE_TORRENT ENABLE_AGGREGATOR ENABLE_POSHUKU ENABLE_HTTP
- ENABLE_FTP ENABLE_LMP ENABLE_DBUSMANAGER ENABLE_DEADLYRICS ENABLE_SEEKTHRU
- ENABLE_NETWORKMONITOR ENABLE_HISTORYHOLDER ENABLE_CHATTER ENABLE_YASD
- ENABLE_DCMINATOR ENABLE_NEWLIFE ENABLE_ANHERO ENABLE_VGRABBER
-As an example, you can do this: ENABLE_LMP=OFF ./leechcraft.SlackBuild
-
-An optional dependency is libtorrent-rasterbar.
diff --git a/network/leechcraft/doinst.sh b/network/leechcraft/doinst.sh
deleted file mode 100644
index f3f8604d5a..0000000000
--- a/network/leechcraft/doinst.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
-
-if [ -e usr/share/icons/Pevzi/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/Pevzi >/dev/null 2>&1
- fi
-fi
-
-if [ -e usr/share/icons/oxygen/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/oxygen >/dev/null 2>&1
- fi
-fi
-
diff --git a/network/leechcraft/leechcraft.SlackBuild b/network/leechcraft/leechcraft.SlackBuild
deleted file mode 100644
index 80b2acc607..0000000000
--- a/network/leechcraft/leechcraft.SlackBuild
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for LeechCraft
-
-# Copyright 2009 rexim
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=leechcraft
-VERSION=${VERSION:-0.3.65}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
- EXTRA_CMAKE_FLAGS=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
- EXTRA_CMAKE_FLAGS=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
- EXTRA_CMAKE_FLAGS="-DRESPECTLIB64=True"
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
-cmake \
- -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX="/usr" \
- -DLIB_SUFFIX="$LIBDIRSUFFIX" \
- -DENABLE_SUMMARY="${ENABLE_SUMMARY:-ON}" \
- -DENABLE_TORRENT="${ENABLE_TORRENT:-ON}" \
- -DENABLE_AGGREGATOR="${ENABLE_AGGREGATOR:-ON}" \
- -DENABLE_POSHUKU="${ENABLE_POSHUKU:-ON}" \
- -DENABLE_HTTP="${ENABLE_HTTP:-ON}" \
- -DENABLE_FTP="${ENABLE_FTP:-ON}" \
- -DENABLE_LMP="${ENABLE_LMP:-ON}" \
- -DENABLE_DBUSMANAGER="${ENABLE_DBUSMANAGER:-ON}" \
- -DENABLE_DEADLYRICS="${ENABLE_DEADLYRICS:-ON}" \
- -DENABLE_SEEKTHRU="${ENABLE_SEEKTHRU:-ON}" \
- -DENABLE_NETWORKMONITOR="${ENABLE_NETWORKMONITOR:-ON}" \
- -DENABLE_HISTORYHOLDER="${ENABLE_HISTORYHOLDER:-ON}" \
- -DENABLE_CHATTER="${ENABLE_CHATTER:-ON}" \
- -DENABLE_YASD="${ENABLE_YASD:-ON}" \
- -DENABLE_DCMINATOR="${ENABLE_DCMINATOR:-ON}" \
- -DENABLE_NEWLIFE="${ENABLE_NEWLIFE:-ON}" \
- -DENABLE_ANHERO="${ENABLE_ANHERO:-ON}" \
- -DENABLE_VGRABBER="${ENABLE_VGRABBER:-ON}" \
- $EXTRA_CMAKE_FLAGS \
- ../src/
-
-make
-make install DESTDIR=$PKG
-
-# Move the manual pages to the correct place
-mv $PKG/usr/share/man $PKG/usr
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/leechcraft/leechcraft.info b/network/leechcraft/leechcraft.info
deleted file mode 100644
index 946c9060bd..0000000000
--- a/network/leechcraft/leechcraft.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="leechcraft"
-VERSION="0.3.65"
-HOMEPAGE="https://leechcraft.org/"
-DOWNLOAD="https://downloads.sourceforge.net/leechcraft/leechcraft-0.3.65.tar.bz2"
-MD5SUM="f410eae27731aa80b8921701477b15e7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="rexim"
-EMAIL="reximkut@gmail.com"
diff --git a/network/leechcraft/slack-desc b/network/leechcraft/slack-desc
deleted file mode 100644
index eddd124950..0000000000
--- a/network/leechcraft/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-leechcraft: leechcraft (modular internet client application)
-leechcraft:
-leechcraft: LeechCraft is a full-featured modular "Internet client" application,
-leechcraft: currently including plugins for a web browser, news feed reader,
-leechcraft: BitTorrent client, FTP client and many more. Plugins are easily added
-leechcraft: and integrated with each other with no effort.
-leechcraft:
-leechcraft: Homepage: http://leechcraft.org/
-leechcraft:
-leechcraft:
-leechcraft:
diff --git a/network/linuxdcpp/linuxdcpp.SlackBuild b/network/linuxdcpp/linuxdcpp.SlackBuild
index e83b5a345b..bf57367f58 100644
--- a/network/linuxdcpp/linuxdcpp.SlackBuild
+++ b/network/linuxdcpp/linuxdcpp.SlackBuild
@@ -65,7 +65,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -fpermissive" \
+CXXFLAGS="$SLKCFLAGS -fpermissive -std=gnu++98" \
scons \
PREFIX=/usr \
FAKE_ROOT=$PKG \
diff --git a/network/memcached/memcached.SlackBuild b/network/memcached/memcached.SlackBuild
index 404909ad39..833314e8d8 100644
--- a/network/memcached/memcached.SlackBuild
+++ b/network/memcached/memcached.SlackBuild
@@ -82,7 +82,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=format-overflow -Wno-error=format-truncation" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/network/midori/README b/network/midori/README
index 16ec7ed18a..d8f163a4e0 100644
--- a/network/midori/README
+++ b/network/midori/README
@@ -1,7 +1,7 @@
Midori is a lightweight, webkit-based web browser.
Features:
- * Full integration with GTK+2
+ * Full integration with GTK+3
* Fast rendering with WebKit
* Tabs, windows and session management
* Flexibly configurable Web Search.
@@ -10,11 +10,3 @@ Features:
* Customizable and extensible interface.
* Extensions such as Adblock, form history, mouse gestures
or cookie management.
-
-GTK3 support is disabled by default but can be enabled
-by passing GTK3=yes to the script, e.g.
-
- GTK3=yes ./midori.SlackBuild
-
-If enabled then webkitgtk3 and libunique3 (instead of webkitgtk
-and libunique) are required.
diff --git a/network/midori/doinst.sh b/network/midori/doinst.sh
index 8505e6eaff..4a25de5e6f 100644
--- a/network/midori/doinst.sh
+++ b/network/midori/doinst.sh
@@ -1,19 +1,3 @@
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/xdg/midori/search.new
-config etc/xdg/midori/extensions/adblock/config.new
-
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
diff --git a/network/midori/midori.SlackBuild b/network/midori/midori.SlackBuild
index 99efa991c7..8aeed3e3ed 100644
--- a/network/midori/midori.SlackBuild
+++ b/network/midori/midori.SlackBuild
@@ -5,7 +5,7 @@
# Copyright 2008 Andrew Brouwers <abrouwers@gmail.com>
# Copyright 2009-2011 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
# Copyright 2012-2013 Roberto Neri, Palermo, Italy
-# Copyright 2013-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
#
# All rights reserved.
#
@@ -27,7 +27,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=midori
-VERSION=${VERSION:-0.5.11}
+SRCNAM=core
+VERSION=${VERSION:-9.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -61,22 +62,14 @@ else
LIBDIRSUFFIX=""
fi
-# GTK3 support is disabled by default but can be enabled
-# by passing GTK3=yes to the script
-if [ "${GTK3:-no}" = "yes" ]; then
- ENABLE_GTK3="ON"
-else
- ENABLE_GTK3="OFF"
-fi
-
set -eu
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_${VERSION}_all_.tar.?z*
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $SRCNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -87,30 +80,20 @@ find -L . \
mkdir -p build
cd build
cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc \
- -DCMAKE_INSTALL_FULL_LIBDIR=/usr/lib$LIBDIRSUFFIX \
- -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
- -DDATADIR=/usr/share/$PRGNAM \
- -DUSE_ZEITGEIST=OFF \
- -DUSE_GTK3="$ENABLE_GTK3" \
- -DHALF_BRO_INCOM_WEBKIT2=ON \
- -DCMAKE_BUILD_TYPE=Release ..
- make
- make install DESTDIR=$PKG
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib$LIBDIRSUFFIX \
+ -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+ -DVALA_CFLAGS="$SLKCFLAGS" \
+ -G Ninja \
+ ..
+ ninja
+ DESTDIR=$PKG ninja install
cd ..
-# Don't clobber existing configs
-mv $PKG/etc/xdg/midori/search $PKG/etc/xdg/midori/search.new
-mv $PKG/etc/xdg/midori/extensions/adblock/config $PKG/etc/xdg/midori/extensions/adblock/config.new
-
-# The other docs have been taken care by make install
+rm -fR $PKG/usr/share/doc
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a HACKING TODO TRANSLATE \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING *.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-ln -s $PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/midori/midori.info b/network/midori/midori.info
index a2abab3152..516e7ec757 100644
--- a/network/midori/midori.info
+++ b/network/midori/midori.info
@@ -1,10 +1,10 @@
PRGNAM="midori"
-VERSION="0.5.11"
-HOMEPAGE="http://midori-browser.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/midori_0.5.11_all_.tar.bz2"
-MD5SUM="fcc03ef759fce4fe9f2446d9da4a065e"
+VERSION="9.0"
+HOMEPAGE="https://midori-browser.org/"
+DOWNLOAD="https://github.com/midori-browser/core/archive/v9.0/midori-9.0.tar.gz"
+MD5SUM="b39172aeb754e666f044d69828f82bcc"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="vala webkit2gtk"
+REQUIRES="libpeas webkit2gtk"
MAINTAINER="Matteo Bernardini"
EMAIL="ponce@slackbuilds.org"
diff --git a/network/midori/slack-desc b/network/midori/slack-desc
index bddbb483ce..15edff5601 100644
--- a/network/midori/slack-desc
+++ b/network/midori/slack-desc
@@ -8,12 +8,12 @@
|-----handy-ruler------------------------------------------------------|
midori: midori (simple web-browser)
midori:
-midori: midori is a simple web-browser, based on the webkit framework.
+midori: midori is a simple web-browser, based on the webkit framework
+midori: and gtk+3.
midori:
+midori: Homepage: https://midori-browser.org
midori:
midori:
-midori: Homepage: http://midori-browser.org/
-midori:
midori:
midori:
midori:
diff --git a/network/mldonkey/mldonkey.SlackBuild b/network/mldonkey/mldonkey.SlackBuild
index 5845ea64a1..8c7adeb4bd 100644
--- a/network/mldonkey/mldonkey.SlackBuild
+++ b/network/mldonkey/mldonkey.SlackBuild
@@ -26,13 +26,13 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=mldonkey
-VERSION=${VERSION:-3.1.5}
+VERSION=${VERSION:-3.1.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -45,8 +45,8 @@ PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
GUIOPT=${GUIOPT:-no}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,10 +69,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# This avoids downloading tarballs when the SlackBuild is running
mkdir -p patches
@@ -105,7 +105,7 @@ CXXFLAGS="$SLKCFLAGS" \
make -j1
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
if [ "$GUIOPT" = 'yes' ]; then
@@ -116,7 +116,7 @@ fi
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- distrib/*.txt docs ChangeLog \
+ distrib/*.txt docs \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/mldonkey/mldonkey.info b/network/mldonkey/mldonkey.info
index f2de7a097c..8d2907a4bc 100644
--- a/network/mldonkey/mldonkey.info
+++ b/network/mldonkey/mldonkey.info
@@ -1,10 +1,10 @@
PRGNAM="mldonkey"
-VERSION="3.1.5"
+VERSION="3.1.6"
HOMEPAGE="http://mldonkey.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/mldonkey/mldonkey-3.1.5.tar.bz2 \
+DOWNLOAD="https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2 \
http://caml.inria.fr/pub/distrib/ocaml-3.12/ocaml-3.12.0.tar.gz \
http://www.math.nagoya-u.ac.jp/~garrigue/soft/olabl/dist/lablgtk-2.14.2.tar.gz"
-MD5SUM="eca07c8ce88702dd437c72db531162d9 \
+MD5SUM="d73a925fb3559eed2c1d91fdeed1153a \
3ba7cc65123c3579f14e7c726d3ee782 \
bad77680a72dab8b915cae99d1ec9b1f"
DOWNLOAD_x86_64=""
diff --git a/network/mosh/mosh.SlackBuild b/network/mosh/mosh.SlackBuild
index ac040947a9..40ba6d2b63 100644
--- a/network/mosh/mosh.SlackBuild
+++ b/network/mosh/mosh.SlackBuild
@@ -53,7 +53,7 @@ find -L . \
-exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/network/museek+/README b/network/museek+/README
deleted file mode 100644
index 350f3838de..0000000000
--- a/network/museek+/README
+++ /dev/null
@@ -1,23 +0,0 @@
-Museek+ is a file-sharing application for the Soulseek peer-to-peer network,
-written in C++. It's an enhanced version of Hyriand's original Museek
-(see http://museek.thegraveyard.org). It supports chat, transferring files,
-searching, user-management, shares browsing and more. The new features are:
-room searching, interests, buddy-only shares, banlists, icon themes, and
-font/color selecting.
-
-Museek+ consists of museekd (daemon), muscan (shares scanning tool), muscand
-(automated shares scanning tool), musetup (command-line configuration script),
-musetup-gtk (PyGTK configuration app), museeq (QT GUI client), mucous (curses
-python client), murmur (PyGTK client) and museekcontrol (command-line python
-client).
-
-After installing museek+ follow these steps:
- 1) Configure your settings with musetup: server, username, password,
- interface password, download directory, shared directories.
- 2) Run museekd.
- 3) Run museeq, mucous, or museekcontrol.
- 4) Login into museekd via the interface socket or host:port and the
- interface password.
-
-An example init script (rc.museekd) for the museekd daemon is provided.
-Feel free to modify it for your needs. Use it at your own risk.
diff --git a/network/museek+/doinst.sh b/network/museek+/doinst.sh
deleted file mode 100644
index 74a3bd3a48..0000000000
--- a/network/museek+/doinst.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-# Keep same perms on rc.museekd.new:
-#if [ -e etc/rc.d/rc.museekd ]; then
-# cp -a etc/rc.d/rc.museekd etc/rc.d/rc.museekd.new.incoming
-# cat etc/rc.d/rc.museekd.new > etc/rc.d/rc.museekd.new.incoming
-# mv etc/rc.d/rc.museekd.new.incoming etc/rc.d/rc.museekd.new
-#fi
-#
-#config etc/rc.d/rc.museekd.new
-
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/network/museek+/museek+.SlackBuild b/network/museek+/museek+.SlackBuild
deleted file mode 100644
index 347b8903bf..0000000000
--- a/network/museek+/museek+.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for museek+
-# Written by Iskar Enev <iskar.enev[@]gmail.com>
-# Currently maintained by B. Watson <yalhcru@gmail.com>
-
-PRGNAM=museek+
-VERSION=${VERSION:-0.2}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# This patch fixes the python modules install path
-# to be architecture aware
-patch -p0 < $CWD/museek-python.diff
-
-cmake -DPREFIX=/usr \
- -DMANDIR=man \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
- -DSWIG_DIR:PATH=`swig -swiglib` \
- -DEVERYTHING=1 \
- -DTRAYICON=1 \
- -DBINRELOC=0
-
-make VERBOSE=1
-make install VERBOSE=1 DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- COPYING CREDITS FILES LICENSE README TODO INSTALL \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/rc.museekd > $PKG/usr/doc/$PRGNAM-$VERSION/rc.museekd.new
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/museek+/museek+.info b/network/museek+/museek+.info
deleted file mode 100644
index 8ee1bc1126..0000000000
--- a/network/museek+/museek+.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="museek+"
-VERSION="0.2"
-HOMEPAGE="http://museek-plus.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/museek-plus/museek+-0.2.tar.bz2"
-MD5SUM="66d3eab341e1cd6642f83d329a18c3b5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libxml++"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/network/museek+/museek-python.diff b/network/museek+/museek-python.diff
deleted file mode 100644
index 844d17d624..0000000000
--- a/network/museek+/museek-python.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- murmur/CMakeLists.txt 2008-09-22 11:49:33.000000000 +0300
-+++ murmur/CMakeLists.txt.1 2009-09-01 12:04:34.000000000 +0300
-@@ -25,7 +25,7 @@
- ${PYMURMUR_FILES}
- )
-
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-
- if (NOT sitepackages OR error)
- MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
---- mucous/CMakeLists.txt 2008-09-22 11:49:33.000000000 +0300
-+++ mucous/CMakeLists.txt.1 2009-09-01 12:04:55.000000000 +0300
-@@ -28,7 +28,7 @@
- ${PYMUCOUS_FILES}
- )
-
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-
- if (NOT sitepackages OR error)
- MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
---- python-bindings/CMakeLists.txt 2008-09-22 11:49:33.000000000 +0300
-+++ python-bindings/CMakeLists.txt.1 2009-09-01 12:04:15.000000000 +0300
-@@ -18,7 +18,7 @@
- museek/driver.py
- )
-
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-
- if (NOT sitepackages OR error)
- MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
---- Mucipher/PyMucipher/CMakeLists.txt 2008-10-07 19:58:27.000000000 +0300
-+++ Mucipher/PyMucipher/CMakeLists.txt.1 2009-09-01 12:05:46.000000000 +0300
-@@ -37,7 +37,7 @@
- ${CMAKE_CURRENT_BINARY_DIR}/mucipherc.py
- ${CMAKE_CURRENT_BINARY_DIR}/_mucipherc.so
- )
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-
- if (NOT sitepackages OR error)
- MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
diff --git a/network/museek+/rc.museekd b/network/museek+/rc.museekd
deleted file mode 100644
index 8c74eb95ab..0000000000
--- a/network/museek+/rc.museekd
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-#
-# This shell script takes care of starting and stopping museekd.
-
-MUSEEKD=/usr/bin/museekd
-MUSETUP=/usr/bin/musetup
-MUSCAN=/usr/bin/muscan
-MUSOCKET=/tmp/museekd.root
-PIDFILE=/var/run/museekd.pid
-DBDIR=/var/museek
-CONFIG=$DBDIR/museekd.xml
-CHOWNSOCKET=YES
-
-case "$1" in
- start)
- if [ ! -d $DBDIR ]; then
- mkdir $DBDIR
- fi
- if [ ! -f $CONFIG ]; then
- echo -n "Starting Museek Setup"
- echo
- if [ ! -d $DBDIR ]; then
- mkdir $DBDIR
- fi
- $MUSETUP $CONFIG
- echo
- fi
- if [ -f $PIDFILE ]; then
- echo -n "Museek Daemon already running (or zombie pid file in /var/run/)"
- echo
- exit
- fi
- echo -n "Starting Museek Daemon"
- $MUSEEKD -c $CONFIG &>/dev/null &
- PID="$!"
- sleep 2
- if kill -0 $PID # pid check
- then
- if [ $CHOWNSOCKET = YES ];
- then
- if [ -e $MUSOCKET ]; then chmod 666 $MUSOCKET
- # access the museekd socket from other users, may be a security risk on multiuser systems
- fi
- fi
- echo $PID > $PIDFILE
- echo
- else
- echo -n "Museekd isn't starting up properly. Check your Config file, \nor run 'museekd -c /var/museek/museekd.xml' for verbose messages."
- echo
- fi
- ;;
- stop)
- echo -n "Stopping Museek Daemon"
- echo
- if [ -f $PIDFILE ]; then
- kill -15 $(cat $PIDFILE) &>/dev/null
- rm $PIDFILE
- else
- echo -n "Museek Daemon not running"
- echo
- exit
- fi
- ;;
- reconnect)
- if [ -f $PIDFILE ]; then
- echo -n "Attempting to reconnect Museekd to the Server"
- kill -ALRM $(cat $PIDFILE) &>/dev/null
- echo
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- rescan)
- echo -n "Starting Muscan, rescanning shared files"
- echo
- $MUSCAN -c $CONFIG -r -v
- echo
- $0 reload
- ;;
- setup)
- echo -n "Starting Museek Setup"
- echo
- if [ ! -d $DBDIR ]; then
- mkdir $DBDIR
- fi
- $MUSETUP $CONFIG
- echo
- ;;
- reload)
- if [ -f $PIDFILE ]; then
- echo -n "Reloading Museek Daemon to update Shares"
- kill -HUP $(cat $PIDFILE)
- echo
- else
- echo -n "Museek Daemon not running, can't reload shares"
- echo
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|rescan|reconnect|setup|reload}"
- echo -n
-esac
diff --git a/network/museek+/slack-desc b/network/museek+/slack-desc
deleted file mode 100644
index 58f0d98ace..0000000000
--- a/network/museek+/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-museek+: museek+ (file-sharing application)
-museek+:
-museek+: Museek+ is a file-sharing application for the Soulseek p2p network,
-museek+: written in C++. It's an enhanced version of Hyriand's original Museek
-museek+: (http://museek.thegraveyard.org). It supports chat, transferring
-museek+: files, searching, user-management, sharing, banlists, interests
-museek+: and more. Museek+ consists of museekd (daemon), muscan (shares
-museek+: scanning tool), muscand (automated shares scanning tool), musetup
-museek+: (command-line configuration script), musetup-gtk (PyGTK configuration
-museek+: app), museeq (QT GUI client), mucous (curses python client),
-museek+: museekcontrol (command-line python client) and murmur (PyGTK client).
diff --git a/network/ncrack/ncrack.SlackBuild b/network/ncrack/ncrack.SlackBuild
index e7fa0d50de..c99b3248a4 100644
--- a/network/ncrack/ncrack.SlackBuild
+++ b/network/ncrack/ncrack.SlackBuild
@@ -71,7 +71,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/network/nextcloud-server/nextcloud-server.SlackBuild b/network/nextcloud-server/nextcloud-server.SlackBuild
index 1a139248f2..8276ac8a74 100644
--- a/network/nextcloud-server/nextcloud-server.SlackBuild
+++ b/network/nextcloud-server/nextcloud-server.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=nextcloud-server
SRCNAM=nextcloud
-VERSION=${VERSION:-13.0.7}
+VERSION=${VERSION:-18.0.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/nextcloud-server/nextcloud-server.info b/network/nextcloud-server/nextcloud-server.info
index 4087894048..42fbb27b4b 100644
--- a/network/nextcloud-server/nextcloud-server.info
+++ b/network/nextcloud-server/nextcloud-server.info
@@ -1,8 +1,8 @@
PRGNAM="nextcloud-server"
-VERSION="13.0.7"
+VERSION="18.0.4"
HOMEPAGE="https://nextcloud.com/"
-DOWNLOAD="https://download.nextcloud.com/server/releases/nextcloud-13.0.7.tar.bz2"
-MD5SUM="ee0c0e53a1ac8e2feb3ce0fdfe27f9b2"
+DOWNLOAD="https://download.nextcloud.com/server/releases/nextcloud-18.0.4.tar.bz2"
+MD5SUM="d2f3c7bd402ef61d30a576d165fe7c1d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/nghttp2/README b/network/nghttp2/README
deleted file mode 100644
index 3d05758f54..0000000000
--- a/network/nghttp2/README
+++ /dev/null
@@ -1,4 +0,0 @@
-nghttp2 is an implementation of HTTP/2 and its header compression
-algorithm HPACK in C.
-The framing layer of HTTP/2 is implemented as a form of reusable C
-library.
diff --git a/network/nghttp2/nghttp2.SlackBuild b/network/nghttp2/nghttp2.SlackBuild
deleted file mode 100644
index 39af89748f..0000000000
--- a/network/nghttp2/nghttp2.SlackBuild
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for "nghttp2".
-
-# Copyright 2016 Marcel Saegebarth <marc@mos6581.de>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=nghttp2
-VERSION=${VERSION:-1.16.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-python-bindings \
- --with-jemalloc \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/nghttp2/nghttp2.info b/network/nghttp2/nghttp2.info
deleted file mode 100644
index 11476aa1b8..0000000000
--- a/network/nghttp2/nghttp2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nghttp2"
-VERSION="1.16.1"
-HOMEPAGE="https://nghttp2.org/"
-DOWNLOAD="https://github.com/nghttp2/nghttp2/releases/download/v1.16.1/nghttp2-1.16.1.tar.xz"
-MD5SUM="bde0dca3fd5da7bc5c7c8470ed0674b5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jansson"
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
diff --git a/network/nghttp2/slack-desc b/network/nghttp2/slack-desc
deleted file mode 100644
index a1d218da43..0000000000
--- a/network/nghttp2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-nghttp2: nghttp2 (HTTP/2 implementation)
-nghttp2:
-nghttp2: nghttp2 is an implementation of HTTP/2 and its header compression
-nghttp2: algorithm HPACK in C.
-nghttp2: The framing layer of HTTP/2 is implemented as a form of reusable C
-nghttp2: library.
-nghttp2:
-nghttp2: Homepage: https://nghttp2.org/
-nghttp2:
-nghttp2:
-nghttp2:
diff --git a/network/opendkim/opendkim.SlackBuild b/network/opendkim/opendkim.SlackBuild
index 85b2b88f4b..83b188ea96 100644
--- a/network/opendkim/opendkim.SlackBuild
+++ b/network/opendkim/opendkim.SlackBuild
@@ -104,6 +104,9 @@ else
UNBOUND=""
fi
+patch -p1 < $CWD/openssl_1.1.0_compat.patch
+autoreconf -vif
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/opendkim/openssl_1.1.0_compat.patch b/network/opendkim/openssl_1.1.0_compat.patch
new file mode 100644
index 0000000000..383990832a
--- /dev/null
+++ b/network/opendkim/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+ * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+ - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- opendkim-2.11.0~alpha.orig/configure.ac
++++ opendkim-2.11.0~alpha/configure.ac
+@@ -864,26 +864,28 @@ then
+ AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ AC_MSG_ERROR([libcrypto not found]))
+
+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+- [
+- if test x"$enable_shared" = x"yes"
+- then
+- AC_MSG_ERROR([Cannot build shared opendkim
+- against static openssl libraries.
+- Configure with --disable-shared
+- to get this working or obtain a
+- shared libssl library for
+- opendkim to use.])
+- fi
+
+- # avoid caching issue - last result of SSL_library_init
+- # shouldn't be cached for this next check
+- unset ac_cv_search_SSL_library_init
+- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+- AC_MSG_ERROR([libssl not found]), [-ldl])
+- ]
+- )
++ AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++ [[SSL_library_init();]])],
++ [od_have_ossl="yes";],
++ [od_have_ossl="no";])
++ if test x"$od_have_ossl" = x"no"
++ then
++ if test x"$enable_shared" = x"yes"
++ then
++ AC_MSG_ERROR([Cannot build shared opendkim
++ against static openssl libraries.
++ Configure with --disable-shared
++ to get this working or obtain a
++ shared libssl library for
++ opendkim to use.])
++ fi
++
++ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++ AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++ AC_MSG_ERROR([libssl not found]), [-ldl])
++ fi
+
+ AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+ AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim-2.11.0~alpha.orig/opendkim/opendkim-crypto.c
++++ opendkim-2.11.0~alpha/opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ {
+ assert(pthread_setspecific(id_key, ptr) == 0);
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++ OPENSSL_thread_stop();
++#else
+ ERR_remove_state(0);
++#endif
+
+ free(ptr);
+
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ if (crypto_init_done)
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++ OPENSSL_thread_stop();
++#else
+ CRYPTO_cleanup_all_ex_data();
+ CONF_modules_free();
+ EVP_cleanup();
+ ERR_free_strings();
+ ERR_remove_state(0);
++#endif
+
+ if (nmutexes > 0)
+ {
diff --git a/network/opensmtpd/aliases b/network/opensmtpd/aliases
index ea54878974..85cc8e71ac 100644
--- a/network/opensmtpd/aliases
+++ b/network/opensmtpd/aliases
@@ -1,23 +1,49 @@
-# See aliases(5) for more information
+# Sample aliases file installed in /etc/opensmtpd/aliases
+#
+# Aliases in this file will NOT be expanded in the header from
+# Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
+#
+# >>>>>>>>>> The program "newaliases" must be run after
+# >> NOTE >> this file is updated for any changes to
+# >>>>>>>>>> show through to smtpd.
+#
+
+# Person who should get root's mail. Don't receive mail as root!
+#root: you
# Basic system aliases -- these MUST be present
MAILER-DAEMON: postmaster
postmaster: root
# General redirections for pseudo accounts
-bin: root
daemon: root
named: root
-nobody: root
uucp: root
www: root
ftp-bugs: root
+# Redirections for pseudo accounts that should not receive mail
+bin: /dev/null
+build: /dev/null
+nobody: /dev/null
+sshd: /dev/null
+
# Well-known aliases
manager: root
dumper: root
operator: root
-abuse: postmaster
+
+# RFC 2142: NETWORK OPERATIONS MAILBOX NAMES
+abuse: root
+# noc: root
+security: root
+
+# RFC 2142: SUPPORT MAILBOX NAMES FOR SPECIFIC INTERNET SERVICES
+# hostmaster: root
+# usenet: root
+# news: usenet
+# webmaster: root
+# ftp: root
# trap decode to catch security attacks
decode: root
diff --git a/network/opensmtpd/fix-crash-on-authentication.patch b/network/opensmtpd/fix-crash-on-authentication.patch
deleted file mode 100644
index c20b5e0a0e..0000000000
--- a/network/opensmtpd/fix-crash-on-authentication.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 9b5f70b93e038df5446bd37a4adac5a0380748e7 Mon Sep 17 00:00:00 2001
-From: johannes <johannes.brechtmann@gmail.com>
-Date: Wed, 21 Feb 2018 23:57:11 +0100
-Subject: [PATCH] crypt_checkpass: include HAVE_CRYPT_H definition, add NULL
- check
-
----
- openbsd-compat/crypt_checkpass.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/openbsd-compat/crypt_checkpass.c b/openbsd-compat/crypt_checkpass.c
-index dafd2dae..d10b3a57 100644
---- a/openbsd-compat/crypt_checkpass.c
-+++ b/openbsd-compat/crypt_checkpass.c
-@@ -1,5 +1,6 @@
- /* OPENBSD ORIGINAL: lib/libc/crypt/cryptutil.c */
-
-+#include "includes.h"
- #include <errno.h>
- #ifdef HAVE_CRYPT_H
- #include <crypt.h>
-@@ -10,6 +11,8 @@
- int
- crypt_checkpass(const char *pass, const char *goodhash)
- {
-+ char *c;
-+
- if (goodhash == NULL)
- goto fail;
-
-@@ -17,7 +20,11 @@ crypt_checkpass(const char *pass, const char *goodhash)
- if (strlen(goodhash) == 0 && strlen(pass) == 0)
- return 0;
-
-- if (strcmp(crypt(pass, goodhash), goodhash) == 0)
-+ c = crypt(pass, goodhash);
-+ if (c == NULL)
-+ goto fail;
-+
-+ if (strcmp(c, goodhash) == 0)
- return 0;
-
- fail:
diff --git a/network/opensmtpd/openbsd64-020-smtpd.patch b/network/opensmtpd/openbsd64-020-smtpd.patch
deleted file mode 100644
index 8ce7178da8..0000000000
--- a/network/opensmtpd/openbsd64-020-smtpd.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-OpenBSD 6.4 errata 020, August 2, 2019
-
-smtpd can crash on excessively large input, causing a denial of service.
-
---- a/smtpd/smtp_session.c 3 Sep 2018 19:01:29 -0000 1.337
-+++ b/smtpd/smtp_session.c 1 Aug 2019 21:18:53 -0000
-@@ -1904,15 +1904,21 @@ smtp_reply(struct smtp_session *s, char
- {
- va_list ap;
- int n;
-- char buf[LINE_MAX], tmp[LINE_MAX];
-+ char buf[LINE_MAX*2], tmp[LINE_MAX*2];
-
- va_start(ap, fmt);
- n = vsnprintf(buf, sizeof buf, fmt, ap);
- va_end(ap);
-- if (n == -1 || n >= LINE_MAX)
-- fatalx("smtp_reply: line too long");
-+ if (n < 0)
-+ fatalx("smtp_reply: response format error");
- if (n < 4)
- fatalx("smtp_reply: response too short");
-+ if (n >= (int)sizeof buf) {
-+ /* only first three bytes are used by SMTP logic,
-+ * so if _our_ reply does not fit entirely in the
-+ * buffer, it's ok to truncate.
-+ */
-+ }
-
- log_trace(TRACE_SMTP, "smtp: %p: >>> %s", s, buf);
-
diff --git a/network/opensmtpd/openbsd65-029-smptd-tls.patch b/network/opensmtpd/openbsd65-029-smptd-tls.patch
deleted file mode 100644
index a2727decf8..0000000000
--- a/network/opensmtpd/openbsd65-029-smptd-tls.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-OpenBSD 6.5 errata 029, January 30, 2020:
-
-smtpd can crash on opportunistic TLS downgrade, causing a denial of service.
-
---- usr.sbin/smtpd/mta_session.c 23 Dec 2018 16:37:53 -0000 1.115
-+++ usr.sbin/smtpd/mta_session.c 20 Jan 2020 10:36:58 -0000
-@@ -1292,40 +1292,20 @@ mta_io(struct io *io, int evt, void *arg
- break;
-
- case IO_ERROR:
-+ case IO_TLSERROR:
- log_debug("debug: mta: %p: IO error: %s", s, io_error(io));
-- if (!s->ready) {
-- mta_error(s, "IO Error: %s", io_error(io));
-- mta_connect(s);
-- break;
-- }
-- else if (!(s->flags & (MTA_FORCE_TLS|MTA_FORCE_SMTPS|MTA_FORCE_ANYSSL))) {
-- /* error in non-strict SSL negotiation, downgrade to plain */
-- if (s->flags & MTA_TLS) {
-- log_info("smtp-out: Error on session %016"PRIx64
-- ": opportunistic TLS failed, "
-- "downgrading to plain", s->id);
-- s->flags &= ~MTA_TLS;
-- s->flags |= MTA_DOWNGRADE_PLAIN;
-- mta_connect(s);
-- break;
-- }
-- }
-- mta_error(s, "IO Error: %s", io_error(io));
-- mta_free(s);
-- break;
-
-- case IO_TLSERROR:
-- log_debug("debug: mta: %p: TLS IO error: %s", s, io_error(io));
-- if (!(s->flags & (MTA_FORCE_TLS|MTA_FORCE_SMTPS|MTA_FORCE_ANYSSL))) {
-+ if (s->state == MTA_STARTTLS && s->use_smtp_tls) {
- /* error in non-strict SSL negotiation, downgrade to plain */
-- log_info("smtp-out: TLS Error on session %016"PRIx64
-- ": TLS failed, "
-+ log_info("smtp-out: Error on session %016"PRIx64
-+ ": opportunistic TLS failed, "
- "downgrading to plain", s->id);
- s->flags &= ~MTA_TLS;
- s->flags |= MTA_DOWNGRADE_PLAIN;
- mta_connect(s);
- break;
- }
-+
- mta_error(s, "IO Error: %s", io_error(io));
- mta_free(s);
- break;
diff --git a/network/opensmtpd/openbsd65-031-smtpd-envelope.patch b/network/opensmtpd/openbsd65-031-smtpd-envelope.patch
deleted file mode 100644
index cd59f1d6fa..0000000000
--- a/network/opensmtpd/openbsd65-031-smtpd-envelope.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-OpenBSD 6.5 errata 031, February 24, 2020:
-
-An out of bounds read in smtpd allows an attacker to inject arbitrary
-commands into the envelope file which are then executed as root.
-Separately, missing privilege revocation in smtpctl allows arbitrary
-commands to be run with the _smtpq group.
-
---- a/smtpd/makemap.c.orig 2018-01-10 05:06:40.000000000 -0800
-+++ b/smtpd/makemap.c 2020-02-24 15:41:18.278340410 -0800
-@@ -105,8 +105,13 @@ makemap(int prog_mode, int argc, char *a
- int ch, dbputs = 0, Uflag = 0;
- DBTYPE dbtype = DB_HASH;
- char *p;
-+ gid_t gid;
- int fd = -1;
-
-+ gid = getgid();
-+ if (setresgid(gid, gid, gid) == -1)
-+ err(1, "setresgid");
-+
- log_init(1, LOG_MAIL);
-
- mode = prog_mode;
-@@ -180,9 +185,9 @@ makemap(int prog_mode, int argc, char *a
- errx(1, "database name too long");
- }
-
-- execlp("makemap", "makemap", "-d", argv[0], "-o", dbname, "-",
-- (char *)NULL);
-- err(1, "execlp");
-+ execl(PATH_MAKEMAP, "makemap", "-d", argv[0], "-o", dbname,
-+ "-", (char *)NULL);
-+ err(1, "execl");
- }
-
- if (mode == P_NEWALIASES) {
---- a/smtpd/mta_session.c.orig 2020-02-08 10:24:17.692029666 -0800
-+++ b/smtpd/mta_session.c 2020-02-24 15:46:46.121342818 -0800
-@@ -1214,7 +1214,7 @@ mta_io(struct io *io, int evt, void *arg
- if (cont) {
- if (s->replybuf[0] == '\0')
- (void)strlcat(s->replybuf, line, sizeof s->replybuf);
-- else {
-+ else if (len > 4) {
- line = line + 4;
- if (isdigit((int)*line) && *(line + 1) == '.' &&
- isdigit((int)*line+2) && *(line + 3) == '.' &&
-@@ -1229,7 +1229,9 @@ mta_io(struct io *io, int evt, void *arg
- /* last line of a reply, check if we're on a continuation to parse out status and ESC.
- * if we overflow reply buffer or are not on continuation, log entire last line.
- */
-- if (s->replybuf[0] != '\0') {
-+ if (s->replybuf[0] == '\0')
-+ (void)strlcat(s->replybuf, line, sizeof s->replybuf);
-+ else if (len > 4) {
- p = line + 4;
- if (isdigit((int)*p) && *(p + 1) == '.' &&
- isdigit((int)*p+2) && *(p + 3) == '.' &&
-@@ -1238,8 +1240,6 @@ mta_io(struct io *io, int evt, void *arg
- if (strlcat(s->replybuf, p, sizeof s->replybuf) >= sizeof s->replybuf)
- (void)strlcpy(s->replybuf, line, sizeof s->replybuf);
- }
-- else
-- (void)strlcpy(s->replybuf, line, sizeof s->replybuf);
-
- if (s->state == MTA_QUIT) {
- log_info("%016"PRIx64" mta event=closed reason=quit messages=%zu",
---- a/smtpd/smtpctl.c.orig 2018-01-10 05:06:40.000000000 -0800
-+++ b/smtpd/smtpctl.c 2020-02-24 14:57:04.687320914 -0800
-@@ -1116,7 +1116,7 @@ sendmail_compat(int argc, char **argv)
- */
- for (i = 1; i < argc; i++)
- if (strncmp(argv[i], "-bi", 3) == 0)
-- exit(makemap(P_NEWALIASES, argc, argv));
-+ exit(makemap(P_SENDMAIL, argc, argv));
-
- if (!srv_connect())
- offlinefp = offline_file();
---- a/smtpd/smtpd-defines.h.orig 2018-01-10 05:06:40.000000000 -0800
-+++ b/smtpd/smtpd-defines.h 2020-02-24 15:00:29.616322420 -0800
-@@ -46,6 +46,9 @@
- #ifndef PATH_SPOOL
- #define PATH_SPOOL "/var/spool/smtpd"
- #endif
-+#ifndef PATH_MAKEUP
-+#define PATH_MAKEMAP "/usr/sbin/makemap"
-+#endif
-
- #define SUBADDRESSING_DELIMITER "+"
-
---- a/smtpd/smtpd.c.orig 2018-01-10 05:06:40.000000000 -0800
-+++ b/smtpd/smtpd.c 2020-02-24 15:55:55.503346854 -0800
-@@ -109,9 +109,10 @@ static struct mproc *setup_peer(enum smt
- static int imsg_wait(struct imsgbuf *, struct imsg *, int);
-
- static void offline_scan(int, short, void *);
--static int offline_add(char *);
-+static int offline_add(char *, uid_t, gid_t);
- static void offline_done(void);
--static int offline_enqueue(char *);
-+static int offline_enqueue(char *, uid_t, gid_t);
-+
-
- static void purge_task(void);
- static int parent_auth_user(const char *, const char *);
-@@ -136,6 +137,8 @@ struct child {
-
- struct offline {
- TAILQ_ENTRY(offline) entry;
-+ uid_t uid;
-+ gid_t gid;
- char *path;
- };
-
-@@ -1409,7 +1412,8 @@ offline_scan(int fd, short ev, void *arg
- continue;
- }
-
-- if (offline_add(e->fts_name)) {
-+ if (offline_add(e->fts_name, e->fts_statp->st_uid,
-+ e->fts_statp->st_gid)) {
- log_warnx("warn: smtpd: "
- "could not add offline message %s", e->fts_name);
- continue;
-@@ -1429,7 +1433,7 @@ offline_scan(int fd, short ev, void *arg
- }
-
- static int
--offline_enqueue(char *name)
-+offline_enqueue(char *name, uid_t uid, gid_t gid)
- {
- char *path;
- struct stat sb;
-@@ -1491,6 +1495,18 @@ offline_enqueue(char *name)
- _exit(1);
- }
-
-+ if (sb.st_uid != uid) {
-+ log_warnx("warn: smtpd: file %s has bad uid %d",
-+ path, sb.st_uid);
-+ _exit(1);
-+ }
-+
-+ if (sb.st_gid != gid) {
-+ log_warnx("warn: smtpd: file %s has bad gid %d",
-+ path, sb.st_gid);
-+ _exit(1);
-+ }
-+
- pw = getpwuid(sb.st_uid);
- if (pw == NULL) {
- log_warnx("warn: smtpd: getpwuid for uid %d failed",
-@@ -1547,17 +1563,19 @@ offline_enqueue(char *name)
- }
-
- static int
--offline_add(char *path)
-+offline_add(char *path, uid_t uid, gid_t gid)
- {
- struct offline *q;
-
- if (offline_running < OFFLINE_QUEUEMAX)
- /* skip queue */
-- return offline_enqueue(path);
-+ return offline_enqueue(path, uid, gid);
-
- q = malloc(sizeof(*q) + strlen(path) + 1);
- if (q == NULL)
- return (-1);
-+ q->uid = uid;
-+ q->gid = gid;
- q->path = (char *)q + sizeof(*q);
- memmove(q->path, path, strlen(path) + 1);
- TAILQ_INSERT_TAIL(&offline_q, q, entry);
-@@ -1576,7 +1594,8 @@ offline_done(void)
- if ((q = TAILQ_FIRST(&offline_q)) == NULL)
- break; /* all done */
- TAILQ_REMOVE(&offline_q, q, entry);
-- offline_enqueue(q->path);
-+ offline_enqueue(q->path, q->uid, q->gid);
-+
- free(q);
- }
- }
---- a/smtpd/smtpd.h.orig 2018-01-10 05:06:40.000000000 -0800
-+++ b/smtpd/smtpd.h 2020-02-24 15:20:09.043331085 -0800
-@@ -128,8 +128,10 @@
- #define MTA_EXT_DSN 0x400
-
-
--#define P_NEWALIASES 0
--#define P_MAKEMAP 1
-+#define P_SENDMAIL 0
-+#define P_NEWALIASES 1
-+#define P_MAKEMAP 2
-+
-
- struct userinfo {
- char username[SMTPD_VUSERNAME_SIZE];
diff --git a/network/opensmtpd/openbsd66-019-smtpd-exec.patch b/network/opensmtpd/openbsd66-019-smtpd-exec.patch
deleted file mode 100644
index 93ce19dcb1..0000000000
--- a/network/opensmtpd/openbsd66-019-smtpd-exec.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-OpenBSD 6.6 errata 019, January 30, 2020:
-
-An incorrect check allows an attacker to trick mbox delivery into executing
-arbitrary commands as root and lmtp delivery into executing arbitrary commands
-as an unprivileged user.
-
---- usr.sbin/smtpd/smtp_session.c 4 Oct 2019 08:34:29 -0000 1.415
-+++ usr.sbin/smtpd/smtp_session.c 26 Jan 2020 05:56:37 -0000
-@@ -2012,24 +2012,22 @@ smtp_mailaddr(struct mailaddr *maddr, ch
- memmove(maddr->user, p, strlen(p) + 1);
- }
-
-- if (!valid_localpart(maddr->user) ||
-- !valid_domainpart(maddr->domain)) {
-- /* accept empty return-path in MAIL FROM, required for bounces */
-- if (mailfrom && maddr->user[0] == '\0' && maddr->domain[0] == '\0')
-- return (1);
-+ /* accept empty return-path in MAIL FROM, required for bounces */
-+ if (mailfrom && maddr->user[0] == '\0' && maddr->domain[0] == '\0')
-+ return (1);
-
-- /* no user-part, reject */
-- if (maddr->user[0] == '\0')
-- return (0);
--
-- /* no domain, local user */
-- if (maddr->domain[0] == '\0') {
-- (void)strlcpy(maddr->domain, domain,
-- sizeof(maddr->domain));
-- return (1);
-- }
-+ /* no or invalid user-part, reject */
-+ if (maddr->user[0] == '\0' || !valid_localpart(maddr->user))
- return (0);
-+
-+ /* no domain part, local user */
-+ if (maddr->domain[0] == '\0') {
-+ (void)strlcpy(maddr->domain, domain,
-+ sizeof(maddr->domain));
- }
-+
-+ if (!valid_domainpart(maddr->domain))
-+ return (0);
-
- return (1);
- }
diff --git a/network/opensmtpd/opensmtpd.SlackBuild b/network/opensmtpd/opensmtpd.SlackBuild
index 54a4f8e4cf..afda7fedc1 100644
--- a/network/opensmtpd/opensmtpd.SlackBuild
+++ b/network/opensmtpd/opensmtpd.SlackBuild
@@ -24,8 +24,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=opensmtpd
-VERSION=${VERSION:-6.0.3p1}
-BUILD=${BUILD:-6}
+VERSION=${VERSION:-6.6.4p1}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -92,21 +92,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# fix reply buffer overflow
-cat $CWD/openbsd64-020-smtpd.patch | patch -p1
-
-# fix tls downgrade
-cat $CWD/openbsd65-029-smptd-tls.patch | patch -p1
-
-# fix exec
-cat $CWD/openbsd66-019-smtpd-exec.patch | patch -p1
-
-# check null from crypt function
-cat $CWD/fix-crash-on-authentication.patch | patch -p1
-
-# fix smtpctl envelop
-cat $CWD/openbsd65-031-smtpd-envelope.patch | patch -p1
-
CFLAGS="$SLKCFLAGS -D_DEFAULT_SOURCE" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -150,10 +135,16 @@ ln -s smtpctl $PKG/usr/sbin/makemap
mkdir -p $PKG/etc/rc.d
cat $CWD/rc.opensmtpd > $PKG/etc/rc.d/rc.opensmtpd.new
-# Don't clobber the config file
+# copy original smtpd.conf file
+cp -p $PKG/etc/opensmtpd/smtpd.conf $PKG/etc/opensmtpd/smtpd.conf.upstream.default
+
+# Don't clobber the existing config file
mv $PKG/etc/opensmtpd/smtpd.conf $PKG/etc/opensmtpd/smtpd.conf.new
# and reflect the correct path to aliases file
-sed -i "s,/etc/mail/,/etc/opensmtpd/,g" $PKG/etc/opensmtpd/smtpd.conf.new
+# and use mbox instead of maildir
+sed -i -e "s,/etc/mail/,/etc/opensmtpd/,g" \
+ -e "s,maildir alias,mbox alias,g" \
+ $PKG/etc/opensmtpd/smtpd.conf.new
# Create (but don't clobber) the aliases file
cat $CWD/aliases > $PKG/etc/opensmtpd/aliases.new
@@ -176,7 +167,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL LICENSE README.md THANKS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.slackware
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/opensmtpd/opensmtpd.info b/network/opensmtpd/opensmtpd.info
index 0930880299..b8753bc31d 100644
--- a/network/opensmtpd/opensmtpd.info
+++ b/network/opensmtpd/opensmtpd.info
@@ -1,8 +1,8 @@
PRGNAM="opensmtpd"
-VERSION="6.0.3p1"
+VERSION="6.6.4p1"
HOMEPAGE="https://www.opensmtpd.org/"
-DOWNLOAD="https://www.opensmtpd.org/archives/opensmtpd-6.0.3p1.tar.gz"
-MD5SUM="66e496bb0f3303d660744f4fa2178765"
+DOWNLOAD="https://www.opensmtpd.org/archives/opensmtpd-6.6.4p1.tar.gz"
+MD5SUM="4744943277f9a6dc942e7560dbdb5643"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libasr"
diff --git a/network/owncloud-client/owncloud-client.SlackBuild b/network/owncloud-client/owncloud-client.SlackBuild
index b5ab05a98d..f94a92ef0e 100644
--- a/network/owncloud-client/owncloud-client.SlackBuild
+++ b/network/owncloud-client/owncloud-client.SlackBuild
@@ -72,6 +72,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i '/^#include <QPainter>$/a #include <QPainterPath>' src/libsync/networkjobs.cpp
+
mkdir -p build
cd build
cmake \
diff --git a/network/phodav/phodav.SlackBuild b/network/phodav/phodav.SlackBuild
index 1b3c1bcebc..6b597d6460 100644
--- a/network/phodav/phodav.SlackBuild
+++ b/network/phodav/phodav.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for phodav
-# Copyright 2016-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2016-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=phodav
-VERSION=${VERSION:-2.2}
+VERSION=${VERSION:-2.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -73,21 +73,15 @@ find -L . \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-./configure \
+meson \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
- --localstatedir=/var \
--mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-static \
- --build=$ARCH-slackware-linux
+ build
-make
-make install DESTDIR=$PKG
-
-mkdir $PKG/lib
-mv $PKG/usr/lib/udev $PKG/lib/
+ninja -C build
+DESTDIR=$PKG ninja -C build install
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/network/phodav/phodav.info b/network/phodav/phodav.info
index 7b7b8d7050..5fc7a8b668 100644
--- a/network/phodav/phodav.info
+++ b/network/phodav/phodav.info
@@ -1,8 +1,8 @@
PRGNAM="phodav"
-VERSION="2.2"
+VERSION="2.3"
HOMEPAGE="https://wiki.gnome.org/phodav"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/phodav/2.2/phodav-2.2.tar.xz"
-MD5SUM="18dc8890ef3606f2a053054658dbf016"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/phodav/2.3/phodav-2.3.tar.xz"
+MD5SUM="0f4bbe83181037577c808acea166b26a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/pidgin-musictracker/pidgin-musictracker.SlackBuild b/network/pidgin-musictracker/pidgin-musictracker.SlackBuild
index 2307eb44cc..5a4ea68244 100644
--- a/network/pidgin-musictracker/pidgin-musictracker.SlackBuild
+++ b/network/pidgin-musictracker/pidgin-musictracker.SlackBuild
@@ -70,7 +70,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS -Wno-error=deprecated-declarations" \
+CFLAGS="$SLKCFLAGS -Wno-error=deprecated-declarations -Wno-error=expansion-to-defined -Wno-error=implicit-fallthrough= -Wno-error=format-truncation=" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/network/pidgin-sipe/pidgin-sipe.SlackBuild b/network/pidgin-sipe/pidgin-sipe.SlackBuild
index e59c906f6e..c041a67d75 100644
--- a/network/pidgin-sipe/pidgin-sipe.SlackBuild
+++ b/network/pidgin-sipe/pidgin-sipe.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=pidgin-sipe
-VERSION=${VERSION:-1.23.0}
+VERSION=${VERSION:-1.24.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/pidgin-sipe/pidgin-sipe.info b/network/pidgin-sipe/pidgin-sipe.info
index a2cc1045d7..31c45157f6 100644
--- a/network/pidgin-sipe/pidgin-sipe.info
+++ b/network/pidgin-sipe/pidgin-sipe.info
@@ -1,8 +1,8 @@
PRGNAM="pidgin-sipe"
-VERSION="1.23.0"
+VERSION="1.24.0"
HOMEPAGE="http://sipe.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sipe/pidgin-sipe-1.23.0.tar.xz"
-MD5SUM="75fb9417834bc78114786d78a41bcd37"
+DOWNLOAD="http://downloads.sourceforge.net/sipe/pidgin-sipe-1.24.0.tar.xz"
+MD5SUM="b91106d28c235b347a63dcb676f7b66a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/postfix/README b/network/postfix/README
deleted file mode 100644
index 80840d5668..0000000000
--- a/network/postfix/README
+++ /dev/null
@@ -1,39 +0,0 @@
-Postfix is Wietse Venema's mailer that started life as an alternative to the
-widely-used Sendmail program. It attempts to be fast, easy to administer, and
-secure, while at the same time, being sendmail compatible enough to not upset
-existing users. Thus, the outside has a sendmail-ish flavor, but the inside is
-completely different.
-
-This script builds postfix with optional support for Dovecot SASL, Cyrus SASL
-can be enabled with:
-
- SASL=cyrus ./postfix.SlackBuild
-
-You can also enable support for MySQL:
-
- DATABASE=mysql ./postfix.SlackBuild
-
-PostgreSQL support can be enabled with:
-
- DATABASE=pgsql ./postfix.SlackBuild
-
-On systems with multiple instances, add major version, eg: DATABASE=pgsql-9.5
-
-This script will find support for BerkleyDB and PCRE automagically; TLS support
-requires openssl package, openssl-solibs alone is not enough. Additionally, this
-script doesn't add postfix user and groups, instead it offers sane defaults that
-won't conflict with system users and groups, and other scripts from the SBo.
-
-Package created with this script will conflict with stock sendmail package, you
-*should* remove sendmail before installing postfix, otherwise sendmail updates
-could break your postfix instance.
-
-When upgrading from an older postfix version, make sure the variables such as
-html_directory and readme_directory in /etc/postfix/main.cf point to the new
-location. These can also be fixed later, afterwards make sure to run:
-
- postfix set-permissions
-
-Furthermore, many of the utilities in postfix have multiple manpages such as
-postconf(5) and postconf(8). Use man -k to find them, and don't forget to
-subscribe to the postfix-users mailing list!
diff --git a/network/postfix/doinst.sh b/network/postfix/doinst.sh
deleted file mode 100644
index 97e6510432..0000000000
--- a/network/postfix/doinst.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- if [ -e $OLD ]; then
- cp -a $OLD ${NEW}.incoming
- cat $NEW > ${NEW}.incoming
- mv ${NEW}.incoming $NEW
- fi
- config $NEW
-}
-
-find etc/postfix -type f -name '*.new' \
- | while read new ; do config $new ; done
-
-preserve_perms etc/rc.d/rc.postfix.new
-
-# This is an incompatability with the sendmail package
-( cd usr/lib; rm -f sendmail )
-( cd usr/lib; ln -s /usr/sbin/sendmail sendmail)
-
-# This will set the permissions on all postfix files correctly
-postfix set-permissions
-
-# Symlinks added by makepkg(8)
-
diff --git a/network/postfix/patches/postconf.diff b/network/postfix/patches/postconf.diff
deleted file mode 100644
index c51c1822fe..0000000000
--- a/network/postfix/patches/postconf.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- postfix-3.0.3/postfix-install.orig 2015-01-29 23:15:30.000000000 +0100
-+++ postfix-3.0.3/postfix-install 2015-10-17 03:57:42.269896095 +0200
-@@ -248,7 +248,7 @@
- case "$junk" in
- *MAIL_VERSION*)
- case "$mail_version" in
-- "") mail_version="`bin/postconf -dhx mail_version`" || exit 1
-+ "") mail_version="`bin/postconf -c conf -dhx mail_version`" || exit 1
- esac
- val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1
- case "$val" in
-@@ -810,7 +810,7 @@
- # the wrong place when Postfix is being upgraded.
-
- case "$mail_version" in
--"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
-+"") mail_version="`bin/postconf -c conf -dhx mail_version`" || exit 1
- esac
-
- # Undo MAIL_VERSION expansion at the end of a parameter value. If
---- postfix-3.0.3/Makefile.in.orig 2014-09-25 21:16:29.000000000 +0200
-+++ postfix-3.0.3/Makefile.in 2015-10-17 04:01:27.170920308 +0200
-@@ -20,7 +20,7 @@
- EXPAND = sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \
- -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);"
- SHLIB_DIR_OVERRIDE = \
-- $${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`}
-+ $${shlib_directory:-`$(SHLIB_ENV) bin/postconf -c conf -dhx shlib_directory`}
-
- default: update
-
diff --git a/network/postfix/postfix.SlackBuild b/network/postfix/postfix.SlackBuild
deleted file mode 100644
index 6bf3f38e2d..0000000000
--- a/network/postfix/postfix.SlackBuild
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2006, 2011 Alan Hicks, Lizella, GA
-# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Mario Preksavec, Zagreb, Croatia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=postfix
-VERSION=${VERSION:-3.3.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""5
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-# Build with dovecot sasl support by default
-SASL=${SASL:-dovecot}
-case "$SASL" in
- dovecot) SASLARGS="-DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- SASLLIBS="" ;;
- cyrus) SASLARGS="-I/usr/include/sasl -DUSE_CYRUS_SASL"
- SASLLIBS="-L/usr/lib${LIBDIRSUFFIX}/sasl2 -lsasl2" ;;
- *) SASLARGS=""
- SASLLIBS="" ;;
-esac
-
-# Build without database support by default
-DATABASE=${DATABASE:-none}
-case "$DATABASE" in
- mysql) DBARGS="-I/usr/include/mysql -DHAS_MYSQL"
- DBLIBS="-L/usr/lib${LIBDIRSUFFIX}/mysql -lmysqlclient -lz -lm" ;;
- pgsql*) PGVER=${DATABASE/pgsql-}
- [ "$PGVER" = "pgsql" ] && PGVER=$(ls /usr/lib${LIBDIRSUFFIX}/postgresql/)
- [ -d "/usr/lib${LIBDIRSUFFIX}/postgresql/$PGVER/lib" ] && {
- DBARGS="-I/usr/include/postgresql -DHAS_PGSQL"
- DBLIBS="-L/usr/lib${LIBDIRSUFFIX}/postgresql/$PGVER/lib -lpq -lz -lm"
- } || echo "PostgreSQL not found" ;;
- *) DBARGS=""
- DBLIBS="" ;;
-esac
-
-# Build without ldap support by default
-LDAP=${LDAP:-no}
-case "$LDAP" in
- yes) LDAPARGS="-DUSE_LDAP_SASL -DHAS_LDAP"
- LDAPLIBS="-lldap -llber" ;;
- *) LDAPARGS=""
- LDAPLIBS="" ;;
-esac
-
-# MySQL compile hack
-if [ $DATABASE == "mysql" ] && [ -f /usr/include/mysql/events.h ]; then
-
-cat << EOF
-
- Postfix will fail to compile with mysql support if a system-wide
- events.h file is not removed (postfix has its own events.h).
- Either disable mysql support or (re)move events.h, eg:
-
- # mv /usr/include/mysql/events.h /usr/include/mysql/events.h.bak
-
-EOF
-
- exit
-fi
-
-# Bail if user or group isn't valid on your system
-if ! grep ^postfix: /etc/passwd 2>&1 > /dev/null; then
-
-cat << EOF
-
- You must have a postfix user to run this script
-
- # groupadd -g 200 postfix
- # useradd -u 200 -d /dev/null -s /bin/false -g postfix postfix
-
-EOF
-
- exit
-elif ! grep ^postdrop: /etc/group 2>&1 > /dev/null; then
-
-cat << EOF
-
- You must have a postdrop group to run this script
-
- # groupadd -g 201 postdrop
-
-EOF
-
- exit
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Use config files from build tree, not system ones
-# This should probably go to upstream...
-patch -p1 <$CWD/patches/postconf.diff
-
-# Postfix does not use a ./configure script
-
-make makefiles shared=yes \
- CCARGS="-DUSE_SASL_AUTH -DUSE_TLS $SASLARGS $DBARGS $LDAPARGS" \
- AUXLIBS="-lssl -lcrypto $SASLLIBS $DBLIBS $LDAPLIBS" \
- OPT="$SLKCFLAGS" DEBUG=""
-
-make non-interactive-package \
- install_root=$PKG \
- tempdir=$TMP/$PRGNAM-temp \
- config_directory=/etc/postfix \
- daemon_directory=/usr/libexec/postfix \
- command_directory=/usr/sbin \
- queue_directory=/var/spool/postfix \
- sendmail_path=/usr/sbin/sendmail \
- newaliases_path=/usr/bin/newaliases \
- mailq_path=/usr/bin/mailq \
- mail_owner=postfix \
- setgid_group=postdrop \
- html_directory=/usr/doc/$PRGNAM-$VERSION/html \
- manpage_directory=/usr/man \
- readme_directory=/usr/doc/$PRGNAM-$VERSION/README_FILES
-
-install -D -m 0644 -oroot -groot $CWD/rc.postfix $PKG/etc/rc.d/rc.postfix.new
-find $PKG/etc/postfix -type f ! -name "*.default" ! -name "*.proto" ! -name "*.out" \
- ! -name "postfix-files" -exec mv {} {}.new \;
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-sed -i 's#\($manpage_directory/man[158]/.\+\.[158]\)\(:.*\)#\1.gz\2#' \
- $PKG/etc/postfix/postfix-files
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AAAREADME COMPATIBILITY COPYRIGHT HISTORY IPv6-ChangeLog LICENSE PORTING \
- RELEASE_NOTES TLS_ACKNOWLEDGEMENTS TLS_CHANGES TLS_LICENSE US_PATENT_6321267 \
- examples implementation-notes $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/postfix/postfix.info b/network/postfix/postfix.info
deleted file mode 100644
index 9809f40eb0..0000000000
--- a/network/postfix/postfix.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="postfix"
-VERSION="3.3.2"
-HOMEPAGE="http://www.postfix.org/"
-DOWNLOAD="http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/postfix-3.3.2.tar.gz"
-MD5SUM="4e6ed7056576e0c54cfce6040a0bb0ad"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mario Preksavec"
-EMAIL="mario at slackware dot hr"
diff --git a/network/postfix/rc.postfix b/network/postfix/rc.postfix
deleted file mode 100644
index 6e133ad9ec..0000000000
--- a/network/postfix/rc.postfix
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-# Copyright 2006, Alan Hicks, Lizella, GA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-postfix_start()
-{
- /usr/sbin/postfix start
-}
-
-postfix_stop()
-{
- /usr/sbin/postfix stop
-}
-
-postfix_restart()
-{
- postfix_stop
- postfix_start
-}
-
-postfix_reload()
-{
- /usr/sbin/postfix reload
-}
-
-postfix_status()
-{
- /usr/sbin/postfix status
-}
-
-case $1 in
-'start')
- postfix_start
- ;;
-'stop')
- postfix_stop
- ;;
-'restart')
- postfix_restart
- ;;
-'reload')
- postfix_reload
- ;;
-'status')
- postfix_status
- ;;
-*)
- echo "usage $0 start|stop|restart|reload|status"
-esac
diff --git a/network/postfix/slack-desc b/network/postfix/slack-desc
deleted file mode 100644
index 0e8c796afc..0000000000
--- a/network/postfix/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-postfix: postfix (alternative to the widely-used Sendmail program)
-postfix:
-postfix: Postfix attempts to be fast, easy to administer, and secure, while at
-postfix: the same time being sendmail compatible enough to not upset existing
-postfix: users. Thus, the outside has a sendmail-ish flavor, but the inside is
-postfix: completely different.
-postfix:
-postfix: Packaging script written by Alan Hicks <alan@lizella.net>
-postfix: and the SlackBuilds.org Team <http://www.slackbuilds.org>
-postfix:
-postfix:
diff --git a/network/pptp/pptp.SlackBuild b/network/pptp/pptp.SlackBuild
index 0ea1de4b74..c6895c11e9 100644
--- a/network/pptp/pptp.SlackBuild
+++ b/network/pptp/pptp.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=pptp
-VERSION=${VERSION:-1.8.0}
+VERSION=${VERSION:-1.10.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/pptp/pptp.info b/network/pptp/pptp.info
index 93fefabf34..c676283935 100644
--- a/network/pptp/pptp.info
+++ b/network/pptp/pptp.info
@@ -1,8 +1,8 @@
PRGNAM="pptp"
-VERSION="1.8.0"
+VERSION="1.10.0"
HOMEPAGE="http://pptpclient.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/pptpclient/pptp-1.8.0.tar.gz"
-MD5SUM="4efce9f263e2c3f38d79d9df222476de"
+DOWNLOAD="http://downloads.sourceforge.net/pptpclient/pptp-1.10.0.tar.gz"
+MD5SUM="8d25341352fdae5ad5b36b9f18254908"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/qTox/qTox.SlackBuild b/network/qTox/qTox.SlackBuild
index 1fff74fa2d..c44cc94480 100644
--- a/network/qTox/qTox.SlackBuild
+++ b/network/qTox/qTox.SlackBuild
@@ -72,6 +72,8 @@ find -L . \
# gcc-7 fix
#patch -p1 <$CWD/rawdatabase.h.diff
+sed -e 's|-Werror||' -i CMakeLists.txt
+
mkdir -p build
cd build
cmake \
diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild
index 7a89b06188..db15e08b4d 100644
--- a/network/remmina/remmina.SlackBuild
+++ b/network/remmina/remmina.SlackBuild
@@ -80,7 +80,7 @@ find -L . \
mkdir -p build
cd build
cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -lz -lssl -lcrypto" \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -lz -lssl -lcrypto -fcommon" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-DWITH_AVAHI=${AVAHI} \
diff --git a/network/rtorrent/README b/network/rtorrent/README
index 6c05b5620f..74e8064101 100644
--- a/network/rtorrent/README
+++ b/network/rtorrent/README
@@ -2,3 +2,5 @@ rtorrent is a BitTorrent client for ncurses, using the libtorrent
library. The client and library is written in C++ with emphasis on speed
and efficiency, while delivering equivalent features to those found in
GUI based clients in an ncurses client.
+
+Optional dependency: xmlrpc-c
diff --git a/network/rtorrent/rtorrent.SlackBuild b/network/rtorrent/rtorrent.SlackBuild
index f5ee018aff..421bf99503 100644
--- a/network/rtorrent/rtorrent.SlackBuild
+++ b/network/rtorrent/rtorrent.SlackBuild
@@ -17,7 +17,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -28,8 +28,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -42,6 +42,8 @@ else
LIBDIRSUFFIX=""
fi
+xmlrpcc="" ; [ -x /usr/bin/xmlrpc-c-config ] && xmlrpcc="--with-xmlrpc-c"
+
set -e
rm -rf $PKG
@@ -66,6 +68,8 @@ CXXFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
+ $xmlrpcc \
+ --disable-debug \
--build=$ARCH-slackware-linux
make
diff --git a/network/s-nail/README b/network/s-nail/README
deleted file mode 100644
index c18e83c0f2..0000000000
--- a/network/s-nail/README
+++ /dev/null
@@ -1,16 +0,0 @@
-S-nail (mail sending and receiving utility)
-
-S-nail provides a simple and friendly environment for sending and
-receiving mail. It is intended to provide the functionality of the
-POSIX mailx command, but is MIME capable and optionally offers
-extensions for line editing, S/MIME, SMTP and POP3, among others. It
-divides incoming mail into its constituent messages and allows the
-user to deal with them in any order. It offers many COMMANDS and
-INTERNAL VARIABLES for manipulating messages and sending mail. It
-offers simple editing capabilities, and increasingly powerful and
-reliable non-interactive scripting capabilities.
-
-NOTE
-
-This package conflicts with Slackware's mailx package. You should
-remove mailx before installing this package.
diff --git a/network/s-nail/doinst.sh b/network/s-nail/doinst.sh
deleted file mode 100644
index b541fb201d..0000000000
--- a/network/s-nail/doinst.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-config etc/nail.rc.new
diff --git a/network/s-nail/s-nail.SlackBuild b/network/s-nail/s-nail.SlackBuild
deleted file mode 100644
index b50c566f5a..0000000000
--- a/network/s-nail/s-nail.SlackBuild
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for S-nail
-
-# Copyright 2008, 2009, 2010, 2016 Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2018 - 2020 Johannes Schoepfer, Germany
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=s-nail
-VERSION=${VERSION:-14.9.17}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-make \
- VAL_PREFIX=/usr \
- VAL_SYSCONFDIR=/etc \
- VAL_MANDIR=/usr/man \
- VAL_MAIL=/var/spool/mail \
- VAL_MTA=/usr/sbin/sendmail \
- OPT_AUTOCC=0 \
- VAL_SID= \
- VAL_MAILX=mailx \
- VAL_SYSCONFRC=nail.rc \
- VAL_RANDOM="libgetrandom,sysgetrandom,urandom" \
- config
-
-make build
-make test
-make install DESTDIR=$PKG
-
-# Tighten up the perms a bit:
-chmod 4711 $PKG/usr/libexec/mailx-dotlock
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# We put symlinks in /bin since some things still expect '/bin/mail' or '/bin/Mail':
-mkdir -p $PKG/bin
-( cd $PKG/bin
- ln -sf /usr/bin/mailx Mail
- ln -sf /usr/bin/mailx mail
- ln -sf /usr/bin/mailx nail
-)
-
-# Likewise, we make some compat symlinks in /usr/bin:
-( cd $PKG/usr/bin
- ln -sf mailx Mail
- ln -sf mailx mail
- ln -sf mailx nail
-)
-
-mv $PKG/etc/nail.rc $PKG/etc/nail.rc.new
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-# Manpage links:
-( cd $PKG/usr/man/man1
- ln -sf mailx.1.gz mail.1.gz
- ln -sf mailx.1.gz nail.1.gz
- ln -sf mailx.1.gz Mail.1.gz
-)
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- COPYING* INSTALL* NEWS* README* THANKS* \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/s-nail/s-nail.info b/network/s-nail/s-nail.info
deleted file mode 100644
index 5fa74b7f7a..0000000000
--- a/network/s-nail/s-nail.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="s-nail"
-VERSION="14.9.17"
-HOMEPAGE="https://www.sdaoden.eu/code.html"
-DOWNLOAD="https://www.sdaoden.eu/downloads/s-nail-14.9.17.tar.xz"
-MD5SUM="844524dee4c7c9b5255a2b0cf7159c7a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="%README%"
-MAINTAINER="Johannes Schoepfer"
-EMAIL="slackbuilds@schoepfer.info"
diff --git a/network/s-nail/slack-desc b/network/s-nail/slack-desc
deleted file mode 100644
index ab63a8e702..0000000000
--- a/network/s-nail/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-s-nail: s-nail (mail sending and receiving utility)
-s-nail:
-s-nail: S-nail provides a simple and friendly environment for sending and
-s-nail: receiving mail. It is intended to provide the functionality of the
-s-nail: POSIX mailx command, but is MIME capable and optionally offers
-s-nail: extensions for line editing, S/MIME, SMTP and POP3, among others. It
-s-nail: divides incoming mail into its constituent messages and allows the
-s-nail: user to deal with them in any order. It offers many COMMANDS and
-s-nail: INTERNAL VARIABLES for manipulating messages and sending mail. It
-s-nail: offers simple editing capabilities, and increasingly powerful and
-s-nail: reliable non-interactive scripting capabilities.
diff --git a/network/seafile-client/seafile-client.SlackBuild b/network/seafile-client/seafile-client.SlackBuild
deleted file mode 100644
index 205c0af148..0000000000
--- a/network/seafile-client/seafile-client.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for "seafile-client".
-
-# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=seafile-client
-SRCNAM=seafile
-VERSION=${VERSION:-4.4.6}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/v$VERSION-server.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION-server.tar.gz
-cd $SRCNAM-$VERSION-server
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-sh autogen.sh
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-client \
- --enable-static=no \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/seafile-client/seafile-client.info b/network/seafile-client/seafile-client.info
deleted file mode 100644
index ef875c1f8f..0000000000
--- a/network/seafile-client/seafile-client.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="seafile-client"
-VERSION="4.4.6"
-HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/seafile/archive/v4.4.6-server.tar.gz"
-MD5SUM="753db8ec00c8f4e43270afff097a23af"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="ccnet libevhtp"
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
diff --git a/network/seafile-client/slack-desc b/network/seafile-client/slack-desc
deleted file mode 100644
index e41d278faa..0000000000
--- a/network/seafile-client/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-seafile-client: seafile-client (Cloud Storage System)
-seafile-client:
-seafile-client: Seafile is a next-generation open source cloud storage system with
-seafile-client: advanced support for file syncing, privacy protection and teamwork.
-seafile-client:
-seafile-client: Homepage: http://seafile.com/
-seafile-client:
-seafile-client:
-seafile-client:
-seafile-client:
-seafile-client:
diff --git a/network/seafile-client/README b/network/seafile/README
index 937324eae1..937324eae1 100644
--- a/network/seafile-client/README
+++ b/network/seafile/README
diff --git a/network/seafile/seafile.SlackBuild b/network/seafile/seafile.SlackBuild
new file mode 100644
index 0000000000..63f62460ce
--- /dev/null
+++ b/network/seafile/seafile.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for seafile
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=seafile
+VERSION=${VERSION:-6.2.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sh autogen.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --enable-client \
+ --enable-static=no \
+ --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/seafile/seafile.info b/network/seafile/seafile.info
new file mode 100644
index 0000000000..85067fd4fe
--- /dev/null
+++ b/network/seafile/seafile.info
@@ -0,0 +1,10 @@
+PRGNAM="seafile"
+VERSION="6.2.5"
+HOMEPAGE="https://seafile.com"
+DOWNLOAD="https://github.com/haiwen/seafile/archive/v6.2.5/seafile-6.2.5.tar.gz"
+MD5SUM="220790c24a8cb1ff88bacc03e4e87976"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="ccnet libevhtp"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/network/seafile/slack-desc b/network/seafile/slack-desc
new file mode 100644
index 0000000000..cad22d1bb6
--- /dev/null
+++ b/network/seafile/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+seafile: seafile (Cloud Storage System)
+seafile:
+seafile: Seafile is a next-generation open source cloud storage system with
+seafile: advanced support for file syncing, privacy protection and teamwork.
+seafile:
+seafile: Homepage: http://seafile.com/
+seafile:
+seafile:
+seafile:
+seafile:
+seafile:
diff --git a/network/socat/README b/network/socat/README
deleted file mode 100644
index 828012f25b..0000000000
--- a/network/socat/README
+++ /dev/null
@@ -1,12 +0,0 @@
-socat is a relay for bidirectional data transfer between two
-independent data channels. Each of these data channels may be a file,
-pipe, device (serial line etc. or a pseudo terminal), a socket (UNIX,
-IP4, IP6 - raw, UDP, TCP), an SSL socket, proxy CONNECT connection,
-a file descriptor (stdin etc.), the GNU line editor (readline),
-a program, or a combination of two of these. These modes include
-generation of "listening" sockets, named pipes, and pseudo terminals.
-
-socat can use the OpenSSL FIPS module, if it is installed on your system.
-
-Upon install, you may want to read the SECURITY file in the documentation
-directory.
diff --git a/network/socat/slack-desc b/network/socat/slack-desc
deleted file mode 100644
index b0e75054c5..0000000000
--- a/network/socat/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-socat: socat (multipurpose data relay)
-socat:
-socat: socat is a relay for bidirectional data transfer between two
-socat: independent data channels. Each of these data channels may be a file,
-socat: pipe, device (serial line etc. or a pseudo terminal), a socket (UNIX,
-socat: IP4, IP6 - raw, UDP, TCP), an SSL socket, proxy CONNECT connection,
-socat: a file descriptor (stdin etc.), the GNU line editor (readline),
-socat: a program, or a combination of two of these. These modes include
-socat: generation of "listening" sockets, named pipes, and pseudo terminals.
-socat:
-socat: Homepage: http://www.dest-unreach.org/socat
diff --git a/network/socat/socat.SlackBuild b/network/socat/socat.SlackBuild
deleted file mode 100644
index eddb6935dc..0000000000
--- a/network/socat/socat.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-# Slackware build script for socat
-
-# Copyright 2009 Andrew Psaltis <ampsaltis@gmail.com>
-# Copyright 2011 Grigorios Bouzakis <grbzks@imap.cc>
-# Copyright 2014-2019 Larry Hajali <larryhaja[at]gmail[dot]com>
-# All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software for any purpose
-# with or without fee is hereby granted, provided that the above copyright
-# notice and this permission notice appear in all copies.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=socat
-VERSION=${VERSION:-1.7.3.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- BUGREPORTS CHANGES COPYING* DEVELOPMENT EXAMPLES FAQ PORTING \
- README* SECURITY doc/*.{css,html} \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/socat/socat.info b/network/socat/socat.info
deleted file mode 100644
index 08d3a5222e..0000000000
--- a/network/socat/socat.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="socat"
-VERSION="1.7.3.3"
-HOMEPAGE="http://www.dest-unreach.org/socat"
-DOWNLOAD="http://www.dest-unreach.org/socat/download/socat-1.7.3.3.tar.bz2"
-MD5SUM="b2a032a47b8b89a18485697fa975154f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/network/spice-gtk/spice-gtk.SlackBuild b/network/spice-gtk/spice-gtk.SlackBuild
index 6561b22050..a006bfc9db 100644
--- a/network/spice-gtk/spice-gtk.SlackBuild
+++ b/network/spice-gtk/spice-gtk.SlackBuild
@@ -1,7 +1,8 @@
#!/bin/sh
# Slackware build script for spice-gtk
-# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org> Pisa, Italy
+
+# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org> Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=spice-gtk
-VERSION=${VERSION:-0.35}
+VERSION=${VERSION:-0.37}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -58,7 +59,7 @@ if pkg-config --exists libusbredirhost; then usbredir="en"; else usbredir="dis";
if pkg-config --exists libcacard; then cacard="en"; else cacard="dis"; fi
if pkg-config --exists libphodav-2.0; then phodav="en"; else phodav="dis"; fi
-DOCS="AUTHORS COPYING NEWS README THANKS TODO"
+DOCS="AUTHORS CHANGELOG.md COPYING README.md"
set -e
diff --git a/network/spice-gtk/spice-gtk.info b/network/spice-gtk/spice-gtk.info
index e17de616e8..4bb1378921 100644
--- a/network/spice-gtk/spice-gtk.info
+++ b/network/spice-gtk/spice-gtk.info
@@ -1,8 +1,8 @@
PRGNAM="spice-gtk"
-VERSION="0.35"
+VERSION="0.37"
HOMEPAGE="https://www.spice-space.org"
-DOWNLOAD="https://www.spice-space.org/download/gtk/spice-gtk-0.35.tar.bz2"
-MD5SUM="a8c919ee4a48dfeab619deb70900d788"
+DOWNLOAD="https://www.spice-space.org/download/gtk/spice-gtk-0.37.tar.bz2"
+MD5SUM="f1554a2442817109d2bdc37d30336208"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="opus spice vala"
diff --git a/network/spice/spice.SlackBuild b/network/spice/spice.SlackBuild
index e887c96ddf..566a495b55 100644
--- a/network/spice/spice.SlackBuild
+++ b/network/spice/spice.SlackBuild
@@ -22,7 +22,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=spice
-VERSION=${VERSION:-0.14.1}
+VERSION=${VERSION:-0.14.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/spice/spice.info b/network/spice/spice.info
index 04a4e89706..62370277dd 100644
--- a/network/spice/spice.info
+++ b/network/spice/spice.info
@@ -1,8 +1,8 @@
PRGNAM="spice"
-VERSION="0.14.1"
+VERSION="0.14.2"
HOMEPAGE="https://www.spice-space.org"
-DOWNLOAD="https://www.spice-space.org/download/releases/spice-server/spice-0.14.1.tar.bz2"
-MD5SUM="1e2442b08605a5a17430d1aaa0912c24"
+DOWNLOAD="https://www.spice-space.org/download/releases/spice-server/spice-0.14.2.tar.bz2"
+MD5SUM="7ca431580b662e7c3cb8021983a3d387"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="opus pyparsing six spice-protocol"
diff --git a/network/sqlrelay/sqlrelay.SlackBuild b/network/sqlrelay/sqlrelay.SlackBuild
index aa56ae3355..434b548bdb 100644
--- a/network/sqlrelay/sqlrelay.SlackBuild
+++ b/network/sqlrelay/sqlrelay.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=sqlrelay
-VERSION=${VERSION:-0.65.0}
+VERSION=${VERSION:-1.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/network/sqlrelay/sqlrelay.info b/network/sqlrelay/sqlrelay.info
index 99177781f8..260729b0fe 100644
--- a/network/sqlrelay/sqlrelay.info
+++ b/network/sqlrelay/sqlrelay.info
@@ -1,8 +1,8 @@
PRGNAM="sqlrelay"
-VERSION="0.65.0"
+VERSION="1.1.0"
HOMEPAGE="http://sqlrelay.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sqlrelay/sqlrelay-0.65.0.tar.gz"
-MD5SUM="231cc46bc32f6c05dc372c2f04cdcd02"
+DOWNLOAD="http://downloads.sourceforge.net/sqlrelay/sqlrelay-1.1.0.tar.gz"
+MD5SUM="be726dd405aef7d5530fd22c0c146f98"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="rudiments"
diff --git a/network/squid/rc.squid b/network/squid/rc.squid
index 7aef4777fe..2f3463e6be 100644
--- a/network/squid/rc.squid
+++ b/network/squid/rc.squid
@@ -34,7 +34,7 @@ squid_start() {
# Create piddir and set proper permissions
mkdir -p /var/run/squid
- chown root:@SQUIDGROUP@ /var/run/squid
+ chown @SQUIDUSER@:@SQUIDGROUP@ /var/run/squid
echo "Starting Squid: $SQUIDCMD -F"
$SQUIDCMD -F
diff --git a/network/squid/squid.SlackBuild b/network/squid/squid.SlackBuild
index 900d9081c8..2f8ef8fce1 100644
--- a/network/squid/squid.SlackBuild
+++ b/network/squid/squid.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=squid
-VERSION=${VERSION:-3.5.26}
+VERSION=${VERSION:-4.13}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -68,10 +68,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
OPT_ICAP=""
if [ "${ICAP:-no}" = "yes" ]; then
@@ -117,26 +117,25 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
chown root:root $PKG/usr/doc/$PRGNAM-$VERSION/*
mkdir -p $PKG/etc/rc.d
-sed -e "s,@SQUIDGROUP@,$SQUIDGROUP," $CWD/rc.squid > $PKG/etc/rc.d/rc.squid.new
+sed -e "s,@SQUIDUSER@,$SQUIDUSER," -e "s,@SQUIDGROUP@,$SQUIDGROUP," \
+ $CWD/rc.squid > $PKG/etc/rc.d/rc.squid.new
mkdir -p $PKG/etc/logrotate.d
-sed -e "s,@USER@,$SQUIDUSER," -e "s,@GROUP@,$SQUIDGROUP," $CWD/squid.logrotate \
+sed -e "s,@SQUIDUSER@,$SQUIDUSER," -e "s,@SQUIDGROUP@,$SQUIDGROUP," $CWD/squid.logrotate \
> $PKG/etc/logrotate.d/squid.new
-mv $PKG/etc/squid/mime.conf $PKG/etc/squid/mime.conf.new
-mv $PKG/etc/squid/cachemgr.conf $PKG/etc/squid/cachemgr.conf.new
-rm $PKG/etc/squid/squid.conf
-cat $CWD/squid.conf > $PKG/etc/squid/squid.conf.new
-cat $CWD/squid.conf.documented > $PKG/etc/squid/squid.conf.documented
+( cd $PKG/etc/squid
+ for i in mime cachemgr squid ; do mv $i.conf $i.conf.new ; done )
+cp src/squid.conf.documented $PKG/etc/squid/squid.conf.documented
mkdir -p $PKG/var/{cache,lib,run}/squid
chown $SQUIDUSER:$SQUIDGROUP $PKG/var/{cache,lib,log,run}/squid
-## Edit the config file to set the user and group to run as
-sed -i -e 's%^cache_effective_user nobody%cache_effective_user '"$SQUIDUSER"'%g' \
- $PKG/etc/squid/squid.conf.new
-sed -i -e 's%^cache_effective_group nobody%cache_effective_group '"$SQUIDGROUP"'%g' \
- $PKG/etc/squid/squid.conf.new
+# Set a chache dir, the user and group to run as and set the pid location
+sed -i "s|^#cache_dir|cache_dir|" $PKG/etc/squid/squid.conf.new
+echo -e "\npid_filename /var/run/squid/squid.pid" >> $PKG/etc/squid/squid.conf.new
+echo "cache_effective_user $SQUIDUSER" >> $PKG/etc/squid/squid.conf.new
+echo "cache_effective_group $SQUIDGROUP" >> $PKG/etc/squid/squid.conf.new
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/squid/squid.conf b/network/squid/squid.conf
deleted file mode 100644
index 1e9345bc30..0000000000
--- a/network/squid/squid.conf
+++ /dev/null
@@ -1,7806 +0,0 @@
-# WELCOME TO SQUID 3.4.10
-# ----------------------------
-#
-# This is the documentation for the Squid configuration file.
-# This documentation can also be found online at:
-# http://www.squid-cache.org/Doc/config/
-#
-# You may wish to look at the Squid home page and wiki for the
-# FAQ and other documentation:
-# http://www.squid-cache.org/
-# http://wiki.squid-cache.org/SquidFaq
-# http://wiki.squid-cache.org/ConfigExamples
-#
-# This documentation shows what the defaults for various directives
-# happen to be. If you don't need to change the default, you should
-# leave the line out of your squid.conf in most cases.
-#
-# In some cases "none" refers to no default setting at all,
-# while in other cases it refers to the value of the option
-# - the comments for that keyword indicate if this is the case.
-#
-
-# Configuration options can be included using the "include" directive.
-# Include takes a list of files to include. Quoting and wildcards are
-# supported.
-#
-# For example,
-#
-# include /path/to/included/file/squid.acl.config
-#
-# Includes can be nested up to a hard-coded depth of 16 levels.
-# This arbitrary restriction is to prevent recursive include references
-# from causing Squid entering an infinite loop whilst trying to load
-# configuration files.
-#
-# Values with byte units
-#
-# Squid accepts size units on some size related directives. All
-# such directives are documented with a default value displaying
-# a unit.
-#
-# Units accepted by Squid are:
-# bytes - byte
-# KB - Kilobyte (1024 bytes)
-# MB - Megabyte
-# GB - Gigabyte
-#
-# Values with spaces, quotes, and other special characters
-#
-# Squid supports directive parameters with spaces, quotes, and other
-# special characters. Surround such parameters with "double quotes". Use
-# the configuration_includes_quoted_values directive to enable or
-# disable that support.
-#
-# For example;
-#
-# configuration_includes_quoted_values on
-# acl group external groupCheck Administrators "Internet Users" Guest
-# configuration_includes_quoted_values off
-#
-#
-# Conditional configuration
-#
-# If-statements can be used to make configuration directives
-# depend on conditions:
-#
-# if <CONDITION>
-# ... regular configuration directives ...
-# [else
-# ... regular configuration directives ...]
-# endif
-#
-# The else part is optional. The keywords "if", "else", and "endif"
-# must be typed on their own lines, as if they were regular
-# configuration directives.
-#
-# NOTE: An else-if condition is not supported.
-#
-# These individual conditions types are supported:
-#
-# true
-# Always evaluates to true.
-# false
-# Always evaluates to false.
-# <integer> = <integer>
-# Equality comparison of two integer numbers.
-#
-#
-# SMP-Related Macros
-#
-# The following SMP-related preprocessor macros can be used.
-#
-# ${process_name} expands to the current Squid process "name"
-# (e.g., squid1, squid2, or cache1).
-#
-# ${process_number} expands to the current Squid process
-# identifier, which is an integer number (e.g., 1, 2, 3) unique
-# across all Squid processes.
-
-# TAG: broken_vary_encoding
-# This option is not yet supported by Squid-3.
-#Default:
-# none
-
-# TAG: cache_vary
-# This option is not yet supported by Squid-3.
-#Default:
-# none
-
-# TAG: collapsed_forwarding
-# This option is not yet supported by Squid-3. see http://bugs.squid-cache.org/show_bug.cgi?id=3495
-#Default:
-# none
-
-# TAG: error_map
-# This option is not yet supported by Squid-3.
-#Default:
-# none
-
-# TAG: external_refresh_check
-# This option is not yet supported by Squid-3.
-#Default:
-# none
-
-# TAG: location_rewrite_program
-# This option is not yet supported by Squid-3.
-#Default:
-# none
-
-# TAG: refresh_stale_hit
-# This option is not yet supported by Squid-3.
-#Default:
-# none
-
-# TAG: ignore_ims_on_miss
-# Remove this line. The HTTP/1.1 feature is now configured by 'cache_miss_revalidate'.
-#Default:
-# none
-
-# TAG: ignore_expect_100
-# Remove this line. The HTTP/1.1 feature is now fully supported by default.
-#Default:
-# none
-
-# TAG: dns_v4_fallback
-# Remove this line. Squid performs a 'Happy Eyeballs' algorithm, the 'fallback' algorithm is no longer relevant.
-#Default:
-# none
-
-# TAG: ftp_list_width
-# Remove this line. Configure FTP page display using the CSS controls in errorpages.css instead.
-#Default:
-# none
-
-# TAG: maximum_single_addr_tries
-# Replaced by connect_retries. The behaviour has changed, please read the documentation before altering.
-#Default:
-# none
-
-# TAG: update_headers
-# Remove this line. The feature is supported by default in storage types where update is implemented.
-#Default:
-# none
-
-# TAG: url_rewrite_concurrency
-# Remove this line. Set the 'concurrency=' option of url_rewrite_children instead.
-#Default:
-# none
-
-# TAG: dns_testnames
-# Remove this line. DNS is no longer tested on startup.
-#Default:
-# none
-
-# TAG: extension_methods
-# Remove this line. All valid methods for HTTP are accepted by default.
-#Default:
-# none
-
-# TAG: zero_buffers
-#Default:
-# none
-
-# TAG: incoming_rate
-#Default:
-# none
-
-# TAG: server_http11
-# Remove this line. HTTP/1.1 is supported by default.
-#Default:
-# none
-
-# TAG: upgrade_http0.9
-# Remove this line. ICY/1.0 streaming protocol is supported by default.
-#Default:
-# none
-
-# TAG: zph_local
-# Alter these entries. Use the qos_flows directive instead.
-#Default:
-# none
-
-# TAG: header_access
-# Since squid-3.0 replace with request_header_access or reply_header_access
-# depending on whether you wish to match client requests or server replies.
-#Default:
-# none
-
-# TAG: httpd_accel_no_pmtu_disc
-# Since squid-3.0 use the 'disable-pmtu-discovery' flag on http_port instead.
-#Default:
-# none
-
-# TAG: wais_relay_host
-# Replace this line with 'cache_peer' configuration.
-#Default:
-# none
-
-# TAG: wais_relay_port
-# Replace this line with 'cache_peer' configuration.
-#Default:
-# none
-
-# OPTIONS FOR AUTHENTICATION
-# -----------------------------------------------------------------------------
-
-# TAG: auth_param
-# This is used to define parameters for the various authentication
-# schemes supported by Squid.
-#
-# format: auth_param scheme parameter [setting]
-#
-# The order in which authentication schemes are presented to the client is
-# dependent on the order the scheme first appears in config file. IE
-# has a bug (it's not RFC 2617 compliant) in that it will use the basic
-# scheme if basic is the first entry presented, even if more secure
-# schemes are presented. For now use the order in the recommended
-# settings section below. If other browsers have difficulties (don't
-# recognize the schemes offered even if you are using basic) either
-# put basic first, or disable the other schemes (by commenting out their
-# program entry).
-#
-# Once an authentication scheme is fully configured, it can only be
-# shutdown by shutting squid down and restarting. Changes can be made on
-# the fly and activated with a reconfigure. I.E. You can change to a
-# different helper, but not unconfigure the helper completely.
-#
-# Please note that while this directive defines how Squid processes
-# authentication it does not automatically activate authentication.
-# To use authentication you must in addition make use of ACLs based
-# on login name in http_access (proxy_auth, proxy_auth_regex or
-# external with %LOGIN used in the format tag). The browser will be
-# challenged for authentication on the first such acl encountered
-# in http_access processing and will also be re-challenged for new
-# login credentials if the request is being denied by a proxy_auth
-# type acl.
-#
-# WARNING: authentication can't be used in a transparently intercepting
-# proxy as the client then thinks it is talking to an origin server and
-# not the proxy. This is a limitation of bending the TCP/IP protocol to
-# transparently intercepting port 80, not a limitation in Squid.
-# Ports flagged 'transparent', 'intercept', or 'tproxy' have
-# authentication disabled.
-#
-# === Parameters for the basic scheme follow. ===
-#
-# "program" cmdline
-# Specify the command for the external authenticator. Such a program
-# reads a line containing "username password" and replies with one of
-# three results:
-#
-# OK
-# the user exists.
-#
-# ERR
-# the user does not exist.
-#
-# BH
-# An internal error occurred in the helper, preventing
-# a result being identified.
-#
-# "ERR" and "BH" results may optionally be followed by message="..."
-# containing a description available as %m in the returned error page.
-#
-# If you use an authenticator, make sure you have 1 acl of type
-# proxy_auth.
-#
-# By default, the basic authentication scheme is not used unless a
-# program is specified.
-#
-# If you want to use the traditional NCSA proxy authentication, set
-# this line to something like
-#
-# auth_param basic program /usr/libexec/basic_ncsa_auth /usr/etc/passwd
-#
-# "utf8" on|off
-# HTTP uses iso-latin-1 as character set, while some authentication
-# backends such as LDAP expects UTF-8. If this is set to on Squid will
-# translate the HTTP iso-latin-1 charset to UTF-8 before sending the
-# username & password to the helper.
-#
-# "children" numberofchildren [startup=N] [idle=N] [concurrency=N]
-# The maximum number of authenticator processes to spawn. If you start too few
-# Squid will have to wait for them to process a backlog of credential
-# verifications, slowing it down. When password verifications are
-# done via a (slow) network you are likely to need lots of
-# authenticator processes.
-#
-# The startup= and idle= options permit some skew in the exact amount
-# run. A minimum of startup=N will begin during startup and reconfigure.
-# Squid will start more in groups of up to idle=N in an attempt to meet
-# traffic needs and to keep idle=N free above those traffic needs up to
-# the maximum.
-#
-# The concurrency= option sets the number of concurrent requests the
-# helper can process. The default of 0 is used for helpers who only
-# supports one request at a time. Setting this to a number greater than
-# 0 changes the protocol used to include a channel number first on the
-# request/response line, allowing multiple requests to be sent to the
-# same helper in parallel without waiting for the response.
-# Must not be set unless it's known the helper supports this.
-#
-# auth_param basic children 20 startup=0 idle=1
-#
-# "realm" realmstring
-# Specifies the realm name which is to be reported to the
-# client for the basic proxy authentication scheme (part of
-# the text the user will see when prompted their username and
-# password). There is no default.
-# auth_param basic realm Squid proxy-caching web server
-#
-# "credentialsttl" timetolive
-# Specifies how long squid assumes an externally validated
-# username:password pair is valid for - in other words how
-# often the helper program is called for that user. Set this
-# low to force revalidation with short lived passwords. Note
-# setting this high does not impact your susceptibility
-# to replay attacks unless you are using an one-time password
-# system (such as SecureID). If you are using such a system,
-# you will be vulnerable to replay attacks unless you also
-# use the max_user_ip ACL in an http_access rule.
-#
-# "casesensitive" on|off
-# Specifies if usernames are case sensitive. Most user databases are
-# case insensitive allowing the same username to be spelled using both
-# lower and upper case letters, but some are case sensitive. This
-# makes a big difference for user_max_ip ACL processing and similar.
-# auth_param basic casesensitive off
-#
-# === Parameters for the digest scheme follow ===
-#
-# "program" cmdline
-# Specify the command for the external authenticator. Such
-# a program reads a line containing "username":"realm" and
-# replies with one of three results:
-#
-# OK ha1="..."
-# the user exists. The ha1= key is mandatory and
-# contains the appropriate H(A1) value, hex encoded.
-# See rfc 2616 for the definition of H(A1).
-#
-# ERR
-# the user does not exist.
-#
-# BH
-# An internal error occurred in the helper, preventing
-# a result being identified.
-#
-# "ERR" and "BH" results may optionally be followed by message="..."
-# containing a description available as %m in the returned error page.
-#
-# By default, the digest authentication scheme is not used unless a
-# program is specified.
-#
-# If you want to use a digest authenticator, set this line to
-# something like
-#
-# auth_param digest program /usr/bin/digest_pw_auth /usr/etc/digpass
-#
-# "utf8" on|off
-# HTTP uses iso-latin-1 as character set, while some authentication
-# backends such as LDAP expects UTF-8. If this is set to on Squid will
-# translate the HTTP iso-latin-1 charset to UTF-8 before sending the
-# username & password to the helper.
-#
-# "children" numberofchildren [startup=N] [idle=N] [concurrency=N]
-# The maximum number of authenticator processes to spawn (default 5).
-# If you start too few Squid will have to wait for them to
-# process a backlog of H(A1) calculations, slowing it down.
-# When the H(A1) calculations are done via a (slow) network
-# you are likely to need lots of authenticator processes.
-#
-# The startup= and idle= options permit some skew in the exact amount
-# run. A minimum of startup=N will begin during startup and reconfigure.
-# Squid will start more in groups of up to idle=N in an attempt to meet
-# traffic needs and to keep idle=N free above those traffic needs up to
-# the maximum.
-#
-# The concurrency= option sets the number of concurrent requests the
-# helper can process. The default of 0 is used for helpers who only
-# supports one request at a time. Setting this to a number greater than
-# 0 changes the protocol used to include a channel number first on the
-# request/response line, allowing multiple requests to be sent to the
-# same helper in parallel without waiting for the response.
-# Must not be set unless it's known the helper supports this.
-#
-# auth_param digest children 20 startup=0 idle=1
-#
-# "realm" realmstring
-# Specifies the realm name which is to be reported to the
-# client for the digest proxy authentication scheme (part of
-# the text the user will see when prompted their username and
-# password). There is no default.
-# auth_param digest realm Squid proxy-caching web server
-#
-# "nonce_garbage_interval" timeinterval
-# Specifies the interval that nonces that have been issued
-# to client_agent's are checked for validity.
-#
-# "nonce_max_duration" timeinterval
-# Specifies the maximum length of time a given nonce will be
-# valid for.
-#
-# "nonce_max_count" number
-# Specifies the maximum number of times a given nonce can be
-# used.
-#
-# "nonce_strictness" on|off
-# Determines if squid requires strict increment-by-1 behavior
-# for nonce counts, or just incrementing (off - for use when
-# user agents generate nonce counts that occasionally miss 1
-# (ie, 1,2,4,6)). Default off.
-#
-# "check_nonce_count" on|off
-# This directive if set to off can disable the nonce count check
-# completely to work around buggy digest qop implementations in
-# certain mainstream browser versions. Default on to check the
-# nonce count to protect from authentication replay attacks.
-#
-# "post_workaround" on|off
-# This is a workaround to certain buggy browsers who sends
-# an incorrect request digest in POST requests when reusing
-# the same nonce as acquired earlier on a GET request.
-#
-# === NTLM scheme options follow ===
-#
-# "program" cmdline
-# Specify the command for the external NTLM authenticator.
-# Such a program reads exchanged NTLMSSP packets with
-# the browser via Squid until authentication is completed.
-# If you use an NTLM authenticator, make sure you have 1 acl
-# of type proxy_auth. By default, the NTLM authenticator program
-# is not used.
-#
-# auth_param ntlm program /usr/bin/ntlm_auth
-#
-# "children" numberofchildren [startup=N] [idle=N]
-# The maximum number of authenticator processes to spawn (default 5).
-# If you start too few Squid will have to wait for them to
-# process a backlog of credential verifications, slowing it
-# down. When credential verifications are done via a (slow)
-# network you are likely to need lots of authenticator
-# processes.
-#
-# The startup= and idle= options permit some skew in the exact amount
-# run. A minimum of startup=N will begin during startup and reconfigure.
-# Squid will start more in groups of up to idle=N in an attempt to meet
-# traffic needs and to keep idle=N free above those traffic needs up to
-# the maximum.
-#
-# auth_param ntlm children 20 startup=0 idle=1
-#
-# "keep_alive" on|off
-# If you experience problems with PUT/POST requests when using the
-# Negotiate authentication scheme then you can try setting this to
-# off. This will cause Squid to forcibly close the connection on
-# the initial requests where the browser asks which schemes are
-# supported by the proxy.
-#
-# auth_param ntlm keep_alive on
-#
-# === Options for configuring the NEGOTIATE auth-scheme follow ===
-#
-# "program" cmdline
-# Specify the command for the external Negotiate authenticator.
-# This protocol is used in Microsoft Active-Directory enabled setups with
-# the Microsoft Internet Explorer or Mozilla Firefox browsers.
-# Its main purpose is to exchange credentials with the Squid proxy
-# using the Kerberos mechanisms.
-# If you use a Negotiate authenticator, make sure you have at least
-# one acl of type proxy_auth active. By default, the negotiate
-# authenticator program is not used.
-# The only supported program for this role is the ntlm_auth
-# program distributed as part of Samba, version 4 or later.
-#
-# auth_param negotiate program /usr/bin/ntlm_auth --helper-protocol=gss-spnego
-#
-# "children" numberofchildren [startup=N] [idle=N]
-# The maximum number of authenticator processes to spawn (default 5).
-# If you start too few Squid will have to wait for them to
-# process a backlog of credential verifications, slowing it
-# down. When credential verifications are done via a (slow)
-# network you are likely to need lots of authenticator
-# processes.
-#
-# The startup= and idle= options permit some skew in the exact amount
-# run. A minimum of startup=N will begin during startup and reconfigure.
-# Squid will start more in groups of up to idle=N in an attempt to meet
-# traffic needs and to keep idle=N free above those traffic needs up to
-# the maximum.
-#
-# auth_param negotiate children 20 startup=0 idle=1
-#
-# "keep_alive" on|off
-# If you experience problems with PUT/POST requests when using the
-# Negotiate authentication scheme then you can try setting this to
-# off. This will cause Squid to forcibly close the connection on
-# the initial requests where the browser asks which schemes are
-# supported by the proxy.
-#
-# auth_param negotiate keep_alive on
-#
-#
-# Examples:
-#
-##Recommended minimum configuration per scheme:
-##auth_param negotiate program <uncomment and complete this line to activate>
-##auth_param negotiate children 20 startup=0 idle=1
-##auth_param negotiate keep_alive on
-##
-##auth_param ntlm program <uncomment and complete this line to activate>
-##auth_param ntlm children 20 startup=0 idle=1
-##auth_param ntlm keep_alive on
-##
-##auth_param digest program <uncomment and complete this line>
-##auth_param digest children 20 startup=0 idle=1
-##auth_param digest realm Squid proxy-caching web server
-##auth_param digest nonce_garbage_interval 5 minutes
-##auth_param digest nonce_max_duration 30 minutes
-##auth_param digest nonce_max_count 50
-##
-##auth_param basic program <uncomment and complete this line>
-##auth_param basic children 5 startup=5 idle=1
-##auth_param basic realm Squid proxy-caching web server
-##auth_param basic credentialsttl 2 hours
-#Default:
-# none
-
-# TAG: authenticate_cache_garbage_interval
-# The time period between garbage collection across the username cache.
-# This is a trade-off between memory utilization (long intervals - say
-# 2 days) and CPU (short intervals - say 1 minute). Only change if you
-# have good reason to.
-#Default:
-# authenticate_cache_garbage_interval 1 hour
-
-# TAG: authenticate_ttl
-# The time a user & their credentials stay in the logged in
-# user cache since their last request. When the garbage
-# interval passes, all user credentials that have passed their
-# TTL are removed from memory.
-#Default:
-# authenticate_ttl 1 hour
-
-# TAG: authenticate_ip_ttl
-# If you use proxy authentication and the 'max_user_ip' ACL,
-# this directive controls how long Squid remembers the IP
-# addresses associated with each user. Use a small value
-# (e.g., 60 seconds) if your users might change addresses
-# quickly, as is the case with dialup. You might be safe
-# using a larger value (e.g., 2 hours) in a corporate LAN
-# environment with relatively static address assignments.
-#Default:
-# authenticate_ip_ttl 1 second
-
-# ACCESS CONTROLS
-# -----------------------------------------------------------------------------
-
-# TAG: external_acl_type
-# This option defines external acl classes using a helper program
-# to look up the status
-#
-# external_acl_type name [options] FORMAT.. /path/to/helper [helper arguments..]
-#
-# Options:
-#
-# ttl=n TTL in seconds for cached results (defaults to 3600
-# for 1 hour)
-#
-# negative_ttl=n
-# TTL for cached negative lookups (default same
-# as ttl)
-#
-# grace=n Percentage remaining of TTL where a refresh of a
-# cached entry should be initiated without needing to
-# wait for a new reply. (default is for no grace period)
-#
-# cache=n Limit the result cache size, default is 262144.
-# The expanded FORMAT value is used as the cache key, so
-# if the details in FORMAT are highly variable a larger
-# cache may be needed to produce reduction in helper load.
-#
-# children-max=n
-# Maximum number of acl helper processes spawned to service
-# external acl lookups of this type. (default 20)
-#
-# children-startup=n
-# Minimum number of acl helper processes to spawn during
-# startup and reconfigure to service external acl lookups
-# of this type. (default 0)
-#
-# children-idle=n
-# Number of acl helper processes to keep ahead of traffic
-# loads. Squid will spawn this many at once whenever load
-# rises above the capabilities of existing processes.
-# Up to the value of children-max. (default 1)
-#
-# concurrency=n concurrency level per process. Only used with helpers
-# capable of processing more than one query at a time.
-#
-# protocol=2.5 Compatibility mode for Squid-2.5 external acl helpers.
-#
-# ipv4 / ipv6 IP protocol used to communicate with this helper.
-# The default is to auto-detect IPv6 and use it when available.
-#
-#
-# FORMAT specifications
-#
-# %LOGIN Authenticated user login name
-# %EXT_USER Username from previous external acl
-# %EXT_LOG Log details from previous external acl
-# %EXT_TAG Tag from previous external acl
-# %IDENT Ident user name
-# %SRC Client IP
-# %SRCPORT Client source port
-# %URI Requested URI
-# %DST Requested host
-# %PROTO Requested protocol
-# %PORT Requested port
-# %PATH Requested URL path
-# %METHOD Request method
-# %MYADDR Squid interface address
-# %MYPORT Squid http_port number
-# %PATH Requested URL-path (including query-string if any)
-# %USER_CERT SSL User certificate in PEM format
-# %USER_CERTCHAIN SSL User certificate chain in PEM format
-# %USER_CERT_xx SSL User certificate subject attribute xx
-# %USER_CA_CERT_xx SSL User certificate issuer attribute xx
-#
-# %>{Header} HTTP request header "Header"
-# %>{Hdr:member}
-# HTTP request header "Hdr" list member "member"
-# %>{Hdr:;member}
-# HTTP request header list member using ; as
-# list separator. ; can be any non-alphanumeric
-# character.
-#
-# %<{Header} HTTP reply header "Header"
-# %<{Hdr:member}
-# HTTP reply header "Hdr" list member "member"
-# %<{Hdr:;member}
-# HTTP reply header list member using ; as
-# list separator. ; can be any non-alphanumeric
-# character.
-#
-# %ACL The name of the ACL being tested.
-# %DATA The ACL arguments. If not used then any arguments
-# is automatically added at the end of the line
-# sent to the helper.
-# NOTE: this will encode the arguments as one token,
-# whereas the default will pass each separately.
-#
-# %% The percent sign. Useful for helpers which need
-# an unchanging input format.
-#
-#
-# General request syntax:
-#
-# [channel-ID] FORMAT-values [acl-values ...]
-#
-#
-# FORMAT-values consists of transaction details expanded with
-# whitespace separation per the config file FORMAT specification
-# using the FORMAT macros listed above.
-#
-# acl-values consists of any string specified in the referencing
-# config 'acl ... external' line. see the "acl external" directive.
-#
-# Request values sent to the helper are URL escaped to protect
-# each value in requests against whitespaces.
-#
-# If using protocol=2.5 then the request sent to the helper is not
-# URL escaped to protect against whitespace.
-#
-# NOTE: protocol=3.0 is deprecated as no longer necessary.
-#
-# When using the concurrency= option the protocol is changed by
-# introducing a query channel tag in front of the request/response.
-# The query channel tag is a number between 0 and concurrency-1.
-# This value must be echoed back unchanged to Squid as the first part
-# of the response relating to its request.
-#
-#
-# The helper receives lines expanded per the above format specification
-# and for each input line returns 1 line starting with OK/ERR/BH result
-# code and optionally followed by additional keywords with more details.
-#
-#
-# General result syntax:
-#
-# [channel-ID] result keyword=value ...
-#
-# Result consists of one of the codes:
-#
-# OK
-# the ACL test produced a match.
-#
-# ERR
-# the ACL test does not produce a match.
-#
-# BH
-# An internal error occurred in the helper, preventing
-# a result being identified.
-#
-# The meaning of 'a match' is determined by your squid.conf
-# access control configuration. See the Squid wiki for details.
-#
-# Defined keywords:
-#
-# user= The users name (login)
-#
-# password= The users password (for login= cache_peer option)
-#
-# message= Message describing the reason for this response.
-# Available as %o in error pages.
-# Useful on (ERR and BH results).
-#
-# tag= Apply a tag to a request. Only sets a tag once,
-# does not alter existing tags.
-#
-# log= String to be logged in access.log. Available as
-# %ea in logformat specifications.
-#
-# Any keywords may be sent on any response whether OK, ERR or BH.
-#
-# All response keyword values need to be a single token with URL
-# escaping, or enclosed in double quotes (") and escaped using \ on
-# any double quotes or \ characters within the value. The wrapping
-# double quotes are removed before the value is interpreted by Squid.
-# \r and \n are also replace by CR and LF.
-#
-# Some example key values:
-#
-# user=John%20Smith
-# user="John Smith"
-# user="J. \"Bob\" Smith"
-#Default:
-# none
-
-# TAG: acl
-# Defining an Access List
-#
-# Every access list definition must begin with an aclname and acltype,
-# followed by either type-specific arguments or a quoted filename that
-# they are read from.
-#
-# acl aclname acltype argument ...
-# acl aclname acltype "file" ...
-#
-# When using "file", the file should contain one item per line.
-#
-# Some acl types supports options which changes their default behaviour.
-# The available options are:
-#
-# -i,+i By default, regular expressions are CASE-SENSITIVE. To make them
-# case-insensitive, use the -i option. To return case-sensitive
-# use the +i option between patterns, or make a new ACL line
-# without -i.
-#
-# -n Disable lookups and address type conversions. If lookup or
-# conversion is required because the parameter type (IP or
-# domain name) does not match the message address type (domain
-# name or IP), then the ACL would immediately declare a mismatch
-# without any warnings or lookups.
-#
-# -- Used to stop processing all options, in the case the first acl
-# value has '-' character as first character (for example the '-'
-# is a valid domain name)
-#
-# Some acl types require suspending the current request in order
-# to access some external data source.
-# Those which do are marked with the tag [slow], those which
-# don't are marked as [fast].
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl
-# for further information
-#
-# ***** ACL TYPES AVAILABLE *****
-#
-# acl aclname src ip-address/mask ... # clients IP address [fast]
-# acl aclname src addr1-addr2/mask ... # range of addresses [fast]
-# acl aclname dst [-n] ip-address/mask ... # URL host's IP address [slow]
-# acl aclname localip ip-address/mask ... # IP address the client connected to [fast]
-#
-# acl aclname arp mac-address ... (xx:xx:xx:xx:xx:xx notation)
-# # The arp ACL requires the special configure option --enable-arp-acl.
-# # Furthermore, the ARP ACL code is not portable to all operating systems.
-# # It works on Linux, Solaris, Windows, FreeBSD, and some
-# # other *BSD variants.
-# # [fast]
-# #
-# # NOTE: Squid can only determine the MAC address for clients that are on
-# # the same subnet. If the client is on a different subnet,
-# # then Squid cannot find out its MAC address.
-#
-# acl aclname srcdomain .foo.com ...
-# # reverse lookup, from client IP [slow]
-# acl aclname dstdomain [-n] .foo.com ...
-# # Destination server from URL [fast]
-# acl aclname srcdom_regex [-i] \.foo\.com ...
-# # regex matching client name [slow]
-# acl aclname dstdom_regex [-n] [-i] \.foo\.com ...
-# # regex matching server [fast]
-# #
-# # For dstdomain and dstdom_regex a reverse lookup is tried if a IP
-# # based URL is used and no match is found. The name "none" is used
-# # if the reverse lookup fails.
-#
-# acl aclname src_as number ...
-# acl aclname dst_as number ...
-# # [fast]
-# # Except for access control, AS numbers can be used for
-# # routing of requests to specific caches. Here's an
-# # example for routing all requests for AS#1241 and only
-# # those to mycache.mydomain.net:
-# # acl asexample dst_as 1241
-# # cache_peer_access mycache.mydomain.net allow asexample
-# # cache_peer_access mycache_mydomain.net deny all
-#
-# acl aclname peername myPeer ...
-# # [fast]
-# # match against a named cache_peer entry
-# # set unique name= on cache_peer lines for reliable use.
-#
-# acl aclname time [day-abbrevs] [h1:m1-h2:m2]
-# # [fast]
-# # day-abbrevs:
-# # S - Sunday
-# # M - Monday
-# # T - Tuesday
-# # W - Wednesday
-# # H - Thursday
-# # F - Friday
-# # A - Saturday
-# # h1:m1 must be less than h2:m2
-#
-# acl aclname url_regex [-i] ^http:// ...
-# # regex matching on whole URL [fast]
-# acl aclname urllogin [-i] [^a-zA-Z0-9] ...
-# # regex matching on URL login field
-# acl aclname urlpath_regex [-i] \.gif$ ...
-# # regex matching on URL path [fast]
-#
-# acl aclname port 80 70 21 0-1024... # destination TCP port [fast]
-# # ranges are alloed
-# acl aclname localport 3128 ... # TCP port the client connected to [fast]
-# # NP: for interception mode this is usually '80'
-#
-# acl aclname myportname 3128 ... # http(s)_port name [fast]
-#
-# acl aclname proto HTTP FTP ... # request protocol [fast]
-#
-# acl aclname method GET POST ... # HTTP request method [fast]
-#
-# acl aclname http_status 200 301 500- 400-403 ...
-# # status code in reply [fast]
-#
-# acl aclname browser [-i] regexp ...
-# # pattern match on User-Agent header (see also req_header below) [fast]
-#
-# acl aclname referer_regex [-i] regexp ...
-# # pattern match on Referer header [fast]
-# # Referer is highly unreliable, so use with care
-#
-# acl aclname ident username ...
-# acl aclname ident_regex [-i] pattern ...
-# # string match on ident output [slow]
-# # use REQUIRED to accept any non-null ident.
-#
-# acl aclname proxy_auth [-i] username ...
-# acl aclname proxy_auth_regex [-i] pattern ...
-# # perform http authentication challenge to the client and match against
-# # supplied credentials [slow]
-# #
-# # takes a list of allowed usernames.
-# # use REQUIRED to accept any valid username.
-# #
-# # Will use proxy authentication in forward-proxy scenarios, and plain
-# # http authenticaiton in reverse-proxy scenarios
-# #
-# # NOTE: when a Proxy-Authentication header is sent but it is not
-# # needed during ACL checking the username is NOT logged
-# # in access.log.
-# #
-# # NOTE: proxy_auth requires a EXTERNAL authentication program
-# # to check username/password combinations (see
-# # auth_param directive).
-# #
-# # NOTE: proxy_auth can't be used in a transparent/intercepting proxy
-# # as the browser needs to be configured for using a proxy in order
-# # to respond to proxy authentication.
-#
-# acl aclname snmp_community string ...
-# # A community string to limit access to your SNMP Agent [fast]
-# # Example:
-# #
-# # acl snmppublic snmp_community public
-#
-# acl aclname maxconn number
-# # This will be matched when the client's IP address has
-# # more than <number> TCP connections established. [fast]
-# # NOTE: This only measures direct TCP links so X-Forwarded-For
-# # indirect clients are not counted.
-#
-# acl aclname max_user_ip [-s] number
-# # This will be matched when the user attempts to log in from more
-# # than <number> different ip addresses. The authenticate_ip_ttl
-# # parameter controls the timeout on the ip entries. [fast]
-# # If -s is specified the limit is strict, denying browsing
-# # from any further IP addresses until the ttl has expired. Without
-# # -s Squid will just annoy the user by "randomly" denying requests.
-# # (the counter is reset each time the limit is reached and a
-# # request is denied)
-# # NOTE: in acceleration mode or where there is mesh of child proxies,
-# # clients may appear to come from multiple addresses if they are
-# # going through proxy farms, so a limit of 1 may cause user problems.
-#
-# acl aclname random probability
-# # Pseudo-randomly match requests. Based on the probability given.
-# # Probability may be written as a decimal (0.333), fraction (1/3)
-# # or ratio of matches:non-matches (3:5).
-#
-# acl aclname req_mime_type [-i] mime-type ...
-# # regex match against the mime type of the request generated
-# # by the client. Can be used to detect file upload or some
-# # types HTTP tunneling requests [fast]
-# # NOTE: This does NOT match the reply. You cannot use this
-# # to match the returned file type.
-#
-# acl aclname req_header header-name [-i] any\.regex\.here
-# # regex match against any of the known request headers. May be
-# # thought of as a superset of "browser", "referer" and "mime-type"
-# # ACL [fast]
-#
-# acl aclname rep_mime_type [-i] mime-type ...
-# # regex match against the mime type of the reply received by
-# # squid. Can be used to detect file download or some
-# # types HTTP tunneling requests. [fast]
-# # NOTE: This has no effect in http_access rules. It only has
-# # effect in rules that affect the reply data stream such as
-# # http_reply_access.
-#
-# acl aclname rep_header header-name [-i] any\.regex\.here
-# # regex match against any of the known reply headers. May be
-# # thought of as a superset of "browser", "referer" and "mime-type"
-# # ACLs [fast]
-#
-# acl aclname external class_name [arguments...]
-# # external ACL lookup via a helper class defined by the
-# # external_acl_type directive [slow]
-#
-# acl aclname user_cert attribute values...
-# # match against attributes in a user SSL certificate
-# # attribute is one of DN/C/O/CN/L/ST [fast]
-#
-# acl aclname ca_cert attribute values...
-# # match against attributes a users issuing CA SSL certificate
-# # attribute is one of DN/C/O/CN/L/ST [fast]
-#
-# acl aclname ext_user username ...
-# acl aclname ext_user_regex [-i] pattern ...
-# # string match on username returned by external acl helper [slow]
-# # use REQUIRED to accept any non-null user name.
-#
-# acl aclname tag tagvalue ...
-# # string match on tag returned by external acl helper [slow]
-#
-# acl aclname hier_code codename ...
-# # string match against squid hierarchy code(s); [fast]
-# # e.g., DIRECT, PARENT_HIT, NONE, etc.
-# #
-# # NOTE: This has no effect in http_access rules. It only has
-# # effect in rules that affect the reply data stream such as
-# # http_reply_access.
-#
-# acl aclname note name [value ...]
-# # match transaction annotation [fast]
-# # Without values, matches any annotation with a given name.
-# # With value(s), matches any annotation with a given name that
-# # also has one of the given values.
-# # Names and values are compared using a string equality test.
-# # Annotation sources include note and adaptation_meta directives
-# # as well as helper and eCAP responses.
-#
-# acl aclname any-of acl1 acl2 ...
-# # match any one of the acls [fast or slow]
-# # The first matching ACL stops further ACL evaluation.
-# #
-# # ACLs from multiple any-of lines with the same name are ORed.
-# # For example, A = (a1 or a2) or (a3 or a4) can be written as
-# # acl A any-of a1 a2
-# # acl A any-of a3 a4
-# #
-# # This group ACL is fast if all evaluated ACLs in the group are fast
-# # and slow otherwise.
-#
-# acl aclname all-of acl1 acl2 ...
-# # match all of the acls [fast or slow]
-# # The first mismatching ACL stops further ACL evaluation.
-# #
-# # ACLs from multiple all-of lines with the same name are ORed.
-# # For example, B = (b1 and b2) or (b3 and b4) can be written as
-# # acl B all-of b1 b2
-# # acl B all-of b3 b4
-# #
-# # This group ACL is fast if all evaluated ACLs in the group are fast
-# # and slow otherwise.
-#
-# Examples:
-# acl macaddress arp 09:00:2b:23:45:67
-# acl myexample dst_as 1241
-# acl password proxy_auth REQUIRED
-# acl fileupload req_mime_type -i ^multipart/form-data$
-# acl javascript rep_mime_type -i ^application/x-javascript$
-#
-#Default:
-# ACLs all, manager, localhost, and to_localhost are predefined.
-#
-#
-# Recommended minimum configuration:
-#
-
-# Example rule allowing access from your local networks.
-# Adapt to list your (internal) IP networks from where browsing
-# should be allowed
-acl localnet src 10.0.0.0/8 # RFC1918 possible internal network
-acl localnet src 172.16.0.0/12 # RFC1918 possible internal network
-acl localnet src 192.168.0.0/16 # RFC1918 possible internal network
-acl localnet src fc00::/7 # RFC 4193 local private network range
-acl localnet src fe80::/10 # RFC 4291 link-local (directly plugged) machines
-
-acl SSL_ports port 443
-acl Safe_ports port 80 # http
-acl Safe_ports port 21 # ftp
-acl Safe_ports port 443 # https
-acl Safe_ports port 70 # gopher
-acl Safe_ports port 210 # wais
-acl Safe_ports port 1025-65535 # unregistered ports
-acl Safe_ports port 280 # http-mgmt
-acl Safe_ports port 488 # gss-http
-acl Safe_ports port 591 # filemaker
-acl Safe_ports port 777 # multiling http
-acl CONNECT method CONNECT
-
-# TAG: follow_x_forwarded_for
-# Allowing or Denying the X-Forwarded-For header to be followed to
-# find the original source of a request.
-#
-# Requests may pass through a chain of several other proxies
-# before reaching us. The X-Forwarded-For header will contain a
-# comma-separated list of the IP addresses in the chain, with the
-# rightmost address being the most recent.
-#
-# If a request reaches us from a source that is allowed by this
-# configuration item, then we consult the X-Forwarded-For header
-# to see where that host received the request from. If the
-# X-Forwarded-For header contains multiple addresses, we continue
-# backtracking until we reach an address for which we are not allowed
-# to follow the X-Forwarded-For header, or until we reach the first
-# address in the list. For the purpose of ACL used in the
-# follow_x_forwarded_for directive the src ACL type always matches
-# the address we are testing and srcdomain matches its rDNS.
-#
-# The end result of this process is an IP address that we will
-# refer to as the indirect client address. This address may
-# be treated as the client address for access control, ICAP, delay
-# pools and logging, depending on the acl_uses_indirect_client,
-# icap_uses_indirect_client, delay_pool_uses_indirect_client,
-# log_uses_indirect_client and tproxy_uses_indirect_client options.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-# SECURITY CONSIDERATIONS:
-#
-# Any host for which we follow the X-Forwarded-For header
-# can place incorrect information in the header, and Squid
-# will use the incorrect information as if it were the
-# source address of the request. This may enable remote
-# hosts to bypass any access control restrictions that are
-# based on the client's source addresses.
-#
-# For example:
-#
-# acl localhost src 127.0.0.1
-# acl my_other_proxy srcdomain .proxy.example.com
-# follow_x_forwarded_for allow localhost
-# follow_x_forwarded_for allow my_other_proxy
-#Default:
-# X-Forwarded-For header will be ignored.
-
-# TAG: acl_uses_indirect_client on|off
-# Controls whether the indirect client address
-# (see follow_x_forwarded_for) is used instead of the
-# direct client address in acl matching.
-#
-# NOTE: maxconn ACL considers direct TCP links and indirect
-# clients will always have zero. So no match.
-#Default:
-# acl_uses_indirect_client on
-
-# TAG: delay_pool_uses_indirect_client on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-follow-x-forwarded-for and --enable-delay-pools
-#
-# Controls whether the indirect client address
-# (see follow_x_forwarded_for) is used instead of the
-# direct client address in delay pools.
-#Default:
-# delay_pool_uses_indirect_client on
-
-# TAG: log_uses_indirect_client on|off
-# Controls whether the indirect client address
-# (see follow_x_forwarded_for) is used instead of the
-# direct client address in the access log.
-#Default:
-# log_uses_indirect_client on
-
-# TAG: tproxy_uses_indirect_client on|off
-# Controls whether the indirect client address
-# (see follow_x_forwarded_for) is used instead of the
-# direct client address when spoofing the outgoing client.
-#
-# This has no effect on requests arriving in non-tproxy
-# mode ports.
-#
-# SECURITY WARNING: Usage of this option is dangerous
-# and should not be used trivially. Correct configuration
-# of follow_x_forewarded_for with a limited set of trusted
-# sources is required to prevent abuse of your proxy.
-#Default:
-# tproxy_uses_indirect_client off
-
-# TAG: spoof_client_ip
-# Control client IP address spoofing of TPROXY traffic based on
-# defined access lists.
-#
-# spoof_client_ip allow|deny [!]aclname ...
-#
-# If there are no "spoof_client_ip" lines present, the default
-# is to "allow" spoofing of any suitable request.
-#
-# Note that the cache_peer "no-tproxy" option overrides this ACL.
-#
-# This clause supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow spoofing on all TPROXY traffic.
-
-# TAG: http_access
-# Allowing or Denying access based on defined access lists
-#
-# Access to the HTTP port:
-# http_access allow|deny [!]aclname ...
-#
-# NOTE on default values:
-#
-# If there are no "access" lines present, the default is to deny
-# the request.
-#
-# If none of the "access" lines cause a match, the default is the
-# opposite of the last line in the list. If the last line was
-# deny, the default is allow. Conversely, if the last line
-# is allow, the default will be deny. For these reasons, it is a
-# good idea to have an "deny all" entry at the end of your access
-# lists to avoid potential confusion.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Default:
-# Deny, unless rules exist in squid.conf.
-#
-
-#
-# Recommended minimum Access Permission configuration:
-#
-# Deny requests to certain unsafe ports
-http_access deny !Safe_ports
-
-# Deny CONNECT to other than secure SSL ports
-http_access deny CONNECT !SSL_ports
-
-# Only allow cachemgr access from localhost
-http_access allow localhost manager
-http_access deny manager
-
-# We strongly recommend the following be uncommented to protect innocent
-# web applications running on the proxy server who think the only
-# one who can access services on "localhost" is a local user
-#http_access deny to_localhost
-
-#
-# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
-#
-
-# Example rule allowing access from your local networks.
-# Adapt localnet in the ACL section to list your (internal) IP networks
-# from where browsing should be allowed
-http_access allow localnet
-http_access allow localhost
-
-# And finally deny all other access to this proxy
-http_access deny all
-
-# TAG: adapted_http_access
-# Allowing or Denying access based on defined access lists
-#
-# Essentially identical to http_access, but runs after redirectors
-# and ICAP/eCAP adaptation. Allowing access control based on their
-# output.
-#
-# If not set then only http_access is used.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-# TAG: http_reply_access
-# Allow replies to client requests. This is complementary to http_access.
-#
-# http_reply_access allow|deny [!] aclname ...
-#
-# NOTE: if there are no access lines present, the default is to allow
-# all replies.
-#
-# If none of the access lines cause a match the opposite of the
-# last line will apply. Thus it is good practice to end the rules
-# with an "allow all" or "deny all" entry.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-# TAG: icp_access
-# Allowing or Denying access to the ICP port based on defined
-# access lists
-#
-# icp_access allow|deny [!]aclname ...
-#
-# NOTE: The default if no icp_access lines are present is to
-# deny all traffic. This default may cause problems with peers
-# using ICP.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow ICP queries from local networks only
-##icp_access allow localnet
-##icp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-# TAG: htcp_access
-# Allowing or Denying access to the HTCP port based on defined
-# access lists
-#
-# htcp_access allow|deny [!]aclname ...
-#
-# See also htcp_clr_access for details on access control for
-# cache purge (CLR) HTCP messages.
-#
-# NOTE: The default if no htcp_access lines are present is to
-# deny all traffic. This default may cause problems with peers
-# using the htcp option.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow HTCP queries from local networks only
-##htcp_access allow localnet
-##htcp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-# TAG: htcp_clr_access
-# Allowing or Denying access to purge content using HTCP based
-# on defined access lists.
-# See htcp_access for details on general HTCP access control.
-#
-# htcp_clr_access allow|deny [!]aclname ...
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow HTCP CLR requests from trusted peers
-#acl htcp_clr_peer src 192.0.2.2 2001:DB8::2
-#htcp_clr_access allow htcp_clr_peer
-#htcp_clr_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-# TAG: miss_access
-# Determins whether network access is permitted when satisfying a request.
-#
-# For example;
-# to force your neighbors to use you as a sibling instead of
-# a parent.
-#
-# acl localclients src 192.0.2.0/24 2001:DB8::a:0/64
-# miss_access deny !localclients
-# miss_access allow all
-#
-# This means only your local clients are allowed to fetch relayed/MISS
-# replies from the network and all other clients can only fetch cached
-# objects (HITs).
-#
-# The default for this setting allows all clients who passed the
-# http_access rules to relay via this proxy.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-# TAG: ident_lookup_access
-# A list of ACL elements which, if matched, cause an ident
-# (RFC 931) lookup to be performed for this request. For
-# example, you might choose to always perform ident lookups
-# for your main multi-user Unix boxes, but not for your Macs
-# and PCs. By default, ident lookups are not performed for
-# any requests.
-#
-# To enable ident lookups for specific client addresses, you
-# can follow this example:
-#
-# acl ident_aware_hosts src 198.168.1.0/24
-# ident_lookup_access allow ident_aware_hosts
-# ident_lookup_access deny all
-#
-# Only src type ACL checks are fully supported. A srcdomain
-# ACL might work at times, but it will not always provide
-# the correct result.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Unless rules exist in squid.conf, IDENT is not fetched.
-
-# TAG: reply_body_max_size size [acl acl...]
-# This option specifies the maximum size of a reply body. It can be
-# used to prevent users from downloading very large files, such as
-# MP3's and movies. When the reply headers are received, the
-# reply_body_max_size lines are processed, and the first line where
-# all (if any) listed ACLs are true is used as the maximum body size
-# for this reply.
-#
-# This size is checked twice. First when we get the reply headers,
-# we check the content-length value. If the content length value exists
-# and is larger than the allowed size, the request is denied and the
-# user receives an error message that says "the request or reply
-# is too large." If there is no content-length, and the reply
-# size exceeds this limit, the client's connection is just closed
-# and they will receive a partial reply.
-#
-# WARNING: downstream caches probably can not detect a partial reply
-# if there is no content-length header, so they will cache
-# partial responses and give them out as hits. You should NOT
-# use this option if you have downstream caches.
-#
-# WARNING: A maximum size smaller than the size of squid's error messages
-# will cause an infinite loop and crash squid. Ensure that the smallest
-# non-zero value you use is greater that the maximum header size plus
-# the size of your largest error page.
-#
-# If you set this parameter none (the default), there will be
-# no limit imposed.
-#
-# Configuration Format is:
-# reply_body_max_size SIZE UNITS [acl ...]
-# ie.
-# reply_body_max_size 10 MB
-#
-#Default:
-# No limit is applied.
-
-# NETWORK OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: http_port
-# Usage: port [mode] [options]
-# hostname:port [mode] [options]
-# 1.2.3.4:port [mode] [options]
-#
-# The socket addresses where Squid will listen for HTTP client
-# requests. You may specify multiple socket addresses.
-# There are three forms: port alone, hostname with port, and
-# IP address with port. If you specify a hostname or IP
-# address, Squid binds the socket to that specific
-# address. Most likely, you do not need to bind to a specific
-# address, so you can use the port number alone.
-#
-# If you are running Squid in accelerator mode, you
-# probably want to listen on port 80 also, or instead.
-#
-# The -a command line option may be used to specify additional
-# port(s) where Squid listens for proxy request. Such ports will
-# be plain proxy ports with no options.
-#
-# You may specify multiple socket addresses on multiple lines.
-#
-# Modes:
-#
-# intercept Support for IP-Layer interception of
-# outgoing requests without browser settings.
-# NP: disables authentication and IPv6 on the port.
-#
-# tproxy Support Linux TPROXY for spoofing outgoing
-# connections using the client IP address.
-# NP: disables authentication and maybe IPv6 on the port.
-#
-# accel Accelerator / reverse proxy mode
-#
-# ssl-bump For each CONNECT request allowed by ssl_bump ACLs,
-# establish secure connection with the client and with
-# the server, decrypt HTTPS messages as they pass through
-# Squid, and treat them as unencrypted HTTP messages,
-# becoming the man-in-the-middle.
-#
-# The ssl_bump option is required to fully enable
-# bumping of CONNECT requests.
-#
-# Omitting the mode flag causes default forward proxy mode to be used.
-#
-#
-# Accelerator Mode Options:
-#
-# defaultsite=domainname
-# What to use for the Host: header if it is not present
-# in a request. Determines what site (not origin server)
-# accelerators should consider the default.
-#
-# no-vhost Disable using HTTP/1.1 Host header for virtual domain support.
-#
-# protocol= Protocol to reconstruct accelerated requests with.
-# Defaults to http for http_port and https for
-# https_port
-#
-# vport Virtual host port support. Using the http_port number
-# instead of the port passed on Host: headers.
-#
-# vport=NN Virtual host port support. Using the specified port
-# number instead of the port passed on Host: headers.
-#
-# act-as-origin
-# Act as if this Squid is the origin server.
-# This currently means generate new Date: and Expires:
-# headers on HIT instead of adding Age:.
-#
-# ignore-cc Ignore request Cache-Control headers.
-#
-# WARNING: This option violates HTTP specifications if
-# used in non-accelerator setups.
-#
-# allow-direct Allow direct forwarding in accelerator mode. Normally
-# accelerated requests are denied direct forwarding as if
-# never_direct was used.
-#
-# WARNING: this option opens accelerator mode to security
-# vulnerabilities usually only affecting in interception
-# mode. Make sure to protect forwarding with suitable
-# http_access rules when using this.
-#
-#
-# SSL Bump Mode Options:
-# In addition to these options ssl-bump requires TLS/SSL options.
-#
-# generate-host-certificates[=<on|off>]
-# Dynamically create SSL server certificates for the
-# destination hosts of bumped CONNECT requests.When
-# enabled, the cert and key options are used to sign
-# generated certificates. Otherwise generated
-# certificate will be selfsigned.
-# If there is a CA certificate lifetime of the generated
-# certificate equals lifetime of the CA certificate. If
-# generated certificate is selfsigned lifetime is three
-# years.
-# This option is enabled by default when ssl-bump is used.
-# See the ssl-bump option above for more information.
-#
-# dynamic_cert_mem_cache_size=SIZE
-# Approximate total RAM size spent on cached generated
-# certificates. If set to zero, caching is disabled. The
-# default value is 4MB.
-#
-# TLS / SSL Options:
-#
-# cert= Path to SSL certificate (PEM format).
-#
-# key= Path to SSL private key file (PEM format)
-# if not specified, the certificate file is
-# assumed to be a combined certificate and
-# key file.
-#
-# version= The version of SSL/TLS supported
-# 1 automatic (default)
-# 2 SSLv2 only
-# 3 SSLv3 only
-# 4 TLSv1.0 only
-# 5 TLSv1.1 only
-# 6 TLSv1.2 only
-#
-# cipher= Colon separated list of supported ciphers.
-# NOTE: some ciphers such as EDH ciphers depend on
-# additional settings. If those settings are
-# omitted the ciphers may be silently ignored
-# by the OpenSSL library.
-#
-# options= Various SSL implementation options. The most important
-# being:
-# NO_SSLv2 Disallow the use of SSLv2
-# NO_SSLv3 Disallow the use of SSLv3
-# NO_TLSv1 Disallow the use of TLSv1.0
-# NO_TLSv1_1 Disallow the use of TLSv1.1
-# NO_TLSv1_2 Disallow the use of TLSv1.2
-# SINGLE_DH_USE Always create a new key when using
-# temporary/ephemeral DH key exchanges
-# ALL Enable various bug workarounds
-# suggested as "harmless" by OpenSSL
-# Be warned that this reduces SSL/TLS
-# strength to some attacks.
-# See OpenSSL SSL_CTX_set_options documentation for a
-# complete list of options.
-#
-# clientca= File containing the list of CAs to use when
-# requesting a client certificate.
-#
-# cafile= File containing additional CA certificates to
-# use when verifying client certificates. If unset
-# clientca will be used.
-#
-# capath= Directory containing additional CA certificates
-# and CRL lists to use when verifying client certificates.
-#
-# crlfile= File of additional CRL lists to use when verifying
-# the client certificate, in addition to CRLs stored in
-# the capath. Implies VERIFY_CRL flag below.
-#
-# dhparams= File containing DH parameters for temporary/ephemeral
-# DH key exchanges. See OpenSSL documentation for details
-# on how to create this file.
-# WARNING: EDH ciphers will be silently disabled if this
-# option is not set.
-#
-# sslflags= Various flags modifying the use of SSL:
-# DELAYED_AUTH
-# Don't request client certificates
-# immediately, but wait until acl processing
-# requires a certificate (not yet implemented).
-# NO_DEFAULT_CA
-# Don't use the default CA lists built in
-# to OpenSSL.
-# NO_SESSION_REUSE
-# Don't allow for session reuse. Each connection
-# will result in a new SSL session.
-# VERIFY_CRL
-# Verify CRL lists when accepting client
-# certificates.
-# VERIFY_CRL_ALL
-# Verify CRL lists for all certificates in the
-# client certificate chain.
-#
-# sslcontext= SSL session ID context identifier.
-#
-# Other Options:
-#
-# connection-auth[=on|off]
-# use connection-auth=off to tell Squid to prevent
-# forwarding Microsoft connection oriented authentication
-# (NTLM, Negotiate and Kerberos)
-#
-# disable-pmtu-discovery=
-# Control Path-MTU discovery usage:
-# off lets OS decide on what to do (default).
-# transparent disable PMTU discovery when transparent
-# support is enabled.
-# always disable always PMTU discovery.
-#
-# In many setups of transparently intercepting proxies
-# Path-MTU discovery can not work on traffic towards the
-# clients. This is the case when the intercepting device
-# does not fully track connections and fails to forward
-# ICMP must fragment messages to the cache server. If you
-# have such setup and experience that certain clients
-# sporadically hang or never complete requests set
-# disable-pmtu-discovery option to 'transparent'.
-#
-# name= Specifies a internal name for the port. Defaults to
-# the port specification (port or addr:port)
-#
-# tcpkeepalive[=idle,interval,timeout]
-# Enable TCP keepalive probes of idle connections.
-# In seconds; idle is the initial time before TCP starts
-# probing the connection, interval how often to probe, and
-# timeout the time before giving up.
-#
-# If you run Squid on a dual-homed machine with an internal
-# and an external interface we recommend you to specify the
-# internal address:port in http_port. This way Squid will only be
-# visible on the internal address.
-#
-#
-
-# Squid normally listens to port 3128
-http_port 3128
-
-# TAG: https_port
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Usage: [ip:]port cert=certificate.pem [key=key.pem] [mode] [options...]
-#
-# The socket address where Squid will listen for client requests made
-# over TLS or SSL connections. Commonly referred to as HTTPS.
-#
-# This is most useful for situations where you are running squid in
-# accelerator mode and you want to do the SSL work at the accelerator level.
-#
-# You may specify multiple socket addresses on multiple lines,
-# each with their own SSL certificate and/or options.
-#
-# Modes:
-#
-# accel Accelerator / reverse proxy mode
-#
-# intercept Support for IP-Layer interception of
-# outgoing requests without browser settings.
-# NP: disables authentication and IPv6 on the port.
-#
-# tproxy Support Linux TPROXY for spoofing outgoing
-# connections using the client IP address.
-# NP: disables authentication and maybe IPv6 on the port.
-#
-# ssl-bump For each intercepted connection allowed by ssl_bump
-# ACLs, establish a secure connection with the client and with
-# the server, decrypt HTTPS messages as they pass through
-# Squid, and treat them as unencrypted HTTP messages,
-# becoming the man-in-the-middle.
-#
-# An "ssl_bump server-first" match is required to
-# fully enable bumping of intercepted SSL connections.
-#
-# Requires tproxy or intercept.
-#
-# Omitting the mode flag causes default forward proxy mode to be used.
-#
-#
-# See http_port for a list of generic options
-#
-#
-# SSL Options:
-#
-# cert= Path to SSL certificate (PEM format).
-#
-# key= Path to SSL private key file (PEM format)
-# if not specified, the certificate file is
-# assumed to be a combined certificate and
-# key file.
-#
-# version= The version of SSL/TLS supported
-# 1 automatic (default)
-# 2 SSLv2 only
-# 3 SSLv3 only
-# 4 TLSv1 only
-#
-# cipher= Colon separated list of supported ciphers.
-#
-# options= Various SSL engine options. The most important
-# being:
-# NO_SSLv2 Disallow the use of SSLv2
-# NO_SSLv3 Disallow the use of SSLv3
-# NO_TLSv1 Disallow the use of TLSv1
-# SINGLE_DH_USE Always create a new key when using
-# temporary/ephemeral DH key exchanges
-# See src/ssl_support.c or OpenSSL SSL_CTX_set_options
-# documentation for a complete list of options.
-#
-# clientca= File containing the list of CAs to use when
-# requesting a client certificate.
-#
-# cafile= File containing additional CA certificates to
-# use when verifying client certificates. If unset
-# clientca will be used.
-#
-# capath= Directory containing additional CA certificates
-# and CRL lists to use when verifying client certificates.
-#
-# crlfile= File of additional CRL lists to use when verifying
-# the client certificate, in addition to CRLs stored in
-# the capath. Implies VERIFY_CRL flag below.
-#
-# dhparams= File containing DH parameters for temporary/ephemeral
-# DH key exchanges.
-#
-# sslflags= Various flags modifying the use of SSL:
-# DELAYED_AUTH
-# Don't request client certificates
-# immediately, but wait until acl processing
-# requires a certificate (not yet implemented).
-# NO_DEFAULT_CA
-# Don't use the default CA lists built in
-# to OpenSSL.
-# NO_SESSION_REUSE
-# Don't allow for session reuse. Each connection
-# will result in a new SSL session.
-# VERIFY_CRL
-# Verify CRL lists when accepting client
-# certificates.
-# VERIFY_CRL_ALL
-# Verify CRL lists for all certificates in the
-# client certificate chain.
-#
-# sslcontext= SSL session ID context identifier.
-#
-# generate-host-certificates[=<on|off>]
-# Dynamically create SSL server certificates for the
-# destination hosts of bumped SSL requests.When
-# enabled, the cert and key options are used to sign
-# generated certificates. Otherwise generated
-# certificate will be selfsigned.
-# If there is CA certificate life time of generated
-# certificate equals lifetime of CA certificate. If
-# generated certificate is selfsigned lifetime is three
-# years.
-# This option is enabled by default when SslBump is used.
-# See the sslBump option above for more information.
-#
-# dynamic_cert_mem_cache_size=SIZE
-# Approximate total RAM size spent on cached generated
-# certificates. If set to zero, caching is disabled. The
-# default value is 4MB.
-#
-# See http_port for a list of available options.
-#Default:
-# none
-
-# TAG: tcp_outgoing_tos
-# Allows you to select a TOS/Diffserv value for packets outgoing
-# on the server side, based on an ACL.
-#
-# tcp_outgoing_tos ds-field [!]aclname ...
-#
-# Example where normal_service_net uses the TOS value 0x00
-# and good_service_net uses 0x20
-#
-# acl normal_service_net src 10.0.0.0/24
-# acl good_service_net src 10.0.1.0/24
-# tcp_outgoing_tos 0x00 normal_service_net
-# tcp_outgoing_tos 0x20 good_service_net
-#
-# TOS/DSCP values really only have local significance - so you should
-# know what you're specifying. For more information, see RFC2474,
-# RFC2475, and RFC3260.
-#
-# The TOS/DSCP byte must be exactly that - a octet value 0 - 255, or
-# "default" to use whatever default your host has. Note that in
-# practice often only multiples of 4 is usable as the two rightmost bits
-# have been redefined for use by ECN (RFC 3168 section 23.1).
-#
-# Processing proceeds in the order specified, and stops at first fully
-# matching line.
-#Default:
-# none
-
-# TAG: clientside_tos
-# Allows you to select a TOS/Diffserv value for packets being transmitted
-# on the client-side, based on an ACL.
-#
-# clientside_tos ds-field [!]aclname ...
-#
-# Example where normal_service_net uses the TOS value 0x00
-# and good_service_net uses 0x20
-#
-# acl normal_service_net src 10.0.0.0/24
-# acl good_service_net src 10.0.1.0/24
-# clientside_tos 0x00 normal_service_net
-# clientside_tos 0x20 good_service_net
-#
-# Note: This feature is incompatible with qos_flows. Any TOS values set here
-# will be overwritten by TOS values in qos_flows.
-#Default:
-# none
-
-# TAG: tcp_outgoing_mark
-# Note: This option is only available if Squid is rebuilt with the
-# Packet MARK (Linux)
-#
-# Allows you to apply a Netfilter mark value to outgoing packets
-# on the server side, based on an ACL.
-#
-# tcp_outgoing_mark mark-value [!]aclname ...
-#
-# Example where normal_service_net uses the mark value 0x00
-# and good_service_net uses 0x20
-#
-# acl normal_service_net src 10.0.0.0/24
-# acl good_service_net src 10.0.1.0/24
-# tcp_outgoing_mark 0x00 normal_service_net
-# tcp_outgoing_mark 0x20 good_service_net
-#Default:
-# none
-
-# TAG: clientside_mark
-# Note: This option is only available if Squid is rebuilt with the
-# Packet MARK (Linux)
-#
-# Allows you to apply a Netfilter mark value to packets being transmitted
-# on the client-side, based on an ACL.
-#
-# clientside_mark mark-value [!]aclname ...
-#
-# Example where normal_service_net uses the mark value 0x00
-# and good_service_net uses 0x20
-#
-# acl normal_service_net src 10.0.0.0/24
-# acl good_service_net src 10.0.1.0/24
-# clientside_mark 0x00 normal_service_net
-# clientside_mark 0x20 good_service_net
-#
-# Note: This feature is incompatible with qos_flows. Any mark values set here
-# will be overwritten by mark values in qos_flows.
-#Default:
-# none
-
-# TAG: qos_flows
-# Allows you to select a TOS/DSCP value to mark outgoing
-# connections to the client, based on where the reply was sourced.
-# For platforms using netfilter, allows you to set a netfilter mark
-# value instead of, or in addition to, a TOS value.
-#
-# By default this functionality is disabled. To enable it with the default
-# settings simply use "qos_flows mark" or "qos_flows tos". Default
-# settings will result in the netfilter mark or TOS value being copied
-# from the upstream connection to the client. Note that it is the connection
-# CONNMARK value not the packet MARK value that is copied.
-#
-# It is not currently possible to copy the mark or TOS value from the
-# client to the upstream connection request.
-#
-# TOS values really only have local significance - so you should
-# know what you're specifying. For more information, see RFC2474,
-# RFC2475, and RFC3260.
-#
-# The TOS/DSCP byte must be exactly that - a octet value 0 - 255. Note that
-# in practice often only multiples of 4 is usable as the two rightmost bits
-# have been redefined for use by ECN (RFC 3168 section 23.1).
-#
-# Mark values can be any unsigned 32-bit integer value.
-#
-# This setting is configured by setting the following values:
-#
-# tos|mark Whether to set TOS or netfilter mark values
-#
-# local-hit=0xFF Value to mark local cache hits.
-#
-# sibling-hit=0xFF Value to mark hits from sibling peers.
-#
-# parent-hit=0xFF Value to mark hits from parent peers.
-#
-# miss=0xFF[/mask] Value to mark cache misses. Takes precedence
-# over the preserve-miss feature (see below), unless
-# mask is specified, in which case only the bits
-# specified in the mask are written.
-#
-# The TOS variant of the following features are only possible on Linux
-# and require your kernel to be patched with the TOS preserving ZPH
-# patch, available from http://zph.bratcheda.org
-# No patch is needed to preserve the netfilter mark, which will work
-# with all variants of netfilter.
-#
-# disable-preserve-miss
-# This option disables the preservation of the TOS or netfilter
-# mark. By default, the existing TOS or netfilter mark value of
-# the response coming from the remote server will be retained
-# and masked with miss-mark.
-# NOTE: in the case of a netfilter mark, the mark must be set on
-# the connection (using the CONNMARK target) not on the packet
-# (MARK target).
-#
-# miss-mask=0xFF
-# Allows you to mask certain bits in the TOS or mark value
-# received from the remote server, before copying the value to
-# the TOS sent towards clients.
-# Default for tos: 0xFF (TOS from server is not changed).
-# Default for mark: 0xFFFFFFFF (mark from server is not changed).
-#
-# All of these features require the --enable-zph-qos compilation flag
-# (enabled by default). Netfilter marking also requires the
-# libnetfilter_conntrack libraries (--with-netfilter-conntrack) and
-# libcap 2.09+ (--with-libcap).
-#
-#Default:
-# none
-
-# TAG: tcp_outgoing_address
-# Allows you to map requests to different outgoing IP addresses
-# based on the username or source address of the user making
-# the request.
-#
-# tcp_outgoing_address ipaddr [[!]aclname] ...
-#
-# For example;
-# Forwarding clients with dedicated IPs for certain subnets.
-#
-# acl normal_service_net src 10.0.0.0/24
-# acl good_service_net src 10.0.2.0/24
-#
-# tcp_outgoing_address 2001:db8::c001 good_service_net
-# tcp_outgoing_address 10.1.0.2 good_service_net
-#
-# tcp_outgoing_address 2001:db8::beef normal_service_net
-# tcp_outgoing_address 10.1.0.1 normal_service_net
-#
-# tcp_outgoing_address 2001:db8::1
-# tcp_outgoing_address 10.1.0.3
-#
-# Processing proceeds in the order specified, and stops at first fully
-# matching line.
-#
-# Squid will add an implicit IP version test to each line.
-# Requests going to IPv4 websites will use the outgoing 10.1.0.* addresses.
-# Requests going to IPv6 websites will use the outgoing 2001:db8:* addresses.
-#
-#
-# NOTE: The use of this directive using client dependent ACLs is
-# incompatible with the use of server side persistent connections. To
-# ensure correct results it is best to set server_persistent_connections
-# to off when using this directive in such configurations.
-#
-# NOTE: The use of this directive to set a local IP on outgoing TCP links
-# is incompatible with using TPROXY to set client IP out outbound TCP links.
-# When needing to contact peers use the no-tproxy cache_peer option and the
-# client_dst_passthru directive re-enable normal forwarding such as this.
-#
-#Default:
-# Address selection is performed by the operating system.
-
-# TAG: host_verify_strict
-# Regardless of this option setting, when dealing with intercepted
-# traffic, Squid always verifies that the destination IP address matches
-# the Host header domain or IP (called 'authority form URL').
-#
-# This enforcement is performed to satisfy a MUST-level requirement in
-# RFC 2616 section 14.23: "The Host field value MUST represent the naming
-# authority of the origin server or gateway given by the original URL".
-#
-# When set to ON:
-# Squid always responds with an HTTP 409 (Conflict) error
-# page and logs a security warning if there is no match.
-#
-# Squid verifies that the destination IP address matches
-# the Host header for forward-proxy and reverse-proxy traffic
-# as well. For those traffic types, Squid also enables the
-# following checks, comparing the corresponding Host header
-# and Request-URI components:
-#
-# * The host names (domain or IP) must be identical,
-# but valueless or missing Host header disables all checks.
-# For the two host names to match, both must be either IP
-# or FQDN.
-#
-# * Port numbers must be identical, but if a port is missing
-# the scheme-default port is assumed.
-#
-#
-# When set to OFF (the default):
-# Squid allows suspicious requests to continue but logs a
-# security warning and blocks caching of the response.
-#
-# * Forward-proxy traffic is not checked at all.
-#
-# * Reverse-proxy traffic is not checked at all.
-#
-# * Intercepted traffic which passes verification is handled
-# according to client_dst_passthru.
-#
-# * Intercepted requests which fail verification are sent
-# to the client original destination instead of DIRECT.
-# This overrides 'client_dst_passthru off'.
-#
-# For now suspicious intercepted CONNECT requests are always
-# responded to with an HTTP 409 (Conflict) error page.
-#
-#
-# SECURITY NOTE:
-#
-# As described in CVE-2009-0801 when the Host: header alone is used
-# to determine the destination of a request it becomes trivial for
-# malicious scripts on remote websites to bypass browser same-origin
-# security policy and sandboxing protections.
-#
-# The cause of this is that such applets are allowed to perform their
-# own HTTP stack, in which case the same-origin policy of the browser
-# sandbox only verifies that the applet tries to contact the same IP
-# as from where it was loaded at the IP level. The Host: header may
-# be different from the connected IP and approved origin.
-#
-#Default:
-# host_verify_strict off
-
-# TAG: client_dst_passthru
-# With NAT or TPROXY intercepted traffic Squid may pass the request
-# directly to the original client destination IP or seek a faster
-# source using the HTTP Host header.
-#
-# Using Host to locate alternative servers can provide faster
-# connectivity with a range of failure recovery options.
-# But can also lead to connectivity trouble when the client and
-# server are attempting stateful interactions unaware of the proxy.
-#
-# This option (on by default) prevents alternative DNS entries being
-# located to send intercepted traffic DIRECT to an origin server.
-# The clients original destination IP and port will be used instead.
-#
-# Regardless of this option setting, when dealing with intercepted
-# traffic Squid will verify the Host: header and any traffic which
-# fails Host verification will be treated as if this option were ON.
-#
-# see host_verify_strict for details on the verification process.
-#Default:
-# client_dst_passthru on
-
-# SSL OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: ssl_unclean_shutdown
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Some browsers (especially MSIE) bugs out on SSL shutdown
-# messages.
-#Default:
-# ssl_unclean_shutdown off
-
-# TAG: ssl_engine
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# The OpenSSL engine to use. You will need to set this if you
-# would like to use hardware SSL acceleration for example.
-#Default:
-# none
-
-# TAG: sslproxy_client_certificate
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Client SSL Certificate to use when proxying https:// URLs
-#Default:
-# none
-
-# TAG: sslproxy_client_key
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Client SSL Key to use when proxying https:// URLs
-#Default:
-# none
-
-# TAG: sslproxy_version
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# SSL version level to use when proxying https:// URLs
-#
-# The versions of SSL/TLS supported:
-#
-# 1 automatic (default)
-# 2 SSLv2 only
-# 3 SSLv3 only
-# 4 TLSv1.0 only
-# 5 TLSv1.1 only
-# 6 TLSv1.2 only
-#Default:
-# automatic SSL/TLS version negotiation
-
-# TAG: sslproxy_options
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# SSL implementation options to use when proxying https:// URLs
-#
-# The most important being:
-#
-# NO_SSLv2 Disallow the use of SSLv2
-# NO_SSLv3 Disallow the use of SSLv3
-# NO_TLSv1 Disallow the use of TLSv1.0
-# NO_TLSv1_1 Disallow the use of TLSv1.1
-# NO_TLSv1_2 Disallow the use of TLSv1.2
-# SINGLE_DH_USE
-# Always create a new key when using temporary/ephemeral
-# DH key exchanges
-# SSL_OP_NO_TICKET
-# Disable use of RFC5077 session tickets. Some servers
-# may have problems understanding the TLS extension due
-# to ambiguous specification in RFC4507.
-# ALL Enable various bug workarounds suggested as "harmless"
-# by OpenSSL. Be warned that this may reduce SSL/TLS
-# strength to some attacks.
-#
-# See the OpenSSL SSL_CTX_set_options documentation for a
-# complete list of possible options.
-#Default:
-# none
-
-# TAG: sslproxy_cipher
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# SSL cipher list to use when proxying https:// URLs
-#
-# Colon separated list of supported ciphers.
-#Default:
-# none
-
-# TAG: sslproxy_cafile
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# file containing CA certificates to use when verifying server
-# certificates while proxying https:// URLs
-#Default:
-# none
-
-# TAG: sslproxy_capath
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# directory containing CA certificates to use when verifying
-# server certificates while proxying https:// URLs
-#Default:
-# none
-
-# TAG: ssl_bump
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# This option is consulted when a CONNECT request is received on
-# an http_port (or a new connection is intercepted at an
-# https_port), provided that port was configured with an ssl-bump
-# flag. The subsequent data on the connection is either treated as
-# HTTPS and decrypted OR tunneled at TCP level without decryption,
-# depending on the first bumping "mode" which ACLs match.
-#
-# ssl_bump <mode> [!]acl ...
-#
-# The following bumping modes are supported:
-#
-# client-first
-# Allow bumping of the connection. Establish a secure connection
-# with the client first, then connect to the server. This old mode
-# does not allow Squid to mimic server SSL certificate and does
-# not work with intercepted SSL connections.
-#
-# server-first
-# Allow bumping of the connection. Establish a secure connection
-# with the server first, then establish a secure connection with
-# the client, using a mimicked server certificate. Works with both
-# CONNECT requests and intercepted SSL connections.
-#
-# none
-# Become a TCP tunnel without decoding the connection.
-# Works with both CONNECT requests and intercepted SSL
-# connections. This is the default behavior when no
-# ssl_bump option is given or no ssl_bump ACLs match.
-#
-# By default, no connections are bumped.
-#
-# The first matching ssl_bump option wins. If no ACLs match, the
-# connection is not bumped. Unlike most allow/deny ACL lists, ssl_bump
-# does not have an implicit "negate the last given option" rule. You
-# must make that rule explicit if you convert old ssl_bump allow/deny
-# rules that rely on such an implicit rule.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-# See also: http_port ssl-bump, https_port ssl-bump
-#
-#
-# # Example: Bump all requests except those originating from
-# # localhost or those going to example.com.
-#
-# acl broken_sites dstdomain .example.com
-# ssl_bump none localhost
-# ssl_bump none broken_sites
-# ssl_bump server-first all
-#Default:
-# Does not bump unless rules are present in squid.conf
-
-# TAG: sslproxy_flags
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Various flags modifying the use of SSL while proxying https:// URLs:
-# DONT_VERIFY_PEER Accept certificates that fail verification.
-# For refined control, see sslproxy_cert_error.
-# NO_DEFAULT_CA Don't use the default CA list built in
-# to OpenSSL.
-#Default:
-# none
-
-# TAG: sslproxy_cert_error
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Use this ACL to bypass server certificate validation errors.
-#
-# For example, the following lines will bypass all validation errors
-# when talking to servers for example.com. All other
-# validation errors will result in ERR_SECURE_CONNECT_FAIL error.
-#
-# acl BrokenButTrustedServers dstdomain example.com
-# sslproxy_cert_error allow BrokenButTrustedServers
-# sslproxy_cert_error deny all
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-# Using slow acl types may result in server crashes
-#
-# Without this option, all server certificate validation errors
-# terminate the transaction to protect Squid and the client.
-#
-# SQUID_X509_V_ERR_INFINITE_VALIDATION error cannot be bypassed
-# but should not happen unless your OpenSSL library is buggy.
-#
-# SECURITY WARNING:
-# Bypassing validation errors is dangerous because an
-# error usually implies that the server cannot be trusted
-# and the connection may be insecure.
-#
-# See also: sslproxy_flags and DONT_VERIFY_PEER.
-#Default:
-# Server certificate errors terminate the transaction.
-
-# TAG: sslproxy_cert_sign
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-#
-# sslproxy_cert_sign <signing algorithm> acl ...
-#
-# The following certificate signing algorithms are supported:
-#
-# signTrusted
-# Sign using the configured CA certificate which is usually
-# placed in and trusted by end-user browsers. This is the
-# default for trusted origin server certificates.
-#
-# signUntrusted
-# Sign to guarantee an X509_V_ERR_CERT_UNTRUSTED browser error.
-# This is the default for untrusted origin server certificates
-# that are not self-signed (see ssl::certUntrusted).
-#
-# signSelf
-# Sign using a self-signed certificate with the right CN to
-# generate a X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT error in the
-# browser. This is the default for self-signed origin server
-# certificates (see ssl::certSelfSigned).
-#
-# This clause only supports fast acl types.
-#
-# When sslproxy_cert_sign acl(s) match, Squid uses the corresponding
-# signing algorithm to generate the certificate and ignores all
-# subsequent sslproxy_cert_sign options (the first match wins). If no
-# acl(s) match, the default signing algorithm is determined by errors
-# detected when obtaining and validating the origin server certificate.
-#
-# WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can
-# be used with sslproxy_cert_adapt, but if and only if Squid is bumping a
-# CONNECT request that carries a domain name. In all other cases (CONNECT
-# to an IP address or an intercepted SSL connection), Squid cannot detect
-# the domain mismatch at certificate generation time when
-# bump-server-first is used.
-#Default:
-# none
-
-# TAG: sslproxy_cert_adapt
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-#
-# sslproxy_cert_adapt <adaptation algorithm> acl ...
-#
-# The following certificate adaptation algorithms are supported:
-#
-# setValidAfter
-# Sets the "Not After" property to the "Not After" property of
-# the CA certificate used to sign generated certificates.
-#
-# setValidBefore
-# Sets the "Not Before" property to the "Not Before" property of
-# the CA certificate used to sign generated certificates.
-#
-# setCommonName or setCommonName{CN}
-# Sets Subject.CN property to the host name specified as a
-# CN parameter or, if no explicit CN parameter was specified,
-# extracted from the CONNECT request. It is a misconfiguration
-# to use setCommonName without an explicit parameter for
-# intercepted or tproxied SSL connections.
-#
-# This clause only supports fast acl types.
-#
-# Squid first groups sslproxy_cert_adapt options by adaptation algorithm.
-# Within a group, when sslproxy_cert_adapt acl(s) match, Squid uses the
-# corresponding adaptation algorithm to generate the certificate and
-# ignores all subsequent sslproxy_cert_adapt options in that algorithm's
-# group (i.e., the first match wins within each algorithm group). If no
-# acl(s) match, the default mimicking action takes place.
-#
-# WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can
-# be used with sslproxy_cert_adapt, but if and only if Squid is bumping a
-# CONNECT request that carries a domain name. In all other cases (CONNECT
-# to an IP address or an intercepted SSL connection), Squid cannot detect
-# the domain mismatch at certificate generation time when
-# bump-server-first is used.
-#Default:
-# none
-
-# TAG: sslpassword_program
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Specify a program used for entering SSL key passphrases
-# when using encrypted SSL certificate keys. If not specified
-# keys must either be unencrypted, or Squid started with the -N
-# option to allow it to query interactively for the passphrase.
-#
-# The key file name is given as argument to the program allowing
-# selection of the right password if you have multiple encrypted
-# keys.
-#Default:
-# none
-
-# OPTIONS RELATING TO EXTERNAL SSL_CRTD
-# -----------------------------------------------------------------------------
-
-# TAG: sslcrtd_program
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl-crtd
-#
-# Specify the location and options of the executable for ssl_crtd process.
-# /usr/libexec/ssl_crtd program requires -s and -M parameters
-# For more information use:
-# /usr/libexec/ssl_crtd -h
-#Default:
-# sslcrtd_program /usr/libexec/ssl_crtd -s /var/log/squid/lib/ssl_db -M 4MB
-
-# TAG: sslcrtd_children
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl-crtd
-#
-# The maximum number of processes spawn to service ssl server.
-# The maximum this may be safely set to is 32.
-#
-# The startup= and idle= options allow some measure of skew in your
-# tuning.
-#
-# startup=N
-#
-# Sets the minimum number of processes to spawn when Squid
-# starts or reconfigures. When set to zero the first request will
-# cause spawning of the first child process to handle it.
-#
-# Starting too few children temporary slows Squid under load while it
-# tries to spawn enough additional processes to cope with traffic.
-#
-# idle=N
-#
-# Sets a minimum of how many processes Squid is to try and keep available
-# at all times. When traffic begins to rise above what the existing
-# processes can handle this many more will be spawned up to the maximum
-# configured. A minimum setting of 1 is required.
-#
-# You must have at least one ssl_crtd process.
-#Default:
-# sslcrtd_children 32 startup=5 idle=1
-
-# TAG: sslcrtvalidator_program
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Specify the location and options of the executable for ssl_crt_validator
-# process.
-#
-# Usage: sslcrtvalidator_program [ttl=n] [cache=n] path ...
-#
-# Options:
-# ttl=n TTL in seconds for cached results. The default is 60 secs
-# cache=n limit the result cache size. The default value is 2048
-#Default:
-# none
-
-# TAG: sslcrtvalidator_children
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# The maximum number of processes spawn to service SSL server.
-# The maximum this may be safely set to is 32.
-#
-# The startup= and idle= options allow some measure of skew in your
-# tuning.
-#
-# startup=N
-#
-# Sets the minimum number of processes to spawn when Squid
-# starts or reconfigures. When set to zero the first request will
-# cause spawning of the first child process to handle it.
-#
-# Starting too few children temporary slows Squid under load while it
-# tries to spawn enough additional processes to cope with traffic.
-#
-# idle=N
-#
-# Sets a minimum of how many processes Squid is to try and keep available
-# at all times. When traffic begins to rise above what the existing
-# processes can handle this many more will be spawned up to the maximum
-# configured. A minimum setting of 1 is required.
-#
-# concurrency=
-#
-# The number of requests each certificate validator helper can handle in
-# parallel. A value of 0 indicates the certficate validator does not
-# support concurrency. Defaults to 1.
-#
-# When this directive is set to a value >= 1 then the protocol
-# used to communicate with the helper is modified to include
-# a request ID in front of the request/response. The request
-# ID from the request must be echoed back with the response
-# to that request.
-#
-# You must have at least one ssl_crt_validator process.
-#Default:
-# sslcrtvalidator_children 32 startup=5 idle=1 concurrency=1
-
-# OPTIONS WHICH AFFECT THE NEIGHBOR SELECTION ALGORITHM
-# -----------------------------------------------------------------------------
-
-# TAG: cache_peer
-# To specify other caches in a hierarchy, use the format:
-#
-# cache_peer hostname type http-port icp-port [options]
-#
-# For example,
-#
-# # proxy icp
-# # hostname type port port options
-# # -------------------- -------- ----- ----- -----------
-# cache_peer parent.foo.net parent 3128 3130 default
-# cache_peer sib1.foo.net sibling 3128 3130 proxy-only
-# cache_peer sib2.foo.net sibling 3128 3130 proxy-only
-# cache_peer example.com parent 80 0 default
-# cache_peer cdn.example.com sibling 3128 0
-#
-# type: either 'parent', 'sibling', or 'multicast'.
-#
-# proxy-port: The port number where the peer accept HTTP requests.
-# For other Squid proxies this is usually 3128
-# For web servers this is usually 80
-#
-# icp-port: Used for querying neighbor caches about objects.
-# Set to 0 if the peer does not support ICP or HTCP.
-# See ICP and HTCP options below for additional details.
-#
-#
-# ==== ICP OPTIONS ====
-#
-# You MUST also set icp_port and icp_access explicitly when using these options.
-# The defaults will prevent peer traffic using ICP.
-#
-#
-# no-query Disable ICP queries to this neighbor.
-#
-# multicast-responder
-# Indicates the named peer is a member of a multicast group.
-# ICP queries will not be sent directly to the peer, but ICP
-# replies will be accepted from it.
-#
-# closest-only Indicates that, for ICP_OP_MISS replies, we'll only forward
-# CLOSEST_PARENT_MISSes and never FIRST_PARENT_MISSes.
-#
-# background-ping
-# To only send ICP queries to this neighbor infrequently.
-# This is used to keep the neighbor round trip time updated
-# and is usually used in conjunction with weighted-round-robin.
-#
-#
-# ==== HTCP OPTIONS ====
-#
-# You MUST also set htcp_port and htcp_access explicitly when using these options.
-# The defaults will prevent peer traffic using HTCP.
-#
-#
-# htcp Send HTCP, instead of ICP, queries to the neighbor.
-# You probably also want to set the "icp-port" to 4827
-# instead of 3130. This directive accepts a comma separated
-# list of options described below.
-#
-# htcp=oldsquid Send HTCP to old Squid versions (2.5 or earlier).
-#
-# htcp=no-clr Send HTCP to the neighbor but without
-# sending any CLR requests. This cannot be used with
-# only-clr.
-#
-# htcp=only-clr Send HTCP to the neighbor but ONLY CLR requests.
-# This cannot be used with no-clr.
-#
-# htcp=no-purge-clr
-# Send HTCP to the neighbor including CLRs but only when
-# they do not result from PURGE requests.
-#
-# htcp=forward-clr
-# Forward any HTCP CLR requests this proxy receives to the peer.
-#
-#
-# ==== PEER SELECTION METHODS ====
-#
-# The default peer selection method is ICP, with the first responding peer
-# being used as source. These options can be used for better load balancing.
-#
-#
-# default This is a parent cache which can be used as a "last-resort"
-# if a peer cannot be located by any of the peer-selection methods.
-# If specified more than once, only the first is used.
-#
-# round-robin Load-Balance parents which should be used in a round-robin
-# fashion in the absence of any ICP queries.
-# weight=N can be used to add bias.
-#
-# weighted-round-robin
-# Load-Balance parents which should be used in a round-robin
-# fashion with the frequency of each parent being based on the
-# round trip time. Closer parents are used more often.
-# Usually used for background-ping parents.
-# weight=N can be used to add bias.
-#
-# carp Load-Balance parents which should be used as a CARP array.
-# The requests will be distributed among the parents based on the
-# CARP load balancing hash function based on their weight.
-#
-# userhash Load-balance parents based on the client proxy_auth or ident username.
-#
-# sourcehash Load-balance parents based on the client source IP.
-#
-# multicast-siblings
-# To be used only for cache peers of type "multicast".
-# ALL members of this multicast group have "sibling"
-# relationship with it, not "parent". This is to a multicast
-# group when the requested object would be fetched only from
-# a "parent" cache, anyway. It's useful, e.g., when
-# configuring a pool of redundant Squid proxies, being
-# members of the same multicast group.
-#
-#
-# ==== PEER SELECTION OPTIONS ====
-#
-# weight=N use to affect the selection of a peer during any weighted
-# peer-selection mechanisms.
-# The weight must be an integer; default is 1,
-# larger weights are favored more.
-# This option does not affect parent selection if a peering
-# protocol is not in use.
-#
-# basetime=N Specify a base amount to be subtracted from round trip
-# times of parents.
-# It is subtracted before division by weight in calculating
-# which parent to fectch from. If the rtt is less than the
-# base time the rtt is set to a minimal value.
-#
-# ttl=N Specify a TTL to use when sending multicast ICP queries
-# to this address.
-# Only useful when sending to a multicast group.
-# Because we don't accept ICP replies from random
-# hosts, you must configure other group members as
-# peers with the 'multicast-responder' option.
-#
-# no-delay To prevent access to this neighbor from influencing the
-# delay pools.
-#
-# digest-url=URL Tell Squid to fetch the cache digest (if digests are
-# enabled) for this host from the specified URL rather
-# than the Squid default location.
-#
-#
-# ==== CARP OPTIONS ====
-#
-# carp-key=key-specification
-# use a different key than the full URL to hash against the peer.
-# the key-specification is a comma-separated list of the keywords
-# scheme, host, port, path, params
-# Order is not important.
-#
-# ==== ACCELERATOR / REVERSE-PROXY OPTIONS ====
-#
-# originserver Causes this parent to be contacted as an origin server.
-# Meant to be used in accelerator setups when the peer
-# is a web server.
-#
-# forceddomain=name
-# Set the Host header of requests forwarded to this peer.
-# Useful in accelerator setups where the server (peer)
-# expects a certain domain name but clients may request
-# others. ie example.com or www.example.com
-#
-# no-digest Disable request of cache digests.
-#
-# no-netdb-exchange
-# Disables requesting ICMP RTT database (NetDB).
-#
-#
-# ==== AUTHENTICATION OPTIONS ====
-#
-# login=user:password
-# If this is a personal/workgroup proxy and your parent
-# requires proxy authentication.
-#
-# Note: The string can include URL escapes (i.e. %20 for
-# spaces). This also means % must be written as %%.
-#
-# login=PASSTHRU
-# Send login details received from client to this peer.
-# Both Proxy- and WWW-Authorization headers are passed
-# without alteration to the peer.
-# Authentication is not required by Squid for this to work.
-#
-# Note: This will pass any form of authentication but
-# only Basic auth will work through a proxy unless the
-# connection-auth options are also used.
-#
-# login=PASS Send login details received from client to this peer.
-# Authentication is not required by this option.
-#
-# If there are no client-provided authentication headers
-# to pass on, but username and password are available
-# from an external ACL user= and password= result tags
-# they may be sent instead.
-#
-# Note: To combine this with proxy_auth both proxies must
-# share the same user database as HTTP only allows for
-# a single login (one for proxy, one for origin server).
-# Also be warned this will expose your users proxy
-# password to the peer. USE WITH CAUTION
-#
-# login=*:password
-# Send the username to the upstream cache, but with a
-# fixed password. This is meant to be used when the peer
-# is in another administrative domain, but it is still
-# needed to identify each user.
-# The star can optionally be followed by some extra
-# information which is added to the username. This can
-# be used to identify this proxy to the peer, similar to
-# the login=username:password option above.
-#
-# login=NEGOTIATE
-# If this is a personal/workgroup proxy and your parent
-# requires a secure proxy authentication.
-# The first principal from the default keytab or defined by
-# the environment variable KRB5_KTNAME will be used.
-#
-# WARNING: The connection may transmit requests from multiple
-# clients. Negotiate often assumes end-to-end authentication
-# and a single-client. Which is not strictly true here.
-#
-# login=NEGOTIATE:principal_name
-# If this is a personal/workgroup proxy and your parent
-# requires a secure proxy authentication.
-# The principal principal_name from the default keytab or
-# defined by the environment variable KRB5_KTNAME will be
-# used.
-#
-# WARNING: The connection may transmit requests from multiple
-# clients. Negotiate often assumes end-to-end authentication
-# and a single-client. Which is not strictly true here.
-#
-# connection-auth=on|off
-# Tell Squid that this peer does or not support Microsoft
-# connection oriented authentication, and any such
-# challenges received from there should be ignored.
-# Default is auto to automatically determine the status
-# of the peer.
-#
-#
-# ==== SSL / HTTPS / TLS OPTIONS ====
-#
-# ssl Encrypt connections to this peer with SSL/TLS.
-#
-# sslcert=/path/to/ssl/certificate
-# A client SSL certificate to use when connecting to
-# this peer.
-#
-# sslkey=/path/to/ssl/key
-# The private SSL key corresponding to sslcert above.
-# If 'sslkey' is not specified 'sslcert' is assumed to
-# reference a combined file containing both the
-# certificate and the key.
-#
-# sslversion=1|2|3|4|5|6
-# The SSL version to use when connecting to this peer
-# 1 = automatic (default)
-# 2 = SSL v2 only
-# 3 = SSL v3 only
-# 4 = TLS v1.0 only
-# 5 = TLS v1.1 only
-# 6 = TLS v1.2 only
-#
-# sslcipher=... The list of valid SSL ciphers to use when connecting
-# to this peer.
-#
-# ssloptions=... Specify various SSL implementation options:
-#
-# NO_SSLv2 Disallow the use of SSLv2
-# NO_SSLv3 Disallow the use of SSLv3
-# NO_TLSv1 Disallow the use of TLSv1.0
-# NO_TLSv1_1 Disallow the use of TLSv1.1
-# NO_TLSv1_2 Disallow the use of TLSv1.2
-# SINGLE_DH_USE
-# Always create a new key when using
-# temporary/ephemeral DH key exchanges
-# ALL Enable various bug workarounds
-# suggested as "harmless" by OpenSSL
-# Be warned that this reduces SSL/TLS
-# strength to some attacks.
-#
-# See the OpenSSL SSL_CTX_set_options documentation for a
-# more complete list.
-#
-# sslcafile=... A file containing additional CA certificates to use
-# when verifying the peer certificate.
-#
-# sslcapath=... A directory containing additional CA certificates to
-# use when verifying the peer certificate.
-#
-# sslcrlfile=... A certificate revocation list file to use when
-# verifying the peer certificate.
-#
-# sslflags=... Specify various flags modifying the SSL implementation:
-#
-# DONT_VERIFY_PEER
-# Accept certificates even if they fail to
-# verify.
-# NO_DEFAULT_CA
-# Don't use the default CA list built in
-# to OpenSSL.
-# DONT_VERIFY_DOMAIN
-# Don't verify the peer certificate
-# matches the server name
-#
-# ssldomain= The peer name as advertised in it's certificate.
-# Used for verifying the correctness of the received peer
-# certificate. If not specified the peer hostname will be
-# used.
-#
-# front-end-https
-# Enable the "Front-End-Https: On" header needed when
-# using Squid as a SSL frontend in front of Microsoft OWA.
-# See MS KB document Q307347 for details on this header.
-# If set to auto the header will only be added if the
-# request is forwarded as a https:// URL.
-#
-#
-# ==== GENERAL OPTIONS ====
-#
-# connect-timeout=N
-# A peer-specific connect timeout.
-# Also see the peer_connect_timeout directive.
-#
-# connect-fail-limit=N
-# How many times connecting to a peer must fail before
-# it is marked as down. Default is 10.
-#
-# allow-miss Disable Squid's use of only-if-cached when forwarding
-# requests to siblings. This is primarily useful when
-# icp_hit_stale is used by the sibling. To extensive use
-# of this option may result in forwarding loops, and you
-# should avoid having two-way peerings with this option.
-# For example to deny peer usage on requests from peer
-# by denying cache_peer_access if the source is a peer.
-#
-# max-conn=N Limit the amount of connections Squid may open to this
-# peer. see also
-#
-# name=xxx Unique name for the peer.
-# Required if you have multiple peers on the same host
-# but different ports.
-# This name can be used in cache_peer_access and similar
-# directives to dentify the peer.
-# Can be used by outgoing access controls through the
-# peername ACL type.
-#
-# no-tproxy Do not use the client-spoof TPROXY support when forwarding
-# requests to this peer. Use normal address selection instead.
-# This overrides the spoof_client_ip ACL.
-#
-# proxy-only objects fetched from the peer will not be stored locally.
-#
-#Default:
-# none
-
-# TAG: cache_peer_domain
-# Use to limit the domains for which a neighbor cache will be
-# queried.
-#
-# Usage:
-# cache_peer_domain cache-host domain [domain ...]
-# cache_peer_domain cache-host !domain
-#
-# For example, specifying
-#
-# cache_peer_domain parent.foo.net .edu
-#
-# has the effect such that UDP query packets are sent to
-# 'bigserver' only when the requested object exists on a
-# server in the .edu domain. Prefixing the domainname
-# with '!' means the cache will be queried for objects
-# NOT in that domain.
-#
-# NOTE: * Any number of domains may be given for a cache-host,
-# either on the same or separate lines.
-# * When multiple domains are given for a particular
-# cache-host, the first matched domain is applied.
-# * Cache hosts with no domain restrictions are queried
-# for all requests.
-# * There are no defaults.
-# * There is also a 'cache_peer_access' tag in the ACL
-# section.
-#Default:
-# none
-
-# TAG: cache_peer_access
-# Similar to 'cache_peer_domain' but provides more flexibility by
-# using ACL elements.
-#
-# Usage:
-# cache_peer_access cache-host allow|deny [!]aclname ...
-#
-# The syntax is identical to 'http_access' and the other lists of
-# ACL elements. See the comments for 'http_access' below, or
-# the Squid FAQ (http://wiki.squid-cache.org/SquidFaq/SquidAcl).
-#Default:
-# none
-
-# TAG: neighbor_type_domain
-# Modify the cache_peer neighbor type when passing requests
-# about specific domains to the peer.
-#
-# Usage:
-# neighbor_type_domain neighbor parent|sibling domain domain ...
-#
-# For example:
-# cache_peer foo.example.com parent 3128 3130
-# neighbor_type_domain foo.example.com sibling .au .de
-#
-# The above configuration treats all requests to foo.example.com as a
-# parent proxy unless the request is for a .au or .de ccTLD domain name.
-#Default:
-# The peer type from cache_peer directive is used for all requests to that peer.
-
-# TAG: dead_peer_timeout (seconds)
-# This controls how long Squid waits to declare a peer cache
-# as "dead." If there are no ICP replies received in this
-# amount of time, Squid will declare the peer dead and not
-# expect to receive any further ICP replies. However, it
-# continues to send ICP queries, and will mark the peer as
-# alive upon receipt of the first subsequent ICP reply.
-#
-# This timeout also affects when Squid expects to receive ICP
-# replies from peers. If more than 'dead_peer' seconds have
-# passed since the last ICP reply was received, Squid will not
-# expect to receive an ICP reply on the next query. Thus, if
-# your time between requests is greater than this timeout, you
-# will see a lot of requests sent DIRECT to origin servers
-# instead of to your parents.
-#Default:
-# dead_peer_timeout 10 seconds
-
-# TAG: forward_max_tries
-# Controls how many different forward paths Squid will try
-# before giving up. See also forward_timeout.
-#
-# NOTE: connect_retries (default: none) can make each of these
-# possible forwarding paths be tried multiple times.
-#Default:
-# forward_max_tries 10
-
-# TAG: hierarchy_stoplist
-# A list of words which, if found in a URL, cause the object to
-# be handled directly by this cache. In other words, use this
-# to not query neighbor caches for certain objects. You may
-# list this option multiple times.
-#
-# Example:
-# hierarchy_stoplist cgi-bin ?
-#
-# Note: never_direct overrides this option.
-#Default:
-# none
-
-# MEMORY CACHE OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: cache_mem (bytes)
-# NOTE: THIS PARAMETER DOES NOT SPECIFY THE MAXIMUM PROCESS SIZE.
-# IT ONLY PLACES A LIMIT ON HOW MUCH ADDITIONAL MEMORY SQUID WILL
-# USE AS A MEMORY CACHE OF OBJECTS. SQUID USES MEMORY FOR OTHER
-# THINGS AS WELL. SEE THE SQUID FAQ SECTION 8 FOR DETAILS.
-#
-# 'cache_mem' specifies the ideal amount of memory to be used
-# for:
-# * In-Transit objects
-# * Hot Objects
-# * Negative-Cached objects
-#
-# Data for these objects are stored in 4 KB blocks. This
-# parameter specifies the ideal upper limit on the total size of
-# 4 KB blocks allocated. In-Transit objects take the highest
-# priority.
-#
-# In-transit objects have priority over the others. When
-# additional space is needed for incoming data, negative-cached
-# and hot objects will be released. In other words, the
-# negative-cached and hot objects will fill up any unused space
-# not needed for in-transit objects.
-#
-# If circumstances require, this limit will be exceeded.
-# Specifically, if your incoming request rate requires more than
-# 'cache_mem' of memory to hold in-transit objects, Squid will
-# exceed this limit to satisfy the new requests. When the load
-# decreases, blocks will be freed until the high-water mark is
-# reached. Thereafter, blocks will be used to store hot
-# objects.
-#
-# If shared memory caching is enabled, Squid does not use the shared
-# cache space for in-transit objects, but they still consume as much
-# local memory as they need. For more details about the shared memory
-# cache, see memory_cache_shared.
-#Default:
-# cache_mem 256 MB
-
-# TAG: maximum_object_size_in_memory (bytes)
-# Objects greater than this size will not be attempted to kept in
-# the memory cache. This should be set high enough to keep objects
-# accessed frequently in memory to improve performance whilst low
-# enough to keep larger objects from hoarding cache_mem.
-#Default:
-# maximum_object_size_in_memory 512 KB
-
-# TAG: memory_cache_shared on|off
-# Controls whether the memory cache is shared among SMP workers.
-#
-# The shared memory cache is meant to occupy cache_mem bytes and replace
-# the non-shared memory cache, although some entities may still be
-# cached locally by workers for now (e.g., internal and in-transit
-# objects may be served from a local memory cache even if shared memory
-# caching is enabled).
-#
-# By default, the memory cache is shared if and only if all of the
-# following conditions are satisfied: Squid runs in SMP mode with
-# multiple workers, cache_mem is positive, and Squid environment
-# supports required IPC primitives (e.g., POSIX shared memory segments
-# and GCC-style atomic operations).
-#
-# To avoid blocking locks, shared memory uses opportunistic algorithms
-# that do not guarantee that every cachable entity that could have been
-# shared among SMP workers will actually be shared.
-#
-# Currently, entities exceeding 32KB in size cannot be shared.
-#Default:
-# "on" where supported if doing memory caching with multiple SMP workers.
-
-# TAG: memory_cache_mode
-# Controls which objects to keep in the memory cache (cache_mem)
-#
-# always Keep most recently fetched objects in memory (default)
-#
-# disk Only disk cache hits are kept in memory, which means
-# an object must first be cached on disk and then hit
-# a second time before cached in memory.
-#
-# network Only objects fetched from network is kept in memory
-#Default:
-# Keep the most recently fetched objects in memory
-
-# TAG: memory_replacement_policy
-# The memory replacement policy parameter determines which
-# objects are purged from memory when memory space is needed.
-#
-# See cache_replacement_policy for details on algorithms.
-#Default:
-# memory_replacement_policy lru
-
-# DISK CACHE OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: cache_replacement_policy
-# The cache replacement policy parameter determines which
-# objects are evicted (replaced) when disk space is needed.
-#
-# lru : Squid's original list based LRU policy
-# heap GDSF : Greedy-Dual Size Frequency
-# heap LFUDA: Least Frequently Used with Dynamic Aging
-# heap LRU : LRU policy implemented using a heap
-#
-# Applies to any cache_dir lines listed below this directive.
-#
-# The LRU policies keeps recently referenced objects.
-#
-# The heap GDSF policy optimizes object hit rate by keeping smaller
-# popular objects in cache so it has a better chance of getting a
-# hit. It achieves a lower byte hit rate than LFUDA though since
-# it evicts larger (possibly popular) objects.
-#
-# The heap LFUDA policy keeps popular objects in cache regardless of
-# their size and thus optimizes byte hit rate at the expense of
-# hit rate since one large, popular object will prevent many
-# smaller, slightly less popular objects from being cached.
-#
-# Both policies utilize a dynamic aging mechanism that prevents
-# cache pollution that can otherwise occur with frequency-based
-# replacement policies.
-#
-# NOTE: if using the LFUDA replacement policy you should increase
-# the value of maximum_object_size above its default of 4 MB to
-# to maximize the potential byte hit rate improvement of LFUDA.
-#
-# For more information about the GDSF and LFUDA cache replacement
-# policies see http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html
-# and http://fog.hpl.external.hp.com/techreports/98/HPL-98-173.html.
-#Default:
-# cache_replacement_policy lru
-
-# TAG: minimum_object_size (bytes)
-# Objects smaller than this size will NOT be saved on disk. The
-# value is specified in bytes, and the default is 0 KB, which
-# means all responses can be stored.
-#Default:
-# no limit
-
-# TAG: maximum_object_size (bytes)
-# Set the default value for max-size parameter on any cache_dir.
-# The value is specified in bytes, and the default is 4 MB.
-#
-# If you wish to get a high BYTES hit ratio, you should probably
-# increase this (one 32 MB object hit counts for 3200 10KB
-# hits).
-#
-# If you wish to increase hit ratio more than you want to
-# save bandwidth you should leave this low.
-#
-# NOTE: if using the LFUDA replacement policy you should increase
-# this value to maximize the byte hit rate improvement of LFUDA!
-# See cache_replacement_policy for a discussion of this policy.
-#Default:
-# maximum_object_size 4 MB
-
-# TAG: cache_dir
-# Format:
-# cache_dir Type Directory-Name Fs-specific-data [options]
-#
-# You can specify multiple cache_dir lines to spread the
-# cache among different disk partitions.
-#
-# Type specifies the kind of storage system to use. Only "ufs"
-# is built by default. To enable any of the other storage systems
-# see the --enable-storeio configure option.
-#
-# 'Directory' is a top-level directory where cache swap
-# files will be stored. If you want to use an entire disk
-# for caching, this can be the mount-point directory.
-# The directory must exist and be writable by the Squid
-# process. Squid will NOT create this directory for you.
-#
-# In SMP configurations, cache_dir must not precede the workers option
-# and should use configuration macros or conditionals to give each
-# worker interested in disk caching a dedicated cache directory.
-#
-#
-# ==== The ufs store type ====
-#
-# "ufs" is the old well-known Squid storage format that has always
-# been there.
-#
-# Usage:
-# cache_dir ufs Directory-Name Mbytes L1 L2 [options]
-#
-# 'Mbytes' is the amount of disk space (MB) to use under this
-# directory. The default is 100 MB. Change this to suit your
-# configuration. Do NOT put the size of your disk drive here.
-# Instead, if you want Squid to use the entire disk drive,
-# subtract 20% and use that value.
-#
-# 'L1' is the number of first-level subdirectories which
-# will be created under the 'Directory'. The default is 16.
-#
-# 'L2' is the number of second-level subdirectories which
-# will be created under each first-level directory. The default
-# is 256.
-#
-#
-# ==== The aufs store type ====
-#
-# "aufs" uses the same storage format as "ufs", utilizing
-# POSIX-threads to avoid blocking the main Squid process on
-# disk-I/O. This was formerly known in Squid as async-io.
-#
-# Usage:
-# cache_dir aufs Directory-Name Mbytes L1 L2 [options]
-#
-# see argument descriptions under ufs above
-#
-#
-# ==== The diskd store type ====
-#
-# "diskd" uses the same storage format as "ufs", utilizing a
-# separate process to avoid blocking the main Squid process on
-# disk-I/O.
-#
-# Usage:
-# cache_dir diskd Directory-Name Mbytes L1 L2 [options] [Q1=n] [Q2=n]
-#
-# see argument descriptions under ufs above
-#
-# Q1 specifies the number of unacknowledged I/O requests when Squid
-# stops opening new files. If this many messages are in the queues,
-# Squid won't open new files. Default is 64
-#
-# Q2 specifies the number of unacknowledged messages when Squid
-# starts blocking. If this many messages are in the queues,
-# Squid blocks until it receives some replies. Default is 72
-#
-# When Q1 < Q2 (the default), the cache directory is optimized
-# for lower response time at the expense of a decrease in hit
-# ratio. If Q1 > Q2, the cache directory is optimized for
-# higher hit ratio at the expense of an increase in response
-# time.
-#
-#
-# ==== The rock store type ====
-#
-# Usage:
-# cache_dir rock Directory-Name Mbytes <max-size=bytes> [options]
-#
-# The Rock Store type is a database-style storage. All cached
-# entries are stored in a "database" file, using fixed-size slots,
-# one entry per slot. The database size is specified in MB. The
-# slot size is specified in bytes using the max-size option. See
-# below for more info on the max-size option.
-#
-# If possible, Squid using Rock Store creates a dedicated kid
-# process called "disker" to avoid blocking Squid worker(s) on disk
-# I/O. One disker kid is created for each rock cache_dir. Diskers
-# are created only when Squid, running in daemon mode, has support
-# for the IpcIo disk I/O module.
-#
-# swap-timeout=msec: Squid will not start writing a miss to or
-# reading a hit from disk if it estimates that the swap operation
-# will take more than the specified number of milliseconds. By
-# default and when set to zero, disables the disk I/O time limit
-# enforcement. Ignored when using blocking I/O module because
-# blocking synchronous I/O does not allow Squid to estimate the
-# expected swap wait time.
-#
-# max-swap-rate=swaps/sec: Artificially limits disk access using
-# the specified I/O rate limit. Swap out requests that
-# would cause the average I/O rate to exceed the limit are
-# delayed. Individual swap in requests (i.e., hits or reads) are
-# not delayed, but they do contribute to measured swap rate and
-# since they are placed in the same FIFO queue as swap out
-# requests, they may wait longer if max-swap-rate is smaller.
-# This is necessary on file systems that buffer "too
-# many" writes and then start blocking Squid and other processes
-# while committing those writes to disk. Usually used together
-# with swap-timeout to avoid excessive delays and queue overflows
-# when disk demand exceeds available disk "bandwidth". By default
-# and when set to zero, disables the disk I/O rate limit
-# enforcement. Currently supported by IpcIo module only.
-#
-#
-# ==== The coss store type ====
-#
-# NP: COSS filesystem in Squid-3 has been deemed too unstable for
-# production use and has thus been removed from this release.
-# We hope that it can be made usable again soon.
-#
-# block-size=n defines the "block size" for COSS cache_dir's.
-# Squid uses file numbers as block numbers. Since file numbers
-# are limited to 24 bits, the block size determines the maximum
-# size of the COSS partition. The default is 512 bytes, which
-# leads to a maximum cache_dir size of 512<<24, or 8 GB. Note
-# you should not change the coss block size after Squid
-# has written some objects to the cache_dir.
-#
-# The coss file store has changed from 2.5. Now it uses a file
-# called 'stripe' in the directory names in the config - and
-# this will be created by squid -z.
-#
-#
-# ==== COMMON OPTIONS ====
-#
-# no-store no new objects should be stored to this cache_dir.
-#
-# min-size=n the minimum object size in bytes this cache_dir
-# will accept. It's used to restrict a cache_dir
-# to only store large objects (e.g. AUFS) while
-# other stores are optimized for smaller objects
-# (e.g. COSS).
-# Defaults to 0.
-#
-# max-size=n the maximum object size in bytes this cache_dir
-# supports.
-# The value in maximum_object_size directive sets
-# the default unless more specific details are
-# available (ie a small store capacity).
-#
-# Note: To make optimal use of the max-size limits you should order
-# the cache_dir lines with the smallest max-size value first.
-#
-# Note for coss, max-size must be less than COSS_MEMBUF_SZ,
-# which can be changed with the --with-coss-membuf-size=N configure
-# option.
-#
-#Default:
-# No disk cache. Store cache ojects only in memory.
-#
-
-# Uncomment and adjust the following to add a disk cache directory.
-cache_dir ufs /var/cache/squid 256 16 256
-
-# TAG: store_dir_select_algorithm
-# How Squid selects which cache_dir to use when the response
-# object will fit into more than one.
-#
-# Regardless of which algorithm is used the cache_dir min-size
-# and max-size parameters are obeyed. As such they can affect
-# the selection algorithm by limiting the set of considered
-# cache_dir.
-#
-# Algorithms:
-#
-# least-load
-#
-# This algorithm is suited to caches with similar cache_dir
-# sizes and disk speeds.
-#
-# The disk with the least I/O pending is selected.
-# When there are multiple disks with the same I/O load ranking
-# the cache_dir with most available capacity is selected.
-#
-# When a mix of cache_dir sizes are configured the faster disks
-# have a naturally lower I/O loading and larger disks have more
-# capacity. So space used to store objects and data throughput
-# may be very unbalanced towards larger disks.
-#
-#
-# round-robin
-#
-# This algorithm is suited to caches with unequal cache_dir
-# disk sizes.
-#
-# Each cache_dir is selected in a rotation. The next suitable
-# cache_dir is used.
-#
-# Available cache_dir capacity is only considered in relation
-# to whether the object will fit and meets the min-size and
-# max-size parameters.
-#
-# Disk I/O loading is only considered to prevent overload on slow
-# disks. This algorithm does not spread objects by size, so any
-# I/O loading per-disk may appear very unbalanced and volatile.
-#
-#Default:
-# store_dir_select_algorithm least-load
-
-# TAG: max_open_disk_fds
-# To avoid having disk as the I/O bottleneck Squid can optionally
-# bypass the on-disk cache if more than this amount of disk file
-# descriptors are open.
-#
-# A value of 0 indicates no limit.
-#Default:
-# no limit
-
-# TAG: cache_swap_low (percent, 0-100)
-# The low-water mark for cache object replacement.
-# Replacement begins when the swap (disk) usage is above the
-# low-water mark and attempts to maintain utilization near the
-# low-water mark. As swap utilization gets close to high-water
-# mark object eviction becomes more aggressive. If utilization is
-# close to the low-water mark less replacement is done each time.
-#
-# Defaults are 90% and 95%. If you have a large cache, 5% could be
-# hundreds of MB. If this is the case you may wish to set these
-# numbers closer together.
-#
-# See also cache_swap_high
-#Default:
-# cache_swap_low 90
-
-# TAG: cache_swap_high (percent, 0-100)
-# The high-water mark for cache object replacement.
-# Replacement begins when the swap (disk) usage is above the
-# low-water mark and attempts to maintain utilization near the
-# low-water mark. As swap utilization gets close to high-water
-# mark object eviction becomes more aggressive. If utilization is
-# close to the low-water mark less replacement is done each time.
-#
-# Defaults are 90% and 95%. If you have a large cache, 5% could be
-# hundreds of MB. If this is the case you may wish to set these
-# numbers closer together.
-#
-# See also cache_swap_low
-#Default:
-# cache_swap_high 95
-
-# LOGFILE OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: logformat
-# Usage:
-#
-# logformat <name> <format specification>
-#
-# Defines an access log format.
-#
-# The <format specification> is a string with embedded % format codes
-#
-# % format codes all follow the same basic structure where all but
-# the formatcode is optional. Output strings are automatically escaped
-# as required according to their context and the output format
-# modifiers are usually not needed, but can be specified if an explicit
-# output format is desired.
-#
-# % ["|[|'|#] [-] [[0]width] [{argument}] formatcode
-#
-# " output in quoted string format
-# [ output in squid text log format as used by log_mime_hdrs
-# # output in URL quoted format
-# ' output as-is
-#
-# - left aligned
-#
-# width minimum and/or maximum field width:
-# [width_min][.width_max]
-# When minimum starts with 0, the field is zero-padded.
-# String values exceeding maximum width are truncated.
-#
-# {arg} argument such as header name etc
-#
-# Format codes:
-#
-# % a literal % character
-# sn Unique sequence number per log line entry
-# err_code The ID of an error response served by Squid or
-# a similar internal error identifier.
-# err_detail Additional err_code-dependent error information.
-# note The annotation specified by the argument. Also
-# logs the adaptation meta headers set by the
-# adaptation_meta configuration parameter.
-# If no argument given all annotations logged.
-# The argument may include a separator to use with
-# annotation values:
-# name[:separator]
-# By default, multiple note values are separated with ","
-# and multiple notes are separated with "\r\n".
-# When logging named notes with %{name}note, the
-# explicitly configured separator is used between note
-# values. When logging all notes with %note, the
-# explicitly configured separator is used between
-# individual notes. There is currently no way to
-# specify both value and notes separators when logging
-# all notes with %note.
-#
-# Connection related format codes:
-#
-# >a Client source IP address
-# >A Client FQDN
-# >p Client source port
-# >eui Client source EUI (MAC address, EUI-48 or EUI-64 identifier)
-# >la Local IP address the client connected to
-# >lp Local port number the client connected to
-# >qos Client connection TOS/DSCP value set by Squid
-# >nfmark Client connection netfilter mark set by Squid
-#
-# la Local listening IP address the client connection was connected to.
-# lp Local listening port number the client connection was connected to.
-#
-# <a Server IP address of the last server or peer connection
-# <A Server FQDN or peer name
-# <p Server port number of the last server or peer connection
-# <la Local IP address of the last server or peer connection
-# <lp Local port number of the last server or peer connection
-# <qos Server connection TOS/DSCP value set by Squid
-# <nfmark Server connection netfilter mark set by Squid
-#
-# Time related format codes:
-#
-# ts Seconds since epoch
-# tu subsecond time (milliseconds)
-# tl Local time. Optional strftime format argument
-# default %d/%b/%Y:%H:%M:%S %z
-# tg GMT time. Optional strftime format argument
-# default %d/%b/%Y:%H:%M:%S %z
-# tr Response time (milliseconds)
-# dt Total time spent making DNS lookups (milliseconds)
-#
-# Access Control related format codes:
-#
-# et Tag returned by external acl
-# ea Log string returned by external acl
-# un User name (any available)
-# ul User name from authentication
-# ue User name from external acl helper
-# ui User name from ident
-# us User name from SSL
-#
-# HTTP related format codes:
-#
-# [http::]>h Original received request header.
-# Usually differs from the request header sent by
-# Squid, although most fields are often preserved.
-# Accepts optional header field name/value filter
-# argument using name[:[separator]element] format.
-# [http::]>ha Received request header after adaptation and
-# redirection (pre-cache REQMOD vectoring point).
-# Usually differs from the request header sent by
-# Squid, although most fields are often preserved.
-# Optional header name argument as for >h
-# [http::]<h Reply header. Optional header name argument
-# as for >h
-# [http::]>Hs HTTP status code sent to the client
-# [http::]<Hs HTTP status code received from the next hop
-# [http::]<bs Number of HTTP-equivalent message body bytes
-# received from the next hop, excluding chunked
-# transfer encoding and control messages.
-# Generated FTP/Gopher listings are treated as
-# received bodies.
-# [http::]mt MIME content type
-# [http::]rm Request method (GET/POST etc)
-# [http::]>rm Request method from client
-# [http::]<rm Request method sent to server or peer
-# [http::]ru Request URL from client (historic, filtered for logging)
-# [http::]>ru Request URL from client
-# [http::]<ru Request URL sent to server or peer
-# [http::]rp Request URL-Path excluding hostname
-# [http::]>rp Request URL-Path excluding hostname from client
-# [http::]<rp Request URL-Path excluding hostname sento to server or peer
-# [http::]rv Request protocol version
-# [http::]>rv Request protocol version from client
-# [http::]<rv Request protocol version sent to server or peer
-# [http::]<st Sent reply size including HTTP headers
-# [http::]>st Received request size including HTTP headers. In the
-# case of chunked requests the chunked encoding metadata
-# are not included
-# [http::]>sh Received HTTP request headers size
-# [http::]<sh Sent HTTP reply headers size
-# [http::]st Request+Reply size including HTTP headers
-# [http::]<sH Reply high offset sent
-# [http::]<sS Upstream object size
-# [http::]<pt Peer response time in milliseconds. The timer starts
-# when the last request byte is sent to the next hop
-# and stops when the last response byte is received.
-# [http::]<tt Total server-side time in milliseconds. The timer
-# starts with the first connect request (or write I/O)
-# sent to the first selected peer. The timer stops
-# with the last I/O with the last peer.
-#
-# Squid handling related format codes:
-#
-# Ss Squid request status (TCP_MISS etc)
-# Sh Squid hierarchy status (DEFAULT_PARENT etc)
-#
-# SSL-related format codes:
-#
-# ssl::bump_mode SslBump decision for the transaction:
-#
-# For CONNECT requests that initiated bumping of
-# a connection and for any request received on
-# an already bumped connection, Squid logs the
-# corresponding SslBump mode ("server-first" or
-# "client-first"). See the ssl_bump option for
-# more information about these modes.
-#
-# A "none" token is logged for requests that
-# triggered "ssl_bump" ACL evaluation matching
-# either a "none" rule or no rules at all.
-#
-# In all other cases, a single dash ("-") is
-# logged.
-#
-# If ICAP is enabled, the following code becomes available (as
-# well as ICAP log codes documented with the icap_log option):
-#
-# icap::tt Total ICAP processing time for the HTTP
-# transaction. The timer ticks when ICAP
-# ACLs are checked and when ICAP
-# transaction is in progress.
-#
-# If adaptation is enabled the following three codes become available:
-#
-# adapt::<last_h The header of the last ICAP response or
-# meta-information from the last eCAP
-# transaction related to the HTTP transaction.
-# Like <h, accepts an optional header name
-# argument.
-#
-# adapt::sum_trs Summed adaptation transaction response
-# times recorded as a comma-separated list in
-# the order of transaction start time. Each time
-# value is recorded as an integer number,
-# representing response time of one or more
-# adaptation (ICAP or eCAP) transaction in
-# milliseconds. When a failed transaction is
-# being retried or repeated, its time is not
-# logged individually but added to the
-# replacement (next) transaction. See also:
-# adapt::all_trs.
-#
-# adapt::all_trs All adaptation transaction response times.
-# Same as adaptation_strs but response times of
-# individual transactions are never added
-# together. Instead, all transaction response
-# times are recorded individually.
-#
-# You can prefix adapt::*_trs format codes with adaptation
-# service name in curly braces to record response time(s) specific
-# to that service. For example: %{my_service}adapt::sum_trs
-#
-# If SSL is enabled, the following formating codes become available:
-#
-# %ssl::>cert_subject The Subject field of the received client
-# SSL certificate or a dash ('-') if Squid has
-# received an invalid/malformed certificate or
-# no certificate at all. Consider encoding the
-# logged value because Subject often has spaces.
-#
-# %ssl::>cert_issuer The Issuer field of the received client
-# SSL certificate or a dash ('-') if Squid has
-# received an invalid/malformed certificate or
-# no certificate at all. Consider encoding the
-# logged value because Issuer often has spaces.
-#
-# The default formats available (which do not need re-defining) are:
-#
-#logformat squid %ts.%03tu %6tr %>a %Ss/%03>Hs %<st %rm %ru %[un %Sh/%<a %mt
-#logformat common %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st %Ss:%Sh
-#logformat combined %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st "%{Referer}>h" "%{User-Agent}>h" %Ss:%Sh
-#logformat referrer %ts.%03tu %>a %{Referer}>h %ru
-#logformat useragent %>a [%tl] "%{User-Agent}>h"
-#
-# NOTE: When the log_mime_hdrs directive is set to ON.
-# The squid, common and combined formats have a safely encoded copy
-# of the mime headers appended to each line within a pair of brackets.
-#
-# NOTE: The common and combined formats are not quite true to the Apache definition.
-# The logs from Squid contain an extra status and hierarchy code appended.
-#
-#Default:
-# The format definitions squid, common, combined, referrer, useragent are built in.
-
-# TAG: access_log
-# Configures whether and how Squid logs HTTP and ICP transactions.
-# If access logging is enabled, a single line is logged for every
-# matching HTTP or ICP request. The recommended directive formats are:
-#
-# access_log <module>:<place> [option ...] [acl acl ...]
-# access_log none [acl acl ...]
-#
-# The following directive format is accepted but may be deprecated:
-# access_log <module>:<place> [<logformat name> [acl acl ...]]
-#
-# In most cases, the first ACL name must not contain the '=' character
-# and should not be equal to an existing logformat name. You can always
-# start with an 'all' ACL to work around those restrictions.
-#
-# Will log to the specified module:place using the specified format (which
-# must be defined in a logformat directive) those entries which match
-# ALL the acl's specified (which must be defined in acl clauses).
-# If no acl is specified, all requests will be logged to this destination.
-#
-# ===== Available options for the recommended directive format =====
-#
-# logformat=name Names log line format (either built-in or
-# defined by a logformat directive). Defaults
-# to 'squid'.
-#
-# buffer-size=64KB Defines approximate buffering limit for log
-# records (see buffered_logs). Squid should not
-# keep more than the specified size and, hence,
-# should flush records before the buffer becomes
-# full to avoid overflows under normal
-# conditions (the exact flushing algorithm is
-# module-dependent though). The on-error option
-# controls overflow handling.
-#
-# on-error=die|drop Defines action on unrecoverable errors. The
-# 'drop' action ignores (i.e., does not log)
-# affected log records. The default 'die' action
-# kills the affected worker. The drop action
-# support has not been tested for modules other
-# than tcp.
-#
-# ===== Modules Currently available =====
-#
-# none Do not log any requests matching these ACL.
-# Do not specify Place or logformat name.
-#
-# stdio Write each log line to disk immediately at the completion of
-# each request.
-# Place: the filename and path to be written.
-#
-# daemon Very similar to stdio. But instead of writing to disk the log
-# line is passed to a daemon helper for asychronous handling instead.
-# Place: varies depending on the daemon.
-#
-# log_file_daemon Place: the file name and path to be written.
-#
-# syslog To log each request via syslog facility.
-# Place: The syslog facility and priority level for these entries.
-# Place Format: facility.priority
-#
-# where facility could be any of:
-# authpriv, daemon, local0 ... local7 or user.
-#
-# And priority could be any of:
-# err, warning, notice, info, debug.
-#
-# udp To send each log line as text data to a UDP receiver.
-# Place: The destination host name or IP and port.
-# Place Format: //host:port
-#
-# tcp To send each log line as text data to a TCP receiver.
-# Lines may be accumulated before sending (see buffered_logs).
-# Place: The destination host name or IP and port.
-# Place Format: //host:port
-#
-# Default:
-# access_log daemon:/var/log/squid/access.log squid
-#Default:
-# access_log daemon:/var/log/squid/access.log squid
-
-# TAG: icap_log
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# ICAP log files record ICAP transaction summaries, one line per
-# transaction.
-#
-# The icap_log option format is:
-# icap_log <filepath> [<logformat name> [acl acl ...]]
-# icap_log none [acl acl ...]]
-#
-# Please see access_log option documentation for details. The two
-# kinds of logs share the overall configuration approach and many
-# features.
-#
-# ICAP processing of a single HTTP message or transaction may
-# require multiple ICAP transactions. In such cases, multiple
-# ICAP transaction log lines will correspond to a single access
-# log line.
-#
-# ICAP log uses logformat codes that make sense for an ICAP
-# transaction. Header-related codes are applied to the HTTP header
-# embedded in an ICAP server response, with the following caveats:
-# For REQMOD, there is no HTTP response header unless the ICAP
-# server performed request satisfaction. For RESPMOD, the HTTP
-# request header is the header sent to the ICAP server. For
-# OPTIONS, there are no HTTP headers.
-#
-# The following format codes are also available for ICAP logs:
-#
-# icap::<A ICAP server IP address. Similar to <A.
-#
-# icap::<service_name ICAP service name from the icap_service
-# option in Squid configuration file.
-#
-# icap::ru ICAP Request-URI. Similar to ru.
-#
-# icap::rm ICAP request method (REQMOD, RESPMOD, or
-# OPTIONS). Similar to existing rm.
-#
-# icap::>st Bytes sent to the ICAP server (TCP payload
-# only; i.e., what Squid writes to the socket).
-#
-# icap::<st Bytes received from the ICAP server (TCP
-# payload only; i.e., what Squid reads from
-# the socket).
-#
-# icap::<bs Number of message body bytes received from the
-# ICAP server. ICAP message body, if any, usually
-# includes encapsulated HTTP message headers and
-# possibly encapsulated HTTP message body. The
-# HTTP body part is dechunked before its size is
-# computed.
-#
-# icap::tr Transaction response time (in
-# milliseconds). The timer starts when
-# the ICAP transaction is created and
-# stops when the transaction is completed.
-# Similar to tr.
-#
-# icap::tio Transaction I/O time (in milliseconds). The
-# timer starts when the first ICAP request
-# byte is scheduled for sending. The timers
-# stops when the last byte of the ICAP response
-# is received.
-#
-# icap::to Transaction outcome: ICAP_ERR* for all
-# transaction errors, ICAP_OPT for OPTION
-# transactions, ICAP_ECHO for 204
-# responses, ICAP_MOD for message
-# modification, and ICAP_SAT for request
-# satisfaction. Similar to Ss.
-#
-# icap::Hs ICAP response status code. Similar to Hs.
-#
-# icap::>h ICAP request header(s). Similar to >h.
-#
-# icap::<h ICAP response header(s). Similar to <h.
-#
-# The default ICAP log format, which can be used without an explicit
-# definition, is called icap_squid:
-#
-#logformat icap_squid %ts.%03tu %6icap::tr %>a %icap::to/%03icap::Hs %icap::<size %icap::rm %icap::ru% %un -/%icap::<A -
-#
-# See also: logformat, log_icap, and %adapt::<last_h
-#Default:
-# none
-
-# TAG: logfile_daemon
-# Specify the path to the logfile-writing daemon. This daemon is
-# used to write the access and store logs, if configured.
-#
-# Squid sends a number of commands to the log daemon:
-# L<data>\n - logfile data
-# R\n - rotate file
-# T\n - truncate file
-# O\n - reopen file
-# F\n - flush file
-# r<n>\n - set rotate count to <n>
-# b<n>\n - 1 = buffer output, 0 = don't buffer output
-#
-# No responses is expected.
-#Default:
-# logfile_daemon /usr/libexec/log_file_daemon
-
-# TAG: log_access
-# Remove this line. Use acls with access_log directives to control access logging
-#Default:
-# none
-
-# TAG: log_icap
-# Remove this line. Use acls with icap_log directives to control icap logging
-#Default:
-# none
-
-# TAG: stats_collection allow|deny acl acl...
-# This options allows you to control which requests gets accounted
-# in performance counters.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow logging for all transactions.
-
-# TAG: cache_store_log
-# Logs the activities of the storage manager. Shows which
-# objects are ejected from the cache, and which objects are
-# saved and for how long.
-# There are not really utilities to analyze this data, so you can safely
-# disable it (the default).
-#
-# Store log uses modular logging outputs. See access_log for the list
-# of modules supported.
-#
-# Example:
-# cache_store_log stdio:/var/log/squid/store.log
-# cache_store_log daemon:/var/log/squid/store.log
-#Default:
-# none
-
-# TAG: cache_swap_state
-# Location for the cache "swap.state" file. This index file holds
-# the metadata of objects saved on disk. It is used to rebuild
-# the cache during startup. Normally this file resides in each
-# 'cache_dir' directory, but you may specify an alternate
-# pathname here. Note you must give a full filename, not just
-# a directory. Since this is the index for the whole object
-# list you CANNOT periodically rotate it!
-#
-# If %s can be used in the file name it will be replaced with a
-# a representation of the cache_dir name where each / is replaced
-# with '.'. This is needed to allow adding/removing cache_dir
-# lines when cache_swap_log is being used.
-#
-# If have more than one 'cache_dir', and %s is not used in the name
-# these swap logs will have names such as:
-#
-# cache_swap_log.00
-# cache_swap_log.01
-# cache_swap_log.02
-#
-# The numbered extension (which is added automatically)
-# corresponds to the order of the 'cache_dir' lines in this
-# configuration file. If you change the order of the 'cache_dir'
-# lines in this file, these index files will NOT correspond to
-# the correct 'cache_dir' entry (unless you manually rename
-# them). We recommend you do NOT use this option. It is
-# better to keep these index files in each 'cache_dir' directory.
-#Default:
-# Store the journal inside its cache_dir
-
-# TAG: logfile_rotate
-# Specifies the number of logfile rotations to make when you
-# type 'squid -k rotate'. The default is 10, which will rotate
-# with extensions 0 through 9. Setting logfile_rotate to 0 will
-# disable the file name rotation, but the logfiles are still closed
-# and re-opened. This will enable you to rename the logfiles
-# yourself just before sending the rotate signal.
-#
-# Note, the 'squid -k rotate' command normally sends a USR1
-# signal to the running squid process. In certain situations
-# (e.g. on Linux with Async I/O), USR1 is used for other
-# purposes, so -k rotate uses another signal. It is best to get
-# in the habit of using 'squid -k rotate' instead of 'kill -USR1
-# <pid>'.
-#
-# Note, from Squid-3.1 this option is only a default for cache.log,
-# that log can be rotated separately by using debug_options.
-#Default:
-# logfile_rotate 10
-
-# TAG: emulate_httpd_log
-# Replace this with an access_log directive using the format 'common' or 'combined'.
-#Default:
-# none
-
-# TAG: log_ip_on_direct
-# Remove this option from your config. To log server or peer names use %<A in the log format.
-#Default:
-# none
-
-# TAG: mime_table
-# Path to Squid's icon configuration file.
-#
-# You shouldn't need to change this, but the default file contains
-# examples and formatting information if you do.
-#Default:
-# mime_table /etc/squid/mime.conf
-
-# TAG: log_mime_hdrs on|off
-# The Cache can record both the request and the response MIME
-# headers for each HTTP transaction. The headers are encoded
-# safely and will appear as two bracketed fields at the end of
-# the access log (for either the native or httpd-emulated log
-# formats). To enable this logging set log_mime_hdrs to 'on'.
-#Default:
-# log_mime_hdrs off
-
-# TAG: useragent_log
-# Replace this with an access_log directive using the format 'useragent'.
-#Default:
-# none
-
-# TAG: referer_log
-# Replace this with an access_log directive using the format 'referrer'.
-#Default:
-# none
-
-# TAG: pid_filename
-# A filename to write the process-id to. To disable, enter "none".
-#Default:
-pid_filename /var/run/squid/squid.pid
-
-# TAG: log_fqdn
-# Remove this option from your config. To log FQDN use %>A in the log format.
-#Default:
-# none
-
-# TAG: client_netmask
-# A netmask for client addresses in logfiles and cachemgr output.
-# Change this to protect the privacy of your cache clients.
-# A netmask of 255.255.255.0 will log all IP's in that range with
-# the last digit set to '0'.
-#Default:
-# Log full client IP address
-
-# TAG: forward_log
-# Use a regular access.log with ACL limiting it to MISS events.
-#Default:
-# none
-
-# TAG: strip_query_terms
-# By default, Squid strips query terms from requested URLs before
-# logging. This protects your user's privacy and reduces log size.
-#
-# When investigating HIT/MISS or other caching behaviour you
-# will need to disable this to see the full URL used by Squid.
-#Default:
-# strip_query_terms on
-
-# TAG: buffered_logs on|off
-# Whether to write/send access_log records ASAP or accumulate them and
-# then write/send them in larger chunks. Buffering may improve
-# performance because it decreases the number of I/Os. However,
-# buffering increases the delay before log records become available to
-# the final recipient (e.g., a disk file or logging daemon) and,
-# hence, increases the risk of log records loss.
-#
-# Note that even when buffered_logs are off, Squid may have to buffer
-# records if it cannot write/send them immediately due to pending I/Os
-# (e.g., the I/O writing the previous log record) or connectivity loss.
-#
-# Currently honored by 'daemon' and 'tcp' access_log modules only.
-#Default:
-# buffered_logs off
-
-# TAG: netdb_filename
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icmp
-#
-# Where Squid stores it's netdb journal.
-# When enabled this journal preserves netdb state between restarts.
-#
-# To disable, enter "none".
-#Default:
-# netdb_filename stdio:/var/log/squid/netdb.state
-
-# OPTIONS FOR TROUBLESHOOTING
-# -----------------------------------------------------------------------------
-
-# TAG: cache_log
-# Squid administrative logging file.
-#
-# This is where general information about Squid behavior goes. You can
-# increase the amount of data logged to this file and how often it is
-# rotated with "debug_options"
-#Default:
-# cache_log /var/log/squid/cache.log
-
-# TAG: debug_options
-# Logging options are set as section,level where each source file
-# is assigned a unique section. Lower levels result in less
-# output, Full debugging (level 9) can result in a very large
-# log file, so be careful.
-#
-# The magic word "ALL" sets debugging levels for all sections.
-# The default is to run with "ALL,1" to record important warnings.
-#
-# The rotate=N option can be used to keep more or less of these logs
-# than would otherwise be kept by logfile_rotate.
-# For most uses a single log should be enough to monitor current
-# events affecting Squid.
-#Default:
-# Log all critical and important messages.
-
-# TAG: coredump_dir
-# By default Squid leaves core files in the directory from where
-# it was started. If you set 'coredump_dir' to a directory
-# that exists, Squid will chdir() to that directory at startup
-# and coredump files will be left there.
-#
-#Default:
-# Use the directory from where Squid was started.
-#
-
-# Leave coredumps in the first cache dir
-coredump_dir /var/log/squid/cache/squid
-
-# OPTIONS FOR FTP GATEWAYING
-# -----------------------------------------------------------------------------
-
-# TAG: ftp_user
-# If you want the anonymous login password to be more informative
-# (and enable the use of picky FTP servers), set this to something
-# reasonable for your domain, like wwwuser@somewhere.net
-#
-# The reason why this is domainless by default is the
-# request can be made on the behalf of a user in any domain,
-# depending on how the cache is used.
-# Some FTP server also validate the email address is valid
-# (for example perl.com).
-#Default:
-# ftp_user Squid@
-
-# TAG: ftp_passive
-# If your firewall does not allow Squid to use passive
-# connections, turn off this option.
-#
-# Use of ftp_epsv_all option requires this to be ON.
-#Default:
-# ftp_passive on
-
-# TAG: ftp_epsv_all
-# FTP Protocol extensions permit the use of a special "EPSV ALL" command.
-#
-# NATs may be able to put the connection on a "fast path" through the
-# translator, as the EPRT command will never be used and therefore,
-# translation of the data portion of the segments will never be needed.
-#
-# When a client only expects to do two-way FTP transfers this may be
-# useful.
-# If squid finds that it must do a three-way FTP transfer after issuing
-# an EPSV ALL command, the FTP session will fail.
-#
-# If you have any doubts about this option do not use it.
-# Squid will nicely attempt all other connection methods.
-#
-# Requires ftp_passive to be ON (default) for any effect.
-#Default:
-# ftp_epsv_all off
-
-# TAG: ftp_epsv
-# FTP Protocol extensions permit the use of a special "EPSV" command.
-#
-# NATs may be able to put the connection on a "fast path" through the
-# translator using EPSV, as the EPRT command will never be used
-# and therefore, translation of the data portion of the segments
-# will never be needed.
-#
-# Turning this OFF will prevent EPSV being attempted.
-# WARNING: Doing so will convert Squid back to the old behavior with all
-# the related problems with external NAT devices/layers.
-#
-# Requires ftp_passive to be ON (default) for any effect.
-#Default:
-# ftp_epsv on
-
-# TAG: ftp_eprt
-# FTP Protocol extensions permit the use of a special "EPRT" command.
-#
-# This extension provides a protocol neutral alternative to the
-# IPv4-only PORT command. When supported it enables active FTP data
-# channels over IPv6 and efficient NAT handling.
-#
-# Turning this OFF will prevent EPRT being attempted and will skip
-# straight to using PORT for IPv4 servers.
-#
-# Some devices are known to not handle this extension correctly and
-# may result in crashes. Devices which suport EPRT enough to fail
-# cleanly will result in Squid attempting PORT anyway. This directive
-# should only be disabled when EPRT results in device failures.
-#
-# WARNING: Doing so will convert Squid back to the old behavior with all
-# the related problems with external NAT devices/layers and IPv4-only FTP.
-#Default:
-# ftp_eprt on
-
-# TAG: ftp_sanitycheck
-# For security and data integrity reasons Squid by default performs
-# sanity checks of the addresses of FTP data connections ensure the
-# data connection is to the requested server. If you need to allow
-# FTP connections to servers using another IP address for the data
-# connection turn this off.
-#Default:
-# ftp_sanitycheck on
-
-# TAG: ftp_telnet_protocol
-# The FTP protocol is officially defined to use the telnet protocol
-# as transport channel for the control connection. However, many
-# implementations are broken and does not respect this aspect of
-# the FTP protocol.
-#
-# If you have trouble accessing files with ASCII code 255 in the
-# path or similar problems involving this ASCII code you can
-# try setting this directive to off. If that helps, report to the
-# operator of the FTP server in question that their FTP server
-# is broken and does not follow the FTP standard.
-#Default:
-# ftp_telnet_protocol on
-
-# OPTIONS FOR EXTERNAL SUPPORT PROGRAMS
-# -----------------------------------------------------------------------------
-
-# TAG: diskd_program
-# Specify the location of the diskd executable.
-# Note this is only useful if you have compiled in
-# diskd as one of the store io modules.
-#Default:
-# diskd_program /usr/libexec/diskd
-
-# TAG: unlinkd_program
-# Specify the location of the executable for file deletion process.
-#Default:
-# unlinkd_program /usr/libexec/unlinkd
-
-# TAG: pinger_program
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icmp
-#
-# Specify the location of the executable for the pinger process.
-#Default:
-# pinger_program /usr/libexec/pinger
-
-# TAG: pinger_enable
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icmp
-#
-# Control whether the pinger is active at run-time.
-# Enables turning ICMP pinger on and off with a simple
-# squid -k reconfigure.
-#Default:
-# pinger_enable on
-
-# OPTIONS FOR URL REWRITING
-# -----------------------------------------------------------------------------
-
-# TAG: url_rewrite_program
-# Specify the location of the executable URL rewriter to use.
-# Since they can perform almost any function there isn't one included.
-#
-# For each requested URL, the rewriter will receive on line with the format
-#
-# [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
-#
-#
-# After processing the request the helper must reply using the following format:
-#
-# [channel-ID <SP>] result [<SP> kv-pairs]
-#
-# The result code can be:
-#
-# OK status=30N url="..."
-# Redirect the URL to the one supplied in 'url='.
-# 'status=' is optional and contains the status code to send
-# the client in Squids HTTP response. It must be one of the
-# HTTP redirect status codes: 301, 302, 303, 307, 308.
-# When no status is given Squid will use 302.
-#
-# OK rewrite-url="..."
-# Rewrite the URL to the one supplied in 'rewrite-url='.
-# The new URL is fetched directly by Squid and returned to
-# the client as the response to its request.
-#
-# OK
-# When neither of url= and rewrite-url= are sent Squid does
-# not change the URL.
-#
-# ERR
-# Do not change the URL.
-#
-# BH
-# An internal error occurred in the helper, preventing
-# a result being identified. The 'message=' key name is
-# reserved for delivering a log message.
-#
-#
-# In the future, the interface protocol will be extended with
-# key=value pairs ("kv-pairs" shown above). Helper programs
-# should be prepared to receive and possibly ignore additional
-# whitespace-separated tokens on each input line.
-#
-# When using the concurrency= option the protocol is changed by
-# introducing a query channel tag in front of the request/response.
-# The query channel tag is a number between 0 and concurrency-1.
-# This value must be echoed back unchanged to Squid as the first part
-# of the response relating to its request.
-#
-# WARNING: URL re-writing ability should be avoided whenever possible.
-# Use the URL redirect form of response instead.
-#
-# Re-write creates a difference in the state held by the client
-# and server. Possibly causing confusion when the server response
-# contains snippets of its view state. Embeded URLs, response
-# and content Location headers, etc. are not re-written by this
-# interface.
-#
-# By default, a URL rewriter is not used.
-#Default:
-# none
-
-# TAG: url_rewrite_children
-# The maximum number of redirector processes to spawn. If you limit
-# it too few Squid will have to wait for them to process a backlog of
-# URLs, slowing it down. If you allow too many they will use RAM
-# and other system resources noticably.
-#
-# The startup= and idle= options allow some measure of skew in your
-# tuning.
-#
-# startup=
-#
-# Sets a minimum of how many processes are to be spawned when Squid
-# starts or reconfigures. When set to zero the first request will
-# cause spawning of the first child process to handle it.
-#
-# Starting too few will cause an initial slowdown in traffic as Squid
-# attempts to simultaneously spawn enough processes to cope.
-#
-# idle=
-#
-# Sets a minimum of how many processes Squid is to try and keep available
-# at all times. When traffic begins to rise above what the existing
-# processes can handle this many more will be spawned up to the maximum
-# configured. A minimum setting of 1 is required.
-#
-# concurrency=
-#
-# The number of requests each redirector helper can handle in
-# parallel. Defaults to 0 which indicates the redirector
-# is a old-style single threaded redirector.
-#
-# When this directive is set to a value >= 1 then the protocol
-# used to communicate with the helper is modified to include
-# an ID in front of the request/response. The ID from the request
-# must be echoed back with the response to that request.
-#Default:
-# url_rewrite_children 20 startup=0 idle=1 concurrency=0
-
-# TAG: url_rewrite_host_header
-# To preserve same-origin security policies in browsers and
-# prevent Host: header forgery by redirectors Squid rewrites
-# any Host: header in redirected requests.
-#
-# If you are running an accelerator this may not be a wanted
-# effect of a redirector. This directive enables you disable
-# Host: alteration in reverse-proxy traffic.
-#
-# WARNING: Entries are cached on the result of the URL rewriting
-# process, so be careful if you have domain-virtual hosts.
-#
-# WARNING: Squid and other software verifies the URL and Host
-# are matching, so be careful not to relay through other proxies
-# or inspecting firewalls with this disabled.
-#Default:
-# url_rewrite_host_header on
-
-# TAG: url_rewrite_access
-# If defined, this access list specifies which requests are
-# sent to the redirector processes.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-# TAG: url_rewrite_bypass
-# When this is 'on', a request will not go through the
-# redirector if all the helpers are busy. If this is 'off'
-# and the redirector queue grows too large, Squid will exit
-# with a FATAL error and ask you to increase the number of
-# redirectors. You should only enable this if the redirectors
-# are not critical to your caching system. If you use
-# redirectors for access control, and you enable this option,
-# users may have access to pages they should not
-# be allowed to request.
-#Default:
-# url_rewrite_bypass off
-
-# OPTIONS FOR STORE ID
-# -----------------------------------------------------------------------------
-
-# TAG: store_id_program
-# Specify the location of the executable StoreID helper to use.
-# Since they can perform almost any function there isn't one included.
-#
-# For each requested URL, the helper will receive one line with the format
-#
-# [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
-#
-#
-# After processing the request the helper must reply using the following format:
-#
-# [channel-ID <SP>] result [<SP> kv-pairs]
-#
-# The result code can be:
-#
-# OK store-id="..."
-# Use the StoreID supplied in 'store-id='.
-#
-# ERR
-# The default is to use HTTP request URL as the store ID.
-#
-# BH
-# An internal error occured in the helper, preventing
-# a result being identified.
-#
-#
-# Helper programs should be prepared to receive and possibly ignore additional
-# kv-pairs with keys they do not support.
-#
-# When using the concurrency= option the protocol is changed by
-# introducing a query channel tag in front of the request/response.
-# The query channel tag is a number between 0 and concurrency-1.
-# This value must be echoed back unchanged to Squid as the first part
-# of the response relating to its request.
-#
-# NOTE: when using StoreID refresh_pattern will apply to the StoreID
-# returned from the helper and not the URL.
-#
-# WARNING: Wrong StoreID value returned by a careless helper may result
-# in the wrong cached response returned to the user.
-#
-# By default, a StoreID helper is not used.
-#Default:
-# none
-
-# TAG: store_id_children
-# The maximum number of StoreID helper processes to spawn. If you limit
-# it too few Squid will have to wait for them to process a backlog of
-# requests, slowing it down. If you allow too many they will use RAM
-# and other system resources noticably.
-#
-# The startup= and idle= options allow some measure of skew in your
-# tuning.
-#
-# startup=
-#
-# Sets a minimum of how many processes are to be spawned when Squid
-# starts or reconfigures. When set to zero the first request will
-# cause spawning of the first child process to handle it.
-#
-# Starting too few will cause an initial slowdown in traffic as Squid
-# attempts to simultaneously spawn enough processes to cope.
-#
-# idle=
-#
-# Sets a minimum of how many processes Squid is to try and keep available
-# at all times. When traffic begins to rise above what the existing
-# processes can handle this many more will be spawned up to the maximum
-# configured. A minimum setting of 1 is required.
-#
-# concurrency=
-#
-# The number of requests each storeID helper can handle in
-# parallel. Defaults to 0 which indicates the helper
-# is a old-style single threaded program.
-#
-# When this directive is set to a value >= 1 then the protocol
-# used to communicate with the helper is modified to include
-# an ID in front of the request/response. The ID from the request
-# must be echoed back with the response to that request.
-#Default:
-# store_id_children 20 startup=0 idle=1 concurrency=0
-
-# TAG: store_id_access
-# If defined, this access list specifies which requests are
-# sent to the StoreID processes. By default all requests
-# are sent.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-# TAG: store_id_bypass
-# When this is 'on', a request will not go through the
-# helper if all helpers are busy. If this is 'off'
-# and the helper queue grows too large, Squid will exit
-# with a FATAL error and ask you to increase the number of
-# helpers. You should only enable this if the helperss
-# are not critical to your caching system. If you use
-# helpers for critical caching components, and you enable this
-# option, users may not get objects from cache.
-#Default:
-# store_id_bypass on
-
-# OPTIONS FOR TUNING THE CACHE
-# -----------------------------------------------------------------------------
-
-# TAG: cache
-# A list of ACL elements which, if matched and denied, cause the request to
-# not be satisfied from the cache and the reply to not be cached.
-# In other words, use this to force certain objects to never be cached.
-#
-# You must use the words 'allow' or 'deny' to indicate whether items
-# matching the ACL should be allowed or denied into the cache.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow caching, unless rules exist in squid.conf.
-
-# TAG: max_stale time-units
-# This option puts an upper limit on how stale content Squid
-# will serve from the cache if cache validation fails.
-# Can be overriden by the refresh_pattern max-stale option.
-#Default:
-# max_stale 1 week
-
-# TAG: refresh_pattern
-# usage: refresh_pattern [-i] regex min percent max [options]
-#
-# By default, regular expressions are CASE-SENSITIVE. To make
-# them case-insensitive, use the -i option.
-#
-# 'Min' is the time (in minutes) an object without an explicit
-# expiry time should be considered fresh. The recommended
-# value is 0, any higher values may cause dynamic applications
-# to be erroneously cached unless the application designer
-# has taken the appropriate actions.
-#
-# 'Percent' is a percentage of the objects age (time since last
-# modification age) an object without explicit expiry time
-# will be considered fresh.
-#
-# 'Max' is an upper limit on how long objects without an explicit
-# expiry time will be considered fresh.
-#
-# options: override-expire
-# override-lastmod
-# reload-into-ims
-# ignore-reload
-# ignore-no-store
-# ignore-must-revalidate
-# ignore-private
-# ignore-auth
-# max-stale=NN
-# refresh-ims
-# store-stale
-#
-# override-expire enforces min age even if the server
-# sent an explicit expiry time (e.g., with the
-# Expires: header or Cache-Control: max-age). Doing this
-# VIOLATES the HTTP standard. Enabling this feature
-# could make you liable for problems which it causes.
-#
-# Note: override-expire does not enforce staleness - it only extends
-# freshness / min. If the server returns a Expires time which
-# is longer than your max time, Squid will still consider
-# the object fresh for that period of time.
-#
-# override-lastmod enforces min age even on objects
-# that were modified recently.
-#
-# reload-into-ims changes a client no-cache or ``reload''
-# request for a cached entry into a conditional request using
-# If-Modified-Since and/or If-None-Match headers, provided the
-# cached entry has a Last-Modified and/or a strong ETag header.
-# Doing this VIOLATES the HTTP standard. Enabling this feature
-# could make you liable for problems which it causes.
-#
-# ignore-reload ignores a client no-cache or ``reload''
-# header. Doing this VIOLATES the HTTP standard. Enabling
-# this feature could make you liable for problems which
-# it causes.
-#
-# ignore-no-store ignores any ``Cache-control: no-store''
-# headers received from a server. Doing this VIOLATES
-# the HTTP standard. Enabling this feature could make you
-# liable for problems which it causes.
-#
-# ignore-must-revalidate ignores any ``Cache-Control: must-revalidate``
-# headers received from a server. Doing this VIOLATES
-# the HTTP standard. Enabling this feature could make you
-# liable for problems which it causes.
-#
-# ignore-private ignores any ``Cache-control: private''
-# headers received from a server. Doing this VIOLATES
-# the HTTP standard. Enabling this feature could make you
-# liable for problems which it causes.
-#
-# ignore-auth caches responses to requests with authorization,
-# as if the originserver had sent ``Cache-control: public''
-# in the response header. Doing this VIOLATES the HTTP standard.
-# Enabling this feature could make you liable for problems which
-# it causes.
-#
-# refresh-ims causes squid to contact the origin server
-# when a client issues an If-Modified-Since request. This
-# ensures that the client will receive an updated version
-# if one is available.
-#
-# store-stale stores responses even if they don't have explicit
-# freshness or a validator (i.e., Last-Modified or an ETag)
-# present, or if they're already stale. By default, Squid will
-# not cache such responses because they usually can't be
-# reused. Note that such responses will be stale by default.
-#
-# max-stale=NN provide a maximum staleness factor. Squid won't
-# serve objects more stale than this even if it failed to
-# validate the object. Default: use the max_stale global limit.
-#
-# Basically a cached object is:
-#
-# FRESH if expires < now, else STALE
-# STALE if age > max
-# FRESH if lm-factor < percent, else STALE
-# FRESH if age < min
-# else STALE
-#
-# The refresh_pattern lines are checked in the order listed here.
-# The first entry which matches is used. If none of the entries
-# match the default will be used.
-#
-# Note, you must uncomment all the default lines if you want
-# to change one. The default setting is only active if none is
-# used.
-#
-#
-
-#
-# Add any of your own refresh_pattern entries above these.
-#
-refresh_pattern ^ftp: 1440 20% 10080
-refresh_pattern ^gopher: 1440 0% 1440
-refresh_pattern -i (/cgi-bin/|\?) 0 0% 0
-refresh_pattern . 0 20% 4320
-
-# TAG: quick_abort_min (KB)
-#Default:
-# quick_abort_min 16 KB
-
-# TAG: quick_abort_max (KB)
-#Default:
-# quick_abort_max 16 KB
-
-# TAG: quick_abort_pct (percent)
-# The cache by default continues downloading aborted requests
-# which are almost completed (less than 16 KB remaining). This
-# may be undesirable on slow (e.g. SLIP) links and/or very busy
-# caches. Impatient users may tie up file descriptors and
-# bandwidth by repeatedly requesting and immediately aborting
-# downloads.
-#
-# When the user aborts a request, Squid will check the
-# quick_abort values to the amount of data transferred until
-# then.
-#
-# If the transfer has less than 'quick_abort_min' KB remaining,
-# it will finish the retrieval.
-#
-# If the transfer has more than 'quick_abort_max' KB remaining,
-# it will abort the retrieval.
-#
-# If more than 'quick_abort_pct' of the transfer has completed,
-# it will finish the retrieval.
-#
-# If you do not want any retrieval to continue after the client
-# has aborted, set both 'quick_abort_min' and 'quick_abort_max'
-# to '0 KB'.
-#
-# If you want retrievals to always continue if they are being
-# cached set 'quick_abort_min' to '-1 KB'.
-#Default:
-# quick_abort_pct 95
-
-# TAG: read_ahead_gap buffer-size
-# The amount of data the cache will buffer ahead of what has been
-# sent to the client when retrieving an object from another server.
-#Default:
-# read_ahead_gap 16 KB
-
-# TAG: negative_ttl time-units
-# Set the Default Time-to-Live (TTL) for failed requests.
-# Certain types of failures (such as "connection refused" and
-# "404 Not Found") are able to be negatively-cached for a short time.
-# Modern web servers should provide Expires: header, however if they
-# do not this can provide a minimum TTL.
-# The default is not to cache errors with unknown expiry details.
-#
-# Note that this is different from negative caching of DNS lookups.
-#
-# WARNING: Doing this VIOLATES the HTTP standard. Enabling
-# this feature could make you liable for problems which it
-# causes.
-#Default:
-# negative_ttl 0 seconds
-
-# TAG: positive_dns_ttl time-units
-# Upper limit on how long Squid will cache positive DNS responses.
-# Default is 6 hours (360 minutes). This directive must be set
-# larger than negative_dns_ttl.
-#Default:
-# positive_dns_ttl 6 hours
-
-# TAG: negative_dns_ttl time-units
-# Time-to-Live (TTL) for negative caching of failed DNS lookups.
-# This also sets the lower cache limit on positive lookups.
-# Minimum value is 1 second, and it is not recommendable to go
-# much below 10 seconds.
-#Default:
-# negative_dns_ttl 1 minutes
-
-# TAG: range_offset_limit size [acl acl...]
-# usage: (size) [units] [[!]aclname]
-#
-# Sets an upper limit on how far (number of bytes) into the file
-# a Range request may be to cause Squid to prefetch the whole file.
-# If beyond this limit, Squid forwards the Range request as it is and
-# the result is NOT cached.
-#
-# This is to stop a far ahead range request (lets say start at 17MB)
-# from making Squid fetch the whole object up to that point before
-# sending anything to the client.
-#
-# Multiple range_offset_limit lines may be specified, and they will
-# be searched from top to bottom on each request until a match is found.
-# The first match found will be used. If no line matches a request, the
-# default limit of 0 bytes will be used.
-#
-# 'size' is the limit specified as a number of units.
-#
-# 'units' specifies whether to use bytes, KB, MB, etc.
-# If no units are specified bytes are assumed.
-#
-# A size of 0 causes Squid to never fetch more than the
-# client requested. (default)
-#
-# A size of 'none' causes Squid to always fetch the object from the
-# beginning so it may cache the result. (2.0 style)
-#
-# 'aclname' is the name of a defined ACL.
-#
-# NP: Using 'none' as the byte value here will override any quick_abort settings
-# that may otherwise apply to the range request. The range request will
-# be fully fetched from start to finish regardless of the client
-# actions. This affects bandwidth usage.
-#Default:
-# none
-
-# TAG: minimum_expiry_time (seconds)
-# The minimum caching time according to (Expires - Date)
-# headers Squid honors if the object can't be revalidated.
-# The default is 60 seconds.
-#
-# In reverse proxy environments it might be desirable to honor
-# shorter object lifetimes. It is most likely better to make
-# your server return a meaningful Last-Modified header however.
-#
-# In ESI environments where page fragments often have short
-# lifetimes, this will often be best set to 0.
-#Default:
-# minimum_expiry_time 60 seconds
-
-# TAG: store_avg_object_size (bytes)
-# Average object size, used to estimate number of objects your
-# cache can hold. The default is 13 KB.
-#
-# This is used to pre-seed the cache index memory allocation to
-# reduce expensive reallocate operations while handling clients
-# traffic. Too-large values may result in memory allocation during
-# peak traffic, too-small values will result in wasted memory.
-#
-# Check the cache manager 'info' report metrics for the real
-# object sizes seen by your Squid before tuning this.
-#Default:
-# store_avg_object_size 13 KB
-
-# TAG: store_objects_per_bucket
-# Target number of objects per bucket in the store hash table.
-# Lowering this value increases the total number of buckets and
-# also the storage maintenance rate. The default is 20.
-#Default:
-# store_objects_per_bucket 20
-
-# HTTP OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: request_header_max_size (KB)
-# This specifies the maximum size for HTTP headers in a request.
-# Request headers are usually relatively small (about 512 bytes).
-# Placing a limit on the request header size will catch certain
-# bugs (for example with persistent connections) and possibly
-# buffer-overflow or denial-of-service attacks.
-#Default:
-# request_header_max_size 64 KB
-
-# TAG: reply_header_max_size (KB)
-# This specifies the maximum size for HTTP headers in a reply.
-# Reply headers are usually relatively small (about 512 bytes).
-# Placing a limit on the reply header size will catch certain
-# bugs (for example with persistent connections) and possibly
-# buffer-overflow or denial-of-service attacks.
-#Default:
-# reply_header_max_size 64 KB
-
-# TAG: request_body_max_size (bytes)
-# This specifies the maximum size for an HTTP request body.
-# In other words, the maximum size of a PUT/POST request.
-# A user who attempts to send a request with a body larger
-# than this limit receives an "Invalid Request" error message.
-# If you set this parameter to a zero (the default), there will
-# be no limit imposed.
-#
-# See also client_request_buffer_max_size for an alternative
-# limitation on client uploads which can be configured.
-#Default:
-# No limit.
-
-# TAG: client_request_buffer_max_size (bytes)
-# This specifies the maximum buffer size of a client request.
-# It prevents squid eating too much memory when somebody uploads
-# a large file.
-#Default:
-# client_request_buffer_max_size 512 KB
-
-# TAG: chunked_request_body_max_size (bytes)
-# A broken or confused HTTP/1.1 client may send a chunked HTTP
-# request to Squid. Squid does not have full support for that
-# feature yet. To cope with such requests, Squid buffers the
-# entire request and then dechunks request body to create a
-# plain HTTP/1.0 request with a known content length. The plain
-# request is then used by the rest of Squid code as usual.
-#
-# The option value specifies the maximum size of the buffer used
-# to hold the request before the conversion. If the chunked
-# request size exceeds the specified limit, the conversion
-# fails, and the client receives an "unsupported request" error,
-# as if dechunking was disabled.
-#
-# Dechunking is enabled by default. To disable conversion of
-# chunked requests, set the maximum to zero.
-#
-# Request dechunking feature and this option in particular are a
-# temporary hack. When chunking requests and responses are fully
-# supported, there will be no need to buffer a chunked request.
-#Default:
-# chunked_request_body_max_size 64 KB
-
-# TAG: broken_posts
-# A list of ACL elements which, if matched, causes Squid to send
-# an extra CRLF pair after the body of a PUT/POST request.
-#
-# Some HTTP servers has broken implementations of PUT/POST,
-# and rely on an extra CRLF pair sent by some WWW clients.
-#
-# Quote from RFC2616 section 4.1 on this matter:
-#
-# Note: certain buggy HTTP/1.0 client implementations generate an
-# extra CRLF's after a POST request. To restate what is explicitly
-# forbidden by the BNF, an HTTP/1.1 client must not preface or follow
-# a request with an extra CRLF.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Example:
-# acl buggy_server url_regex ^http://....
-# broken_posts allow buggy_server
-#Default:
-# Obey RFC 2616.
-
-# TAG: adaptation_uses_indirect_client on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-follow-x-forwarded-for and (--enable-icap-client and/or --enable-ecap)
-#
-# Controls whether the indirect client IP address (instead of the direct
-# client IP address) is passed to adaptation services.
-#
-# See also: follow_x_forwarded_for adaptation_send_client_ip
-#Default:
-# adaptation_uses_indirect_client on
-
-# TAG: via on|off
-# If set (default), Squid will include a Via header in requests and
-# replies as required by RFC2616.
-#Default:
-# via on
-
-# TAG: ie_refresh on|off
-# Microsoft Internet Explorer up until version 5.5 Service
-# Pack 1 has an issue with transparent proxies, wherein it
-# is impossible to force a refresh. Turning this on provides
-# a partial fix to the problem, by causing all IMS-REFRESH
-# requests from older IE versions to check the origin server
-# for fresh content. This reduces hit ratio by some amount
-# (~10% in my experience), but allows users to actually get
-# fresh content when they want it. Note because Squid
-# cannot tell if the user is using 5.5 or 5.5SP1, the behavior
-# of 5.5 is unchanged from old versions of Squid (i.e. a
-# forced refresh is impossible). Newer versions of IE will,
-# hopefully, continue to have the new behavior and will be
-# handled based on that assumption. This option defaults to
-# the old Squid behavior, which is better for hit ratios but
-# worse for clients using IE, if they need to be able to
-# force fresh content.
-#Default:
-# ie_refresh off
-
-# TAG: vary_ignore_expire on|off
-# Many HTTP servers supporting Vary gives such objects
-# immediate expiry time with no cache-control header
-# when requested by a HTTP/1.0 client. This option
-# enables Squid to ignore such expiry times until
-# HTTP/1.1 is fully implemented.
-#
-# WARNING: If turned on this may eventually cause some
-# varying objects not intended for caching to get cached.
-#Default:
-# vary_ignore_expire off
-
-# TAG: request_entities
-# Squid defaults to deny GET and HEAD requests with request entities,
-# as the meaning of such requests are undefined in the HTTP standard
-# even if not explicitly forbidden.
-#
-# Set this directive to on if you have clients which insists
-# on sending request entities in GET or HEAD requests. But be warned
-# that there is server software (both proxies and web servers) which
-# can fail to properly process this kind of request which may make you
-# vulnerable to cache pollution attacks if enabled.
-#Default:
-# request_entities off
-
-# TAG: request_header_access
-# Usage: request_header_access header_name allow|deny [!]aclname ...
-#
-# WARNING: Doing this VIOLATES the HTTP standard. Enabling
-# this feature could make you liable for problems which it
-# causes.
-#
-# This option replaces the old 'anonymize_headers' and the
-# older 'http_anonymizer' option with something that is much
-# more configurable. A list of ACLs for each header name allows
-# removal of specific header fields under specific conditions.
-#
-# This option only applies to outgoing HTTP request headers (i.e.,
-# headers sent by Squid to the next HTTP hop such as a cache peer
-# or an origin server). The option has no effect during cache hit
-# detection. The equivalent adaptation vectoring point in ICAP
-# terminology is post-cache REQMOD.
-#
-# The option is applied to individual outgoing request header
-# fields. For each request header field F, Squid uses the first
-# qualifying sets of request_header_access rules:
-#
-# 1. Rules with header_name equal to F's name.
-# 2. Rules with header_name 'Other', provided F's name is not
-# on the hard-coded list of commonly used HTTP header names.
-# 3. Rules with header_name 'All'.
-#
-# Within that qualifying rule set, rule ACLs are checked as usual.
-# If ACLs of an "allow" rule match, the header field is allowed to
-# go through as is. If ACLs of a "deny" rule match, the header is
-# removed and request_header_replace is then checked to identify
-# if the removed header has a replacement. If no rules within the
-# set have matching ACLs, the header field is left as is.
-#
-# For example, to achieve the same behavior as the old
-# 'http_anonymizer standard' option, you should use:
-#
-# request_header_access From deny all
-# request_header_access Referer deny all
-# request_header_access User-Agent deny all
-#
-# Or, to reproduce the old 'http_anonymizer paranoid' feature
-# you should use:
-#
-# request_header_access Authorization allow all
-# request_header_access Proxy-Authorization allow all
-# request_header_access Cache-Control allow all
-# request_header_access Content-Length allow all
-# request_header_access Content-Type allow all
-# request_header_access Date allow all
-# request_header_access Host allow all
-# request_header_access If-Modified-Since allow all
-# request_header_access Pragma allow all
-# request_header_access Accept allow all
-# request_header_access Accept-Charset allow all
-# request_header_access Accept-Encoding allow all
-# request_header_access Accept-Language allow all
-# request_header_access Connection allow all
-# request_header_access All deny all
-#
-# HTTP reply headers are controlled with the reply_header_access directive.
-#
-# By default, all headers are allowed (no anonymizing is performed).
-#Default:
-# No limits.
-
-# TAG: reply_header_access
-# Usage: reply_header_access header_name allow|deny [!]aclname ...
-#
-# WARNING: Doing this VIOLATES the HTTP standard. Enabling
-# this feature could make you liable for problems which it
-# causes.
-#
-# This option only applies to reply headers, i.e., from the
-# server to the client.
-#
-# This is the same as request_header_access, but in the other
-# direction. Please see request_header_access for detailed
-# documentation.
-#
-# For example, to achieve the same behavior as the old
-# 'http_anonymizer standard' option, you should use:
-#
-# reply_header_access Server deny all
-# reply_header_access WWW-Authenticate deny all
-# reply_header_access Link deny all
-#
-# Or, to reproduce the old 'http_anonymizer paranoid' feature
-# you should use:
-#
-# reply_header_access Allow allow all
-# reply_header_access WWW-Authenticate allow all
-# reply_header_access Proxy-Authenticate allow all
-# reply_header_access Cache-Control allow all
-# reply_header_access Content-Encoding allow all
-# reply_header_access Content-Length allow all
-# reply_header_access Content-Type allow all
-# reply_header_access Date allow all
-# reply_header_access Expires allow all
-# reply_header_access Last-Modified allow all
-# reply_header_access Location allow all
-# reply_header_access Pragma allow all
-# reply_header_access Content-Language allow all
-# reply_header_access Retry-After allow all
-# reply_header_access Title allow all
-# reply_header_access Content-Disposition allow all
-# reply_header_access Connection allow all
-# reply_header_access All deny all
-#
-# HTTP request headers are controlled with the request_header_access directive.
-#
-# By default, all headers are allowed (no anonymizing is
-# performed).
-#Default:
-# No limits.
-
-# TAG: request_header_replace
-# Usage: request_header_replace header_name message
-# Example: request_header_replace User-Agent Nutscrape/1.0 (CP/M; 8-bit)
-#
-# This option allows you to change the contents of headers
-# denied with request_header_access above, by replacing them
-# with some fixed string.
-#
-# This only applies to request headers, not reply headers.
-#
-# By default, headers are removed if denied.
-#Default:
-# none
-
-# TAG: reply_header_replace
-# Usage: reply_header_replace header_name message
-# Example: reply_header_replace Server Foo/1.0
-#
-# This option allows you to change the contents of headers
-# denied with reply_header_access above, by replacing them
-# with some fixed string.
-#
-# This only applies to reply headers, not request headers.
-#
-# By default, headers are removed if denied.
-#Default:
-# none
-
-# TAG: request_header_add
-# Usage: request_header_add field-name field-value acl1 [acl2] ...
-# Example: request_header_add X-Client-CA "CA=%ssl::>cert_issuer" all
-#
-# This option adds header fields to outgoing HTTP requests (i.e.,
-# request headers sent by Squid to the next HTTP hop such as a
-# cache peer or an origin server). The option has no effect during
-# cache hit detection. The equivalent adaptation vectoring point
-# in ICAP terminology is post-cache REQMOD.
-#
-# Field-name is a token specifying an HTTP header name. If a
-# standard HTTP header name is used, Squid does not check whether
-# the new header conflicts with any existing headers or violates
-# HTTP rules. If the request to be modified already contains a
-# field with the same name, the old field is preserved but the
-# header field values are not merged.
-#
-# Field-value is either a token or a quoted string. If quoted
-# string format is used, then the surrounding quotes are removed
-# while escape sequences and %macros are processed.
-#
-# In theory, all of the logformat codes can be used as %macros.
-# However, unlike logging (which happens at the very end of
-# transaction lifetime), the transaction may not yet have enough
-# information to expand a macro when the new header value is needed.
-# And some information may already be available to Squid but not yet
-# committed where the macro expansion code can access it (report
-# such instances!). The macro will be expanded into a single dash
-# ('-') in such cases. Not all macros have been tested.
-#
-# One or more Squid ACLs may be specified to restrict header
-# injection to matching requests. As always in squid.conf, all
-# ACLs in an option ACL list must be satisfied for the insertion
-# to happen. The request_header_add option supports fast ACLs
-# only.
-#Default:
-# none
-
-# TAG: note
-# This option used to log custom information about the master
-# transaction. For example, an admin may configure Squid to log
-# which "user group" the transaction belongs to, where "user group"
-# will be determined based on a set of ACLs and not [just]
-# authentication information.
-# Values of key/value pairs can be logged using %{key}note macros:
-#
-# note key value acl ...
-# logformat myFormat ... %{key}note ...
-#Default:
-# none
-
-# TAG: relaxed_header_parser on|off|warn
-# In the default "on" setting Squid accepts certain forms
-# of non-compliant HTTP messages where it is unambiguous
-# what the sending application intended even if the message
-# is not correctly formatted. The messages is then normalized
-# to the correct form when forwarded by Squid.
-#
-# If set to "warn" then a warning will be emitted in cache.log
-# each time such HTTP error is encountered.
-#
-# If set to "off" then such HTTP errors will cause the request
-# or response to be rejected.
-#Default:
-# relaxed_header_parser on
-
-# TIMEOUTS
-# -----------------------------------------------------------------------------
-
-# TAG: forward_timeout time-units
-# This parameter specifies how long Squid should at most attempt in
-# finding a forwarding path for the request before giving up.
-#Default:
-# forward_timeout 4 minutes
-
-# TAG: connect_timeout time-units
-# This parameter specifies how long to wait for the TCP connect to
-# the requested server or peer to complete before Squid should
-# attempt to find another path where to forward the request.
-#Default:
-# connect_timeout 1 minute
-
-# TAG: peer_connect_timeout time-units
-# This parameter specifies how long to wait for a pending TCP
-# connection to a peer cache. The default is 30 seconds. You
-# may also set different timeout values for individual neighbors
-# with the 'connect-timeout' option on a 'cache_peer' line.
-#Default:
-# peer_connect_timeout 30 seconds
-
-# TAG: read_timeout time-units
-# The read_timeout is applied on server-side connections. After
-# each successful read(), the timeout will be extended by this
-# amount. If no data is read again after this amount of time,
-# the request is aborted and logged with ERR_READ_TIMEOUT. The
-# default is 15 minutes.
-#Default:
-# read_timeout 15 minutes
-
-# TAG: write_timeout time-units
-# This timeout is tracked for all connections that have data
-# available for writing and are waiting for the socket to become
-# ready. After each successful write, the timeout is extended by
-# the configured amount. If Squid has data to write but the
-# connection is not ready for the configured duration, the
-# transaction associated with the connection is terminated. The
-# default is 15 minutes.
-#Default:
-# write_timeout 15 minutes
-
-# TAG: request_timeout
-# How long to wait for complete HTTP request headers after initial
-# connection establishment.
-#Default:
-# request_timeout 5 minutes
-
-# TAG: client_idle_pconn_timeout
-# How long to wait for the next HTTP request on a persistent
-# client connection after the previous request completes.
-#Default:
-# client_idle_pconn_timeout 2 minutes
-
-# TAG: client_lifetime time-units
-# The maximum amount of time a client (browser) is allowed to
-# remain connected to the cache process. This protects the Cache
-# from having a lot of sockets (and hence file descriptors) tied up
-# in a CLOSE_WAIT state from remote clients that go away without
-# properly shutting down (either because of a network failure or
-# because of a poor client implementation). The default is one
-# day, 1440 minutes.
-#
-# NOTE: The default value is intended to be much larger than any
-# client would ever need to be connected to your cache. You
-# should probably change client_lifetime only as a last resort.
-# If you seem to have many client connections tying up
-# filedescriptors, we recommend first tuning the read_timeout,
-# request_timeout, persistent_request_timeout and quick_abort values.
-#Default:
-# client_lifetime 1 day
-
-# TAG: half_closed_clients
-# Some clients may shutdown the sending side of their TCP
-# connections, while leaving their receiving sides open. Sometimes,
-# Squid can not tell the difference between a half-closed and a
-# fully-closed TCP connection.
-#
-# By default, Squid will immediately close client connections when
-# read(2) returns "no more data to read."
-#
-# Change this option to 'on' and Squid will keep open connections
-# until a read(2) or write(2) on the socket returns an error.
-# This may show some benefits for reverse proxies. But if not
-# it is recommended to leave OFF.
-#Default:
-# half_closed_clients off
-
-# TAG: server_idle_pconn_timeout
-# Timeout for idle persistent connections to servers and other
-# proxies.
-#Default:
-# server_idle_pconn_timeout 1 minute
-
-# TAG: ident_timeout
-# Maximum time to wait for IDENT lookups to complete.
-#
-# If this is too high, and you enabled IDENT lookups from untrusted
-# users, you might be susceptible to denial-of-service by having
-# many ident requests going at once.
-#Default:
-# ident_timeout 10 seconds
-
-# TAG: shutdown_lifetime time-units
-# When SIGTERM or SIGHUP is received, the cache is put into
-# "shutdown pending" mode until all active sockets are closed.
-# This value is the lifetime to set for all open descriptors
-# during shutdown mode. Any active clients after this many
-# seconds will receive a 'timeout' message.
-#Default:
-# shutdown_lifetime 30 seconds
-
-# ADMINISTRATIVE PARAMETERS
-# -----------------------------------------------------------------------------
-
-# TAG: cache_mgr
-# Email-address of local cache manager who will receive
-# mail if the cache dies. The default is "webmaster".
-#Default:
-# cache_mgr webmaster
-
-# TAG: mail_from
-# From: email-address for mail sent when the cache dies.
-# The default is to use 'squid@unique_hostname'.
-#
-# See also: unique_hostname directive.
-#Default:
-# none
-
-# TAG: mail_program
-# Email program used to send mail if the cache dies.
-# The default is "mail". The specified program must comply
-# with the standard Unix mail syntax:
-# mail-program recipient < mailfile
-#
-# Optional command line options can be specified.
-#Default:
-# mail_program mail
-
-# TAG: cache_effective_user
-# If you start Squid as root, it will change its effective/real
-# UID/GID to the user specified below. The default is to change
-# to UID of nobody.
-# see also; cache_effective_group
-#Default:
-# cache_effective_user nobody
-
-# TAG: cache_effective_group
-# Squid sets the GID to the effective user's default group ID
-# (taken from the password file) and supplementary group list
-# from the groups membership.
-#
-# If you want Squid to run with a specific GID regardless of
-# the group memberships of the effective user then set this
-# to the group (or GID) you want Squid to run as. When set
-# all other group privileges of the effective user are ignored
-# and only this GID is effective. If Squid is not started as
-# root the user starting Squid MUST be member of the specified
-# group.
-#
-# This option is not recommended by the Squid Team.
-# Our preference is for administrators to configure a secure
-# user account for squid with UID/GID matching system policies.
-#Default:
-# Use system group memberships of the cache_effective_user account
-
-# TAG: httpd_suppress_version_string on|off
-# Suppress Squid version string info in HTTP headers and HTML error pages.
-#Default:
-# httpd_suppress_version_string off
-
-# TAG: visible_hostname
-# If you want to present a special hostname in error messages, etc,
-# define this. Otherwise, the return value of gethostname()
-# will be used. If you have multiple caches in a cluster and
-# get errors about IP-forwarding you must set them to have individual
-# names with this setting.
-#Default:
-# Automatically detect the system host name
-
-# TAG: unique_hostname
-# If you want to have multiple machines with the same
-# 'visible_hostname' you must give each machine a different
-# 'unique_hostname' so forwarding loops can be detected.
-#Default:
-# Copy the value from visible_hostname
-
-# TAG: hostname_aliases
-# A list of other DNS names your cache has.
-#Default:
-# none
-
-# TAG: umask
-# Minimum umask which should be enforced while the proxy
-# is running, in addition to the umask set at startup.
-#
-# For a traditional octal representation of umasks, start
-# your value with 0.
-#Default:
-# umask 027
-
-# OPTIONS FOR THE CACHE REGISTRATION SERVICE
-# -----------------------------------------------------------------------------
-#
-# This section contains parameters for the (optional) cache
-# announcement service. This service is provided to help
-# cache administrators locate one another in order to join or
-# create cache hierarchies.
-#
-# An 'announcement' message is sent (via UDP) to the registration
-# service by Squid. By default, the announcement message is NOT
-# SENT unless you enable it with 'announce_period' below.
-#
-# The announcement message includes your hostname, plus the
-# following information from this configuration file:
-#
-# http_port
-# icp_port
-# cache_mgr
-#
-# All current information is processed regularly and made
-# available on the Web at http://www.ircache.net/Cache/Tracker/.
-
-# TAG: announce_period
-# This is how frequently to send cache announcements.
-#
-# To enable announcing your cache, just set an announce period.
-#
-# Example:
-# announce_period 1 day
-#Default:
-# Announcement messages disabled.
-
-# TAG: announce_host
-# Set the hostname where announce registration messages will be sent.
-#
-# See also announce_port and announce_file
-#Default:
-# announce_host tracker.ircache.net
-
-# TAG: announce_file
-# The contents of this file will be included in the announce
-# registration messages.
-#Default:
-# none
-
-# TAG: announce_port
-# Set the port where announce registration messages will be sent.
-#
-# See also announce_host and announce_file
-#Default:
-# announce_port 3131
-
-# HTTPD-ACCELERATOR OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: httpd_accel_surrogate_id
-# Surrogates (http://www.esi.org/architecture_spec_1.0.html)
-# need an identification token to allow control targeting. Because
-# a farm of surrogates may all perform the same tasks, they may share
-# an identification token.
-#Default:
-# visible_hostname is used if no specific ID is set.
-
-# TAG: http_accel_surrogate_remote on|off
-# Remote surrogates (such as those in a CDN) honour the header
-# "Surrogate-Control: no-store-remote".
-#
-# Set this to on to have squid behave as a remote surrogate.
-#Default:
-# http_accel_surrogate_remote off
-
-# TAG: esi_parser libxml2|expat|custom
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-esi
-#
-# ESI markup is not strictly XML compatible. The custom ESI parser
-# will give higher performance, but cannot handle non ASCII character
-# encodings.
-#Default:
-# esi_parser custom
-
-# DELAY POOL PARAMETERS
-# -----------------------------------------------------------------------------
-
-# TAG: delay_pools
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This represents the number of delay pools to be used. For example,
-# if you have one class 2 delay pool and one class 3 delays pool, you
-# have a total of 2 delay pools.
-#
-# See also delay_parameters, delay_class, delay_access for pool
-# configuration details.
-#Default:
-# delay_pools 0
-
-# TAG: delay_class
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This defines the class of each delay pool. There must be exactly one
-# delay_class line for each delay pool. For example, to define two
-# delay pools, one of class 2 and one of class 3, the settings above
-# and here would be:
-#
-# Example:
-# delay_pools 4 # 4 delay pools
-# delay_class 1 2 # pool 1 is a class 2 pool
-# delay_class 2 3 # pool 2 is a class 3 pool
-# delay_class 3 4 # pool 3 is a class 4 pool
-# delay_class 4 5 # pool 4 is a class 5 pool
-#
-# The delay pool classes are:
-#
-# class 1 Everything is limited by a single aggregate
-# bucket.
-#
-# class 2 Everything is limited by a single aggregate
-# bucket as well as an "individual" bucket chosen
-# from bits 25 through 32 of the IPv4 address.
-#
-# class 3 Everything is limited by a single aggregate
-# bucket as well as a "network" bucket chosen
-# from bits 17 through 24 of the IP address and a
-# "individual" bucket chosen from bits 17 through
-# 32 of the IPv4 address.
-#
-# class 4 Everything in a class 3 delay pool, with an
-# additional limit on a per user basis. This
-# only takes effect if the username is established
-# in advance - by forcing authentication in your
-# http_access rules.
-#
-# class 5 Requests are grouped according their tag (see
-# external_acl's tag= reply).
-#
-#
-# Each pool also requires a delay_parameters directive to configure the pool size
-# and speed limits used whenever the pool is applied to a request. Along with
-# a set of delay_access directives to determine when it is used.
-#
-# NOTE: If an IP address is a.b.c.d
-# -> bits 25 through 32 are "d"
-# -> bits 17 through 24 are "c"
-# -> bits 17 through 32 are "c * 256 + d"
-#
-# NOTE-2: Due to the use of bitmasks in class 2,3,4 pools they only apply to
-# IPv4 traffic. Class 1 and 5 pools may be used with IPv6 traffic.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-# See also delay_parameters and delay_access.
-#Default:
-# none
-
-# TAG: delay_access
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This is used to determine which delay pool a request falls into.
-#
-# delay_access is sorted per pool and the matching starts with pool 1,
-# then pool 2, ..., and finally pool N. The first delay pool where the
-# request is allowed is selected for the request. If it does not allow
-# the request to any pool then the request is not delayed (default).
-#
-# For example, if you want some_big_clients in delay
-# pool 1 and lotsa_little_clients in delay pool 2:
-#
-# delay_access 1 allow some_big_clients
-# delay_access 1 deny all
-# delay_access 2 allow lotsa_little_clients
-# delay_access 2 deny all
-# delay_access 3 allow authenticated_clients
-#
-# See also delay_parameters and delay_class.
-#
-#Default:
-# Deny using the pool, unless allow rules exist in squid.conf for the pool.
-
-# TAG: delay_parameters
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This defines the parameters for a delay pool. Each delay pool has
-# a number of "buckets" associated with it, as explained in the
-# description of delay_class.
-#
-# For a class 1 delay pool, the syntax is:
-# delay_pools pool 1
-# delay_parameters pool aggregate
-#
-# For a class 2 delay pool:
-# delay_pools pool 2
-# delay_parameters pool aggregate individual
-#
-# For a class 3 delay pool:
-# delay_pools pool 3
-# delay_parameters pool aggregate network individual
-#
-# For a class 4 delay pool:
-# delay_pools pool 4
-# delay_parameters pool aggregate network individual user
-#
-# For a class 5 delay pool:
-# delay_pools pool 5
-# delay_parameters pool tagrate
-#
-# The option variables are:
-#
-# pool a pool number - ie, a number between 1 and the
-# number specified in delay_pools as used in
-# delay_class lines.
-#
-# aggregate the speed limit parameters for the aggregate bucket
-# (class 1, 2, 3).
-#
-# individual the speed limit parameters for the individual
-# buckets (class 2, 3).
-#
-# network the speed limit parameters for the network buckets
-# (class 3).
-#
-# user the speed limit parameters for the user buckets
-# (class 4).
-#
-# tagrate the speed limit parameters for the tag buckets
-# (class 5).
-#
-# A pair of delay parameters is written restore/maximum, where restore is
-# the number of bytes (not bits - modem and network speeds are usually
-# quoted in bits) per second placed into the bucket, and maximum is the
-# maximum number of bytes which can be in the bucket at any time.
-#
-# There must be one delay_parameters line for each delay pool.
-#
-#
-# For example, if delay pool number 1 is a class 2 delay pool as in the
-# above example, and is being used to strictly limit each host to 64Kbit/sec
-# (plus overheads), with no overall limit, the line is:
-#
-# delay_parameters 1 -1/-1 8000/8000
-#
-# Note that 8 x 8000 KByte/sec -> 64Kbit/sec.
-#
-# Note that the figure -1 is used to represent "unlimited".
-#
-#
-# And, if delay pool number 2 is a class 3 delay pool as in the above
-# example, and you want to limit it to a total of 256Kbit/sec (strict limit)
-# with each 8-bit network permitted 64Kbit/sec (strict limit) and each
-# individual host permitted 4800bit/sec with a bucket maximum size of 64Kbits
-# to permit a decent web page to be downloaded at a decent speed
-# (if the network is not being limited due to overuse) but slow down
-# large downloads more significantly:
-#
-# delay_parameters 2 32000/32000 8000/8000 600/8000
-#
-# Note that 8 x 32000 KByte/sec -> 256Kbit/sec.
-# 8 x 8000 KByte/sec -> 64Kbit/sec.
-# 8 x 600 Byte/sec -> 4800bit/sec.
-#
-#
-# Finally, for a class 4 delay pool as in the example - each user will
-# be limited to 128Kbits/sec no matter how many workstations they are logged into.:
-#
-# delay_parameters 4 32000/32000 8000/8000 600/64000 16000/16000
-#
-#
-# See also delay_class and delay_access.
-#
-#Default:
-# none
-
-# TAG: delay_initial_bucket_level (percent, 0-100)
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# The initial bucket percentage is used to determine how much is put
-# in each bucket when squid starts, is reconfigured, or first notices
-# a host accessing it (in class 2 and class 3, individual hosts and
-# networks only have buckets associated with them once they have been
-# "seen" by squid).
-#Default:
-# delay_initial_bucket_level 50
-
-# CLIENT DELAY POOL PARAMETERS
-# -----------------------------------------------------------------------------
-
-# TAG: client_delay_pools
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This option specifies the number of client delay pools used. It must
-# preceed other client_delay_* options.
-#
-# Example:
-# client_delay_pools 2
-#
-# See also client_delay_parameters and client_delay_access.
-#Default:
-# client_delay_pools 0
-
-# TAG: client_delay_initial_bucket_level (percent, 0-no_limit)
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This option determines the initial bucket size as a percentage of
-# max_bucket_size from client_delay_parameters. Buckets are created
-# at the time of the "first" connection from the matching IP. Idle
-# buckets are periodically deleted up.
-#
-# You can specify more than 100 percent but note that such "oversized"
-# buckets are not refilled until their size goes down to max_bucket_size
-# from client_delay_parameters.
-#
-# Example:
-# client_delay_initial_bucket_level 50
-#Default:
-# client_delay_initial_bucket_level 50
-
-# TAG: client_delay_parameters
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-#
-# This option configures client-side bandwidth limits using the
-# following format:
-#
-# client_delay_parameters pool speed_limit max_bucket_size
-#
-# pool is an integer ID used for client_delay_access matching.
-#
-# speed_limit is bytes added to the bucket per second.
-#
-# max_bucket_size is the maximum size of a bucket, enforced after any
-# speed_limit additions.
-#
-# Please see the delay_parameters option for more information and
-# examples.
-#
-# Example:
-# client_delay_parameters 1 1024 2048
-# client_delay_parameters 2 51200 16384
-#
-# See also client_delay_access.
-#
-#Default:
-# none
-
-# TAG: client_delay_access
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This option determines the client-side delay pool for the
-# request:
-#
-# client_delay_access pool_ID allow|deny acl_name
-#
-# All client_delay_access options are checked in their pool ID
-# order, starting with pool 1. The first checked pool with allowed
-# request is selected for the request. If no ACL matches or there
-# are no client_delay_access options, the request bandwidth is not
-# limited.
-#
-# The ACL-selected pool is then used to find the
-# client_delay_parameters for the request. Client-side pools are
-# not used to aggregate clients. Clients are always aggregated
-# based on their source IP addresses (one bucket per source IP).
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-# Additionally, only the client TCP connection details are available.
-# ACLs testing HTTP properties will not work.
-#
-# Please see delay_access for more examples.
-#
-# Example:
-# client_delay_access 1 allow low_rate_network
-# client_delay_access 2 allow vips_network
-#
-#
-# See also client_delay_parameters and client_delay_pools.
-#Default:
-# Deny use of the pool, unless allow rules exist in squid.conf for the pool.
-
-# WCCPv1 AND WCCPv2 CONFIGURATION OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: wccp_router
-# Use this option to define your WCCP ``home'' router for
-# Squid.
-#
-# wccp_router supports a single WCCP(v1) router
-#
-# wccp2_router supports multiple WCCPv2 routers
-#
-# only one of the two may be used at the same time and defines
-# which version of WCCP to use.
-#Default:
-# WCCP disabled.
-
-# TAG: wccp2_router
-# Use this option to define your WCCP ``home'' router for
-# Squid.
-#
-# wccp_router supports a single WCCP(v1) router
-#
-# wccp2_router supports multiple WCCPv2 routers
-#
-# only one of the two may be used at the same time and defines
-# which version of WCCP to use.
-#Default:
-# WCCPv2 disabled.
-
-# TAG: wccp_version
-# This directive is only relevant if you need to set up WCCP(v1)
-# to some very old and end-of-life Cisco routers. In all other
-# setups it must be left unset or at the default setting.
-# It defines an internal version in the WCCP(v1) protocol,
-# with version 4 being the officially documented protocol.
-#
-# According to some users, Cisco IOS 11.2 and earlier only
-# support WCCP version 3. If you're using that or an earlier
-# version of IOS, you may need to change this value to 3, otherwise
-# do not specify this parameter.
-#Default:
-# wccp_version 4
-
-# TAG: wccp2_rebuild_wait
-# If this is enabled Squid will wait for the cache dir rebuild to finish
-# before sending the first wccp2 HereIAm packet
-#Default:
-# wccp2_rebuild_wait on
-
-# TAG: wccp2_forwarding_method
-# WCCP2 allows the setting of forwarding methods between the
-# router/switch and the cache. Valid values are as follows:
-#
-# gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
-# l2 - L2 redirect (forward the packet using Layer 2/MAC rewriting)
-#
-# Currently (as of IOS 12.4) cisco routers only support GRE.
-# Cisco switches only support the L2 redirect assignment method.
-#Default:
-# wccp2_forwarding_method gre
-
-# TAG: wccp2_return_method
-# WCCP2 allows the setting of return methods between the
-# router/switch and the cache for packets that the cache
-# decides not to handle. Valid values are as follows:
-#
-# gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
-# l2 - L2 redirect (forward the packet using Layer 2/MAC rewriting)
-#
-# Currently (as of IOS 12.4) cisco routers only support GRE.
-# Cisco switches only support the L2 redirect assignment.
-#
-# If the "ip wccp redirect exclude in" command has been
-# enabled on the cache interface, then it is still safe for
-# the proxy server to use a l2 redirect method even if this
-# option is set to GRE.
-#Default:
-# wccp2_return_method gre
-
-# TAG: wccp2_assignment_method
-# WCCP2 allows the setting of methods to assign the WCCP hash
-# Valid values are as follows:
-#
-# hash - Hash assignment
-# mask - Mask assignment
-#
-# As a general rule, cisco routers support the hash assignment method
-# and cisco switches support the mask assignment method.
-#Default:
-# wccp2_assignment_method hash
-
-# TAG: wccp2_service
-# WCCP2 allows for multiple traffic services. There are two
-# types: "standard" and "dynamic". The standard type defines
-# one service id - http (id 0). The dynamic service ids can be from
-# 51 to 255 inclusive. In order to use a dynamic service id
-# one must define the type of traffic to be redirected; this is done
-# using the wccp2_service_info option.
-#
-# The "standard" type does not require a wccp2_service_info option,
-# just specifying the service id will suffice.
-#
-# MD5 service authentication can be enabled by adding
-# "password=<password>" to the end of this service declaration.
-#
-# Examples:
-#
-# wccp2_service standard 0 # for the 'web-cache' standard service
-# wccp2_service dynamic 80 # a dynamic service type which will be
-# # fleshed out with subsequent options.
-# wccp2_service standard 0 password=foo
-#Default:
-# Use the 'web-cache' standard service.
-
-# TAG: wccp2_service_info
-# Dynamic WCCPv2 services require further information to define the
-# traffic you wish to have diverted.
-#
-# The format is:
-#
-# wccp2_service_info <id> protocol=<protocol> flags=<flag>,<flag>..
-# priority=<priority> ports=<port>,<port>..
-#
-# The relevant WCCPv2 flags:
-# + src_ip_hash, dst_ip_hash
-# + source_port_hash, dst_port_hash
-# + src_ip_alt_hash, dst_ip_alt_hash
-# + src_port_alt_hash, dst_port_alt_hash
-# + ports_source
-#
-# The port list can be one to eight entries.
-#
-# Example:
-#
-# wccp2_service_info 80 protocol=tcp flags=src_ip_hash,ports_source
-# priority=240 ports=80
-#
-# Note: the service id must have been defined by a previous
-# 'wccp2_service dynamic <id>' entry.
-#Default:
-# none
-
-# TAG: wccp2_weight
-# Each cache server gets assigned a set of the destination
-# hash proportional to their weight.
-#Default:
-# wccp2_weight 10000
-
-# TAG: wccp_address
-# Use this option if you require WCCPv2 to use a specific
-# interface address.
-#
-# The default behavior is to not bind to any specific address.
-#Default:
-# Address selected by the operating system.
-
-# TAG: wccp2_address
-# Use this option if you require WCCP to use a specific
-# interface address.
-#
-# The default behavior is to not bind to any specific address.
-#Default:
-# Address selected by the operating system.
-
-# PERSISTENT CONNECTION HANDLING
-# -----------------------------------------------------------------------------
-#
-# Also see "pconn_timeout" in the TIMEOUTS section
-
-# TAG: client_persistent_connections
-# Persistent connection support for clients.
-# Squid uses persistent connections (when allowed). You can use
-# this option to disable persistent connections with clients.
-#Default:
-# client_persistent_connections on
-
-# TAG: server_persistent_connections
-# Persistent connection support for servers.
-# Squid uses persistent connections (when allowed). You can use
-# this option to disable persistent connections with servers.
-#Default:
-# server_persistent_connections on
-
-# TAG: persistent_connection_after_error
-# With this directive the use of persistent connections after
-# HTTP errors can be disabled. Useful if you have clients
-# who fail to handle errors on persistent connections proper.
-#Default:
-# persistent_connection_after_error on
-
-# TAG: detect_broken_pconn
-# Some servers have been found to incorrectly signal the use
-# of HTTP/1.0 persistent connections even on replies not
-# compatible, causing significant delays. This server problem
-# has mostly been seen on redirects.
-#
-# By enabling this directive Squid attempts to detect such
-# broken replies and automatically assume the reply is finished
-# after 10 seconds timeout.
-#Default:
-# detect_broken_pconn off
-
-# CACHE DIGEST OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: digest_generation
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-cache-digests
-#
-# This controls whether the server will generate a Cache Digest
-# of its contents. By default, Cache Digest generation is
-# enabled if Squid is compiled with --enable-cache-digests defined.
-#Default:
-# digest_generation on
-
-# TAG: digest_bits_per_entry
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-cache-digests
-#
-# This is the number of bits of the server's Cache Digest which
-# will be associated with the Digest entry for a given HTTP
-# Method and URL (public key) combination. The default is 5.
-#Default:
-# digest_bits_per_entry 5
-
-# TAG: digest_rebuild_period (seconds)
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-cache-digests
-#
-# This is the wait time between Cache Digest rebuilds.
-#Default:
-# digest_rebuild_period 1 hour
-
-# TAG: digest_rewrite_period (seconds)
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-cache-digests
-#
-# This is the wait time between Cache Digest writes to
-# disk.
-#Default:
-# digest_rewrite_period 1 hour
-
-# TAG: digest_swapout_chunk_size (bytes)
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-cache-digests
-#
-# This is the number of bytes of the Cache Digest to write to
-# disk at a time. It defaults to 4096 bytes (4KB), the Squid
-# default swap page.
-#Default:
-# digest_swapout_chunk_size 4096 bytes
-
-# TAG: digest_rebuild_chunk_percentage (percent, 0-100)
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-cache-digests
-#
-# This is the percentage of the Cache Digest to be scanned at a
-# time. By default it is set to 10% of the Cache Digest.
-#Default:
-# digest_rebuild_chunk_percentage 10
-
-# SNMP OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: snmp_port
-# The port number where Squid listens for SNMP requests. To enable
-# SNMP support set this to a suitable port number. Port number
-# 3401 is often used for the Squid SNMP agent. By default it's
-# set to "0" (disabled)
-#
-# Example:
-# snmp_port 3401
-#Default:
-# SNMP disabled.
-
-# TAG: snmp_access
-# Allowing or denying access to the SNMP port.
-#
-# All access to the agent is denied by default.
-# usage:
-#
-# snmp_access allow|deny [!]aclname ...
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Example:
-# snmp_access allow snmppublic localhost
-# snmp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-# TAG: snmp_incoming_address
-# Just like 'udp_incoming_address', but for the SNMP port.
-#
-# snmp_incoming_address is used for the SNMP socket receiving
-# messages from SNMP agents.
-#
-# The default snmp_incoming_address is to listen on all
-# available network interfaces.
-#Default:
-# Accept SNMP packets from all machine interfaces.
-
-# TAG: snmp_outgoing_address
-# Just like 'udp_outgoing_address', but for the SNMP port.
-#
-# snmp_outgoing_address is used for SNMP packets returned to SNMP
-# agents.
-#
-# If snmp_outgoing_address is not set it will use the same socket
-# as snmp_incoming_address. Only change this if you want to have
-# SNMP replies sent using another address than where this Squid
-# listens for SNMP queries.
-#
-# NOTE, snmp_incoming_address and snmp_outgoing_address can not have
-# the same value since they both use the same port.
-#Default:
-# Use snmp_incoming_address or an address selected by the operating system.
-
-# ICP OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: icp_port
-# The port number where Squid sends and receives ICP queries to
-# and from neighbor caches. The standard UDP port for ICP is 3130.
-#
-# Example:
-# icp_port 3130
-#Default:
-# ICP disabled.
-
-# TAG: htcp_port
-# The port number where Squid sends and receives HTCP queries to
-# and from neighbor caches. To turn it on you want to set it to
-# 4827.
-#
-# Example:
-# htcp_port 4827
-#Default:
-# HTCP disabled.
-
-# TAG: log_icp_queries on|off
-# If set, ICP queries are logged to access.log. You may wish
-# do disable this if your ICP load is VERY high to speed things
-# up or to simplify log analysis.
-#Default:
-# log_icp_queries on
-
-# TAG: udp_incoming_address
-# udp_incoming_address is used for UDP packets received from other
-# caches.
-#
-# The default behavior is to not bind to any specific address.
-#
-# Only change this if you want to have all UDP queries received on
-# a specific interface/address.
-#
-# NOTE: udp_incoming_address is used by the ICP, HTCP, and DNS
-# modules. Altering it will affect all of them in the same manner.
-#
-# see also; udp_outgoing_address
-#
-# NOTE, udp_incoming_address and udp_outgoing_address can not
-# have the same value since they both use the same port.
-#Default:
-# Accept packets from all machine interfaces.
-
-# TAG: udp_outgoing_address
-# udp_outgoing_address is used for UDP packets sent out to other
-# caches.
-#
-# The default behavior is to not bind to any specific address.
-#
-# Instead it will use the same socket as udp_incoming_address.
-# Only change this if you want to have UDP queries sent using another
-# address than where this Squid listens for UDP queries from other
-# caches.
-#
-# NOTE: udp_outgoing_address is used by the ICP, HTCP, and DNS
-# modules. Altering it will affect all of them in the same manner.
-#
-# see also; udp_incoming_address
-#
-# NOTE, udp_incoming_address and udp_outgoing_address can not
-# have the same value since they both use the same port.
-#Default:
-# Use udp_incoming_address or an address selected by the operating system.
-
-# TAG: icp_hit_stale on|off
-# If you want to return ICP_HIT for stale cache objects, set this
-# option to 'on'. If you have sibling relationships with caches
-# in other administrative domains, this should be 'off'. If you only
-# have sibling relationships with caches under your control,
-# it is probably okay to set this to 'on'.
-# If set to 'on', your siblings should use the option "allow-miss"
-# on their cache_peer lines for connecting to you.
-#Default:
-# icp_hit_stale off
-
-# TAG: minimum_direct_hops
-# If using the ICMP pinging stuff, do direct fetches for sites
-# which are no more than this many hops away.
-#Default:
-# minimum_direct_hops 4
-
-# TAG: minimum_direct_rtt (msec)
-# If using the ICMP pinging stuff, do direct fetches for sites
-# which are no more than this many rtt milliseconds away.
-#Default:
-# minimum_direct_rtt 400
-
-# TAG: netdb_low
-# The low water mark for the ICMP measurement database.
-#
-# Note: high watermark controlled by netdb_high directive.
-#
-# These watermarks are counts, not percents. The defaults are
-# (low) 900 and (high) 1000. When the high water mark is
-# reached, database entries will be deleted until the low
-# mark is reached.
-#Default:
-# netdb_low 900
-
-# TAG: netdb_high
-# The high water mark for the ICMP measurement database.
-#
-# Note: low watermark controlled by netdb_low directive.
-#
-# These watermarks are counts, not percents. The defaults are
-# (low) 900 and (high) 1000. When the high water mark is
-# reached, database entries will be deleted until the low
-# mark is reached.
-#Default:
-# netdb_high 1000
-
-# TAG: netdb_ping_period
-# The minimum period for measuring a site. There will be at
-# least this much delay between successive pings to the same
-# network. The default is five minutes.
-#Default:
-# netdb_ping_period 5 minutes
-
-# TAG: query_icmp on|off
-# If you want to ask your peers to include ICMP data in their ICP
-# replies, enable this option.
-#
-# If your peer has configured Squid (during compilation) with
-# '--enable-icmp' that peer will send ICMP pings to origin server
-# sites of the URLs it receives. If you enable this option the
-# ICP replies from that peer will include the ICMP data (if available).
-# Then, when choosing a parent cache, Squid will choose the parent with
-# the minimal RTT to the origin server. When this happens, the
-# hierarchy field of the access.log will be
-# "CLOSEST_PARENT_MISS". This option is off by default.
-#Default:
-# query_icmp off
-
-# TAG: test_reachability on|off
-# When this is 'on', ICP MISS replies will be ICP_MISS_NOFETCH
-# instead of ICP_MISS if the target host is NOT in the ICMP
-# database, or has a zero RTT.
-#Default:
-# test_reachability off
-
-# TAG: icp_query_timeout (msec)
-# Normally Squid will automatically determine an optimal ICP
-# query timeout value based on the round-trip-time of recent ICP
-# queries. If you want to override the value determined by
-# Squid, set this 'icp_query_timeout' to a non-zero value. This
-# value is specified in MILLISECONDS, so, to use a 2-second
-# timeout (the old default), you would write:
-#
-# icp_query_timeout 2000
-#Default:
-# Dynamic detection.
-
-# TAG: maximum_icp_query_timeout (msec)
-# Normally the ICP query timeout is determined dynamically. But
-# sometimes it can lead to very large values (say 5 seconds).
-# Use this option to put an upper limit on the dynamic timeout
-# value. Do NOT use this option to always use a fixed (instead
-# of a dynamic) timeout value. To set a fixed timeout see the
-# 'icp_query_timeout' directive.
-#Default:
-# maximum_icp_query_timeout 2000
-
-# TAG: minimum_icp_query_timeout (msec)
-# Normally the ICP query timeout is determined dynamically. But
-# sometimes it can lead to very small timeouts, even lower than
-# the normal latency variance on your link due to traffic.
-# Use this option to put an lower limit on the dynamic timeout
-# value. Do NOT use this option to always use a fixed (instead
-# of a dynamic) timeout value. To set a fixed timeout see the
-# 'icp_query_timeout' directive.
-#Default:
-# minimum_icp_query_timeout 5
-
-# TAG: background_ping_rate time-units
-# Controls how often the ICP pings are sent to siblings that
-# have background-ping set.
-#Default:
-# background_ping_rate 10 seconds
-
-# MULTICAST ICP OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: mcast_groups
-# This tag specifies a list of multicast groups which your server
-# should join to receive multicasted ICP queries.
-#
-# NOTE! Be very careful what you put here! Be sure you
-# understand the difference between an ICP _query_ and an ICP
-# _reply_. This option is to be set only if you want to RECEIVE
-# multicast queries. Do NOT set this option to SEND multicast
-# ICP (use cache_peer for that). ICP replies are always sent via
-# unicast, so this option does not affect whether or not you will
-# receive replies from multicast group members.
-#
-# You must be very careful to NOT use a multicast address which
-# is already in use by another group of caches.
-#
-# If you are unsure about multicast, please read the Multicast
-# chapter in the Squid FAQ (http://www.squid-cache.org/FAQ/).
-#
-# Usage: mcast_groups 239.128.16.128 224.0.1.20
-#
-# By default, Squid doesn't listen on any multicast groups.
-#Default:
-# none
-
-# TAG: mcast_miss_addr
-# Note: This option is only available if Squid is rebuilt with the
-# -DMULTICAST_MISS_STREAM define
-#
-# If you enable this option, every "cache miss" URL will
-# be sent out on the specified multicast address.
-#
-# Do not enable this option unless you are are absolutely
-# certain you understand what you are doing.
-#Default:
-# disabled.
-
-# TAG: mcast_miss_ttl
-# Note: This option is only available if Squid is rebuilt with the
-# -DMULTICAST_MISS_STREAM define
-#
-# This is the time-to-live value for packets multicasted
-# when multicasting off cache miss URLs is enabled. By
-# default this is set to 'site scope', i.e. 16.
-#Default:
-# mcast_miss_ttl 16
-
-# TAG: mcast_miss_port
-# Note: This option is only available if Squid is rebuilt with the
-# -DMULTICAST_MISS_STREAM define
-#
-# This is the port number to be used in conjunction with
-# 'mcast_miss_addr'.
-#Default:
-# mcast_miss_port 3135
-
-# TAG: mcast_miss_encode_key
-# Note: This option is only available if Squid is rebuilt with the
-# -DMULTICAST_MISS_STREAM define
-#
-# The URLs that are sent in the multicast miss stream are
-# encrypted. This is the encryption key.
-#Default:
-# mcast_miss_encode_key XXXXXXXXXXXXXXXX
-
-# TAG: mcast_icp_query_timeout (msec)
-# For multicast peers, Squid regularly sends out ICP "probes" to
-# count how many other peers are listening on the given multicast
-# address. This value specifies how long Squid should wait to
-# count all the replies. The default is 2000 msec, or 2
-# seconds.
-#Default:
-# mcast_icp_query_timeout 2000
-
-# INTERNAL ICON OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: icon_directory
-# Where the icons are stored. These are normally kept in
-# /usr/share/squid/icons
-#Default:
-# icon_directory /usr/share/squid/icons
-
-# TAG: global_internal_static
-# This directive controls is Squid should intercept all requests for
-# /squid-internal-static/ no matter which host the URL is requesting
-# (default on setting), or if nothing special should be done for
-# such URLs (off setting). The purpose of this directive is to make
-# icons etc work better in complex cache hierarchies where it may
-# not always be possible for all corners in the cache mesh to reach
-# the server generating a directory listing.
-#Default:
-# global_internal_static on
-
-# TAG: short_icon_urls
-# If this is enabled Squid will use short URLs for icons.
-# If disabled it will revert to the old behavior of including
-# it's own name and port in the URL.
-#
-# If you run a complex cache hierarchy with a mix of Squid and
-# other proxies you may need to disable this directive.
-#Default:
-# short_icon_urls on
-
-# ERROR PAGE OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: error_directory
-# If you wish to create your own versions of the default
-# error files to customize them to suit your company copy
-# the error/template files to another directory and point
-# this tag at them.
-#
-# WARNING: This option will disable multi-language support
-# on error pages if used.
-#
-# The squid developers are interested in making squid available in
-# a wide variety of languages. If you are making translations for a
-# language that Squid does not currently provide please consider
-# contributing your translation back to the project.
-# http://wiki.squid-cache.org/Translations
-#
-# The squid developers working on translations are happy to supply drop-in
-# translated error files in exchange for any new language contributions.
-#Default:
-# Send error pages in the clients preferred language
-
-# TAG: error_default_language
-# Set the default language which squid will send error pages in
-# if no existing translation matches the clients language
-# preferences.
-#
-# If unset (default) generic English will be used.
-#
-# The squid developers are interested in making squid available in
-# a wide variety of languages. If you are interested in making
-# translations for any language see the squid wiki for details.
-# http://wiki.squid-cache.org/Translations
-#Default:
-# Generate English language pages.
-
-# TAG: error_log_languages
-# Log to cache.log what languages users are attempting to
-# auto-negotiate for translations.
-#
-# Successful negotiations are not logged. Only failures
-# have meaning to indicate that Squid may need an upgrade
-# of its error page translations.
-#Default:
-# error_log_languages on
-
-# TAG: err_page_stylesheet
-# CSS Stylesheet to pattern the display of Squid default error pages.
-#
-# For information on CSS see http://www.w3.org/Style/CSS/
-#Default:
-# err_page_stylesheet /etc/squid/errorpage.css
-
-# TAG: err_html_text
-# HTML text to include in error messages. Make this a "mailto"
-# URL to your admin address, or maybe just a link to your
-# organizations Web page.
-#
-# To include this in your error messages, you must rewrite
-# the error template files (found in the "errors" directory).
-# Wherever you want the 'err_html_text' line to appear,
-# insert a %L tag in the error template file.
-#Default:
-# none
-
-# TAG: email_err_data on|off
-# If enabled, information about the occurred error will be
-# included in the mailto links of the ERR pages (if %W is set)
-# so that the email body contains the data.
-# Syntax is <A HREF="mailto:%w%W">%w</A>
-#Default:
-# email_err_data on
-
-# TAG: deny_info
-# Usage: deny_info err_page_name acl
-# or deny_info http://... acl
-# or deny_info TCP_RESET acl
-#
-# This can be used to return a ERR_ page for requests which
-# do not pass the 'http_access' rules. Squid remembers the last
-# acl it evaluated in http_access, and if a 'deny_info' line exists
-# for that ACL Squid returns a corresponding error page.
-#
-# The acl is typically the last acl on the http_access deny line which
-# denied access. The exceptions to this rule are:
-# - When Squid needs to request authentication credentials. It's then
-# the first authentication related acl encountered
-# - When none of the http_access lines matches. It's then the last
-# acl processed on the last http_access line.
-# - When the decision to deny access was made by an adaptation service,
-# the acl name is the corresponding eCAP or ICAP service_name.
-#
-# NP: If providing your own custom error pages with error_directory
-# you may also specify them by your custom file name:
-# Example: deny_info ERR_CUSTOM_ACCESS_DENIED bad_guys
-#
-# By defaut Squid will send "403 Forbidden". A different 4xx or 5xx
-# may be specified by prefixing the file name with the code and a colon.
-# e.g. 404:ERR_CUSTOM_ACCESS_DENIED
-#
-# Alternatively you can tell Squid to reset the TCP connection
-# by specifying TCP_RESET.
-#
-# Or you can specify an error URL or URL pattern. The browsers will
-# get redirected to the specified URL after formatting tags have
-# been replaced. Redirect will be done with 302 or 307 according to
-# HTTP/1.1 specs. A different 3xx code may be specified by prefixing
-# the URL. e.g. 303:http://example.com/
-#
-# URL FORMAT TAGS:
-# %a - username (if available. Password NOT included)
-# %B - FTP path URL
-# %e - Error number
-# %E - Error description
-# %h - Squid hostname
-# %H - Request domain name
-# %i - Client IP Address
-# %M - Request Method
-# %o - Message result from external ACL helper
-# %p - Request Port number
-# %P - Request Protocol name
-# %R - Request URL path
-# %T - Timestamp in RFC 1123 format
-# %U - Full canonical URL from client
-# (HTTPS URLs terminate with *)
-# %u - Full canonical URL from client
-# %w - Admin email from squid.conf
-# %x - Error name
-# %% - Literal percent (%) code
-#
-#Default:
-# none
-
-# OPTIONS INFLUENCING REQUEST FORWARDING
-# -----------------------------------------------------------------------------
-
-# TAG: nonhierarchical_direct
-# By default, Squid will send any non-hierarchical requests
-# (matching hierarchy_stoplist or not cacheable request type) direct
-# to origin servers.
-#
-# When this is set to "off", Squid will prefer to send these
-# requests to parents.
-#
-# Note that in most configurations, by turning this off you will only
-# add latency to these request without any improvement in global hit
-# ratio.
-#
-# This option only sets a preference. If the parent is unavailable a
-# direct connection to the origin server may still be attempted. To
-# completely prevent direct connections use never_direct.
-#Default:
-# nonhierarchical_direct on
-
-# TAG: prefer_direct
-# Normally Squid tries to use parents for most requests. If you for some
-# reason like it to first try going direct and only use a parent if
-# going direct fails set this to on.
-#
-# By combining nonhierarchical_direct off and prefer_direct on you
-# can set up Squid to use a parent as a backup path if going direct
-# fails.
-#
-# Note: If you want Squid to use parents for all requests see
-# the never_direct directive. prefer_direct only modifies how Squid
-# acts on cacheable requests.
-#Default:
-# prefer_direct off
-
-# TAG: cache_miss_revalidate on|off
-# RFC 7232 defines a conditional request mechanism to prevent
-# response objects being unnecessarily transferred over the network.
-# If that mechanism is used by the client and a cache MISS occurs
-# it can prevent new cache entries being created.
-#
-# This option determines whether Squid on cache MISS will pass the
-# client revalidation request to the server or tries to fetch new
-# content for caching. It can be useful while the cache is mostly
-# empty to more quickly have the cache populated by generating
-# non-conditional GETs.
-#
-# When set to 'on' (default), Squid will pass all client If-* headers
-# to the server. This permits server responses without a cacheable
-# payload to be delivered and on MISS no new cache entry is created.
-#
-# When set to 'off' and if the request is cacheable, Squid will
-# remove the clients If-Modified-Since and If-None-Match headers from
-# the request sent to the server. This requests a 200 status response
-# from the server to create a new cache entry with.
-#Default:
-# cache_miss_revalidate on
-
-# TAG: always_direct
-# Usage: always_direct allow|deny [!]aclname ...
-#
-# Here you can use ACL elements to specify requests which should
-# ALWAYS be forwarded by Squid to the origin servers without using
-# any peers. For example, to always directly forward requests for
-# local servers ignoring any parents or siblings you may have use
-# something like:
-#
-# acl local-servers dstdomain my.domain.net
-# always_direct allow local-servers
-#
-# To always forward FTP requests directly, use
-#
-# acl FTP proto FTP
-# always_direct allow FTP
-#
-# NOTE: There is a similar, but opposite option named
-# 'never_direct'. You need to be aware that "always_direct deny
-# foo" is NOT the same thing as "never_direct allow foo". You
-# may need to use a deny rule to exclude a more-specific case of
-# some other rule. Example:
-#
-# acl local-external dstdomain external.foo.net
-# acl local-servers dstdomain .foo.net
-# always_direct deny local-external
-# always_direct allow local-servers
-#
-# NOTE: If your goal is to make the client forward the request
-# directly to the origin server bypassing Squid then this needs
-# to be done in the client configuration. Squid configuration
-# can only tell Squid how Squid should fetch the object.
-#
-# NOTE: This directive is not related to caching. The replies
-# is cached as usual even if you use always_direct. To not cache
-# the replies see the 'cache' directive.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Prevent any cache_peer being used for this request.
-
-# TAG: never_direct
-# Usage: never_direct allow|deny [!]aclname ...
-#
-# never_direct is the opposite of always_direct. Please read
-# the description for always_direct if you have not already.
-#
-# With 'never_direct' you can use ACL elements to specify
-# requests which should NEVER be forwarded directly to origin
-# servers. For example, to force the use of a proxy for all
-# requests, except those in your local domain use something like:
-#
-# acl local-servers dstdomain .foo.net
-# never_direct deny local-servers
-# never_direct allow all
-#
-# or if Squid is inside a firewall and there are local intranet
-# servers inside the firewall use something like:
-#
-# acl local-intranet dstdomain .foo.net
-# acl local-external dstdomain external.foo.net
-# always_direct deny local-external
-# always_direct allow local-intranet
-# never_direct allow all
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow DNS results to be used for this request.
-
-# ADVANCED NETWORKING OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: incoming_udp_average
-# Heavy voodoo here. I can't even believe you are reading this.
-# Are you crazy? Don't even think about adjusting these unless
-# you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_udp_average 6
-
-# TAG: incoming_tcp_average
-# Heavy voodoo here. I can't even believe you are reading this.
-# Are you crazy? Don't even think about adjusting these unless
-# you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_tcp_average 4
-
-# TAG: incoming_dns_average
-# Heavy voodoo here. I can't even believe you are reading this.
-# Are you crazy? Don't even think about adjusting these unless
-# you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_dns_average 4
-
-# TAG: min_udp_poll_cnt
-# Heavy voodoo here. I can't even believe you are reading this.
-# Are you crazy? Don't even think about adjusting these unless
-# you understand the algorithms in comm_select.c first!
-#Default:
-# min_udp_poll_cnt 8
-
-# TAG: min_dns_poll_cnt
-# Heavy voodoo here. I can't even believe you are reading this.
-# Are you crazy? Don't even think about adjusting these unless
-# you understand the algorithms in comm_select.c first!
-#Default:
-# min_dns_poll_cnt 8
-
-# TAG: min_tcp_poll_cnt
-# Heavy voodoo here. I can't even believe you are reading this.
-# Are you crazy? Don't even think about adjusting these unless
-# you understand the algorithms in comm_select.c first!
-#Default:
-# min_tcp_poll_cnt 8
-
-# TAG: accept_filter
-# FreeBSD:
-#
-# The name of an accept(2) filter to install on Squid's
-# listen socket(s). This feature is perhaps specific to
-# FreeBSD and requires support in the kernel.
-#
-# The 'httpready' filter delays delivering new connections
-# to Squid until a full HTTP request has been received.
-# See the accf_http(9) man page for details.
-#
-# The 'dataready' filter delays delivering new connections
-# to Squid until there is some data to process.
-# See the accf_dataready(9) man page for details.
-#
-# Linux:
-#
-# The 'data' filter delays delivering of new connections
-# to Squid until there is some data to process by TCP_ACCEPT_DEFER.
-# You may optionally specify a number of seconds to wait by
-# 'data=N' where N is the number of seconds. Defaults to 30
-# if not specified. See the tcp(7) man page for details.
-#EXAMPLE:
-## FreeBSD
-#accept_filter httpready
-## Linux
-#accept_filter data
-#Default:
-# none
-
-# TAG: client_ip_max_connections
-# Set an absolute limit on the number of connections a single
-# client IP can use. Any more than this and Squid will begin to drop
-# new connections from the client until it closes some links.
-#
-# Note that this is a global limit. It affects all HTTP, HTCP, Gopher and FTP
-# connections from the client. For finer control use the ACL access controls.
-#
-# Requires client_db to be enabled (the default).
-#
-# WARNING: This may noticably slow down traffic received via external proxies
-# or NAT devices and cause them to rebound error messages back to their clients.
-#Default:
-# No limit.
-
-# TAG: tcp_recv_bufsize (bytes)
-# Size of receive buffer to set for TCP sockets. Probably just
-# as easy to change your kernel's default.
-# Omit from squid.conf to use the default buffer size.
-#Default:
-# Use operating system TCP defaults.
-
-# ICAP OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: icap_enable on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# If you want to enable the ICAP module support, set this to on.
-#Default:
-# icap_enable off
-
-# TAG: icap_connect_timeout
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# This parameter specifies how long to wait for the TCP connect to
-# the requested ICAP server to complete before giving up and either
-# terminating the HTTP transaction or bypassing the failure.
-#
-# The default for optional services is peer_connect_timeout.
-# The default for essential services is connect_timeout.
-# If this option is explicitly set, its value applies to all services.
-#Default:
-# none
-
-# TAG: icap_io_timeout time-units
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# This parameter specifies how long to wait for an I/O activity on
-# an established, active ICAP connection before giving up and
-# either terminating the HTTP transaction or bypassing the
-# failure.
-#Default:
-# Use read_timeout.
-
-# TAG: icap_service_failure_limit limit [in memory-depth time-units]
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# The limit specifies the number of failures that Squid tolerates
-# when establishing a new TCP connection with an ICAP service. If
-# the number of failures exceeds the limit, the ICAP service is
-# not used for new ICAP requests until it is time to refresh its
-# OPTIONS.
-#
-# A negative value disables the limit. Without the limit, an ICAP
-# service will not be considered down due to connectivity failures
-# between ICAP OPTIONS requests.
-#
-# Squid forgets ICAP service failures older than the specified
-# value of memory-depth. The memory fading algorithm
-# is approximate because Squid does not remember individual
-# errors but groups them instead, splitting the option
-# value into ten time slots of equal length.
-#
-# When memory-depth is 0 and by default this option has no
-# effect on service failure expiration.
-#
-# Squid always forgets failures when updating service settings
-# using an ICAP OPTIONS transaction, regardless of this option
-# setting.
-#
-# For example,
-# # suspend service usage after 10 failures in 5 seconds:
-# icap_service_failure_limit 10 in 5 seconds
-#Default:
-# icap_service_failure_limit 10
-
-# TAG: icap_service_revival_delay
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# The delay specifies the number of seconds to wait after an ICAP
-# OPTIONS request failure before requesting the options again. The
-# failed ICAP service is considered "down" until fresh OPTIONS are
-# fetched.
-#
-# The actual delay cannot be smaller than the hardcoded minimum
-# delay of 30 seconds.
-#Default:
-# icap_service_revival_delay 180
-
-# TAG: icap_preview_enable on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# The ICAP Preview feature allows the ICAP server to handle the
-# HTTP message by looking only at the beginning of the message body
-# or even without receiving the body at all. In some environments,
-# previews greatly speedup ICAP processing.
-#
-# During an ICAP OPTIONS transaction, the server may tell Squid what
-# HTTP messages should be previewed and how big the preview should be.
-# Squid will not use Preview if the server did not request one.
-#
-# To disable ICAP Preview for all ICAP services, regardless of
-# individual ICAP server OPTIONS responses, set this option to "off".
-#Example:
-#icap_preview_enable off
-#Default:
-# icap_preview_enable on
-
-# TAG: icap_preview_size
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# The default size of preview data to be sent to the ICAP server.
-# This value might be overwritten on a per server basis by OPTIONS requests.
-#Default:
-# No preview sent.
-
-# TAG: icap_206_enable on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# 206 (Partial Content) responses is an ICAP extension that allows the
-# ICAP agents to optionally combine adapted and original HTTP message
-# content. The decision to combine is postponed until the end of the
-# ICAP response. Squid supports Partial Content extension by default.
-#
-# Activation of the Partial Content extension is negotiated with each
-# ICAP service during OPTIONS exchange. Most ICAP servers should handle
-# negotation correctly even if they do not support the extension, but
-# some might fail. To disable Partial Content support for all ICAP
-# services and to avoid any negotiation, set this option to "off".
-#
-# Example:
-# icap_206_enable off
-#Default:
-# icap_206_enable on
-
-# TAG: icap_default_options_ttl
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# The default TTL value for ICAP OPTIONS responses that don't have
-# an Options-TTL header.
-#Default:
-# icap_default_options_ttl 60
-
-# TAG: icap_persistent_connections on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# Whether or not Squid should use persistent connections to
-# an ICAP server.
-#Default:
-# icap_persistent_connections on
-
-# TAG: adaptation_send_client_ip on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-# If enabled, Squid shares HTTP client IP information with adaptation
-# services. For ICAP, Squid adds the X-Client-IP header to ICAP requests.
-# For eCAP, Squid sets the libecap::metaClientIp transaction option.
-#
-# See also: adaptation_uses_indirect_client
-#Default:
-# adaptation_send_client_ip off
-
-# TAG: adaptation_send_username on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-# This sends authenticated HTTP client username (if available) to
-# the adaptation service.
-#
-# For ICAP, the username value is encoded based on the
-# icap_client_username_encode option and is sent using the header
-# specified by the icap_client_username_header option.
-#Default:
-# adaptation_send_username off
-
-# TAG: icap_client_username_header
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# ICAP request header name to use for adaptation_send_username.
-#Default:
-# icap_client_username_header X-Client-Username
-
-# TAG: icap_client_username_encode on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# Whether to base64 encode the authenticated client username.
-#Default:
-# icap_client_username_encode off
-
-# TAG: icap_service
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# Defines a single ICAP service using the following format:
-#
-# icap_service id vectoring_point uri [option ...]
-#
-# id: ID
-# an opaque identifier or name which is used to direct traffic to
-# this specific service. Must be unique among all adaptation
-# services in squid.conf.
-#
-# vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache
-# This specifies at which point of transaction processing the
-# ICAP service should be activated. *_postcache vectoring points
-# are not yet supported.
-#
-# uri: icap://servername:port/servicepath
-# ICAP server and service location.
-#
-# ICAP does not allow a single service to handle both REQMOD and RESPMOD
-# transactions. Squid does not enforce that requirement. You can specify
-# services with the same service_url and different vectoring_points. You
-# can even specify multiple identical services as long as their
-# service_names differ.
-#
-# To activate a service, use the adaptation_access directive. To group
-# services, use adaptation_service_chain and adaptation_service_set.
-#
-# Service options are separated by white space. ICAP services support
-# the following name=value options:
-#
-# bypass=on|off|1|0
-# If set to 'on' or '1', the ICAP service is treated as
-# optional. If the service cannot be reached or malfunctions,
-# Squid will try to ignore any errors and process the message as
-# if the service was not enabled. No all ICAP errors can be
-# bypassed. If set to 0, the ICAP service is treated as
-# essential and all ICAP errors will result in an error page
-# returned to the HTTP client.
-#
-# Bypass is off by default: services are treated as essential.
-#
-# routing=on|off|1|0
-# If set to 'on' or '1', the ICAP service is allowed to
-# dynamically change the current message adaptation plan by
-# returning a chain of services to be used next. The services
-# are specified using the X-Next-Services ICAP response header
-# value, formatted as a comma-separated list of service names.
-# Each named service should be configured in squid.conf. Other
-# services are ignored. An empty X-Next-Services value results
-# in an empty plan which ends the current adaptation.
-#
-# Dynamic adaptation plan may cross or cover multiple supported
-# vectoring points in their natural processing order.
-#
-# Routing is not allowed by default: the ICAP X-Next-Services
-# response header is ignored.
-#
-# ipv6=on|off
-# Only has effect on split-stack systems. The default on those systems
-# is to use IPv4-only connections. When set to 'on' this option will
-# make Squid use IPv6-only connections to contact this ICAP service.
-#
-# on-overload=block|bypass|wait|force
-# If the service Max-Connections limit has been reached, do
-# one of the following for each new ICAP transaction:
-# * block: send an HTTP error response to the client
-# * bypass: ignore the "over-connected" ICAP service
-# * wait: wait (in a FIFO queue) for an ICAP connection slot
-# * force: proceed, ignoring the Max-Connections limit
-#
-# In SMP mode with N workers, each worker assumes the service
-# connection limit is Max-Connections/N, even though not all
-# workers may use a given service.
-#
-# The default value is "bypass" if service is bypassable,
-# otherwise it is set to "wait".
-#
-#
-# max-conn=number
-# Use the given number as the Max-Connections limit, regardless
-# of the Max-Connections value given by the service, if any.
-#
-# Older icap_service format without optional named parameters is
-# deprecated but supported for backward compatibility.
-#
-#Example:
-#icap_service svcBlocker reqmod_precache icap://icap1.mydomain.net:1344/reqmod bypass=0
-#icap_service svcLogger reqmod_precache icap://icap2.mydomain.net:1344/respmod routing=on
-#Default:
-# none
-
-# TAG: icap_class
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# This deprecated option was documented to define an ICAP service
-# chain, even though it actually defined a set of similar, redundant
-# services, and the chains were not supported.
-#
-# To define a set of redundant services, please use the
-# adaptation_service_set directive. For service chains, use
-# adaptation_service_chain.
-#Default:
-# none
-
-# TAG: icap_access
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# This option is deprecated. Please use adaptation_access, which
-# has the same ICAP functionality, but comes with better
-# documentation, and eCAP support.
-#Default:
-# none
-
-# eCAP OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: ecap_enable on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap
-#
-# Controls whether eCAP support is enabled.
-#Default:
-# ecap_enable off
-
-# TAG: ecap_service
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap
-#
-# Defines a single eCAP service
-#
-# ecap_service id vectoring_point uri [option ...]
-#
-# id: ID
-# an opaque identifier or name which is used to direct traffic to
-# this specific service. Must be unique among all adaptation
-# services in squid.conf.
-#
-# vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache
-# This specifies at which point of transaction processing the
-# eCAP service should be activated. *_postcache vectoring points
-# are not yet supported.
-#
-# uri: ecap://vendor/service_name?custom&cgi=style&parameters=optional
-# Squid uses the eCAP service URI to match this configuration
-# line with one of the dynamically loaded services. Each loaded
-# eCAP service must have a unique URI. Obtain the right URI from
-# the service provider.
-#
-# To activate a service, use the adaptation_access directive. To group
-# services, use adaptation_service_chain and adaptation_service_set.
-#
-# Service options are separated by white space. eCAP services support
-# the following name=value options:
-#
-# bypass=on|off|1|0
-# If set to 'on' or '1', the eCAP service is treated as optional.
-# If the service cannot be reached or malfunctions, Squid will try
-# to ignore any errors and process the message as if the service
-# was not enabled. No all eCAP errors can be bypassed.
-# If set to 'off' or '0', the eCAP service is treated as essential
-# and all eCAP errors will result in an error page returned to the
-# HTTP client.
-#
-# Bypass is off by default: services are treated as essential.
-#
-# routing=on|off|1|0
-# If set to 'on' or '1', the eCAP service is allowed to
-# dynamically change the current message adaptation plan by
-# returning a chain of services to be used next.
-#
-# Dynamic adaptation plan may cross or cover multiple supported
-# vectoring points in their natural processing order.
-#
-# Routing is not allowed by default.
-#
-# Older ecap_service format without optional named parameters is
-# deprecated but supported for backward compatibility.
-#
-#
-#Example:
-#ecap_service s1 reqmod_precache ecap://filters.R.us/leakDetector?on_error=block bypass=off
-#ecap_service s2 respmod_precache ecap://filters.R.us/virusFilter config=/etc/vf.cfg bypass=on
-#Default:
-# none
-
-# TAG: loadable_modules
-# Instructs Squid to load the specified dynamic module(s) or activate
-# preloaded module(s).
-#Example:
-#loadable_modules /usr/lib/MinimalAdapter.so
-#Default:
-# none
-
-# MESSAGE ADAPTATION OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: adaptation_service_set
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-#
-# Configures an ordered set of similar, redundant services. This is
-# useful when hot standby or backup adaptation servers are available.
-#
-# adaptation_service_set set_name service_name1 service_name2 ...
-#
-# The named services are used in the set declaration order. The first
-# applicable adaptation service from the set is used first. The next
-# applicable service is tried if and only if the transaction with the
-# previous service fails and the message waiting to be adapted is still
-# intact.
-#
-# When adaptation starts, broken services are ignored as if they were
-# not a part of the set. A broken service is a down optional service.
-#
-# The services in a set must be attached to the same vectoring point
-# (e.g., pre-cache) and use the same adaptation method (e.g., REQMOD).
-#
-# If all services in a set are optional then adaptation failures are
-# bypassable. If all services in the set are essential, then a
-# transaction failure with one service may still be retried using
-# another service from the set, but when all services fail, the master
-# transaction fails as well.
-#
-# A set may contain a mix of optional and essential services, but that
-# is likely to lead to surprising results because broken services become
-# ignored (see above), making previously bypassable failures fatal.
-# Technically, it is the bypassability of the last failed service that
-# matters.
-#
-# See also: adaptation_access adaptation_service_chain
-#
-#Example:
-#adaptation_service_set svcBlocker urlFilterPrimary urlFilterBackup
-#adaptation service_set svcLogger loggerLocal loggerRemote
-#Default:
-# none
-
-# TAG: adaptation_service_chain
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-#
-# Configures a list of complementary services that will be applied
-# one-by-one, forming an adaptation chain or pipeline. This is useful
-# when Squid must perform different adaptations on the same message.
-#
-# adaptation_service_chain chain_name service_name1 svc_name2 ...
-#
-# The named services are used in the chain declaration order. The first
-# applicable adaptation service from the chain is used first. The next
-# applicable service is applied to the successful adaptation results of
-# the previous service in the chain.
-#
-# When adaptation starts, broken services are ignored as if they were
-# not a part of the chain. A broken service is a down optional service.
-#
-# Request satisfaction terminates the adaptation chain because Squid
-# does not currently allow declaration of RESPMOD services at the
-# "reqmod_precache" vectoring point (see icap_service or ecap_service).
-#
-# The services in a chain must be attached to the same vectoring point
-# (e.g., pre-cache) and use the same adaptation method (e.g., REQMOD).
-#
-# A chain may contain a mix of optional and essential services. If an
-# essential adaptation fails (or the failure cannot be bypassed for
-# other reasons), the master transaction fails. Otherwise, the failure
-# is bypassed as if the failed adaptation service was not in the chain.
-#
-# See also: adaptation_access adaptation_service_set
-#
-#Example:
-#adaptation_service_chain svcRequest requestLogger urlFilter leakDetector
-#Default:
-# none
-
-# TAG: adaptation_access
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-# Sends an HTTP transaction to an ICAP or eCAP adaptation service.
-#
-# adaptation_access service_name allow|deny [!]aclname...
-# adaptation_access set_name allow|deny [!]aclname...
-#
-# At each supported vectoring point, the adaptation_access
-# statements are processed in the order they appear in this
-# configuration file. Statements pointing to the following services
-# are ignored (i.e., skipped without checking their ACL):
-#
-# - services serving different vectoring points
-# - "broken-but-bypassable" services
-# - "up" services configured to ignore such transactions
-# (e.g., based on the ICAP Transfer-Ignore header).
-#
-# When a set_name is used, all services in the set are checked
-# using the same rules, to find the first applicable one. See
-# adaptation_service_set for details.
-#
-# If an access list is checked and there is a match, the
-# processing stops: For an "allow" rule, the corresponding
-# adaptation service is used for the transaction. For a "deny"
-# rule, no adaptation service is activated.
-#
-# It is currently not possible to apply more than one adaptation
-# service at the same vectoring point to the same HTTP transaction.
-#
-# See also: icap_service and ecap_service
-#
-#Example:
-#adaptation_access service_1 allow all
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-# TAG: adaptation_service_iteration_limit
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-# Limits the number of iterations allowed when applying adaptation
-# services to a message. If your longest adaptation set or chain
-# may have more than 16 services, increase the limit beyond its
-# default value of 16. If detecting infinite iteration loops sooner
-# is critical, make the iteration limit match the actual number
-# of services in your longest adaptation set or chain.
-#
-# Infinite adaptation loops are most likely with routing services.
-#
-# See also: icap_service routing=1
-#Default:
-# adaptation_service_iteration_limit 16
-
-# TAG: adaptation_masterx_shared_names
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-# For each master transaction (i.e., the HTTP request and response
-# sequence, including all related ICAP and eCAP exchanges), Squid
-# maintains a table of metadata. The table entries are (name, value)
-# pairs shared among eCAP and ICAP exchanges. The table is destroyed
-# with the master transaction.
-#
-# This option specifies the table entry names that Squid must accept
-# from and forward to the adaptation transactions.
-#
-# An ICAP REQMOD or RESPMOD transaction may set an entry in the
-# shared table by returning an ICAP header field with a name
-# specified in adaptation_masterx_shared_names.
-#
-# An eCAP REQMOD or RESPMOD transaction may set an entry in the
-# shared table by implementing the libecap::visitEachOption() API
-# to provide an option with a name specified in
-# adaptation_masterx_shared_names.
-#
-# Squid will store and forward the set entry to subsequent adaptation
-# transactions within the same master transaction scope.
-#
-# Only one shared entry name is supported at this time.
-#
-#Example:
-## share authentication information among ICAP services
-#adaptation_masterx_shared_names X-Subscriber-ID
-#Default:
-# none
-
-# TAG: adaptation_meta
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-# This option allows Squid administrator to add custom ICAP request
-# headers or eCAP options to Squid ICAP requests or eCAP transactions.
-# Use it to pass custom authentication tokens and other
-# transaction-state related meta information to an ICAP/eCAP service.
-#
-# The addition of a meta header is ACL-driven:
-# adaptation_meta name value [!]aclname ...
-#
-# Processing for a given header name stops after the first ACL list match.
-# Thus, it is impossible to add two headers with the same name. If no ACL
-# lists match for a given header name, no such header is added. For
-# example:
-#
-# # do not debug transactions except for those that need debugging
-# adaptation_meta X-Debug 1 needs_debugging
-#
-# # log all transactions except for those that must remain secret
-# adaptation_meta X-Log 1 !keep_secret
-#
-# # mark transactions from users in the "G 1" group
-# adaptation_meta X-Authenticated-Groups "G 1" authed_as_G1
-#
-# The "value" parameter may be a regular squid.conf token or a "double
-# quoted string". Within the quoted string, use backslash (\) to escape
-# any character, which is currently only useful for escaping backslashes
-# and double quotes. For example,
-# "this string has one backslash (\\) and two \"quotes\""
-#
-# Used adaptation_meta header values may be logged via %note
-# logformat code. If multiple adaptation_meta headers with the same name
-# are used during master transaction lifetime, the header values are
-# logged in the order they were used and duplicate values are ignored
-# (only the first repeated value will be logged).
-#Default:
-# none
-
-# TAG: icap_retry
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# This ACL determines which retriable ICAP transactions are
-# retried. Transactions that received a complete ICAP response
-# and did not have to consume or produce HTTP bodies to receive
-# that response are usually retriable.
-#
-# icap_retry allow|deny [!]aclname ...
-#
-# Squid automatically retries some ICAP I/O timeouts and errors
-# due to persistent connection race conditions.
-#
-# See also: icap_retry_limit
-#Default:
-# icap_retry deny all
-
-# TAG: icap_retry_limit
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# Limits the number of retries allowed.
-#
-# Communication errors due to persistent connection race
-# conditions are unavoidable, automatically retried, and do not
-# count against this limit.
-#
-# See also: icap_retry
-#Default:
-# No retries are allowed.
-
-# DNS OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: check_hostnames
-# For security and stability reasons Squid can check
-# hostnames for Internet standard RFC compliance. If you want
-# Squid to perform these checks turn this directive on.
-#Default:
-# check_hostnames off
-
-# TAG: allow_underscore
-# Underscore characters is not strictly allowed in Internet hostnames
-# but nevertheless used by many sites. Set this to off if you want
-# Squid to be strict about the standard.
-# This check is performed only when check_hostnames is set to on.
-#Default:
-# allow_underscore on
-
-# TAG: cache_dns_program
-# Note: This option is only available if Squid is rebuilt with the
-# --disable-internal-dns
-#
-# Specify the location of the executable for dnslookup process.
-#Default:
-# cache_dns_program /usr/libexec/dnsserver
-
-# TAG: dns_children
-# Note: This option is only available if Squid is rebuilt with the
-# --disable-internal-dns
-#
-# The maximum number of processes spawn to service DNS name lookups.
-# If you limit it too few Squid will have to wait for them to process
-# a backlog of requests, slowing it down. If you allow too many they
-# will use RAM and other system resources noticably.
-# The maximum this may be safely set to is 32.
-#
-# The startup= and idle= options allow some measure of skew in your
-# tuning.
-#
-# startup=
-#
-# Sets a minimum of how many processes are to be spawned when Squid
-# starts or reconfigures. When set to zero the first request will
-# cause spawning of the first child process to handle it.
-#
-# Starting too few will cause an initial slowdown in traffic as Squid
-# attempts to simultaneously spawn enough processes to cope.
-#
-# idle=
-#
-# Sets a minimum of how many processes Squid is to try and keep available
-# at all times. When traffic begins to rise above what the existing
-# processes can handle this many more will be spawned up to the maximum
-# configured. A minimum setting of 1 is required.
-#Default:
-# dns_children 32 startup=1 idle=1
-
-# TAG: dns_retransmit_interval
-# Initial retransmit interval for DNS queries. The interval is
-# doubled each time all configured DNS servers have been tried.
-#Default:
-# dns_retransmit_interval 5 seconds
-
-# TAG: dns_timeout
-# DNS Query timeout. If no response is received to a DNS query
-# within this time all DNS servers for the queried domain
-# are assumed to be unavailable.
-#Default:
-# dns_timeout 30 seconds
-
-# TAG: dns_packet_max
-# Maximum number of bytes packet size to advertise via EDNS.
-# Set to "none" to disable EDNS large packet support.
-#
-# For legacy reasons DNS UDP replies will default to 512 bytes which
-# is too small for many responses. EDNS provides a means for Squid to
-# negotiate receiving larger responses back immediately without having
-# to failover with repeat requests. Responses larger than this limit
-# will retain the old behaviour of failover to TCP DNS.
-#
-# Squid has no real fixed limit internally, but allowing packet sizes
-# over 1500 bytes requires network jumbogram support and is usually not
-# necessary.
-#
-# WARNING: The RFC also indicates that some older resolvers will reply
-# with failure of the whole request if the extension is added. Some
-# resolvers have already been identified which will reply with mangled
-# EDNS response on occasion. Usually in response to many-KB jumbogram
-# sizes being advertised by Squid.
-# Squid will currently treat these both as an unable-to-resolve domain
-# even if it would be resolvable without EDNS.
-#Default:
-# EDNS disabled
-
-# TAG: dns_defnames on|off
-# Normally the RES_DEFNAMES resolver option is disabled
-# (see res_init(3)). This prevents caches in a hierarchy
-# from interpreting single-component hostnames locally. To allow
-# Squid to handle single-component names, enable this option.
-#Default:
-# Search for single-label domain names is disabled.
-
-# TAG: dns_multicast_local on|off
-# When set to on, Squid sends multicast DNS lookups on the local
-# network for domains ending in .local and .arpa.
-# This enables local servers and devices to be contacted in an
-# ad-hoc or zero-configuration network environment.
-#Default:
-# Search for .local and .arpa names is disabled.
-
-# TAG: dns_nameservers
-# Use this if you want to specify a list of DNS name servers
-# (IP addresses) to use instead of those given in your
-# /etc/resolv.conf file.
-#
-# On Windows platforms, if no value is specified here or in
-# the /etc/resolv.conf file, the list of DNS name servers are
-# taken from the Windows registry, both static and dynamic DHCP
-# configurations are supported.
-#
-# Example: dns_nameservers 10.0.0.1 192.172.0.4
-#Default:
-# Use operating system definitions
-
-# TAG: hosts_file
-# Location of the host-local IP name-address associations
-# database. Most Operating Systems have such a file on different
-# default locations:
-# - Un*X & Linux: /etc/hosts
-# - Windows NT/2000: %SystemRoot%\system32\drivers\etc\hosts
-# (%SystemRoot% value install default is c:\winnt)
-# - Windows XP/2003: %SystemRoot%\system32\drivers\etc\hosts
-# (%SystemRoot% value install default is c:\windows)
-# - Windows 9x/Me: %windir%\hosts
-# (%windir% value is usually c:\windows)
-# - Cygwin: /etc/hosts
-#
-# The file contains newline-separated definitions, in the
-# form ip_address_in_dotted_form name [name ...] names are
-# whitespace-separated. Lines beginning with an hash (#)
-# character are comments.
-#
-# The file is checked at startup and upon configuration.
-# If set to 'none', it won't be checked.
-# If append_domain is used, that domain will be added to
-# domain-local (i.e. not containing any dot character) host
-# definitions.
-#Default:
-# hosts_file /etc/hosts
-
-# TAG: append_domain
-# Appends local domain name to hostnames without any dots in
-# them. append_domain must begin with a period.
-#
-# Be warned there are now Internet names with no dots in
-# them using only top-domain names, so setting this may
-# cause some Internet sites to become unavailable.
-#
-#Example:
-# append_domain .yourdomain.com
-#Default:
-# Use operating system definitions
-
-# TAG: ignore_unknown_nameservers
-# By default Squid checks that DNS responses are received
-# from the same IP addresses they are sent to. If they
-# don't match, Squid ignores the response and writes a warning
-# message to cache.log. You can allow responses from unknown
-# nameservers by setting this option to 'off'.
-#Default:
-# ignore_unknown_nameservers on
-
-# TAG: dns_v4_first
-# With the IPv6 Internet being as fast or faster than IPv4 Internet
-# for most networks Squid prefers to contact websites over IPv6.
-#
-# This option reverses the order of preference to make Squid contact
-# dual-stack websites over IPv4 first. Squid will still perform both
-# IPv6 and IPv4 DNS lookups before connecting.
-#
-# WARNING:
-# This option will restrict the situations under which IPv6
-# connectivity is used (and tested). Hiding network problems
-# which would otherwise be detected and warned about.
-#Default:
-# dns_v4_first off
-
-# TAG: ipcache_size (number of entries)
-# Maximum number of DNS IP cache entries.
-#Default:
-# ipcache_size 1024
-
-# TAG: ipcache_low (percent)
-#Default:
-# ipcache_low 90
-
-# TAG: ipcache_high (percent)
-# The size, low-, and high-water marks for the IP cache.
-#Default:
-# ipcache_high 95
-
-# TAG: fqdncache_size (number of entries)
-# Maximum number of FQDN cache entries.
-#Default:
-# fqdncache_size 1024
-
-# MISCELLANEOUS
-# -----------------------------------------------------------------------------
-
-# TAG: configuration_includes_quoted_values on|off
-# Previous Squid versions have defined "quoted/string" as syntax for
-# ACL to signifiy the value is an included file containing values and
-# has treated the " characters in other places of the configuration file
-# as part of the parameter value it was used for.
-#
-# For compatibility with existing installations that behaviour
-# remains the default.
-#
-# If this directive is set to 'on', Squid will start parsing each
-# "quoted string" as a single configuration directive parameter. The
-# quotes are stripped before the parameter value is interpreted or use.
-#
-# That will continue for all lines until this directive is set to 'off',
-# where Squid will return to the default configuration parsing.
-#
-# For example;
-#
-# configuration_includes_quoted_values on
-# acl group external groupCheck Administrators "Internet Users" Guest
-# configuration_includes_quoted_values off
-#
-#Default:
-# configuration_includes_quoted_values off
-
-# TAG: memory_pools on|off
-# If set, Squid will keep pools of allocated (but unused) memory
-# available for future use. If memory is a premium on your
-# system and you believe your malloc library outperforms Squid
-# routines, disable this.
-#Default:
-# memory_pools on
-
-# TAG: memory_pools_limit (bytes)
-# Used only with memory_pools on:
-# memory_pools_limit 50 MB
-#
-# If set to a non-zero value, Squid will keep at most the specified
-# limit of allocated (but unused) memory in memory pools. All free()
-# requests that exceed this limit will be handled by your malloc
-# library. Squid does not pre-allocate any memory, just safe-keeps
-# objects that otherwise would be free()d. Thus, it is safe to set
-# memory_pools_limit to a reasonably high value even if your
-# configuration will use less memory.
-#
-# If set to none, Squid will keep all memory it can. That is, there
-# will be no limit on the total amount of memory used for safe-keeping.
-#
-# To disable memory allocation optimization, do not set
-# memory_pools_limit to 0 or none. Set memory_pools to "off" instead.
-#
-# An overhead for maintaining memory pools is not taken into account
-# when the limit is checked. This overhead is close to four bytes per
-# object kept. However, pools may actually _save_ memory because of
-# reduced memory thrashing in your malloc library.
-#Default:
-# memory_pools_limit 5 MB
-
-# TAG: forwarded_for on|off|transparent|truncate|delete
-# If set to "on", Squid will append your client's IP address
-# in the HTTP requests it forwards. By default it looks like:
-#
-# X-Forwarded-For: 192.1.2.3
-#
-# If set to "off", it will appear as
-#
-# X-Forwarded-For: unknown
-#
-# If set to "transparent", Squid will not alter the
-# X-Forwarded-For header in any way.
-#
-# If set to "delete", Squid will delete the entire
-# X-Forwarded-For header.
-#
-# If set to "truncate", Squid will remove all existing
-# X-Forwarded-For entries, and place the client IP as the sole entry.
-#Default:
-# forwarded_for on
-
-# TAG: cachemgr_passwd
-# Specify passwords for cachemgr operations.
-#
-# Usage: cachemgr_passwd password action action ...
-#
-# Some valid actions are (see cache manager menu for a full list):
-# 5min
-# 60min
-# asndb
-# authenticator
-# cbdata
-# client_list
-# comm_incoming
-# config *
-# counters
-# delay
-# digest_stats
-# dns
-# events
-# filedescriptors
-# fqdncache
-# histograms
-# http_headers
-# info
-# io
-# ipcache
-# mem
-# menu
-# netdb
-# non_peers
-# objects
-# offline_toggle *
-# pconn
-# peer_select
-# reconfigure *
-# redirector
-# refresh
-# server_list
-# shutdown *
-# store_digest
-# storedir
-# utilization
-# via_headers
-# vm_objects
-#
-# * Indicates actions which will not be performed without a
-# valid password, others can be performed if not listed here.
-#
-# To disable an action, set the password to "disable".
-# To allow performing an action without a password, set the
-# password to "none".
-#
-# Use the keyword "all" to set the same password for all actions.
-#
-#Example:
-# cachemgr_passwd secret shutdown
-# cachemgr_passwd lesssssssecret info stats/objects
-# cachemgr_passwd disable all
-#Default:
-# No password. Actions which require password are denied.
-
-# TAG: client_db on|off
-# If you want to disable collecting per-client statistics,
-# turn off client_db here.
-#Default:
-# client_db on
-
-# TAG: refresh_all_ims on|off
-# When you enable this option, squid will always check
-# the origin server for an update when a client sends an
-# If-Modified-Since request. Many browsers use IMS
-# requests when the user requests a reload, and this
-# ensures those clients receive the latest version.
-#
-# By default (off), squid may return a Not Modified response
-# based on the age of the cached version.
-#Default:
-# refresh_all_ims off
-
-# TAG: reload_into_ims on|off
-# When you enable this option, client no-cache or ``reload''
-# requests will be changed to If-Modified-Since requests.
-# Doing this VIOLATES the HTTP standard. Enabling this
-# feature could make you liable for problems which it
-# causes.
-#
-# see also refresh_pattern for a more selective approach.
-#Default:
-# reload_into_ims off
-
-# TAG: connect_retries
-# This sets the maximum number of connection attempts made for each
-# TCP connection. The connect_retries attempts must all still
-# complete within the connection timeout period.
-#
-# The default is not to re-try if the first connection attempt fails.
-# The (not recommended) maximum is 10 tries.
-#
-# A warning message will be generated if it is set to a too-high
-# value and the configured value will be over-ridden.
-#
-# Note: These re-tries are in addition to forward_max_tries
-# which limit how many different addresses may be tried to find
-# a useful server.
-#Default:
-# Do not retry failed connections.
-
-# TAG: retry_on_error
-# If set to ON Squid will automatically retry requests when
-# receiving an error response with status 403 (Forbidden),
-# 500 (Internal Error), 501 or 503 (Service not available).
-# Status 502 and 504 (Gateway errors) are always retried.
-#
-# This is mainly useful if you are in a complex cache hierarchy to
-# work around access control errors.
-#
-# NOTE: This retry will attempt to find another working destination.
-# Which is different from the server which just failed.
-#Default:
-# retry_on_error off
-
-# TAG: as_whois_server
-# WHOIS server to query for AS numbers. NOTE: AS numbers are
-# queried only when Squid starts up, not for every request.
-#Default:
-# as_whois_server whois.ra.net
-
-# TAG: offline_mode
-# Enable this option and Squid will never try to validate cached
-# objects.
-#Default:
-# offline_mode off
-
-# TAG: uri_whitespace
-# What to do with requests that have whitespace characters in the
-# URI. Options:
-#
-# strip: The whitespace characters are stripped out of the URL.
-# This is the behavior recommended by RFC2396 and RFC3986
-# for tolerant handling of generic URI.
-# NOTE: This is one difference between generic URI and HTTP URLs.
-#
-# deny: The request is denied. The user receives an "Invalid
-# Request" message.
-# This is the behaviour recommended by RFC2616 for safe
-# handling of HTTP request URL.
-#
-# allow: The request is allowed and the URI is not changed. The
-# whitespace characters remain in the URI. Note the
-# whitespace is passed to redirector processes if they
-# are in use.
-# Note this may be considered a violation of RFC2616
-# request parsing where whitespace is prohibited in the
-# URL field.
-#
-# encode: The request is allowed and the whitespace characters are
-# encoded according to RFC1738.
-#
-# chop: The request is allowed and the URI is chopped at the
-# first whitespace.
-#
-#
-# NOTE the current Squid implementation of encode and chop violates
-# RFC2616 by not using a 301 redirect after altering the URL.
-#Default:
-# uri_whitespace strip
-
-# TAG: chroot
-# Specifies a directory where Squid should do a chroot() while
-# initializing. This also causes Squid to fully drop root
-# privileges after initializing. This means, for example, if you
-# use a HTTP port less than 1024 and try to reconfigure, you may
-# get an error saying that Squid can not open the port.
-#Default:
-# none
-
-# TAG: balance_on_multiple_ip
-# Modern IP resolvers in squid sort lookup results by preferred access.
-# By default squid will use these IP in order and only rotates to
-# the next listed when the most preffered fails.
-#
-# Some load balancing servers based on round robin DNS have been
-# found not to preserve user session state across requests
-# to different IP addresses.
-#
-# Enabling this directive Squid rotates IP's per request.
-#Default:
-# balance_on_multiple_ip off
-
-# TAG: pipeline_prefetch
-# HTTP clients may send a pipeline of 1+N requests to Squid using a
-# single connection, without waiting for Squid to respond to the first
-# of those requests. This option limits the number of concurrent
-# requests Squid will try to handle in parallel. If set to N, Squid
-# will try to receive and process up to 1+N requests on the same
-# connection concurrently.
-#
-# Defaults to 0 (off) for bandwidth management and access logging
-# reasons.
-#
-# NOTE: pipelining requires persistent connections to clients.
-#
-# WARNING: pipelining breaks NTLM and Negotiate/Kerberos authentication.
-#Default:
-# Do not pre-parse pipelined requests.
-
-# TAG: high_response_time_warning (msec)
-# If the one-minute median response time exceeds this value,
-# Squid prints a WARNING with debug level 0 to get the
-# administrators attention. The value is in milliseconds.
-#Default:
-# disabled.
-
-# TAG: high_page_fault_warning
-# If the one-minute average page fault rate exceeds this
-# value, Squid prints a WARNING with debug level 0 to get
-# the administrators attention. The value is in page faults
-# per second.
-#Default:
-# disabled.
-
-# TAG: high_memory_warning
-# Note: This option is only available if Squid is rebuilt with the
-# GNU Malloc with mstats()
-#
-# If the memory usage (as determined by mallinfo) exceeds
-# this amount, Squid prints a WARNING with debug level 0 to get
-# the administrators attention.
-#Default:
-# disabled.
-
-# TAG: sleep_after_fork (microseconds)
-# When this is set to a non-zero value, the main Squid process
-# sleeps the specified number of microseconds after a fork()
-# system call. This sleep may help the situation where your
-# system reports fork() failures due to lack of (virtual)
-# memory. Note, however, if you have a lot of child
-# processes, these sleep delays will add up and your
-# Squid will not service requests for some amount of time
-# until all the child processes have been started.
-# On Windows value less then 1000 (1 milliseconds) are
-# rounded to 1000.
-#Default:
-# sleep_after_fork 0
-
-# TAG: windows_ipaddrchangemonitor on|off
-# Note: This option is only available if Squid is rebuilt with the
-# MS Windows
-#
-# On Windows Squid by default will monitor IP address changes and will
-# reconfigure itself after any detected event. This is very useful for
-# proxies connected to internet with dial-up interfaces.
-# In some cases (a Proxy server acting as VPN gateway is one) it could be
-# desiderable to disable this behaviour setting this to 'off'.
-# Note: after changing this, Squid service must be restarted.
-#Default:
-# windows_ipaddrchangemonitor on
-
-# TAG: eui_lookup
-# Whether to lookup the EUI or MAC address of a connected client.
-#Default:
-# eui_lookup on
-
-# TAG: max_filedescriptors
-# Reduce the maximum number of filedescriptors supported below
-# the usual operating system defaults.
-#
-# Remove from squid.conf to inherit the current ulimit setting.
-#
-# Note: Changing this requires a restart of Squid. Also
-# not all I/O types supports large values (eg on Windows).
-#Default:
-# Use operating system limits set by ulimit.
-
-# TAG: workers
-# Number of main Squid processes or "workers" to fork and maintain.
-# 0: "no daemon" mode, like running "squid -N ..."
-# 1: "no SMP" mode, start one main Squid process daemon (default)
-# N: start N main Squid process daemons (i.e., SMP mode)
-#
-# In SMP mode, each worker does nearly all what a single Squid daemon
-# does (e.g., listen on http_port and forward HTTP requests).
-#Default:
-# SMP support disabled.
-
-# TAG: cpu_affinity_map
-# Usage: cpu_affinity_map process_numbers=P1,P2,... cores=C1,C2,...
-#
-# Sets 1:1 mapping between Squid processes and CPU cores. For example,
-#
-# cpu_affinity_map process_numbers=1,2,3,4 cores=1,3,5,7
-#
-# affects processes 1 through 4 only and places them on the first
-# four even cores, starting with core #1.
-#
-# CPU cores are numbered starting from 1. Requires support for
-# sched_getaffinity(2) and sched_setaffinity(2) system calls.
-#
-# Multiple cpu_affinity_map options are merged.
-#
-# See also: workers
-#Default:
-# Let operating system decide.
-
diff --git a/network/squid/squid.conf.documented b/network/squid/squid.conf.documented
deleted file mode 100644
index bd70bbfa5f..0000000000
--- a/network/squid/squid.conf.documented
+++ /dev/null
@@ -1,7806 +0,0 @@
-# WELCOME TO SQUID 3.4.10
-# ----------------------------
-#
-# This is the documentation for the Squid configuration file.
-# This documentation can also be found online at:
-# http://www.squid-cache.org/Doc/config/
-#
-# You may wish to look at the Squid home page and wiki for the
-# FAQ and other documentation:
-# http://www.squid-cache.org/
-# http://wiki.squid-cache.org/SquidFaq
-# http://wiki.squid-cache.org/ConfigExamples
-#
-# This documentation shows what the defaults for various directives
-# happen to be. If you don't need to change the default, you should
-# leave the line out of your squid.conf in most cases.
-#
-# In some cases "none" refers to no default setting at all,
-# while in other cases it refers to the value of the option
-# - the comments for that keyword indicate if this is the case.
-#
-
-# Configuration options can be included using the "include" directive.
-# Include takes a list of files to include. Quoting and wildcards are
-# supported.
-#
-# For example,
-#
-# include /path/to/included/file/squid.acl.config
-#
-# Includes can be nested up to a hard-coded depth of 16 levels.
-# This arbitrary restriction is to prevent recursive include references
-# from causing Squid entering an infinite loop whilst trying to load
-# configuration files.
-#
-# Values with byte units
-#
-# Squid accepts size units on some size related directives. All
-# such directives are documented with a default value displaying
-# a unit.
-#
-# Units accepted by Squid are:
-# bytes - byte
-# KB - Kilobyte (1024 bytes)
-# MB - Megabyte
-# GB - Gigabyte
-#
-# Values with spaces, quotes, and other special characters
-#
-# Squid supports directive parameters with spaces, quotes, and other
-# special characters. Surround such parameters with "double quotes". Use
-# the configuration_includes_quoted_values directive to enable or
-# disable that support.
-#
-# For example;
-#
-# configuration_includes_quoted_values on
-# acl group external groupCheck Administrators "Internet Users" Guest
-# configuration_includes_quoted_values off
-#
-#
-# Conditional configuration
-#
-# If-statements can be used to make configuration directives
-# depend on conditions:
-#
-# if <CONDITION>
-# ... regular configuration directives ...
-# [else
-# ... regular configuration directives ...]
-# endif
-#
-# The else part is optional. The keywords "if", "else", and "endif"
-# must be typed on their own lines, as if they were regular
-# configuration directives.
-#
-# NOTE: An else-if condition is not supported.
-#
-# These individual conditions types are supported:
-#
-# true
-# Always evaluates to true.
-# false
-# Always evaluates to false.
-# <integer> = <integer>
-# Equality comparison of two integer numbers.
-#
-#
-# SMP-Related Macros
-#
-# The following SMP-related preprocessor macros can be used.
-#
-# ${process_name} expands to the current Squid process "name"
-# (e.g., squid1, squid2, or cache1).
-#
-# ${process_number} expands to the current Squid process
-# identifier, which is an integer number (e.g., 1, 2, 3) unique
-# across all Squid processes.
-
-# TAG: broken_vary_encoding
-# This option is not yet supported by Squid-3.
-#Default:
-# none
-
-# TAG: cache_vary
-# This option is not yet supported by Squid-3.
-#Default:
-# none
-
-# TAG: collapsed_forwarding
-# This option is not yet supported by Squid-3. see http://bugs.squid-cache.org/show_bug.cgi?id=3495
-#Default:
-# none
-
-# TAG: error_map
-# This option is not yet supported by Squid-3.
-#Default:
-# none
-
-# TAG: external_refresh_check
-# This option is not yet supported by Squid-3.
-#Default:
-# none
-
-# TAG: location_rewrite_program
-# This option is not yet supported by Squid-3.
-#Default:
-# none
-
-# TAG: refresh_stale_hit
-# This option is not yet supported by Squid-3.
-#Default:
-# none
-
-# TAG: ignore_ims_on_miss
-# Remove this line. The HTTP/1.1 feature is now configured by 'cache_miss_revalidate'.
-#Default:
-# none
-
-# TAG: ignore_expect_100
-# Remove this line. The HTTP/1.1 feature is now fully supported by default.
-#Default:
-# none
-
-# TAG: dns_v4_fallback
-# Remove this line. Squid performs a 'Happy Eyeballs' algorithm, the 'fallback' algorithm is no longer relevant.
-#Default:
-# none
-
-# TAG: ftp_list_width
-# Remove this line. Configure FTP page display using the CSS controls in errorpages.css instead.
-#Default:
-# none
-
-# TAG: maximum_single_addr_tries
-# Replaced by connect_retries. The behaviour has changed, please read the documentation before altering.
-#Default:
-# none
-
-# TAG: update_headers
-# Remove this line. The feature is supported by default in storage types where update is implemented.
-#Default:
-# none
-
-# TAG: url_rewrite_concurrency
-# Remove this line. Set the 'concurrency=' option of url_rewrite_children instead.
-#Default:
-# none
-
-# TAG: dns_testnames
-# Remove this line. DNS is no longer tested on startup.
-#Default:
-# none
-
-# TAG: extension_methods
-# Remove this line. All valid methods for HTTP are accepted by default.
-#Default:
-# none
-
-# TAG: zero_buffers
-#Default:
-# none
-
-# TAG: incoming_rate
-#Default:
-# none
-
-# TAG: server_http11
-# Remove this line. HTTP/1.1 is supported by default.
-#Default:
-# none
-
-# TAG: upgrade_http0.9
-# Remove this line. ICY/1.0 streaming protocol is supported by default.
-#Default:
-# none
-
-# TAG: zph_local
-# Alter these entries. Use the qos_flows directive instead.
-#Default:
-# none
-
-# TAG: header_access
-# Since squid-3.0 replace with request_header_access or reply_header_access
-# depending on whether you wish to match client requests or server replies.
-#Default:
-# none
-
-# TAG: httpd_accel_no_pmtu_disc
-# Since squid-3.0 use the 'disable-pmtu-discovery' flag on http_port instead.
-#Default:
-# none
-
-# TAG: wais_relay_host
-# Replace this line with 'cache_peer' configuration.
-#Default:
-# none
-
-# TAG: wais_relay_port
-# Replace this line with 'cache_peer' configuration.
-#Default:
-# none
-
-# OPTIONS FOR AUTHENTICATION
-# -----------------------------------------------------------------------------
-
-# TAG: auth_param
-# This is used to define parameters for the various authentication
-# schemes supported by Squid.
-#
-# format: auth_param scheme parameter [setting]
-#
-# The order in which authentication schemes are presented to the client is
-# dependent on the order the scheme first appears in config file. IE
-# has a bug (it's not RFC 2617 compliant) in that it will use the basic
-# scheme if basic is the first entry presented, even if more secure
-# schemes are presented. For now use the order in the recommended
-# settings section below. If other browsers have difficulties (don't
-# recognize the schemes offered even if you are using basic) either
-# put basic first, or disable the other schemes (by commenting out their
-# program entry).
-#
-# Once an authentication scheme is fully configured, it can only be
-# shutdown by shutting squid down and restarting. Changes can be made on
-# the fly and activated with a reconfigure. I.E. You can change to a
-# different helper, but not unconfigure the helper completely.
-#
-# Please note that while this directive defines how Squid processes
-# authentication it does not automatically activate authentication.
-# To use authentication you must in addition make use of ACLs based
-# on login name in http_access (proxy_auth, proxy_auth_regex or
-# external with %LOGIN used in the format tag). The browser will be
-# challenged for authentication on the first such acl encountered
-# in http_access processing and will also be re-challenged for new
-# login credentials if the request is being denied by a proxy_auth
-# type acl.
-#
-# WARNING: authentication can't be used in a transparently intercepting
-# proxy as the client then thinks it is talking to an origin server and
-# not the proxy. This is a limitation of bending the TCP/IP protocol to
-# transparently intercepting port 80, not a limitation in Squid.
-# Ports flagged 'transparent', 'intercept', or 'tproxy' have
-# authentication disabled.
-#
-# === Parameters for the basic scheme follow. ===
-#
-# "program" cmdline
-# Specify the command for the external authenticator. Such a program
-# reads a line containing "username password" and replies with one of
-# three results:
-#
-# OK
-# the user exists.
-#
-# ERR
-# the user does not exist.
-#
-# BH
-# An internal error occurred in the helper, preventing
-# a result being identified.
-#
-# "ERR" and "BH" results may optionally be followed by message="..."
-# containing a description available as %m in the returned error page.
-#
-# If you use an authenticator, make sure you have 1 acl of type
-# proxy_auth.
-#
-# By default, the basic authentication scheme is not used unless a
-# program is specified.
-#
-# If you want to use the traditional NCSA proxy authentication, set
-# this line to something like
-#
-# auth_param basic program /usr/libexec/basic_ncsa_auth /usr/etc/passwd
-#
-# "utf8" on|off
-# HTTP uses iso-latin-1 as character set, while some authentication
-# backends such as LDAP expects UTF-8. If this is set to on Squid will
-# translate the HTTP iso-latin-1 charset to UTF-8 before sending the
-# username & password to the helper.
-#
-# "children" numberofchildren [startup=N] [idle=N] [concurrency=N]
-# The maximum number of authenticator processes to spawn. If you start too few
-# Squid will have to wait for them to process a backlog of credential
-# verifications, slowing it down. When password verifications are
-# done via a (slow) network you are likely to need lots of
-# authenticator processes.
-#
-# The startup= and idle= options permit some skew in the exact amount
-# run. A minimum of startup=N will begin during startup and reconfigure.
-# Squid will start more in groups of up to idle=N in an attempt to meet
-# traffic needs and to keep idle=N free above those traffic needs up to
-# the maximum.
-#
-# The concurrency= option sets the number of concurrent requests the
-# helper can process. The default of 0 is used for helpers who only
-# supports one request at a time. Setting this to a number greater than
-# 0 changes the protocol used to include a channel number first on the
-# request/response line, allowing multiple requests to be sent to the
-# same helper in parallel without waiting for the response.
-# Must not be set unless it's known the helper supports this.
-#
-# auth_param basic children 20 startup=0 idle=1
-#
-# "realm" realmstring
-# Specifies the realm name which is to be reported to the
-# client for the basic proxy authentication scheme (part of
-# the text the user will see when prompted their username and
-# password). There is no default.
-# auth_param basic realm Squid proxy-caching web server
-#
-# "credentialsttl" timetolive
-# Specifies how long squid assumes an externally validated
-# username:password pair is valid for - in other words how
-# often the helper program is called for that user. Set this
-# low to force revalidation with short lived passwords. Note
-# setting this high does not impact your susceptibility
-# to replay attacks unless you are using an one-time password
-# system (such as SecureID). If you are using such a system,
-# you will be vulnerable to replay attacks unless you also
-# use the max_user_ip ACL in an http_access rule.
-#
-# "casesensitive" on|off
-# Specifies if usernames are case sensitive. Most user databases are
-# case insensitive allowing the same username to be spelled using both
-# lower and upper case letters, but some are case sensitive. This
-# makes a big difference for user_max_ip ACL processing and similar.
-# auth_param basic casesensitive off
-#
-# === Parameters for the digest scheme follow ===
-#
-# "program" cmdline
-# Specify the command for the external authenticator. Such
-# a program reads a line containing "username":"realm" and
-# replies with one of three results:
-#
-# OK ha1="..."
-# the user exists. The ha1= key is mandatory and
-# contains the appropriate H(A1) value, hex encoded.
-# See rfc 2616 for the definition of H(A1).
-#
-# ERR
-# the user does not exist.
-#
-# BH
-# An internal error occurred in the helper, preventing
-# a result being identified.
-#
-# "ERR" and "BH" results may optionally be followed by message="..."
-# containing a description available as %m in the returned error page.
-#
-# By default, the digest authentication scheme is not used unless a
-# program is specified.
-#
-# If you want to use a digest authenticator, set this line to
-# something like
-#
-# auth_param digest program /usr/bin/digest_pw_auth /usr/etc/digpass
-#
-# "utf8" on|off
-# HTTP uses iso-latin-1 as character set, while some authentication
-# backends such as LDAP expects UTF-8. If this is set to on Squid will
-# translate the HTTP iso-latin-1 charset to UTF-8 before sending the
-# username & password to the helper.
-#
-# "children" numberofchildren [startup=N] [idle=N] [concurrency=N]
-# The maximum number of authenticator processes to spawn (default 5).
-# If you start too few Squid will have to wait for them to
-# process a backlog of H(A1) calculations, slowing it down.
-# When the H(A1) calculations are done via a (slow) network
-# you are likely to need lots of authenticator processes.
-#
-# The startup= and idle= options permit some skew in the exact amount
-# run. A minimum of startup=N will begin during startup and reconfigure.
-# Squid will start more in groups of up to idle=N in an attempt to meet
-# traffic needs and to keep idle=N free above those traffic needs up to
-# the maximum.
-#
-# The concurrency= option sets the number of concurrent requests the
-# helper can process. The default of 0 is used for helpers who only
-# supports one request at a time. Setting this to a number greater than
-# 0 changes the protocol used to include a channel number first on the
-# request/response line, allowing multiple requests to be sent to the
-# same helper in parallel without waiting for the response.
-# Must not be set unless it's known the helper supports this.
-#
-# auth_param digest children 20 startup=0 idle=1
-#
-# "realm" realmstring
-# Specifies the realm name which is to be reported to the
-# client for the digest proxy authentication scheme (part of
-# the text the user will see when prompted their username and
-# password). There is no default.
-# auth_param digest realm Squid proxy-caching web server
-#
-# "nonce_garbage_interval" timeinterval
-# Specifies the interval that nonces that have been issued
-# to client_agent's are checked for validity.
-#
-# "nonce_max_duration" timeinterval
-# Specifies the maximum length of time a given nonce will be
-# valid for.
-#
-# "nonce_max_count" number
-# Specifies the maximum number of times a given nonce can be
-# used.
-#
-# "nonce_strictness" on|off
-# Determines if squid requires strict increment-by-1 behavior
-# for nonce counts, or just incrementing (off - for use when
-# user agents generate nonce counts that occasionally miss 1
-# (ie, 1,2,4,6)). Default off.
-#
-# "check_nonce_count" on|off
-# This directive if set to off can disable the nonce count check
-# completely to work around buggy digest qop implementations in
-# certain mainstream browser versions. Default on to check the
-# nonce count to protect from authentication replay attacks.
-#
-# "post_workaround" on|off
-# This is a workaround to certain buggy browsers who sends
-# an incorrect request digest in POST requests when reusing
-# the same nonce as acquired earlier on a GET request.
-#
-# === NTLM scheme options follow ===
-#
-# "program" cmdline
-# Specify the command for the external NTLM authenticator.
-# Such a program reads exchanged NTLMSSP packets with
-# the browser via Squid until authentication is completed.
-# If you use an NTLM authenticator, make sure you have 1 acl
-# of type proxy_auth. By default, the NTLM authenticator program
-# is not used.
-#
-# auth_param ntlm program /usr/bin/ntlm_auth
-#
-# "children" numberofchildren [startup=N] [idle=N]
-# The maximum number of authenticator processes to spawn (default 5).
-# If you start too few Squid will have to wait for them to
-# process a backlog of credential verifications, slowing it
-# down. When credential verifications are done via a (slow)
-# network you are likely to need lots of authenticator
-# processes.
-#
-# The startup= and idle= options permit some skew in the exact amount
-# run. A minimum of startup=N will begin during startup and reconfigure.
-# Squid will start more in groups of up to idle=N in an attempt to meet
-# traffic needs and to keep idle=N free above those traffic needs up to
-# the maximum.
-#
-# auth_param ntlm children 20 startup=0 idle=1
-#
-# "keep_alive" on|off
-# If you experience problems with PUT/POST requests when using the
-# Negotiate authentication scheme then you can try setting this to
-# off. This will cause Squid to forcibly close the connection on
-# the initial requests where the browser asks which schemes are
-# supported by the proxy.
-#
-# auth_param ntlm keep_alive on
-#
-# === Options for configuring the NEGOTIATE auth-scheme follow ===
-#
-# "program" cmdline
-# Specify the command for the external Negotiate authenticator.
-# This protocol is used in Microsoft Active-Directory enabled setups with
-# the Microsoft Internet Explorer or Mozilla Firefox browsers.
-# Its main purpose is to exchange credentials with the Squid proxy
-# using the Kerberos mechanisms.
-# If you use a Negotiate authenticator, make sure you have at least
-# one acl of type proxy_auth active. By default, the negotiate
-# authenticator program is not used.
-# The only supported program for this role is the ntlm_auth
-# program distributed as part of Samba, version 4 or later.
-#
-# auth_param negotiate program /usr/bin/ntlm_auth --helper-protocol=gss-spnego
-#
-# "children" numberofchildren [startup=N] [idle=N]
-# The maximum number of authenticator processes to spawn (default 5).
-# If you start too few Squid will have to wait for them to
-# process a backlog of credential verifications, slowing it
-# down. When credential verifications are done via a (slow)
-# network you are likely to need lots of authenticator
-# processes.
-#
-# The startup= and idle= options permit some skew in the exact amount
-# run. A minimum of startup=N will begin during startup and reconfigure.
-# Squid will start more in groups of up to idle=N in an attempt to meet
-# traffic needs and to keep idle=N free above those traffic needs up to
-# the maximum.
-#
-# auth_param negotiate children 20 startup=0 idle=1
-#
-# "keep_alive" on|off
-# If you experience problems with PUT/POST requests when using the
-# Negotiate authentication scheme then you can try setting this to
-# off. This will cause Squid to forcibly close the connection on
-# the initial requests where the browser asks which schemes are
-# supported by the proxy.
-#
-# auth_param negotiate keep_alive on
-#
-#
-# Examples:
-#
-##Recommended minimum configuration per scheme:
-##auth_param negotiate program <uncomment and complete this line to activate>
-##auth_param negotiate children 20 startup=0 idle=1
-##auth_param negotiate keep_alive on
-##
-##auth_param ntlm program <uncomment and complete this line to activate>
-##auth_param ntlm children 20 startup=0 idle=1
-##auth_param ntlm keep_alive on
-##
-##auth_param digest program <uncomment and complete this line>
-##auth_param digest children 20 startup=0 idle=1
-##auth_param digest realm Squid proxy-caching web server
-##auth_param digest nonce_garbage_interval 5 minutes
-##auth_param digest nonce_max_duration 30 minutes
-##auth_param digest nonce_max_count 50
-##
-##auth_param basic program <uncomment and complete this line>
-##auth_param basic children 5 startup=5 idle=1
-##auth_param basic realm Squid proxy-caching web server
-##auth_param basic credentialsttl 2 hours
-#Default:
-# none
-
-# TAG: authenticate_cache_garbage_interval
-# The time period between garbage collection across the username cache.
-# This is a trade-off between memory utilization (long intervals - say
-# 2 days) and CPU (short intervals - say 1 minute). Only change if you
-# have good reason to.
-#Default:
-# authenticate_cache_garbage_interval 1 hour
-
-# TAG: authenticate_ttl
-# The time a user & their credentials stay in the logged in
-# user cache since their last request. When the garbage
-# interval passes, all user credentials that have passed their
-# TTL are removed from memory.
-#Default:
-# authenticate_ttl 1 hour
-
-# TAG: authenticate_ip_ttl
-# If you use proxy authentication and the 'max_user_ip' ACL,
-# this directive controls how long Squid remembers the IP
-# addresses associated with each user. Use a small value
-# (e.g., 60 seconds) if your users might change addresses
-# quickly, as is the case with dialup. You might be safe
-# using a larger value (e.g., 2 hours) in a corporate LAN
-# environment with relatively static address assignments.
-#Default:
-# authenticate_ip_ttl 1 second
-
-# ACCESS CONTROLS
-# -----------------------------------------------------------------------------
-
-# TAG: external_acl_type
-# This option defines external acl classes using a helper program
-# to look up the status
-#
-# external_acl_type name [options] FORMAT.. /path/to/helper [helper arguments..]
-#
-# Options:
-#
-# ttl=n TTL in seconds for cached results (defaults to 3600
-# for 1 hour)
-#
-# negative_ttl=n
-# TTL for cached negative lookups (default same
-# as ttl)
-#
-# grace=n Percentage remaining of TTL where a refresh of a
-# cached entry should be initiated without needing to
-# wait for a new reply. (default is for no grace period)
-#
-# cache=n Limit the result cache size, default is 262144.
-# The expanded FORMAT value is used as the cache key, so
-# if the details in FORMAT are highly variable a larger
-# cache may be needed to produce reduction in helper load.
-#
-# children-max=n
-# Maximum number of acl helper processes spawned to service
-# external acl lookups of this type. (default 20)
-#
-# children-startup=n
-# Minimum number of acl helper processes to spawn during
-# startup and reconfigure to service external acl lookups
-# of this type. (default 0)
-#
-# children-idle=n
-# Number of acl helper processes to keep ahead of traffic
-# loads. Squid will spawn this many at once whenever load
-# rises above the capabilities of existing processes.
-# Up to the value of children-max. (default 1)
-#
-# concurrency=n concurrency level per process. Only used with helpers
-# capable of processing more than one query at a time.
-#
-# protocol=2.5 Compatibility mode for Squid-2.5 external acl helpers.
-#
-# ipv4 / ipv6 IP protocol used to communicate with this helper.
-# The default is to auto-detect IPv6 and use it when available.
-#
-#
-# FORMAT specifications
-#
-# %LOGIN Authenticated user login name
-# %EXT_USER Username from previous external acl
-# %EXT_LOG Log details from previous external acl
-# %EXT_TAG Tag from previous external acl
-# %IDENT Ident user name
-# %SRC Client IP
-# %SRCPORT Client source port
-# %URI Requested URI
-# %DST Requested host
-# %PROTO Requested protocol
-# %PORT Requested port
-# %PATH Requested URL path
-# %METHOD Request method
-# %MYADDR Squid interface address
-# %MYPORT Squid http_port number
-# %PATH Requested URL-path (including query-string if any)
-# %USER_CERT SSL User certificate in PEM format
-# %USER_CERTCHAIN SSL User certificate chain in PEM format
-# %USER_CERT_xx SSL User certificate subject attribute xx
-# %USER_CA_CERT_xx SSL User certificate issuer attribute xx
-#
-# %>{Header} HTTP request header "Header"
-# %>{Hdr:member}
-# HTTP request header "Hdr" list member "member"
-# %>{Hdr:;member}
-# HTTP request header list member using ; as
-# list separator. ; can be any non-alphanumeric
-# character.
-#
-# %<{Header} HTTP reply header "Header"
-# %<{Hdr:member}
-# HTTP reply header "Hdr" list member "member"
-# %<{Hdr:;member}
-# HTTP reply header list member using ; as
-# list separator. ; can be any non-alphanumeric
-# character.
-#
-# %ACL The name of the ACL being tested.
-# %DATA The ACL arguments. If not used then any arguments
-# is automatically added at the end of the line
-# sent to the helper.
-# NOTE: this will encode the arguments as one token,
-# whereas the default will pass each separately.
-#
-# %% The percent sign. Useful for helpers which need
-# an unchanging input format.
-#
-#
-# General request syntax:
-#
-# [channel-ID] FORMAT-values [acl-values ...]
-#
-#
-# FORMAT-values consists of transaction details expanded with
-# whitespace separation per the config file FORMAT specification
-# using the FORMAT macros listed above.
-#
-# acl-values consists of any string specified in the referencing
-# config 'acl ... external' line. see the "acl external" directive.
-#
-# Request values sent to the helper are URL escaped to protect
-# each value in requests against whitespaces.
-#
-# If using protocol=2.5 then the request sent to the helper is not
-# URL escaped to protect against whitespace.
-#
-# NOTE: protocol=3.0 is deprecated as no longer necessary.
-#
-# When using the concurrency= option the protocol is changed by
-# introducing a query channel tag in front of the request/response.
-# The query channel tag is a number between 0 and concurrency-1.
-# This value must be echoed back unchanged to Squid as the first part
-# of the response relating to its request.
-#
-#
-# The helper receives lines expanded per the above format specification
-# and for each input line returns 1 line starting with OK/ERR/BH result
-# code and optionally followed by additional keywords with more details.
-#
-#
-# General result syntax:
-#
-# [channel-ID] result keyword=value ...
-#
-# Result consists of one of the codes:
-#
-# OK
-# the ACL test produced a match.
-#
-# ERR
-# the ACL test does not produce a match.
-#
-# BH
-# An internal error occurred in the helper, preventing
-# a result being identified.
-#
-# The meaning of 'a match' is determined by your squid.conf
-# access control configuration. See the Squid wiki for details.
-#
-# Defined keywords:
-#
-# user= The users name (login)
-#
-# password= The users password (for login= cache_peer option)
-#
-# message= Message describing the reason for this response.
-# Available as %o in error pages.
-# Useful on (ERR and BH results).
-#
-# tag= Apply a tag to a request. Only sets a tag once,
-# does not alter existing tags.
-#
-# log= String to be logged in access.log. Available as
-# %ea in logformat specifications.
-#
-# Any keywords may be sent on any response whether OK, ERR or BH.
-#
-# All response keyword values need to be a single token with URL
-# escaping, or enclosed in double quotes (") and escaped using \ on
-# any double quotes or \ characters within the value. The wrapping
-# double quotes are removed before the value is interpreted by Squid.
-# \r and \n are also replace by CR and LF.
-#
-# Some example key values:
-#
-# user=John%20Smith
-# user="John Smith"
-# user="J. \"Bob\" Smith"
-#Default:
-# none
-
-# TAG: acl
-# Defining an Access List
-#
-# Every access list definition must begin with an aclname and acltype,
-# followed by either type-specific arguments or a quoted filename that
-# they are read from.
-#
-# acl aclname acltype argument ...
-# acl aclname acltype "file" ...
-#
-# When using "file", the file should contain one item per line.
-#
-# Some acl types supports options which changes their default behaviour.
-# The available options are:
-#
-# -i,+i By default, regular expressions are CASE-SENSITIVE. To make them
-# case-insensitive, use the -i option. To return case-sensitive
-# use the +i option between patterns, or make a new ACL line
-# without -i.
-#
-# -n Disable lookups and address type conversions. If lookup or
-# conversion is required because the parameter type (IP or
-# domain name) does not match the message address type (domain
-# name or IP), then the ACL would immediately declare a mismatch
-# without any warnings or lookups.
-#
-# -- Used to stop processing all options, in the case the first acl
-# value has '-' character as first character (for example the '-'
-# is a valid domain name)
-#
-# Some acl types require suspending the current request in order
-# to access some external data source.
-# Those which do are marked with the tag [slow], those which
-# don't are marked as [fast].
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl
-# for further information
-#
-# ***** ACL TYPES AVAILABLE *****
-#
-# acl aclname src ip-address/mask ... # clients IP address [fast]
-# acl aclname src addr1-addr2/mask ... # range of addresses [fast]
-# acl aclname dst [-n] ip-address/mask ... # URL host's IP address [slow]
-# acl aclname localip ip-address/mask ... # IP address the client connected to [fast]
-#
-# acl aclname arp mac-address ... (xx:xx:xx:xx:xx:xx notation)
-# # The arp ACL requires the special configure option --enable-arp-acl.
-# # Furthermore, the ARP ACL code is not portable to all operating systems.
-# # It works on Linux, Solaris, Windows, FreeBSD, and some
-# # other *BSD variants.
-# # [fast]
-# #
-# # NOTE: Squid can only determine the MAC address for clients that are on
-# # the same subnet. If the client is on a different subnet,
-# # then Squid cannot find out its MAC address.
-#
-# acl aclname srcdomain .foo.com ...
-# # reverse lookup, from client IP [slow]
-# acl aclname dstdomain [-n] .foo.com ...
-# # Destination server from URL [fast]
-# acl aclname srcdom_regex [-i] \.foo\.com ...
-# # regex matching client name [slow]
-# acl aclname dstdom_regex [-n] [-i] \.foo\.com ...
-# # regex matching server [fast]
-# #
-# # For dstdomain and dstdom_regex a reverse lookup is tried if a IP
-# # based URL is used and no match is found. The name "none" is used
-# # if the reverse lookup fails.
-#
-# acl aclname src_as number ...
-# acl aclname dst_as number ...
-# # [fast]
-# # Except for access control, AS numbers can be used for
-# # routing of requests to specific caches. Here's an
-# # example for routing all requests for AS#1241 and only
-# # those to mycache.mydomain.net:
-# # acl asexample dst_as 1241
-# # cache_peer_access mycache.mydomain.net allow asexample
-# # cache_peer_access mycache_mydomain.net deny all
-#
-# acl aclname peername myPeer ...
-# # [fast]
-# # match against a named cache_peer entry
-# # set unique name= on cache_peer lines for reliable use.
-#
-# acl aclname time [day-abbrevs] [h1:m1-h2:m2]
-# # [fast]
-# # day-abbrevs:
-# # S - Sunday
-# # M - Monday
-# # T - Tuesday
-# # W - Wednesday
-# # H - Thursday
-# # F - Friday
-# # A - Saturday
-# # h1:m1 must be less than h2:m2
-#
-# acl aclname url_regex [-i] ^http:// ...
-# # regex matching on whole URL [fast]
-# acl aclname urllogin [-i] [^a-zA-Z0-9] ...
-# # regex matching on URL login field
-# acl aclname urlpath_regex [-i] \.gif$ ...
-# # regex matching on URL path [fast]
-#
-# acl aclname port 80 70 21 0-1024... # destination TCP port [fast]
-# # ranges are alloed
-# acl aclname localport 3128 ... # TCP port the client connected to [fast]
-# # NP: for interception mode this is usually '80'
-#
-# acl aclname myportname 3128 ... # http(s)_port name [fast]
-#
-# acl aclname proto HTTP FTP ... # request protocol [fast]
-#
-# acl aclname method GET POST ... # HTTP request method [fast]
-#
-# acl aclname http_status 200 301 500- 400-403 ...
-# # status code in reply [fast]
-#
-# acl aclname browser [-i] regexp ...
-# # pattern match on User-Agent header (see also req_header below) [fast]
-#
-# acl aclname referer_regex [-i] regexp ...
-# # pattern match on Referer header [fast]
-# # Referer is highly unreliable, so use with care
-#
-# acl aclname ident username ...
-# acl aclname ident_regex [-i] pattern ...
-# # string match on ident output [slow]
-# # use REQUIRED to accept any non-null ident.
-#
-# acl aclname proxy_auth [-i] username ...
-# acl aclname proxy_auth_regex [-i] pattern ...
-# # perform http authentication challenge to the client and match against
-# # supplied credentials [slow]
-# #
-# # takes a list of allowed usernames.
-# # use REQUIRED to accept any valid username.
-# #
-# # Will use proxy authentication in forward-proxy scenarios, and plain
-# # http authenticaiton in reverse-proxy scenarios
-# #
-# # NOTE: when a Proxy-Authentication header is sent but it is not
-# # needed during ACL checking the username is NOT logged
-# # in access.log.
-# #
-# # NOTE: proxy_auth requires a EXTERNAL authentication program
-# # to check username/password combinations (see
-# # auth_param directive).
-# #
-# # NOTE: proxy_auth can't be used in a transparent/intercepting proxy
-# # as the browser needs to be configured for using a proxy in order
-# # to respond to proxy authentication.
-#
-# acl aclname snmp_community string ...
-# # A community string to limit access to your SNMP Agent [fast]
-# # Example:
-# #
-# # acl snmppublic snmp_community public
-#
-# acl aclname maxconn number
-# # This will be matched when the client's IP address has
-# # more than <number> TCP connections established. [fast]
-# # NOTE: This only measures direct TCP links so X-Forwarded-For
-# # indirect clients are not counted.
-#
-# acl aclname max_user_ip [-s] number
-# # This will be matched when the user attempts to log in from more
-# # than <number> different ip addresses. The authenticate_ip_ttl
-# # parameter controls the timeout on the ip entries. [fast]
-# # If -s is specified the limit is strict, denying browsing
-# # from any further IP addresses until the ttl has expired. Without
-# # -s Squid will just annoy the user by "randomly" denying requests.
-# # (the counter is reset each time the limit is reached and a
-# # request is denied)
-# # NOTE: in acceleration mode or where there is mesh of child proxies,
-# # clients may appear to come from multiple addresses if they are
-# # going through proxy farms, so a limit of 1 may cause user problems.
-#
-# acl aclname random probability
-# # Pseudo-randomly match requests. Based on the probability given.
-# # Probability may be written as a decimal (0.333), fraction (1/3)
-# # or ratio of matches:non-matches (3:5).
-#
-# acl aclname req_mime_type [-i] mime-type ...
-# # regex match against the mime type of the request generated
-# # by the client. Can be used to detect file upload or some
-# # types HTTP tunneling requests [fast]
-# # NOTE: This does NOT match the reply. You cannot use this
-# # to match the returned file type.
-#
-# acl aclname req_header header-name [-i] any\.regex\.here
-# # regex match against any of the known request headers. May be
-# # thought of as a superset of "browser", "referer" and "mime-type"
-# # ACL [fast]
-#
-# acl aclname rep_mime_type [-i] mime-type ...
-# # regex match against the mime type of the reply received by
-# # squid. Can be used to detect file download or some
-# # types HTTP tunneling requests. [fast]
-# # NOTE: This has no effect in http_access rules. It only has
-# # effect in rules that affect the reply data stream such as
-# # http_reply_access.
-#
-# acl aclname rep_header header-name [-i] any\.regex\.here
-# # regex match against any of the known reply headers. May be
-# # thought of as a superset of "browser", "referer" and "mime-type"
-# # ACLs [fast]
-#
-# acl aclname external class_name [arguments...]
-# # external ACL lookup via a helper class defined by the
-# # external_acl_type directive [slow]
-#
-# acl aclname user_cert attribute values...
-# # match against attributes in a user SSL certificate
-# # attribute is one of DN/C/O/CN/L/ST [fast]
-#
-# acl aclname ca_cert attribute values...
-# # match against attributes a users issuing CA SSL certificate
-# # attribute is one of DN/C/O/CN/L/ST [fast]
-#
-# acl aclname ext_user username ...
-# acl aclname ext_user_regex [-i] pattern ...
-# # string match on username returned by external acl helper [slow]
-# # use REQUIRED to accept any non-null user name.
-#
-# acl aclname tag tagvalue ...
-# # string match on tag returned by external acl helper [slow]
-#
-# acl aclname hier_code codename ...
-# # string match against squid hierarchy code(s); [fast]
-# # e.g., DIRECT, PARENT_HIT, NONE, etc.
-# #
-# # NOTE: This has no effect in http_access rules. It only has
-# # effect in rules that affect the reply data stream such as
-# # http_reply_access.
-#
-# acl aclname note name [value ...]
-# # match transaction annotation [fast]
-# # Without values, matches any annotation with a given name.
-# # With value(s), matches any annotation with a given name that
-# # also has one of the given values.
-# # Names and values are compared using a string equality test.
-# # Annotation sources include note and adaptation_meta directives
-# # as well as helper and eCAP responses.
-#
-# acl aclname any-of acl1 acl2 ...
-# # match any one of the acls [fast or slow]
-# # The first matching ACL stops further ACL evaluation.
-# #
-# # ACLs from multiple any-of lines with the same name are ORed.
-# # For example, A = (a1 or a2) or (a3 or a4) can be written as
-# # acl A any-of a1 a2
-# # acl A any-of a3 a4
-# #
-# # This group ACL is fast if all evaluated ACLs in the group are fast
-# # and slow otherwise.
-#
-# acl aclname all-of acl1 acl2 ...
-# # match all of the acls [fast or slow]
-# # The first mismatching ACL stops further ACL evaluation.
-# #
-# # ACLs from multiple all-of lines with the same name are ORed.
-# # For example, B = (b1 and b2) or (b3 and b4) can be written as
-# # acl B all-of b1 b2
-# # acl B all-of b3 b4
-# #
-# # This group ACL is fast if all evaluated ACLs in the group are fast
-# # and slow otherwise.
-#
-# Examples:
-# acl macaddress arp 09:00:2b:23:45:67
-# acl myexample dst_as 1241
-# acl password proxy_auth REQUIRED
-# acl fileupload req_mime_type -i ^multipart/form-data$
-# acl javascript rep_mime_type -i ^application/x-javascript$
-#
-#Default:
-# ACLs all, manager, localhost, and to_localhost are predefined.
-#
-#
-# Recommended minimum configuration:
-#
-
-# Example rule allowing access from your local networks.
-# Adapt to list your (internal) IP networks from where browsing
-# should be allowed
-acl localnet src 10.0.0.0/8 # RFC1918 possible internal network
-acl localnet src 172.16.0.0/12 # RFC1918 possible internal network
-acl localnet src 192.168.0.0/16 # RFC1918 possible internal network
-acl localnet src fc00::/7 # RFC 4193 local private network range
-acl localnet src fe80::/10 # RFC 4291 link-local (directly plugged) machines
-
-acl SSL_ports port 443
-acl Safe_ports port 80 # http
-acl Safe_ports port 21 # ftp
-acl Safe_ports port 443 # https
-acl Safe_ports port 70 # gopher
-acl Safe_ports port 210 # wais
-acl Safe_ports port 1025-65535 # unregistered ports
-acl Safe_ports port 280 # http-mgmt
-acl Safe_ports port 488 # gss-http
-acl Safe_ports port 591 # filemaker
-acl Safe_ports port 777 # multiling http
-acl CONNECT method CONNECT
-
-# TAG: follow_x_forwarded_for
-# Allowing or Denying the X-Forwarded-For header to be followed to
-# find the original source of a request.
-#
-# Requests may pass through a chain of several other proxies
-# before reaching us. The X-Forwarded-For header will contain a
-# comma-separated list of the IP addresses in the chain, with the
-# rightmost address being the most recent.
-#
-# If a request reaches us from a source that is allowed by this
-# configuration item, then we consult the X-Forwarded-For header
-# to see where that host received the request from. If the
-# X-Forwarded-For header contains multiple addresses, we continue
-# backtracking until we reach an address for which we are not allowed
-# to follow the X-Forwarded-For header, or until we reach the first
-# address in the list. For the purpose of ACL used in the
-# follow_x_forwarded_for directive the src ACL type always matches
-# the address we are testing and srcdomain matches its rDNS.
-#
-# The end result of this process is an IP address that we will
-# refer to as the indirect client address. This address may
-# be treated as the client address for access control, ICAP, delay
-# pools and logging, depending on the acl_uses_indirect_client,
-# icap_uses_indirect_client, delay_pool_uses_indirect_client,
-# log_uses_indirect_client and tproxy_uses_indirect_client options.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-# SECURITY CONSIDERATIONS:
-#
-# Any host for which we follow the X-Forwarded-For header
-# can place incorrect information in the header, and Squid
-# will use the incorrect information as if it were the
-# source address of the request. This may enable remote
-# hosts to bypass any access control restrictions that are
-# based on the client's source addresses.
-#
-# For example:
-#
-# acl localhost src 127.0.0.1
-# acl my_other_proxy srcdomain .proxy.example.com
-# follow_x_forwarded_for allow localhost
-# follow_x_forwarded_for allow my_other_proxy
-#Default:
-# X-Forwarded-For header will be ignored.
-
-# TAG: acl_uses_indirect_client on|off
-# Controls whether the indirect client address
-# (see follow_x_forwarded_for) is used instead of the
-# direct client address in acl matching.
-#
-# NOTE: maxconn ACL considers direct TCP links and indirect
-# clients will always have zero. So no match.
-#Default:
-# acl_uses_indirect_client on
-
-# TAG: delay_pool_uses_indirect_client on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-follow-x-forwarded-for and --enable-delay-pools
-#
-# Controls whether the indirect client address
-# (see follow_x_forwarded_for) is used instead of the
-# direct client address in delay pools.
-#Default:
-# delay_pool_uses_indirect_client on
-
-# TAG: log_uses_indirect_client on|off
-# Controls whether the indirect client address
-# (see follow_x_forwarded_for) is used instead of the
-# direct client address in the access log.
-#Default:
-# log_uses_indirect_client on
-
-# TAG: tproxy_uses_indirect_client on|off
-# Controls whether the indirect client address
-# (see follow_x_forwarded_for) is used instead of the
-# direct client address when spoofing the outgoing client.
-#
-# This has no effect on requests arriving in non-tproxy
-# mode ports.
-#
-# SECURITY WARNING: Usage of this option is dangerous
-# and should not be used trivially. Correct configuration
-# of follow_x_forewarded_for with a limited set of trusted
-# sources is required to prevent abuse of your proxy.
-#Default:
-# tproxy_uses_indirect_client off
-
-# TAG: spoof_client_ip
-# Control client IP address spoofing of TPROXY traffic based on
-# defined access lists.
-#
-# spoof_client_ip allow|deny [!]aclname ...
-#
-# If there are no "spoof_client_ip" lines present, the default
-# is to "allow" spoofing of any suitable request.
-#
-# Note that the cache_peer "no-tproxy" option overrides this ACL.
-#
-# This clause supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow spoofing on all TPROXY traffic.
-
-# TAG: http_access
-# Allowing or Denying access based on defined access lists
-#
-# Access to the HTTP port:
-# http_access allow|deny [!]aclname ...
-#
-# NOTE on default values:
-#
-# If there are no "access" lines present, the default is to deny
-# the request.
-#
-# If none of the "access" lines cause a match, the default is the
-# opposite of the last line in the list. If the last line was
-# deny, the default is allow. Conversely, if the last line
-# is allow, the default will be deny. For these reasons, it is a
-# good idea to have an "deny all" entry at the end of your access
-# lists to avoid potential confusion.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Default:
-# Deny, unless rules exist in squid.conf.
-#
-
-#
-# Recommended minimum Access Permission configuration:
-#
-# Deny requests to certain unsafe ports
-http_access deny !Safe_ports
-
-# Deny CONNECT to other than secure SSL ports
-http_access deny CONNECT !SSL_ports
-
-# Only allow cachemgr access from localhost
-http_access allow localhost manager
-http_access deny manager
-
-# We strongly recommend the following be uncommented to protect innocent
-# web applications running on the proxy server who think the only
-# one who can access services on "localhost" is a local user
-#http_access deny to_localhost
-
-#
-# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
-#
-
-# Example rule allowing access from your local networks.
-# Adapt localnet in the ACL section to list your (internal) IP networks
-# from where browsing should be allowed
-http_access allow localnet
-http_access allow localhost
-
-# And finally deny all other access to this proxy
-http_access deny all
-
-# TAG: adapted_http_access
-# Allowing or Denying access based on defined access lists
-#
-# Essentially identical to http_access, but runs after redirectors
-# and ICAP/eCAP adaptation. Allowing access control based on their
-# output.
-#
-# If not set then only http_access is used.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-# TAG: http_reply_access
-# Allow replies to client requests. This is complementary to http_access.
-#
-# http_reply_access allow|deny [!] aclname ...
-#
-# NOTE: if there are no access lines present, the default is to allow
-# all replies.
-#
-# If none of the access lines cause a match the opposite of the
-# last line will apply. Thus it is good practice to end the rules
-# with an "allow all" or "deny all" entry.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-# TAG: icp_access
-# Allowing or Denying access to the ICP port based on defined
-# access lists
-#
-# icp_access allow|deny [!]aclname ...
-#
-# NOTE: The default if no icp_access lines are present is to
-# deny all traffic. This default may cause problems with peers
-# using ICP.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow ICP queries from local networks only
-##icp_access allow localnet
-##icp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-# TAG: htcp_access
-# Allowing or Denying access to the HTCP port based on defined
-# access lists
-#
-# htcp_access allow|deny [!]aclname ...
-#
-# See also htcp_clr_access for details on access control for
-# cache purge (CLR) HTCP messages.
-#
-# NOTE: The default if no htcp_access lines are present is to
-# deny all traffic. This default may cause problems with peers
-# using the htcp option.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow HTCP queries from local networks only
-##htcp_access allow localnet
-##htcp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-# TAG: htcp_clr_access
-# Allowing or Denying access to purge content using HTCP based
-# on defined access lists.
-# See htcp_access for details on general HTCP access control.
-#
-# htcp_clr_access allow|deny [!]aclname ...
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow HTCP CLR requests from trusted peers
-#acl htcp_clr_peer src 192.0.2.2 2001:DB8::2
-#htcp_clr_access allow htcp_clr_peer
-#htcp_clr_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-# TAG: miss_access
-# Determins whether network access is permitted when satisfying a request.
-#
-# For example;
-# to force your neighbors to use you as a sibling instead of
-# a parent.
-#
-# acl localclients src 192.0.2.0/24 2001:DB8::a:0/64
-# miss_access deny !localclients
-# miss_access allow all
-#
-# This means only your local clients are allowed to fetch relayed/MISS
-# replies from the network and all other clients can only fetch cached
-# objects (HITs).
-#
-# The default for this setting allows all clients who passed the
-# http_access rules to relay via this proxy.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-# TAG: ident_lookup_access
-# A list of ACL elements which, if matched, cause an ident
-# (RFC 931) lookup to be performed for this request. For
-# example, you might choose to always perform ident lookups
-# for your main multi-user Unix boxes, but not for your Macs
-# and PCs. By default, ident lookups are not performed for
-# any requests.
-#
-# To enable ident lookups for specific client addresses, you
-# can follow this example:
-#
-# acl ident_aware_hosts src 198.168.1.0/24
-# ident_lookup_access allow ident_aware_hosts
-# ident_lookup_access deny all
-#
-# Only src type ACL checks are fully supported. A srcdomain
-# ACL might work at times, but it will not always provide
-# the correct result.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Unless rules exist in squid.conf, IDENT is not fetched.
-
-# TAG: reply_body_max_size size [acl acl...]
-# This option specifies the maximum size of a reply body. It can be
-# used to prevent users from downloading very large files, such as
-# MP3's and movies. When the reply headers are received, the
-# reply_body_max_size lines are processed, and the first line where
-# all (if any) listed ACLs are true is used as the maximum body size
-# for this reply.
-#
-# This size is checked twice. First when we get the reply headers,
-# we check the content-length value. If the content length value exists
-# and is larger than the allowed size, the request is denied and the
-# user receives an error message that says "the request or reply
-# is too large." If there is no content-length, and the reply
-# size exceeds this limit, the client's connection is just closed
-# and they will receive a partial reply.
-#
-# WARNING: downstream caches probably can not detect a partial reply
-# if there is no content-length header, so they will cache
-# partial responses and give them out as hits. You should NOT
-# use this option if you have downstream caches.
-#
-# WARNING: A maximum size smaller than the size of squid's error messages
-# will cause an infinite loop and crash squid. Ensure that the smallest
-# non-zero value you use is greater that the maximum header size plus
-# the size of your largest error page.
-#
-# If you set this parameter none (the default), there will be
-# no limit imposed.
-#
-# Configuration Format is:
-# reply_body_max_size SIZE UNITS [acl ...]
-# ie.
-# reply_body_max_size 10 MB
-#
-#Default:
-# No limit is applied.
-
-# NETWORK OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: http_port
-# Usage: port [mode] [options]
-# hostname:port [mode] [options]
-# 1.2.3.4:port [mode] [options]
-#
-# The socket addresses where Squid will listen for HTTP client
-# requests. You may specify multiple socket addresses.
-# There are three forms: port alone, hostname with port, and
-# IP address with port. If you specify a hostname or IP
-# address, Squid binds the socket to that specific
-# address. Most likely, you do not need to bind to a specific
-# address, so you can use the port number alone.
-#
-# If you are running Squid in accelerator mode, you
-# probably want to listen on port 80 also, or instead.
-#
-# The -a command line option may be used to specify additional
-# port(s) where Squid listens for proxy request. Such ports will
-# be plain proxy ports with no options.
-#
-# You may specify multiple socket addresses on multiple lines.
-#
-# Modes:
-#
-# intercept Support for IP-Layer interception of
-# outgoing requests without browser settings.
-# NP: disables authentication and IPv6 on the port.
-#
-# tproxy Support Linux TPROXY for spoofing outgoing
-# connections using the client IP address.
-# NP: disables authentication and maybe IPv6 on the port.
-#
-# accel Accelerator / reverse proxy mode
-#
-# ssl-bump For each CONNECT request allowed by ssl_bump ACLs,
-# establish secure connection with the client and with
-# the server, decrypt HTTPS messages as they pass through
-# Squid, and treat them as unencrypted HTTP messages,
-# becoming the man-in-the-middle.
-#
-# The ssl_bump option is required to fully enable
-# bumping of CONNECT requests.
-#
-# Omitting the mode flag causes default forward proxy mode to be used.
-#
-#
-# Accelerator Mode Options:
-#
-# defaultsite=domainname
-# What to use for the Host: header if it is not present
-# in a request. Determines what site (not origin server)
-# accelerators should consider the default.
-#
-# no-vhost Disable using HTTP/1.1 Host header for virtual domain support.
-#
-# protocol= Protocol to reconstruct accelerated requests with.
-# Defaults to http for http_port and https for
-# https_port
-#
-# vport Virtual host port support. Using the http_port number
-# instead of the port passed on Host: headers.
-#
-# vport=NN Virtual host port support. Using the specified port
-# number instead of the port passed on Host: headers.
-#
-# act-as-origin
-# Act as if this Squid is the origin server.
-# This currently means generate new Date: and Expires:
-# headers on HIT instead of adding Age:.
-#
-# ignore-cc Ignore request Cache-Control headers.
-#
-# WARNING: This option violates HTTP specifications if
-# used in non-accelerator setups.
-#
-# allow-direct Allow direct forwarding in accelerator mode. Normally
-# accelerated requests are denied direct forwarding as if
-# never_direct was used.
-#
-# WARNING: this option opens accelerator mode to security
-# vulnerabilities usually only affecting in interception
-# mode. Make sure to protect forwarding with suitable
-# http_access rules when using this.
-#
-#
-# SSL Bump Mode Options:
-# In addition to these options ssl-bump requires TLS/SSL options.
-#
-# generate-host-certificates[=<on|off>]
-# Dynamically create SSL server certificates for the
-# destination hosts of bumped CONNECT requests.When
-# enabled, the cert and key options are used to sign
-# generated certificates. Otherwise generated
-# certificate will be selfsigned.
-# If there is a CA certificate lifetime of the generated
-# certificate equals lifetime of the CA certificate. If
-# generated certificate is selfsigned lifetime is three
-# years.
-# This option is enabled by default when ssl-bump is used.
-# See the ssl-bump option above for more information.
-#
-# dynamic_cert_mem_cache_size=SIZE
-# Approximate total RAM size spent on cached generated
-# certificates. If set to zero, caching is disabled. The
-# default value is 4MB.
-#
-# TLS / SSL Options:
-#
-# cert= Path to SSL certificate (PEM format).
-#
-# key= Path to SSL private key file (PEM format)
-# if not specified, the certificate file is
-# assumed to be a combined certificate and
-# key file.
-#
-# version= The version of SSL/TLS supported
-# 1 automatic (default)
-# 2 SSLv2 only
-# 3 SSLv3 only
-# 4 TLSv1.0 only
-# 5 TLSv1.1 only
-# 6 TLSv1.2 only
-#
-# cipher= Colon separated list of supported ciphers.
-# NOTE: some ciphers such as EDH ciphers depend on
-# additional settings. If those settings are
-# omitted the ciphers may be silently ignored
-# by the OpenSSL library.
-#
-# options= Various SSL implementation options. The most important
-# being:
-# NO_SSLv2 Disallow the use of SSLv2
-# NO_SSLv3 Disallow the use of SSLv3
-# NO_TLSv1 Disallow the use of TLSv1.0
-# NO_TLSv1_1 Disallow the use of TLSv1.1
-# NO_TLSv1_2 Disallow the use of TLSv1.2
-# SINGLE_DH_USE Always create a new key when using
-# temporary/ephemeral DH key exchanges
-# ALL Enable various bug workarounds
-# suggested as "harmless" by OpenSSL
-# Be warned that this reduces SSL/TLS
-# strength to some attacks.
-# See OpenSSL SSL_CTX_set_options documentation for a
-# complete list of options.
-#
-# clientca= File containing the list of CAs to use when
-# requesting a client certificate.
-#
-# cafile= File containing additional CA certificates to
-# use when verifying client certificates. If unset
-# clientca will be used.
-#
-# capath= Directory containing additional CA certificates
-# and CRL lists to use when verifying client certificates.
-#
-# crlfile= File of additional CRL lists to use when verifying
-# the client certificate, in addition to CRLs stored in
-# the capath. Implies VERIFY_CRL flag below.
-#
-# dhparams= File containing DH parameters for temporary/ephemeral
-# DH key exchanges. See OpenSSL documentation for details
-# on how to create this file.
-# WARNING: EDH ciphers will be silently disabled if this
-# option is not set.
-#
-# sslflags= Various flags modifying the use of SSL:
-# DELAYED_AUTH
-# Don't request client certificates
-# immediately, but wait until acl processing
-# requires a certificate (not yet implemented).
-# NO_DEFAULT_CA
-# Don't use the default CA lists built in
-# to OpenSSL.
-# NO_SESSION_REUSE
-# Don't allow for session reuse. Each connection
-# will result in a new SSL session.
-# VERIFY_CRL
-# Verify CRL lists when accepting client
-# certificates.
-# VERIFY_CRL_ALL
-# Verify CRL lists for all certificates in the
-# client certificate chain.
-#
-# sslcontext= SSL session ID context identifier.
-#
-# Other Options:
-#
-# connection-auth[=on|off]
-# use connection-auth=off to tell Squid to prevent
-# forwarding Microsoft connection oriented authentication
-# (NTLM, Negotiate and Kerberos)
-#
-# disable-pmtu-discovery=
-# Control Path-MTU discovery usage:
-# off lets OS decide on what to do (default).
-# transparent disable PMTU discovery when transparent
-# support is enabled.
-# always disable always PMTU discovery.
-#
-# In many setups of transparently intercepting proxies
-# Path-MTU discovery can not work on traffic towards the
-# clients. This is the case when the intercepting device
-# does not fully track connections and fails to forward
-# ICMP must fragment messages to the cache server. If you
-# have such setup and experience that certain clients
-# sporadically hang or never complete requests set
-# disable-pmtu-discovery option to 'transparent'.
-#
-# name= Specifies a internal name for the port. Defaults to
-# the port specification (port or addr:port)
-#
-# tcpkeepalive[=idle,interval,timeout]
-# Enable TCP keepalive probes of idle connections.
-# In seconds; idle is the initial time before TCP starts
-# probing the connection, interval how often to probe, and
-# timeout the time before giving up.
-#
-# If you run Squid on a dual-homed machine with an internal
-# and an external interface we recommend you to specify the
-# internal address:port in http_port. This way Squid will only be
-# visible on the internal address.
-#
-#
-
-# Squid normally listens to port 3128
-http_port 3128
-
-# TAG: https_port
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Usage: [ip:]port cert=certificate.pem [key=key.pem] [mode] [options...]
-#
-# The socket address where Squid will listen for client requests made
-# over TLS or SSL connections. Commonly referred to as HTTPS.
-#
-# This is most useful for situations where you are running squid in
-# accelerator mode and you want to do the SSL work at the accelerator level.
-#
-# You may specify multiple socket addresses on multiple lines,
-# each with their own SSL certificate and/or options.
-#
-# Modes:
-#
-# accel Accelerator / reverse proxy mode
-#
-# intercept Support for IP-Layer interception of
-# outgoing requests without browser settings.
-# NP: disables authentication and IPv6 on the port.
-#
-# tproxy Support Linux TPROXY for spoofing outgoing
-# connections using the client IP address.
-# NP: disables authentication and maybe IPv6 on the port.
-#
-# ssl-bump For each intercepted connection allowed by ssl_bump
-# ACLs, establish a secure connection with the client and with
-# the server, decrypt HTTPS messages as they pass through
-# Squid, and treat them as unencrypted HTTP messages,
-# becoming the man-in-the-middle.
-#
-# An "ssl_bump server-first" match is required to
-# fully enable bumping of intercepted SSL connections.
-#
-# Requires tproxy or intercept.
-#
-# Omitting the mode flag causes default forward proxy mode to be used.
-#
-#
-# See http_port for a list of generic options
-#
-#
-# SSL Options:
-#
-# cert= Path to SSL certificate (PEM format).
-#
-# key= Path to SSL private key file (PEM format)
-# if not specified, the certificate file is
-# assumed to be a combined certificate and
-# key file.
-#
-# version= The version of SSL/TLS supported
-# 1 automatic (default)
-# 2 SSLv2 only
-# 3 SSLv3 only
-# 4 TLSv1 only
-#
-# cipher= Colon separated list of supported ciphers.
-#
-# options= Various SSL engine options. The most important
-# being:
-# NO_SSLv2 Disallow the use of SSLv2
-# NO_SSLv3 Disallow the use of SSLv3
-# NO_TLSv1 Disallow the use of TLSv1
-# SINGLE_DH_USE Always create a new key when using
-# temporary/ephemeral DH key exchanges
-# See src/ssl_support.c or OpenSSL SSL_CTX_set_options
-# documentation for a complete list of options.
-#
-# clientca= File containing the list of CAs to use when
-# requesting a client certificate.
-#
-# cafile= File containing additional CA certificates to
-# use when verifying client certificates. If unset
-# clientca will be used.
-#
-# capath= Directory containing additional CA certificates
-# and CRL lists to use when verifying client certificates.
-#
-# crlfile= File of additional CRL lists to use when verifying
-# the client certificate, in addition to CRLs stored in
-# the capath. Implies VERIFY_CRL flag below.
-#
-# dhparams= File containing DH parameters for temporary/ephemeral
-# DH key exchanges.
-#
-# sslflags= Various flags modifying the use of SSL:
-# DELAYED_AUTH
-# Don't request client certificates
-# immediately, but wait until acl processing
-# requires a certificate (not yet implemented).
-# NO_DEFAULT_CA
-# Don't use the default CA lists built in
-# to OpenSSL.
-# NO_SESSION_REUSE
-# Don't allow for session reuse. Each connection
-# will result in a new SSL session.
-# VERIFY_CRL
-# Verify CRL lists when accepting client
-# certificates.
-# VERIFY_CRL_ALL
-# Verify CRL lists for all certificates in the
-# client certificate chain.
-#
-# sslcontext= SSL session ID context identifier.
-#
-# generate-host-certificates[=<on|off>]
-# Dynamically create SSL server certificates for the
-# destination hosts of bumped SSL requests.When
-# enabled, the cert and key options are used to sign
-# generated certificates. Otherwise generated
-# certificate will be selfsigned.
-# If there is CA certificate life time of generated
-# certificate equals lifetime of CA certificate. If
-# generated certificate is selfsigned lifetime is three
-# years.
-# This option is enabled by default when SslBump is used.
-# See the sslBump option above for more information.
-#
-# dynamic_cert_mem_cache_size=SIZE
-# Approximate total RAM size spent on cached generated
-# certificates. If set to zero, caching is disabled. The
-# default value is 4MB.
-#
-# See http_port for a list of available options.
-#Default:
-# none
-
-# TAG: tcp_outgoing_tos
-# Allows you to select a TOS/Diffserv value for packets outgoing
-# on the server side, based on an ACL.
-#
-# tcp_outgoing_tos ds-field [!]aclname ...
-#
-# Example where normal_service_net uses the TOS value 0x00
-# and good_service_net uses 0x20
-#
-# acl normal_service_net src 10.0.0.0/24
-# acl good_service_net src 10.0.1.0/24
-# tcp_outgoing_tos 0x00 normal_service_net
-# tcp_outgoing_tos 0x20 good_service_net
-#
-# TOS/DSCP values really only have local significance - so you should
-# know what you're specifying. For more information, see RFC2474,
-# RFC2475, and RFC3260.
-#
-# The TOS/DSCP byte must be exactly that - a octet value 0 - 255, or
-# "default" to use whatever default your host has. Note that in
-# practice often only multiples of 4 is usable as the two rightmost bits
-# have been redefined for use by ECN (RFC 3168 section 23.1).
-#
-# Processing proceeds in the order specified, and stops at first fully
-# matching line.
-#Default:
-# none
-
-# TAG: clientside_tos
-# Allows you to select a TOS/Diffserv value for packets being transmitted
-# on the client-side, based on an ACL.
-#
-# clientside_tos ds-field [!]aclname ...
-#
-# Example where normal_service_net uses the TOS value 0x00
-# and good_service_net uses 0x20
-#
-# acl normal_service_net src 10.0.0.0/24
-# acl good_service_net src 10.0.1.0/24
-# clientside_tos 0x00 normal_service_net
-# clientside_tos 0x20 good_service_net
-#
-# Note: This feature is incompatible with qos_flows. Any TOS values set here
-# will be overwritten by TOS values in qos_flows.
-#Default:
-# none
-
-# TAG: tcp_outgoing_mark
-# Note: This option is only available if Squid is rebuilt with the
-# Packet MARK (Linux)
-#
-# Allows you to apply a Netfilter mark value to outgoing packets
-# on the server side, based on an ACL.
-#
-# tcp_outgoing_mark mark-value [!]aclname ...
-#
-# Example where normal_service_net uses the mark value 0x00
-# and good_service_net uses 0x20
-#
-# acl normal_service_net src 10.0.0.0/24
-# acl good_service_net src 10.0.1.0/24
-# tcp_outgoing_mark 0x00 normal_service_net
-# tcp_outgoing_mark 0x20 good_service_net
-#Default:
-# none
-
-# TAG: clientside_mark
-# Note: This option is only available if Squid is rebuilt with the
-# Packet MARK (Linux)
-#
-# Allows you to apply a Netfilter mark value to packets being transmitted
-# on the client-side, based on an ACL.
-#
-# clientside_mark mark-value [!]aclname ...
-#
-# Example where normal_service_net uses the mark value 0x00
-# and good_service_net uses 0x20
-#
-# acl normal_service_net src 10.0.0.0/24
-# acl good_service_net src 10.0.1.0/24
-# clientside_mark 0x00 normal_service_net
-# clientside_mark 0x20 good_service_net
-#
-# Note: This feature is incompatible with qos_flows. Any mark values set here
-# will be overwritten by mark values in qos_flows.
-#Default:
-# none
-
-# TAG: qos_flows
-# Allows you to select a TOS/DSCP value to mark outgoing
-# connections to the client, based on where the reply was sourced.
-# For platforms using netfilter, allows you to set a netfilter mark
-# value instead of, or in addition to, a TOS value.
-#
-# By default this functionality is disabled. To enable it with the default
-# settings simply use "qos_flows mark" or "qos_flows tos". Default
-# settings will result in the netfilter mark or TOS value being copied
-# from the upstream connection to the client. Note that it is the connection
-# CONNMARK value not the packet MARK value that is copied.
-#
-# It is not currently possible to copy the mark or TOS value from the
-# client to the upstream connection request.
-#
-# TOS values really only have local significance - so you should
-# know what you're specifying. For more information, see RFC2474,
-# RFC2475, and RFC3260.
-#
-# The TOS/DSCP byte must be exactly that - a octet value 0 - 255. Note that
-# in practice often only multiples of 4 is usable as the two rightmost bits
-# have been redefined for use by ECN (RFC 3168 section 23.1).
-#
-# Mark values can be any unsigned 32-bit integer value.
-#
-# This setting is configured by setting the following values:
-#
-# tos|mark Whether to set TOS or netfilter mark values
-#
-# local-hit=0xFF Value to mark local cache hits.
-#
-# sibling-hit=0xFF Value to mark hits from sibling peers.
-#
-# parent-hit=0xFF Value to mark hits from parent peers.
-#
-# miss=0xFF[/mask] Value to mark cache misses. Takes precedence
-# over the preserve-miss feature (see below), unless
-# mask is specified, in which case only the bits
-# specified in the mask are written.
-#
-# The TOS variant of the following features are only possible on Linux
-# and require your kernel to be patched with the TOS preserving ZPH
-# patch, available from http://zph.bratcheda.org
-# No patch is needed to preserve the netfilter mark, which will work
-# with all variants of netfilter.
-#
-# disable-preserve-miss
-# This option disables the preservation of the TOS or netfilter
-# mark. By default, the existing TOS or netfilter mark value of
-# the response coming from the remote server will be retained
-# and masked with miss-mark.
-# NOTE: in the case of a netfilter mark, the mark must be set on
-# the connection (using the CONNMARK target) not on the packet
-# (MARK target).
-#
-# miss-mask=0xFF
-# Allows you to mask certain bits in the TOS or mark value
-# received from the remote server, before copying the value to
-# the TOS sent towards clients.
-# Default for tos: 0xFF (TOS from server is not changed).
-# Default for mark: 0xFFFFFFFF (mark from server is not changed).
-#
-# All of these features require the --enable-zph-qos compilation flag
-# (enabled by default). Netfilter marking also requires the
-# libnetfilter_conntrack libraries (--with-netfilter-conntrack) and
-# libcap 2.09+ (--with-libcap).
-#
-#Default:
-# none
-
-# TAG: tcp_outgoing_address
-# Allows you to map requests to different outgoing IP addresses
-# based on the username or source address of the user making
-# the request.
-#
-# tcp_outgoing_address ipaddr [[!]aclname] ...
-#
-# For example;
-# Forwarding clients with dedicated IPs for certain subnets.
-#
-# acl normal_service_net src 10.0.0.0/24
-# acl good_service_net src 10.0.2.0/24
-#
-# tcp_outgoing_address 2001:db8::c001 good_service_net
-# tcp_outgoing_address 10.1.0.2 good_service_net
-#
-# tcp_outgoing_address 2001:db8::beef normal_service_net
-# tcp_outgoing_address 10.1.0.1 normal_service_net
-#
-# tcp_outgoing_address 2001:db8::1
-# tcp_outgoing_address 10.1.0.3
-#
-# Processing proceeds in the order specified, and stops at first fully
-# matching line.
-#
-# Squid will add an implicit IP version test to each line.
-# Requests going to IPv4 websites will use the outgoing 10.1.0.* addresses.
-# Requests going to IPv6 websites will use the outgoing 2001:db8:* addresses.
-#
-#
-# NOTE: The use of this directive using client dependent ACLs is
-# incompatible with the use of server side persistent connections. To
-# ensure correct results it is best to set server_persistent_connections
-# to off when using this directive in such configurations.
-#
-# NOTE: The use of this directive to set a local IP on outgoing TCP links
-# is incompatible with using TPROXY to set client IP out outbound TCP links.
-# When needing to contact peers use the no-tproxy cache_peer option and the
-# client_dst_passthru directive re-enable normal forwarding such as this.
-#
-#Default:
-# Address selection is performed by the operating system.
-
-# TAG: host_verify_strict
-# Regardless of this option setting, when dealing with intercepted
-# traffic, Squid always verifies that the destination IP address matches
-# the Host header domain or IP (called 'authority form URL').
-#
-# This enforcement is performed to satisfy a MUST-level requirement in
-# RFC 2616 section 14.23: "The Host field value MUST represent the naming
-# authority of the origin server or gateway given by the original URL".
-#
-# When set to ON:
-# Squid always responds with an HTTP 409 (Conflict) error
-# page and logs a security warning if there is no match.
-#
-# Squid verifies that the destination IP address matches
-# the Host header for forward-proxy and reverse-proxy traffic
-# as well. For those traffic types, Squid also enables the
-# following checks, comparing the corresponding Host header
-# and Request-URI components:
-#
-# * The host names (domain or IP) must be identical,
-# but valueless or missing Host header disables all checks.
-# For the two host names to match, both must be either IP
-# or FQDN.
-#
-# * Port numbers must be identical, but if a port is missing
-# the scheme-default port is assumed.
-#
-#
-# When set to OFF (the default):
-# Squid allows suspicious requests to continue but logs a
-# security warning and blocks caching of the response.
-#
-# * Forward-proxy traffic is not checked at all.
-#
-# * Reverse-proxy traffic is not checked at all.
-#
-# * Intercepted traffic which passes verification is handled
-# according to client_dst_passthru.
-#
-# * Intercepted requests which fail verification are sent
-# to the client original destination instead of DIRECT.
-# This overrides 'client_dst_passthru off'.
-#
-# For now suspicious intercepted CONNECT requests are always
-# responded to with an HTTP 409 (Conflict) error page.
-#
-#
-# SECURITY NOTE:
-#
-# As described in CVE-2009-0801 when the Host: header alone is used
-# to determine the destination of a request it becomes trivial for
-# malicious scripts on remote websites to bypass browser same-origin
-# security policy and sandboxing protections.
-#
-# The cause of this is that such applets are allowed to perform their
-# own HTTP stack, in which case the same-origin policy of the browser
-# sandbox only verifies that the applet tries to contact the same IP
-# as from where it was loaded at the IP level. The Host: header may
-# be different from the connected IP and approved origin.
-#
-#Default:
-# host_verify_strict off
-
-# TAG: client_dst_passthru
-# With NAT or TPROXY intercepted traffic Squid may pass the request
-# directly to the original client destination IP or seek a faster
-# source using the HTTP Host header.
-#
-# Using Host to locate alternative servers can provide faster
-# connectivity with a range of failure recovery options.
-# But can also lead to connectivity trouble when the client and
-# server are attempting stateful interactions unaware of the proxy.
-#
-# This option (on by default) prevents alternative DNS entries being
-# located to send intercepted traffic DIRECT to an origin server.
-# The clients original destination IP and port will be used instead.
-#
-# Regardless of this option setting, when dealing with intercepted
-# traffic Squid will verify the Host: header and any traffic which
-# fails Host verification will be treated as if this option were ON.
-#
-# see host_verify_strict for details on the verification process.
-#Default:
-# client_dst_passthru on
-
-# SSL OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: ssl_unclean_shutdown
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Some browsers (especially MSIE) bugs out on SSL shutdown
-# messages.
-#Default:
-# ssl_unclean_shutdown off
-
-# TAG: ssl_engine
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# The OpenSSL engine to use. You will need to set this if you
-# would like to use hardware SSL acceleration for example.
-#Default:
-# none
-
-# TAG: sslproxy_client_certificate
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Client SSL Certificate to use when proxying https:// URLs
-#Default:
-# none
-
-# TAG: sslproxy_client_key
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Client SSL Key to use when proxying https:// URLs
-#Default:
-# none
-
-# TAG: sslproxy_version
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# SSL version level to use when proxying https:// URLs
-#
-# The versions of SSL/TLS supported:
-#
-# 1 automatic (default)
-# 2 SSLv2 only
-# 3 SSLv3 only
-# 4 TLSv1.0 only
-# 5 TLSv1.1 only
-# 6 TLSv1.2 only
-#Default:
-# automatic SSL/TLS version negotiation
-
-# TAG: sslproxy_options
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# SSL implementation options to use when proxying https:// URLs
-#
-# The most important being:
-#
-# NO_SSLv2 Disallow the use of SSLv2
-# NO_SSLv3 Disallow the use of SSLv3
-# NO_TLSv1 Disallow the use of TLSv1.0
-# NO_TLSv1_1 Disallow the use of TLSv1.1
-# NO_TLSv1_2 Disallow the use of TLSv1.2
-# SINGLE_DH_USE
-# Always create a new key when using temporary/ephemeral
-# DH key exchanges
-# SSL_OP_NO_TICKET
-# Disable use of RFC5077 session tickets. Some servers
-# may have problems understanding the TLS extension due
-# to ambiguous specification in RFC4507.
-# ALL Enable various bug workarounds suggested as "harmless"
-# by OpenSSL. Be warned that this may reduce SSL/TLS
-# strength to some attacks.
-#
-# See the OpenSSL SSL_CTX_set_options documentation for a
-# complete list of possible options.
-#Default:
-# none
-
-# TAG: sslproxy_cipher
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# SSL cipher list to use when proxying https:// URLs
-#
-# Colon separated list of supported ciphers.
-#Default:
-# none
-
-# TAG: sslproxy_cafile
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# file containing CA certificates to use when verifying server
-# certificates while proxying https:// URLs
-#Default:
-# none
-
-# TAG: sslproxy_capath
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# directory containing CA certificates to use when verifying
-# server certificates while proxying https:// URLs
-#Default:
-# none
-
-# TAG: ssl_bump
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# This option is consulted when a CONNECT request is received on
-# an http_port (or a new connection is intercepted at an
-# https_port), provided that port was configured with an ssl-bump
-# flag. The subsequent data on the connection is either treated as
-# HTTPS and decrypted OR tunneled at TCP level without decryption,
-# depending on the first bumping "mode" which ACLs match.
-#
-# ssl_bump <mode> [!]acl ...
-#
-# The following bumping modes are supported:
-#
-# client-first
-# Allow bumping of the connection. Establish a secure connection
-# with the client first, then connect to the server. This old mode
-# does not allow Squid to mimic server SSL certificate and does
-# not work with intercepted SSL connections.
-#
-# server-first
-# Allow bumping of the connection. Establish a secure connection
-# with the server first, then establish a secure connection with
-# the client, using a mimicked server certificate. Works with both
-# CONNECT requests and intercepted SSL connections.
-#
-# none
-# Become a TCP tunnel without decoding the connection.
-# Works with both CONNECT requests and intercepted SSL
-# connections. This is the default behavior when no
-# ssl_bump option is given or no ssl_bump ACLs match.
-#
-# By default, no connections are bumped.
-#
-# The first matching ssl_bump option wins. If no ACLs match, the
-# connection is not bumped. Unlike most allow/deny ACL lists, ssl_bump
-# does not have an implicit "negate the last given option" rule. You
-# must make that rule explicit if you convert old ssl_bump allow/deny
-# rules that rely on such an implicit rule.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-# See also: http_port ssl-bump, https_port ssl-bump
-#
-#
-# # Example: Bump all requests except those originating from
-# # localhost or those going to example.com.
-#
-# acl broken_sites dstdomain .example.com
-# ssl_bump none localhost
-# ssl_bump none broken_sites
-# ssl_bump server-first all
-#Default:
-# Does not bump unless rules are present in squid.conf
-
-# TAG: sslproxy_flags
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Various flags modifying the use of SSL while proxying https:// URLs:
-# DONT_VERIFY_PEER Accept certificates that fail verification.
-# For refined control, see sslproxy_cert_error.
-# NO_DEFAULT_CA Don't use the default CA list built in
-# to OpenSSL.
-#Default:
-# none
-
-# TAG: sslproxy_cert_error
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Use this ACL to bypass server certificate validation errors.
-#
-# For example, the following lines will bypass all validation errors
-# when talking to servers for example.com. All other
-# validation errors will result in ERR_SECURE_CONNECT_FAIL error.
-#
-# acl BrokenButTrustedServers dstdomain example.com
-# sslproxy_cert_error allow BrokenButTrustedServers
-# sslproxy_cert_error deny all
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-# Using slow acl types may result in server crashes
-#
-# Without this option, all server certificate validation errors
-# terminate the transaction to protect Squid and the client.
-#
-# SQUID_X509_V_ERR_INFINITE_VALIDATION error cannot be bypassed
-# but should not happen unless your OpenSSL library is buggy.
-#
-# SECURITY WARNING:
-# Bypassing validation errors is dangerous because an
-# error usually implies that the server cannot be trusted
-# and the connection may be insecure.
-#
-# See also: sslproxy_flags and DONT_VERIFY_PEER.
-#Default:
-# Server certificate errors terminate the transaction.
-
-# TAG: sslproxy_cert_sign
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-#
-# sslproxy_cert_sign <signing algorithm> acl ...
-#
-# The following certificate signing algorithms are supported:
-#
-# signTrusted
-# Sign using the configured CA certificate which is usually
-# placed in and trusted by end-user browsers. This is the
-# default for trusted origin server certificates.
-#
-# signUntrusted
-# Sign to guarantee an X509_V_ERR_CERT_UNTRUSTED browser error.
-# This is the default for untrusted origin server certificates
-# that are not self-signed (see ssl::certUntrusted).
-#
-# signSelf
-# Sign using a self-signed certificate with the right CN to
-# generate a X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT error in the
-# browser. This is the default for self-signed origin server
-# certificates (see ssl::certSelfSigned).
-#
-# This clause only supports fast acl types.
-#
-# When sslproxy_cert_sign acl(s) match, Squid uses the corresponding
-# signing algorithm to generate the certificate and ignores all
-# subsequent sslproxy_cert_sign options (the first match wins). If no
-# acl(s) match, the default signing algorithm is determined by errors
-# detected when obtaining and validating the origin server certificate.
-#
-# WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can
-# be used with sslproxy_cert_adapt, but if and only if Squid is bumping a
-# CONNECT request that carries a domain name. In all other cases (CONNECT
-# to an IP address or an intercepted SSL connection), Squid cannot detect
-# the domain mismatch at certificate generation time when
-# bump-server-first is used.
-#Default:
-# none
-
-# TAG: sslproxy_cert_adapt
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-#
-# sslproxy_cert_adapt <adaptation algorithm> acl ...
-#
-# The following certificate adaptation algorithms are supported:
-#
-# setValidAfter
-# Sets the "Not After" property to the "Not After" property of
-# the CA certificate used to sign generated certificates.
-#
-# setValidBefore
-# Sets the "Not Before" property to the "Not Before" property of
-# the CA certificate used to sign generated certificates.
-#
-# setCommonName or setCommonName{CN}
-# Sets Subject.CN property to the host name specified as a
-# CN parameter or, if no explicit CN parameter was specified,
-# extracted from the CONNECT request. It is a misconfiguration
-# to use setCommonName without an explicit parameter for
-# intercepted or tproxied SSL connections.
-#
-# This clause only supports fast acl types.
-#
-# Squid first groups sslproxy_cert_adapt options by adaptation algorithm.
-# Within a group, when sslproxy_cert_adapt acl(s) match, Squid uses the
-# corresponding adaptation algorithm to generate the certificate and
-# ignores all subsequent sslproxy_cert_adapt options in that algorithm's
-# group (i.e., the first match wins within each algorithm group). If no
-# acl(s) match, the default mimicking action takes place.
-#
-# WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can
-# be used with sslproxy_cert_adapt, but if and only if Squid is bumping a
-# CONNECT request that carries a domain name. In all other cases (CONNECT
-# to an IP address or an intercepted SSL connection), Squid cannot detect
-# the domain mismatch at certificate generation time when
-# bump-server-first is used.
-#Default:
-# none
-
-# TAG: sslpassword_program
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Specify a program used for entering SSL key passphrases
-# when using encrypted SSL certificate keys. If not specified
-# keys must either be unencrypted, or Squid started with the -N
-# option to allow it to query interactively for the passphrase.
-#
-# The key file name is given as argument to the program allowing
-# selection of the right password if you have multiple encrypted
-# keys.
-#Default:
-# none
-
-# OPTIONS RELATING TO EXTERNAL SSL_CRTD
-# -----------------------------------------------------------------------------
-
-# TAG: sslcrtd_program
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl-crtd
-#
-# Specify the location and options of the executable for ssl_crtd process.
-# /usr/libexec/ssl_crtd program requires -s and -M parameters
-# For more information use:
-# /usr/libexec/ssl_crtd -h
-#Default:
-# sslcrtd_program /usr/libexec/ssl_crtd -s /var/log/squid/lib/ssl_db -M 4MB
-
-# TAG: sslcrtd_children
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl-crtd
-#
-# The maximum number of processes spawn to service ssl server.
-# The maximum this may be safely set to is 32.
-#
-# The startup= and idle= options allow some measure of skew in your
-# tuning.
-#
-# startup=N
-#
-# Sets the minimum number of processes to spawn when Squid
-# starts or reconfigures. When set to zero the first request will
-# cause spawning of the first child process to handle it.
-#
-# Starting too few children temporary slows Squid under load while it
-# tries to spawn enough additional processes to cope with traffic.
-#
-# idle=N
-#
-# Sets a minimum of how many processes Squid is to try and keep available
-# at all times. When traffic begins to rise above what the existing
-# processes can handle this many more will be spawned up to the maximum
-# configured. A minimum setting of 1 is required.
-#
-# You must have at least one ssl_crtd process.
-#Default:
-# sslcrtd_children 32 startup=5 idle=1
-
-# TAG: sslcrtvalidator_program
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# Specify the location and options of the executable for ssl_crt_validator
-# process.
-#
-# Usage: sslcrtvalidator_program [ttl=n] [cache=n] path ...
-#
-# Options:
-# ttl=n TTL in seconds for cached results. The default is 60 secs
-# cache=n limit the result cache size. The default value is 2048
-#Default:
-# none
-
-# TAG: sslcrtvalidator_children
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ssl
-#
-# The maximum number of processes spawn to service SSL server.
-# The maximum this may be safely set to is 32.
-#
-# The startup= and idle= options allow some measure of skew in your
-# tuning.
-#
-# startup=N
-#
-# Sets the minimum number of processes to spawn when Squid
-# starts or reconfigures. When set to zero the first request will
-# cause spawning of the first child process to handle it.
-#
-# Starting too few children temporary slows Squid under load while it
-# tries to spawn enough additional processes to cope with traffic.
-#
-# idle=N
-#
-# Sets a minimum of how many processes Squid is to try and keep available
-# at all times. When traffic begins to rise above what the existing
-# processes can handle this many more will be spawned up to the maximum
-# configured. A minimum setting of 1 is required.
-#
-# concurrency=
-#
-# The number of requests each certificate validator helper can handle in
-# parallel. A value of 0 indicates the certficate validator does not
-# support concurrency. Defaults to 1.
-#
-# When this directive is set to a value >= 1 then the protocol
-# used to communicate with the helper is modified to include
-# a request ID in front of the request/response. The request
-# ID from the request must be echoed back with the response
-# to that request.
-#
-# You must have at least one ssl_crt_validator process.
-#Default:
-# sslcrtvalidator_children 32 startup=5 idle=1 concurrency=1
-
-# OPTIONS WHICH AFFECT THE NEIGHBOR SELECTION ALGORITHM
-# -----------------------------------------------------------------------------
-
-# TAG: cache_peer
-# To specify other caches in a hierarchy, use the format:
-#
-# cache_peer hostname type http-port icp-port [options]
-#
-# For example,
-#
-# # proxy icp
-# # hostname type port port options
-# # -------------------- -------- ----- ----- -----------
-# cache_peer parent.foo.net parent 3128 3130 default
-# cache_peer sib1.foo.net sibling 3128 3130 proxy-only
-# cache_peer sib2.foo.net sibling 3128 3130 proxy-only
-# cache_peer example.com parent 80 0 default
-# cache_peer cdn.example.com sibling 3128 0
-#
-# type: either 'parent', 'sibling', or 'multicast'.
-#
-# proxy-port: The port number where the peer accept HTTP requests.
-# For other Squid proxies this is usually 3128
-# For web servers this is usually 80
-#
-# icp-port: Used for querying neighbor caches about objects.
-# Set to 0 if the peer does not support ICP or HTCP.
-# See ICP and HTCP options below for additional details.
-#
-#
-# ==== ICP OPTIONS ====
-#
-# You MUST also set icp_port and icp_access explicitly when using these options.
-# The defaults will prevent peer traffic using ICP.
-#
-#
-# no-query Disable ICP queries to this neighbor.
-#
-# multicast-responder
-# Indicates the named peer is a member of a multicast group.
-# ICP queries will not be sent directly to the peer, but ICP
-# replies will be accepted from it.
-#
-# closest-only Indicates that, for ICP_OP_MISS replies, we'll only forward
-# CLOSEST_PARENT_MISSes and never FIRST_PARENT_MISSes.
-#
-# background-ping
-# To only send ICP queries to this neighbor infrequently.
-# This is used to keep the neighbor round trip time updated
-# and is usually used in conjunction with weighted-round-robin.
-#
-#
-# ==== HTCP OPTIONS ====
-#
-# You MUST also set htcp_port and htcp_access explicitly when using these options.
-# The defaults will prevent peer traffic using HTCP.
-#
-#
-# htcp Send HTCP, instead of ICP, queries to the neighbor.
-# You probably also want to set the "icp-port" to 4827
-# instead of 3130. This directive accepts a comma separated
-# list of options described below.
-#
-# htcp=oldsquid Send HTCP to old Squid versions (2.5 or earlier).
-#
-# htcp=no-clr Send HTCP to the neighbor but without
-# sending any CLR requests. This cannot be used with
-# only-clr.
-#
-# htcp=only-clr Send HTCP to the neighbor but ONLY CLR requests.
-# This cannot be used with no-clr.
-#
-# htcp=no-purge-clr
-# Send HTCP to the neighbor including CLRs but only when
-# they do not result from PURGE requests.
-#
-# htcp=forward-clr
-# Forward any HTCP CLR requests this proxy receives to the peer.
-#
-#
-# ==== PEER SELECTION METHODS ====
-#
-# The default peer selection method is ICP, with the first responding peer
-# being used as source. These options can be used for better load balancing.
-#
-#
-# default This is a parent cache which can be used as a "last-resort"
-# if a peer cannot be located by any of the peer-selection methods.
-# If specified more than once, only the first is used.
-#
-# round-robin Load-Balance parents which should be used in a round-robin
-# fashion in the absence of any ICP queries.
-# weight=N can be used to add bias.
-#
-# weighted-round-robin
-# Load-Balance parents which should be used in a round-robin
-# fashion with the frequency of each parent being based on the
-# round trip time. Closer parents are used more often.
-# Usually used for background-ping parents.
-# weight=N can be used to add bias.
-#
-# carp Load-Balance parents which should be used as a CARP array.
-# The requests will be distributed among the parents based on the
-# CARP load balancing hash function based on their weight.
-#
-# userhash Load-balance parents based on the client proxy_auth or ident username.
-#
-# sourcehash Load-balance parents based on the client source IP.
-#
-# multicast-siblings
-# To be used only for cache peers of type "multicast".
-# ALL members of this multicast group have "sibling"
-# relationship with it, not "parent". This is to a multicast
-# group when the requested object would be fetched only from
-# a "parent" cache, anyway. It's useful, e.g., when
-# configuring a pool of redundant Squid proxies, being
-# members of the same multicast group.
-#
-#
-# ==== PEER SELECTION OPTIONS ====
-#
-# weight=N use to affect the selection of a peer during any weighted
-# peer-selection mechanisms.
-# The weight must be an integer; default is 1,
-# larger weights are favored more.
-# This option does not affect parent selection if a peering
-# protocol is not in use.
-#
-# basetime=N Specify a base amount to be subtracted from round trip
-# times of parents.
-# It is subtracted before division by weight in calculating
-# which parent to fectch from. If the rtt is less than the
-# base time the rtt is set to a minimal value.
-#
-# ttl=N Specify a TTL to use when sending multicast ICP queries
-# to this address.
-# Only useful when sending to a multicast group.
-# Because we don't accept ICP replies from random
-# hosts, you must configure other group members as
-# peers with the 'multicast-responder' option.
-#
-# no-delay To prevent access to this neighbor from influencing the
-# delay pools.
-#
-# digest-url=URL Tell Squid to fetch the cache digest (if digests are
-# enabled) for this host from the specified URL rather
-# than the Squid default location.
-#
-#
-# ==== CARP OPTIONS ====
-#
-# carp-key=key-specification
-# use a different key than the full URL to hash against the peer.
-# the key-specification is a comma-separated list of the keywords
-# scheme, host, port, path, params
-# Order is not important.
-#
-# ==== ACCELERATOR / REVERSE-PROXY OPTIONS ====
-#
-# originserver Causes this parent to be contacted as an origin server.
-# Meant to be used in accelerator setups when the peer
-# is a web server.
-#
-# forceddomain=name
-# Set the Host header of requests forwarded to this peer.
-# Useful in accelerator setups where the server (peer)
-# expects a certain domain name but clients may request
-# others. ie example.com or www.example.com
-#
-# no-digest Disable request of cache digests.
-#
-# no-netdb-exchange
-# Disables requesting ICMP RTT database (NetDB).
-#
-#
-# ==== AUTHENTICATION OPTIONS ====
-#
-# login=user:password
-# If this is a personal/workgroup proxy and your parent
-# requires proxy authentication.
-#
-# Note: The string can include URL escapes (i.e. %20 for
-# spaces). This also means % must be written as %%.
-#
-# login=PASSTHRU
-# Send login details received from client to this peer.
-# Both Proxy- and WWW-Authorization headers are passed
-# without alteration to the peer.
-# Authentication is not required by Squid for this to work.
-#
-# Note: This will pass any form of authentication but
-# only Basic auth will work through a proxy unless the
-# connection-auth options are also used.
-#
-# login=PASS Send login details received from client to this peer.
-# Authentication is not required by this option.
-#
-# If there are no client-provided authentication headers
-# to pass on, but username and password are available
-# from an external ACL user= and password= result tags
-# they may be sent instead.
-#
-# Note: To combine this with proxy_auth both proxies must
-# share the same user database as HTTP only allows for
-# a single login (one for proxy, one for origin server).
-# Also be warned this will expose your users proxy
-# password to the peer. USE WITH CAUTION
-#
-# login=*:password
-# Send the username to the upstream cache, but with a
-# fixed password. This is meant to be used when the peer
-# is in another administrative domain, but it is still
-# needed to identify each user.
-# The star can optionally be followed by some extra
-# information which is added to the username. This can
-# be used to identify this proxy to the peer, similar to
-# the login=username:password option above.
-#
-# login=NEGOTIATE
-# If this is a personal/workgroup proxy and your parent
-# requires a secure proxy authentication.
-# The first principal from the default keytab or defined by
-# the environment variable KRB5_KTNAME will be used.
-#
-# WARNING: The connection may transmit requests from multiple
-# clients. Negotiate often assumes end-to-end authentication
-# and a single-client. Which is not strictly true here.
-#
-# login=NEGOTIATE:principal_name
-# If this is a personal/workgroup proxy and your parent
-# requires a secure proxy authentication.
-# The principal principal_name from the default keytab or
-# defined by the environment variable KRB5_KTNAME will be
-# used.
-#
-# WARNING: The connection may transmit requests from multiple
-# clients. Negotiate often assumes end-to-end authentication
-# and a single-client. Which is not strictly true here.
-#
-# connection-auth=on|off
-# Tell Squid that this peer does or not support Microsoft
-# connection oriented authentication, and any such
-# challenges received from there should be ignored.
-# Default is auto to automatically determine the status
-# of the peer.
-#
-#
-# ==== SSL / HTTPS / TLS OPTIONS ====
-#
-# ssl Encrypt connections to this peer with SSL/TLS.
-#
-# sslcert=/path/to/ssl/certificate
-# A client SSL certificate to use when connecting to
-# this peer.
-#
-# sslkey=/path/to/ssl/key
-# The private SSL key corresponding to sslcert above.
-# If 'sslkey' is not specified 'sslcert' is assumed to
-# reference a combined file containing both the
-# certificate and the key.
-#
-# sslversion=1|2|3|4|5|6
-# The SSL version to use when connecting to this peer
-# 1 = automatic (default)
-# 2 = SSL v2 only
-# 3 = SSL v3 only
-# 4 = TLS v1.0 only
-# 5 = TLS v1.1 only
-# 6 = TLS v1.2 only
-#
-# sslcipher=... The list of valid SSL ciphers to use when connecting
-# to this peer.
-#
-# ssloptions=... Specify various SSL implementation options:
-#
-# NO_SSLv2 Disallow the use of SSLv2
-# NO_SSLv3 Disallow the use of SSLv3
-# NO_TLSv1 Disallow the use of TLSv1.0
-# NO_TLSv1_1 Disallow the use of TLSv1.1
-# NO_TLSv1_2 Disallow the use of TLSv1.2
-# SINGLE_DH_USE
-# Always create a new key when using
-# temporary/ephemeral DH key exchanges
-# ALL Enable various bug workarounds
-# suggested as "harmless" by OpenSSL
-# Be warned that this reduces SSL/TLS
-# strength to some attacks.
-#
-# See the OpenSSL SSL_CTX_set_options documentation for a
-# more complete list.
-#
-# sslcafile=... A file containing additional CA certificates to use
-# when verifying the peer certificate.
-#
-# sslcapath=... A directory containing additional CA certificates to
-# use when verifying the peer certificate.
-#
-# sslcrlfile=... A certificate revocation list file to use when
-# verifying the peer certificate.
-#
-# sslflags=... Specify various flags modifying the SSL implementation:
-#
-# DONT_VERIFY_PEER
-# Accept certificates even if they fail to
-# verify.
-# NO_DEFAULT_CA
-# Don't use the default CA list built in
-# to OpenSSL.
-# DONT_VERIFY_DOMAIN
-# Don't verify the peer certificate
-# matches the server name
-#
-# ssldomain= The peer name as advertised in it's certificate.
-# Used for verifying the correctness of the received peer
-# certificate. If not specified the peer hostname will be
-# used.
-#
-# front-end-https
-# Enable the "Front-End-Https: On" header needed when
-# using Squid as a SSL frontend in front of Microsoft OWA.
-# See MS KB document Q307347 for details on this header.
-# If set to auto the header will only be added if the
-# request is forwarded as a https:// URL.
-#
-#
-# ==== GENERAL OPTIONS ====
-#
-# connect-timeout=N
-# A peer-specific connect timeout.
-# Also see the peer_connect_timeout directive.
-#
-# connect-fail-limit=N
-# How many times connecting to a peer must fail before
-# it is marked as down. Default is 10.
-#
-# allow-miss Disable Squid's use of only-if-cached when forwarding
-# requests to siblings. This is primarily useful when
-# icp_hit_stale is used by the sibling. To extensive use
-# of this option may result in forwarding loops, and you
-# should avoid having two-way peerings with this option.
-# For example to deny peer usage on requests from peer
-# by denying cache_peer_access if the source is a peer.
-#
-# max-conn=N Limit the amount of connections Squid may open to this
-# peer. see also
-#
-# name=xxx Unique name for the peer.
-# Required if you have multiple peers on the same host
-# but different ports.
-# This name can be used in cache_peer_access and similar
-# directives to dentify the peer.
-# Can be used by outgoing access controls through the
-# peername ACL type.
-#
-# no-tproxy Do not use the client-spoof TPROXY support when forwarding
-# requests to this peer. Use normal address selection instead.
-# This overrides the spoof_client_ip ACL.
-#
-# proxy-only objects fetched from the peer will not be stored locally.
-#
-#Default:
-# none
-
-# TAG: cache_peer_domain
-# Use to limit the domains for which a neighbor cache will be
-# queried.
-#
-# Usage:
-# cache_peer_domain cache-host domain [domain ...]
-# cache_peer_domain cache-host !domain
-#
-# For example, specifying
-#
-# cache_peer_domain parent.foo.net .edu
-#
-# has the effect such that UDP query packets are sent to
-# 'bigserver' only when the requested object exists on a
-# server in the .edu domain. Prefixing the domainname
-# with '!' means the cache will be queried for objects
-# NOT in that domain.
-#
-# NOTE: * Any number of domains may be given for a cache-host,
-# either on the same or separate lines.
-# * When multiple domains are given for a particular
-# cache-host, the first matched domain is applied.
-# * Cache hosts with no domain restrictions are queried
-# for all requests.
-# * There are no defaults.
-# * There is also a 'cache_peer_access' tag in the ACL
-# section.
-#Default:
-# none
-
-# TAG: cache_peer_access
-# Similar to 'cache_peer_domain' but provides more flexibility by
-# using ACL elements.
-#
-# Usage:
-# cache_peer_access cache-host allow|deny [!]aclname ...
-#
-# The syntax is identical to 'http_access' and the other lists of
-# ACL elements. See the comments for 'http_access' below, or
-# the Squid FAQ (http://wiki.squid-cache.org/SquidFaq/SquidAcl).
-#Default:
-# none
-
-# TAG: neighbor_type_domain
-# Modify the cache_peer neighbor type when passing requests
-# about specific domains to the peer.
-#
-# Usage:
-# neighbor_type_domain neighbor parent|sibling domain domain ...
-#
-# For example:
-# cache_peer foo.example.com parent 3128 3130
-# neighbor_type_domain foo.example.com sibling .au .de
-#
-# The above configuration treats all requests to foo.example.com as a
-# parent proxy unless the request is for a .au or .de ccTLD domain name.
-#Default:
-# The peer type from cache_peer directive is used for all requests to that peer.
-
-# TAG: dead_peer_timeout (seconds)
-# This controls how long Squid waits to declare a peer cache
-# as "dead." If there are no ICP replies received in this
-# amount of time, Squid will declare the peer dead and not
-# expect to receive any further ICP replies. However, it
-# continues to send ICP queries, and will mark the peer as
-# alive upon receipt of the first subsequent ICP reply.
-#
-# This timeout also affects when Squid expects to receive ICP
-# replies from peers. If more than 'dead_peer' seconds have
-# passed since the last ICP reply was received, Squid will not
-# expect to receive an ICP reply on the next query. Thus, if
-# your time between requests is greater than this timeout, you
-# will see a lot of requests sent DIRECT to origin servers
-# instead of to your parents.
-#Default:
-# dead_peer_timeout 10 seconds
-
-# TAG: forward_max_tries
-# Controls how many different forward paths Squid will try
-# before giving up. See also forward_timeout.
-#
-# NOTE: connect_retries (default: none) can make each of these
-# possible forwarding paths be tried multiple times.
-#Default:
-# forward_max_tries 10
-
-# TAG: hierarchy_stoplist
-# A list of words which, if found in a URL, cause the object to
-# be handled directly by this cache. In other words, use this
-# to not query neighbor caches for certain objects. You may
-# list this option multiple times.
-#
-# Example:
-# hierarchy_stoplist cgi-bin ?
-#
-# Note: never_direct overrides this option.
-#Default:
-# none
-
-# MEMORY CACHE OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: cache_mem (bytes)
-# NOTE: THIS PARAMETER DOES NOT SPECIFY THE MAXIMUM PROCESS SIZE.
-# IT ONLY PLACES A LIMIT ON HOW MUCH ADDITIONAL MEMORY SQUID WILL
-# USE AS A MEMORY CACHE OF OBJECTS. SQUID USES MEMORY FOR OTHER
-# THINGS AS WELL. SEE THE SQUID FAQ SECTION 8 FOR DETAILS.
-#
-# 'cache_mem' specifies the ideal amount of memory to be used
-# for:
-# * In-Transit objects
-# * Hot Objects
-# * Negative-Cached objects
-#
-# Data for these objects are stored in 4 KB blocks. This
-# parameter specifies the ideal upper limit on the total size of
-# 4 KB blocks allocated. In-Transit objects take the highest
-# priority.
-#
-# In-transit objects have priority over the others. When
-# additional space is needed for incoming data, negative-cached
-# and hot objects will be released. In other words, the
-# negative-cached and hot objects will fill up any unused space
-# not needed for in-transit objects.
-#
-# If circumstances require, this limit will be exceeded.
-# Specifically, if your incoming request rate requires more than
-# 'cache_mem' of memory to hold in-transit objects, Squid will
-# exceed this limit to satisfy the new requests. When the load
-# decreases, blocks will be freed until the high-water mark is
-# reached. Thereafter, blocks will be used to store hot
-# objects.
-#
-# If shared memory caching is enabled, Squid does not use the shared
-# cache space for in-transit objects, but they still consume as much
-# local memory as they need. For more details about the shared memory
-# cache, see memory_cache_shared.
-#Default:
-# cache_mem 256 MB
-
-# TAG: maximum_object_size_in_memory (bytes)
-# Objects greater than this size will not be attempted to kept in
-# the memory cache. This should be set high enough to keep objects
-# accessed frequently in memory to improve performance whilst low
-# enough to keep larger objects from hoarding cache_mem.
-#Default:
-# maximum_object_size_in_memory 512 KB
-
-# TAG: memory_cache_shared on|off
-# Controls whether the memory cache is shared among SMP workers.
-#
-# The shared memory cache is meant to occupy cache_mem bytes and replace
-# the non-shared memory cache, although some entities may still be
-# cached locally by workers for now (e.g., internal and in-transit
-# objects may be served from a local memory cache even if shared memory
-# caching is enabled).
-#
-# By default, the memory cache is shared if and only if all of the
-# following conditions are satisfied: Squid runs in SMP mode with
-# multiple workers, cache_mem is positive, and Squid environment
-# supports required IPC primitives (e.g., POSIX shared memory segments
-# and GCC-style atomic operations).
-#
-# To avoid blocking locks, shared memory uses opportunistic algorithms
-# that do not guarantee that every cachable entity that could have been
-# shared among SMP workers will actually be shared.
-#
-# Currently, entities exceeding 32KB in size cannot be shared.
-#Default:
-# "on" where supported if doing memory caching with multiple SMP workers.
-
-# TAG: memory_cache_mode
-# Controls which objects to keep in the memory cache (cache_mem)
-#
-# always Keep most recently fetched objects in memory (default)
-#
-# disk Only disk cache hits are kept in memory, which means
-# an object must first be cached on disk and then hit
-# a second time before cached in memory.
-#
-# network Only objects fetched from network is kept in memory
-#Default:
-# Keep the most recently fetched objects in memory
-
-# TAG: memory_replacement_policy
-# The memory replacement policy parameter determines which
-# objects are purged from memory when memory space is needed.
-#
-# See cache_replacement_policy for details on algorithms.
-#Default:
-# memory_replacement_policy lru
-
-# DISK CACHE OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: cache_replacement_policy
-# The cache replacement policy parameter determines which
-# objects are evicted (replaced) when disk space is needed.
-#
-# lru : Squid's original list based LRU policy
-# heap GDSF : Greedy-Dual Size Frequency
-# heap LFUDA: Least Frequently Used with Dynamic Aging
-# heap LRU : LRU policy implemented using a heap
-#
-# Applies to any cache_dir lines listed below this directive.
-#
-# The LRU policies keeps recently referenced objects.
-#
-# The heap GDSF policy optimizes object hit rate by keeping smaller
-# popular objects in cache so it has a better chance of getting a
-# hit. It achieves a lower byte hit rate than LFUDA though since
-# it evicts larger (possibly popular) objects.
-#
-# The heap LFUDA policy keeps popular objects in cache regardless of
-# their size and thus optimizes byte hit rate at the expense of
-# hit rate since one large, popular object will prevent many
-# smaller, slightly less popular objects from being cached.
-#
-# Both policies utilize a dynamic aging mechanism that prevents
-# cache pollution that can otherwise occur with frequency-based
-# replacement policies.
-#
-# NOTE: if using the LFUDA replacement policy you should increase
-# the value of maximum_object_size above its default of 4 MB to
-# to maximize the potential byte hit rate improvement of LFUDA.
-#
-# For more information about the GDSF and LFUDA cache replacement
-# policies see http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html
-# and http://fog.hpl.external.hp.com/techreports/98/HPL-98-173.html.
-#Default:
-# cache_replacement_policy lru
-
-# TAG: minimum_object_size (bytes)
-# Objects smaller than this size will NOT be saved on disk. The
-# value is specified in bytes, and the default is 0 KB, which
-# means all responses can be stored.
-#Default:
-# no limit
-
-# TAG: maximum_object_size (bytes)
-# Set the default value for max-size parameter on any cache_dir.
-# The value is specified in bytes, and the default is 4 MB.
-#
-# If you wish to get a high BYTES hit ratio, you should probably
-# increase this (one 32 MB object hit counts for 3200 10KB
-# hits).
-#
-# If you wish to increase hit ratio more than you want to
-# save bandwidth you should leave this low.
-#
-# NOTE: if using the LFUDA replacement policy you should increase
-# this value to maximize the byte hit rate improvement of LFUDA!
-# See cache_replacement_policy for a discussion of this policy.
-#Default:
-# maximum_object_size 4 MB
-
-# TAG: cache_dir
-# Format:
-# cache_dir Type Directory-Name Fs-specific-data [options]
-#
-# You can specify multiple cache_dir lines to spread the
-# cache among different disk partitions.
-#
-# Type specifies the kind of storage system to use. Only "ufs"
-# is built by default. To enable any of the other storage systems
-# see the --enable-storeio configure option.
-#
-# 'Directory' is a top-level directory where cache swap
-# files will be stored. If you want to use an entire disk
-# for caching, this can be the mount-point directory.
-# The directory must exist and be writable by the Squid
-# process. Squid will NOT create this directory for you.
-#
-# In SMP configurations, cache_dir must not precede the workers option
-# and should use configuration macros or conditionals to give each
-# worker interested in disk caching a dedicated cache directory.
-#
-#
-# ==== The ufs store type ====
-#
-# "ufs" is the old well-known Squid storage format that has always
-# been there.
-#
-# Usage:
-# cache_dir ufs Directory-Name Mbytes L1 L2 [options]
-#
-# 'Mbytes' is the amount of disk space (MB) to use under this
-# directory. The default is 100 MB. Change this to suit your
-# configuration. Do NOT put the size of your disk drive here.
-# Instead, if you want Squid to use the entire disk drive,
-# subtract 20% and use that value.
-#
-# 'L1' is the number of first-level subdirectories which
-# will be created under the 'Directory'. The default is 16.
-#
-# 'L2' is the number of second-level subdirectories which
-# will be created under each first-level directory. The default
-# is 256.
-#
-#
-# ==== The aufs store type ====
-#
-# "aufs" uses the same storage format as "ufs", utilizing
-# POSIX-threads to avoid blocking the main Squid process on
-# disk-I/O. This was formerly known in Squid as async-io.
-#
-# Usage:
-# cache_dir aufs Directory-Name Mbytes L1 L2 [options]
-#
-# see argument descriptions under ufs above
-#
-#
-# ==== The diskd store type ====
-#
-# "diskd" uses the same storage format as "ufs", utilizing a
-# separate process to avoid blocking the main Squid process on
-# disk-I/O.
-#
-# Usage:
-# cache_dir diskd Directory-Name Mbytes L1 L2 [options] [Q1=n] [Q2=n]
-#
-# see argument descriptions under ufs above
-#
-# Q1 specifies the number of unacknowledged I/O requests when Squid
-# stops opening new files. If this many messages are in the queues,
-# Squid won't open new files. Default is 64
-#
-# Q2 specifies the number of unacknowledged messages when Squid
-# starts blocking. If this many messages are in the queues,
-# Squid blocks until it receives some replies. Default is 72
-#
-# When Q1 < Q2 (the default), the cache directory is optimized
-# for lower response time at the expense of a decrease in hit
-# ratio. If Q1 > Q2, the cache directory is optimized for
-# higher hit ratio at the expense of an increase in response
-# time.
-#
-#
-# ==== The rock store type ====
-#
-# Usage:
-# cache_dir rock Directory-Name Mbytes <max-size=bytes> [options]
-#
-# The Rock Store type is a database-style storage. All cached
-# entries are stored in a "database" file, using fixed-size slots,
-# one entry per slot. The database size is specified in MB. The
-# slot size is specified in bytes using the max-size option. See
-# below for more info on the max-size option.
-#
-# If possible, Squid using Rock Store creates a dedicated kid
-# process called "disker" to avoid blocking Squid worker(s) on disk
-# I/O. One disker kid is created for each rock cache_dir. Diskers
-# are created only when Squid, running in daemon mode, has support
-# for the IpcIo disk I/O module.
-#
-# swap-timeout=msec: Squid will not start writing a miss to or
-# reading a hit from disk if it estimates that the swap operation
-# will take more than the specified number of milliseconds. By
-# default and when set to zero, disables the disk I/O time limit
-# enforcement. Ignored when using blocking I/O module because
-# blocking synchronous I/O does not allow Squid to estimate the
-# expected swap wait time.
-#
-# max-swap-rate=swaps/sec: Artificially limits disk access using
-# the specified I/O rate limit. Swap out requests that
-# would cause the average I/O rate to exceed the limit are
-# delayed. Individual swap in requests (i.e., hits or reads) are
-# not delayed, but they do contribute to measured swap rate and
-# since they are placed in the same FIFO queue as swap out
-# requests, they may wait longer if max-swap-rate is smaller.
-# This is necessary on file systems that buffer "too
-# many" writes and then start blocking Squid and other processes
-# while committing those writes to disk. Usually used together
-# with swap-timeout to avoid excessive delays and queue overflows
-# when disk demand exceeds available disk "bandwidth". By default
-# and when set to zero, disables the disk I/O rate limit
-# enforcement. Currently supported by IpcIo module only.
-#
-#
-# ==== The coss store type ====
-#
-# NP: COSS filesystem in Squid-3 has been deemed too unstable for
-# production use and has thus been removed from this release.
-# We hope that it can be made usable again soon.
-#
-# block-size=n defines the "block size" for COSS cache_dir's.
-# Squid uses file numbers as block numbers. Since file numbers
-# are limited to 24 bits, the block size determines the maximum
-# size of the COSS partition. The default is 512 bytes, which
-# leads to a maximum cache_dir size of 512<<24, or 8 GB. Note
-# you should not change the coss block size after Squid
-# has written some objects to the cache_dir.
-#
-# The coss file store has changed from 2.5. Now it uses a file
-# called 'stripe' in the directory names in the config - and
-# this will be created by squid -z.
-#
-#
-# ==== COMMON OPTIONS ====
-#
-# no-store no new objects should be stored to this cache_dir.
-#
-# min-size=n the minimum object size in bytes this cache_dir
-# will accept. It's used to restrict a cache_dir
-# to only store large objects (e.g. AUFS) while
-# other stores are optimized for smaller objects
-# (e.g. COSS).
-# Defaults to 0.
-#
-# max-size=n the maximum object size in bytes this cache_dir
-# supports.
-# The value in maximum_object_size directive sets
-# the default unless more specific details are
-# available (ie a small store capacity).
-#
-# Note: To make optimal use of the max-size limits you should order
-# the cache_dir lines with the smallest max-size value first.
-#
-# Note for coss, max-size must be less than COSS_MEMBUF_SZ,
-# which can be changed with the --with-coss-membuf-size=N configure
-# option.
-#
-#Default:
-# No disk cache. Store cache ojects only in memory.
-#
-
-# Uncomment and adjust the following to add a disk cache directory.
-#cache_dir ufs /var/log/squid/cache/squid 100 16 256
-
-# TAG: store_dir_select_algorithm
-# How Squid selects which cache_dir to use when the response
-# object will fit into more than one.
-#
-# Regardless of which algorithm is used the cache_dir min-size
-# and max-size parameters are obeyed. As such they can affect
-# the selection algorithm by limiting the set of considered
-# cache_dir.
-#
-# Algorithms:
-#
-# least-load
-#
-# This algorithm is suited to caches with similar cache_dir
-# sizes and disk speeds.
-#
-# The disk with the least I/O pending is selected.
-# When there are multiple disks with the same I/O load ranking
-# the cache_dir with most available capacity is selected.
-#
-# When a mix of cache_dir sizes are configured the faster disks
-# have a naturally lower I/O loading and larger disks have more
-# capacity. So space used to store objects and data throughput
-# may be very unbalanced towards larger disks.
-#
-#
-# round-robin
-#
-# This algorithm is suited to caches with unequal cache_dir
-# disk sizes.
-#
-# Each cache_dir is selected in a rotation. The next suitable
-# cache_dir is used.
-#
-# Available cache_dir capacity is only considered in relation
-# to whether the object will fit and meets the min-size and
-# max-size parameters.
-#
-# Disk I/O loading is only considered to prevent overload on slow
-# disks. This algorithm does not spread objects by size, so any
-# I/O loading per-disk may appear very unbalanced and volatile.
-#
-#Default:
-# store_dir_select_algorithm least-load
-
-# TAG: max_open_disk_fds
-# To avoid having disk as the I/O bottleneck Squid can optionally
-# bypass the on-disk cache if more than this amount of disk file
-# descriptors are open.
-#
-# A value of 0 indicates no limit.
-#Default:
-# no limit
-
-# TAG: cache_swap_low (percent, 0-100)
-# The low-water mark for cache object replacement.
-# Replacement begins when the swap (disk) usage is above the
-# low-water mark and attempts to maintain utilization near the
-# low-water mark. As swap utilization gets close to high-water
-# mark object eviction becomes more aggressive. If utilization is
-# close to the low-water mark less replacement is done each time.
-#
-# Defaults are 90% and 95%. If you have a large cache, 5% could be
-# hundreds of MB. If this is the case you may wish to set these
-# numbers closer together.
-#
-# See also cache_swap_high
-#Default:
-# cache_swap_low 90
-
-# TAG: cache_swap_high (percent, 0-100)
-# The high-water mark for cache object replacement.
-# Replacement begins when the swap (disk) usage is above the
-# low-water mark and attempts to maintain utilization near the
-# low-water mark. As swap utilization gets close to high-water
-# mark object eviction becomes more aggressive. If utilization is
-# close to the low-water mark less replacement is done each time.
-#
-# Defaults are 90% and 95%. If you have a large cache, 5% could be
-# hundreds of MB. If this is the case you may wish to set these
-# numbers closer together.
-#
-# See also cache_swap_low
-#Default:
-# cache_swap_high 95
-
-# LOGFILE OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: logformat
-# Usage:
-#
-# logformat <name> <format specification>
-#
-# Defines an access log format.
-#
-# The <format specification> is a string with embedded % format codes
-#
-# % format codes all follow the same basic structure where all but
-# the formatcode is optional. Output strings are automatically escaped
-# as required according to their context and the output format
-# modifiers are usually not needed, but can be specified if an explicit
-# output format is desired.
-#
-# % ["|[|'|#] [-] [[0]width] [{argument}] formatcode
-#
-# " output in quoted string format
-# [ output in squid text log format as used by log_mime_hdrs
-# # output in URL quoted format
-# ' output as-is
-#
-# - left aligned
-#
-# width minimum and/or maximum field width:
-# [width_min][.width_max]
-# When minimum starts with 0, the field is zero-padded.
-# String values exceeding maximum width are truncated.
-#
-# {arg} argument such as header name etc
-#
-# Format codes:
-#
-# % a literal % character
-# sn Unique sequence number per log line entry
-# err_code The ID of an error response served by Squid or
-# a similar internal error identifier.
-# err_detail Additional err_code-dependent error information.
-# note The annotation specified by the argument. Also
-# logs the adaptation meta headers set by the
-# adaptation_meta configuration parameter.
-# If no argument given all annotations logged.
-# The argument may include a separator to use with
-# annotation values:
-# name[:separator]
-# By default, multiple note values are separated with ","
-# and multiple notes are separated with "\r\n".
-# When logging named notes with %{name}note, the
-# explicitly configured separator is used between note
-# values. When logging all notes with %note, the
-# explicitly configured separator is used between
-# individual notes. There is currently no way to
-# specify both value and notes separators when logging
-# all notes with %note.
-#
-# Connection related format codes:
-#
-# >a Client source IP address
-# >A Client FQDN
-# >p Client source port
-# >eui Client source EUI (MAC address, EUI-48 or EUI-64 identifier)
-# >la Local IP address the client connected to
-# >lp Local port number the client connected to
-# >qos Client connection TOS/DSCP value set by Squid
-# >nfmark Client connection netfilter mark set by Squid
-#
-# la Local listening IP address the client connection was connected to.
-# lp Local listening port number the client connection was connected to.
-#
-# <a Server IP address of the last server or peer connection
-# <A Server FQDN or peer name
-# <p Server port number of the last server or peer connection
-# <la Local IP address of the last server or peer connection
-# <lp Local port number of the last server or peer connection
-# <qos Server connection TOS/DSCP value set by Squid
-# <nfmark Server connection netfilter mark set by Squid
-#
-# Time related format codes:
-#
-# ts Seconds since epoch
-# tu subsecond time (milliseconds)
-# tl Local time. Optional strftime format argument
-# default %d/%b/%Y:%H:%M:%S %z
-# tg GMT time. Optional strftime format argument
-# default %d/%b/%Y:%H:%M:%S %z
-# tr Response time (milliseconds)
-# dt Total time spent making DNS lookups (milliseconds)
-#
-# Access Control related format codes:
-#
-# et Tag returned by external acl
-# ea Log string returned by external acl
-# un User name (any available)
-# ul User name from authentication
-# ue User name from external acl helper
-# ui User name from ident
-# us User name from SSL
-#
-# HTTP related format codes:
-#
-# [http::]>h Original received request header.
-# Usually differs from the request header sent by
-# Squid, although most fields are often preserved.
-# Accepts optional header field name/value filter
-# argument using name[:[separator]element] format.
-# [http::]>ha Received request header after adaptation and
-# redirection (pre-cache REQMOD vectoring point).
-# Usually differs from the request header sent by
-# Squid, although most fields are often preserved.
-# Optional header name argument as for >h
-# [http::]<h Reply header. Optional header name argument
-# as for >h
-# [http::]>Hs HTTP status code sent to the client
-# [http::]<Hs HTTP status code received from the next hop
-# [http::]<bs Number of HTTP-equivalent message body bytes
-# received from the next hop, excluding chunked
-# transfer encoding and control messages.
-# Generated FTP/Gopher listings are treated as
-# received bodies.
-# [http::]mt MIME content type
-# [http::]rm Request method (GET/POST etc)
-# [http::]>rm Request method from client
-# [http::]<rm Request method sent to server or peer
-# [http::]ru Request URL from client (historic, filtered for logging)
-# [http::]>ru Request URL from client
-# [http::]<ru Request URL sent to server or peer
-# [http::]rp Request URL-Path excluding hostname
-# [http::]>rp Request URL-Path excluding hostname from client
-# [http::]<rp Request URL-Path excluding hostname sento to server or peer
-# [http::]rv Request protocol version
-# [http::]>rv Request protocol version from client
-# [http::]<rv Request protocol version sent to server or peer
-# [http::]<st Sent reply size including HTTP headers
-# [http::]>st Received request size including HTTP headers. In the
-# case of chunked requests the chunked encoding metadata
-# are not included
-# [http::]>sh Received HTTP request headers size
-# [http::]<sh Sent HTTP reply headers size
-# [http::]st Request+Reply size including HTTP headers
-# [http::]<sH Reply high offset sent
-# [http::]<sS Upstream object size
-# [http::]<pt Peer response time in milliseconds. The timer starts
-# when the last request byte is sent to the next hop
-# and stops when the last response byte is received.
-# [http::]<tt Total server-side time in milliseconds. The timer
-# starts with the first connect request (or write I/O)
-# sent to the first selected peer. The timer stops
-# with the last I/O with the last peer.
-#
-# Squid handling related format codes:
-#
-# Ss Squid request status (TCP_MISS etc)
-# Sh Squid hierarchy status (DEFAULT_PARENT etc)
-#
-# SSL-related format codes:
-#
-# ssl::bump_mode SslBump decision for the transaction:
-#
-# For CONNECT requests that initiated bumping of
-# a connection and for any request received on
-# an already bumped connection, Squid logs the
-# corresponding SslBump mode ("server-first" or
-# "client-first"). See the ssl_bump option for
-# more information about these modes.
-#
-# A "none" token is logged for requests that
-# triggered "ssl_bump" ACL evaluation matching
-# either a "none" rule or no rules at all.
-#
-# In all other cases, a single dash ("-") is
-# logged.
-#
-# If ICAP is enabled, the following code becomes available (as
-# well as ICAP log codes documented with the icap_log option):
-#
-# icap::tt Total ICAP processing time for the HTTP
-# transaction. The timer ticks when ICAP
-# ACLs are checked and when ICAP
-# transaction is in progress.
-#
-# If adaptation is enabled the following three codes become available:
-#
-# adapt::<last_h The header of the last ICAP response or
-# meta-information from the last eCAP
-# transaction related to the HTTP transaction.
-# Like <h, accepts an optional header name
-# argument.
-#
-# adapt::sum_trs Summed adaptation transaction response
-# times recorded as a comma-separated list in
-# the order of transaction start time. Each time
-# value is recorded as an integer number,
-# representing response time of one or more
-# adaptation (ICAP or eCAP) transaction in
-# milliseconds. When a failed transaction is
-# being retried or repeated, its time is not
-# logged individually but added to the
-# replacement (next) transaction. See also:
-# adapt::all_trs.
-#
-# adapt::all_trs All adaptation transaction response times.
-# Same as adaptation_strs but response times of
-# individual transactions are never added
-# together. Instead, all transaction response
-# times are recorded individually.
-#
-# You can prefix adapt::*_trs format codes with adaptation
-# service name in curly braces to record response time(s) specific
-# to that service. For example: %{my_service}adapt::sum_trs
-#
-# If SSL is enabled, the following formating codes become available:
-#
-# %ssl::>cert_subject The Subject field of the received client
-# SSL certificate or a dash ('-') if Squid has
-# received an invalid/malformed certificate or
-# no certificate at all. Consider encoding the
-# logged value because Subject often has spaces.
-#
-# %ssl::>cert_issuer The Issuer field of the received client
-# SSL certificate or a dash ('-') if Squid has
-# received an invalid/malformed certificate or
-# no certificate at all. Consider encoding the
-# logged value because Issuer often has spaces.
-#
-# The default formats available (which do not need re-defining) are:
-#
-#logformat squid %ts.%03tu %6tr %>a %Ss/%03>Hs %<st %rm %ru %[un %Sh/%<a %mt
-#logformat common %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st %Ss:%Sh
-#logformat combined %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st "%{Referer}>h" "%{User-Agent}>h" %Ss:%Sh
-#logformat referrer %ts.%03tu %>a %{Referer}>h %ru
-#logformat useragent %>a [%tl] "%{User-Agent}>h"
-#
-# NOTE: When the log_mime_hdrs directive is set to ON.
-# The squid, common and combined formats have a safely encoded copy
-# of the mime headers appended to each line within a pair of brackets.
-#
-# NOTE: The common and combined formats are not quite true to the Apache definition.
-# The logs from Squid contain an extra status and hierarchy code appended.
-#
-#Default:
-# The format definitions squid, common, combined, referrer, useragent are built in.
-
-# TAG: access_log
-# Configures whether and how Squid logs HTTP and ICP transactions.
-# If access logging is enabled, a single line is logged for every
-# matching HTTP or ICP request. The recommended directive formats are:
-#
-# access_log <module>:<place> [option ...] [acl acl ...]
-# access_log none [acl acl ...]
-#
-# The following directive format is accepted but may be deprecated:
-# access_log <module>:<place> [<logformat name> [acl acl ...]]
-#
-# In most cases, the first ACL name must not contain the '=' character
-# and should not be equal to an existing logformat name. You can always
-# start with an 'all' ACL to work around those restrictions.
-#
-# Will log to the specified module:place using the specified format (which
-# must be defined in a logformat directive) those entries which match
-# ALL the acl's specified (which must be defined in acl clauses).
-# If no acl is specified, all requests will be logged to this destination.
-#
-# ===== Available options for the recommended directive format =====
-#
-# logformat=name Names log line format (either built-in or
-# defined by a logformat directive). Defaults
-# to 'squid'.
-#
-# buffer-size=64KB Defines approximate buffering limit for log
-# records (see buffered_logs). Squid should not
-# keep more than the specified size and, hence,
-# should flush records before the buffer becomes
-# full to avoid overflows under normal
-# conditions (the exact flushing algorithm is
-# module-dependent though). The on-error option
-# controls overflow handling.
-#
-# on-error=die|drop Defines action on unrecoverable errors. The
-# 'drop' action ignores (i.e., does not log)
-# affected log records. The default 'die' action
-# kills the affected worker. The drop action
-# support has not been tested for modules other
-# than tcp.
-#
-# ===== Modules Currently available =====
-#
-# none Do not log any requests matching these ACL.
-# Do not specify Place or logformat name.
-#
-# stdio Write each log line to disk immediately at the completion of
-# each request.
-# Place: the filename and path to be written.
-#
-# daemon Very similar to stdio. But instead of writing to disk the log
-# line is passed to a daemon helper for asychronous handling instead.
-# Place: varies depending on the daemon.
-#
-# log_file_daemon Place: the file name and path to be written.
-#
-# syslog To log each request via syslog facility.
-# Place: The syslog facility and priority level for these entries.
-# Place Format: facility.priority
-#
-# where facility could be any of:
-# authpriv, daemon, local0 ... local7 or user.
-#
-# And priority could be any of:
-# err, warning, notice, info, debug.
-#
-# udp To send each log line as text data to a UDP receiver.
-# Place: The destination host name or IP and port.
-# Place Format: //host:port
-#
-# tcp To send each log line as text data to a TCP receiver.
-# Lines may be accumulated before sending (see buffered_logs).
-# Place: The destination host name or IP and port.
-# Place Format: //host:port
-#
-# Default:
-# access_log daemon:/var/log/squid/access.log squid
-#Default:
-# access_log daemon:/var/log/squid/access.log squid
-
-# TAG: icap_log
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# ICAP log files record ICAP transaction summaries, one line per
-# transaction.
-#
-# The icap_log option format is:
-# icap_log <filepath> [<logformat name> [acl acl ...]]
-# icap_log none [acl acl ...]]
-#
-# Please see access_log option documentation for details. The two
-# kinds of logs share the overall configuration approach and many
-# features.
-#
-# ICAP processing of a single HTTP message or transaction may
-# require multiple ICAP transactions. In such cases, multiple
-# ICAP transaction log lines will correspond to a single access
-# log line.
-#
-# ICAP log uses logformat codes that make sense for an ICAP
-# transaction. Header-related codes are applied to the HTTP header
-# embedded in an ICAP server response, with the following caveats:
-# For REQMOD, there is no HTTP response header unless the ICAP
-# server performed request satisfaction. For RESPMOD, the HTTP
-# request header is the header sent to the ICAP server. For
-# OPTIONS, there are no HTTP headers.
-#
-# The following format codes are also available for ICAP logs:
-#
-# icap::<A ICAP server IP address. Similar to <A.
-#
-# icap::<service_name ICAP service name from the icap_service
-# option in Squid configuration file.
-#
-# icap::ru ICAP Request-URI. Similar to ru.
-#
-# icap::rm ICAP request method (REQMOD, RESPMOD, or
-# OPTIONS). Similar to existing rm.
-#
-# icap::>st Bytes sent to the ICAP server (TCP payload
-# only; i.e., what Squid writes to the socket).
-#
-# icap::<st Bytes received from the ICAP server (TCP
-# payload only; i.e., what Squid reads from
-# the socket).
-#
-# icap::<bs Number of message body bytes received from the
-# ICAP server. ICAP message body, if any, usually
-# includes encapsulated HTTP message headers and
-# possibly encapsulated HTTP message body. The
-# HTTP body part is dechunked before its size is
-# computed.
-#
-# icap::tr Transaction response time (in
-# milliseconds). The timer starts when
-# the ICAP transaction is created and
-# stops when the transaction is completed.
-# Similar to tr.
-#
-# icap::tio Transaction I/O time (in milliseconds). The
-# timer starts when the first ICAP request
-# byte is scheduled for sending. The timers
-# stops when the last byte of the ICAP response
-# is received.
-#
-# icap::to Transaction outcome: ICAP_ERR* for all
-# transaction errors, ICAP_OPT for OPTION
-# transactions, ICAP_ECHO for 204
-# responses, ICAP_MOD for message
-# modification, and ICAP_SAT for request
-# satisfaction. Similar to Ss.
-#
-# icap::Hs ICAP response status code. Similar to Hs.
-#
-# icap::>h ICAP request header(s). Similar to >h.
-#
-# icap::<h ICAP response header(s). Similar to <h.
-#
-# The default ICAP log format, which can be used without an explicit
-# definition, is called icap_squid:
-#
-#logformat icap_squid %ts.%03tu %6icap::tr %>a %icap::to/%03icap::Hs %icap::<size %icap::rm %icap::ru% %un -/%icap::<A -
-#
-# See also: logformat, log_icap, and %adapt::<last_h
-#Default:
-# none
-
-# TAG: logfile_daemon
-# Specify the path to the logfile-writing daemon. This daemon is
-# used to write the access and store logs, if configured.
-#
-# Squid sends a number of commands to the log daemon:
-# L<data>\n - logfile data
-# R\n - rotate file
-# T\n - truncate file
-# O\n - reopen file
-# F\n - flush file
-# r<n>\n - set rotate count to <n>
-# b<n>\n - 1 = buffer output, 0 = don't buffer output
-#
-# No responses is expected.
-#Default:
-# logfile_daemon /usr/libexec/log_file_daemon
-
-# TAG: log_access
-# Remove this line. Use acls with access_log directives to control access logging
-#Default:
-# none
-
-# TAG: log_icap
-# Remove this line. Use acls with icap_log directives to control icap logging
-#Default:
-# none
-
-# TAG: stats_collection allow|deny acl acl...
-# This options allows you to control which requests gets accounted
-# in performance counters.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow logging for all transactions.
-
-# TAG: cache_store_log
-# Logs the activities of the storage manager. Shows which
-# objects are ejected from the cache, and which objects are
-# saved and for how long.
-# There are not really utilities to analyze this data, so you can safely
-# disable it (the default).
-#
-# Store log uses modular logging outputs. See access_log for the list
-# of modules supported.
-#
-# Example:
-# cache_store_log stdio:/var/log/squid/store.log
-# cache_store_log daemon:/var/log/squid/store.log
-#Default:
-# none
-
-# TAG: cache_swap_state
-# Location for the cache "swap.state" file. This index file holds
-# the metadata of objects saved on disk. It is used to rebuild
-# the cache during startup. Normally this file resides in each
-# 'cache_dir' directory, but you may specify an alternate
-# pathname here. Note you must give a full filename, not just
-# a directory. Since this is the index for the whole object
-# list you CANNOT periodically rotate it!
-#
-# If %s can be used in the file name it will be replaced with a
-# a representation of the cache_dir name where each / is replaced
-# with '.'. This is needed to allow adding/removing cache_dir
-# lines when cache_swap_log is being used.
-#
-# If have more than one 'cache_dir', and %s is not used in the name
-# these swap logs will have names such as:
-#
-# cache_swap_log.00
-# cache_swap_log.01
-# cache_swap_log.02
-#
-# The numbered extension (which is added automatically)
-# corresponds to the order of the 'cache_dir' lines in this
-# configuration file. If you change the order of the 'cache_dir'
-# lines in this file, these index files will NOT correspond to
-# the correct 'cache_dir' entry (unless you manually rename
-# them). We recommend you do NOT use this option. It is
-# better to keep these index files in each 'cache_dir' directory.
-#Default:
-# Store the journal inside its cache_dir
-
-# TAG: logfile_rotate
-# Specifies the number of logfile rotations to make when you
-# type 'squid -k rotate'. The default is 10, which will rotate
-# with extensions 0 through 9. Setting logfile_rotate to 0 will
-# disable the file name rotation, but the logfiles are still closed
-# and re-opened. This will enable you to rename the logfiles
-# yourself just before sending the rotate signal.
-#
-# Note, the 'squid -k rotate' command normally sends a USR1
-# signal to the running squid process. In certain situations
-# (e.g. on Linux with Async I/O), USR1 is used for other
-# purposes, so -k rotate uses another signal. It is best to get
-# in the habit of using 'squid -k rotate' instead of 'kill -USR1
-# <pid>'.
-#
-# Note, from Squid-3.1 this option is only a default for cache.log,
-# that log can be rotated separately by using debug_options.
-#Default:
-# logfile_rotate 10
-
-# TAG: emulate_httpd_log
-# Replace this with an access_log directive using the format 'common' or 'combined'.
-#Default:
-# none
-
-# TAG: log_ip_on_direct
-# Remove this option from your config. To log server or peer names use %<A in the log format.
-#Default:
-# none
-
-# TAG: mime_table
-# Path to Squid's icon configuration file.
-#
-# You shouldn't need to change this, but the default file contains
-# examples and formatting information if you do.
-#Default:
-# mime_table /etc/squid/mime.conf
-
-# TAG: log_mime_hdrs on|off
-# The Cache can record both the request and the response MIME
-# headers for each HTTP transaction. The headers are encoded
-# safely and will appear as two bracketed fields at the end of
-# the access log (for either the native or httpd-emulated log
-# formats). To enable this logging set log_mime_hdrs to 'on'.
-#Default:
-# log_mime_hdrs off
-
-# TAG: useragent_log
-# Replace this with an access_log directive using the format 'useragent'.
-#Default:
-# none
-
-# TAG: referer_log
-# Replace this with an access_log directive using the format 'referrer'.
-#Default:
-# none
-
-# TAG: pid_filename
-# A filename to write the process-id to. To disable, enter "none".
-#Default:
-# pid_filename /var/run/squid
-
-# TAG: log_fqdn
-# Remove this option from your config. To log FQDN use %>A in the log format.
-#Default:
-# none
-
-# TAG: client_netmask
-# A netmask for client addresses in logfiles and cachemgr output.
-# Change this to protect the privacy of your cache clients.
-# A netmask of 255.255.255.0 will log all IP's in that range with
-# the last digit set to '0'.
-#Default:
-# Log full client IP address
-
-# TAG: forward_log
-# Use a regular access.log with ACL limiting it to MISS events.
-#Default:
-# none
-
-# TAG: strip_query_terms
-# By default, Squid strips query terms from requested URLs before
-# logging. This protects your user's privacy and reduces log size.
-#
-# When investigating HIT/MISS or other caching behaviour you
-# will need to disable this to see the full URL used by Squid.
-#Default:
-# strip_query_terms on
-
-# TAG: buffered_logs on|off
-# Whether to write/send access_log records ASAP or accumulate them and
-# then write/send them in larger chunks. Buffering may improve
-# performance because it decreases the number of I/Os. However,
-# buffering increases the delay before log records become available to
-# the final recipient (e.g., a disk file or logging daemon) and,
-# hence, increases the risk of log records loss.
-#
-# Note that even when buffered_logs are off, Squid may have to buffer
-# records if it cannot write/send them immediately due to pending I/Os
-# (e.g., the I/O writing the previous log record) or connectivity loss.
-#
-# Currently honored by 'daemon' and 'tcp' access_log modules only.
-#Default:
-# buffered_logs off
-
-# TAG: netdb_filename
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icmp
-#
-# Where Squid stores it's netdb journal.
-# When enabled this journal preserves netdb state between restarts.
-#
-# To disable, enter "none".
-#Default:
-# netdb_filename stdio:/var/log/squid/netdb.state
-
-# OPTIONS FOR TROUBLESHOOTING
-# -----------------------------------------------------------------------------
-
-# TAG: cache_log
-# Squid administrative logging file.
-#
-# This is where general information about Squid behavior goes. You can
-# increase the amount of data logged to this file and how often it is
-# rotated with "debug_options"
-#Default:
-# cache_log /var/log/squid/cache.log
-
-# TAG: debug_options
-# Logging options are set as section,level where each source file
-# is assigned a unique section. Lower levels result in less
-# output, Full debugging (level 9) can result in a very large
-# log file, so be careful.
-#
-# The magic word "ALL" sets debugging levels for all sections.
-# The default is to run with "ALL,1" to record important warnings.
-#
-# The rotate=N option can be used to keep more or less of these logs
-# than would otherwise be kept by logfile_rotate.
-# For most uses a single log should be enough to monitor current
-# events affecting Squid.
-#Default:
-# Log all critical and important messages.
-
-# TAG: coredump_dir
-# By default Squid leaves core files in the directory from where
-# it was started. If you set 'coredump_dir' to a directory
-# that exists, Squid will chdir() to that directory at startup
-# and coredump files will be left there.
-#
-#Default:
-# Use the directory from where Squid was started.
-#
-
-# Leave coredumps in the first cache dir
-coredump_dir /var/log/squid/cache/squid
-
-# OPTIONS FOR FTP GATEWAYING
-# -----------------------------------------------------------------------------
-
-# TAG: ftp_user
-# If you want the anonymous login password to be more informative
-# (and enable the use of picky FTP servers), set this to something
-# reasonable for your domain, like wwwuser@somewhere.net
-#
-# The reason why this is domainless by default is the
-# request can be made on the behalf of a user in any domain,
-# depending on how the cache is used.
-# Some FTP server also validate the email address is valid
-# (for example perl.com).
-#Default:
-# ftp_user Squid@
-
-# TAG: ftp_passive
-# If your firewall does not allow Squid to use passive
-# connections, turn off this option.
-#
-# Use of ftp_epsv_all option requires this to be ON.
-#Default:
-# ftp_passive on
-
-# TAG: ftp_epsv_all
-# FTP Protocol extensions permit the use of a special "EPSV ALL" command.
-#
-# NATs may be able to put the connection on a "fast path" through the
-# translator, as the EPRT command will never be used and therefore,
-# translation of the data portion of the segments will never be needed.
-#
-# When a client only expects to do two-way FTP transfers this may be
-# useful.
-# If squid finds that it must do a three-way FTP transfer after issuing
-# an EPSV ALL command, the FTP session will fail.
-#
-# If you have any doubts about this option do not use it.
-# Squid will nicely attempt all other connection methods.
-#
-# Requires ftp_passive to be ON (default) for any effect.
-#Default:
-# ftp_epsv_all off
-
-# TAG: ftp_epsv
-# FTP Protocol extensions permit the use of a special "EPSV" command.
-#
-# NATs may be able to put the connection on a "fast path" through the
-# translator using EPSV, as the EPRT command will never be used
-# and therefore, translation of the data portion of the segments
-# will never be needed.
-#
-# Turning this OFF will prevent EPSV being attempted.
-# WARNING: Doing so will convert Squid back to the old behavior with all
-# the related problems with external NAT devices/layers.
-#
-# Requires ftp_passive to be ON (default) for any effect.
-#Default:
-# ftp_epsv on
-
-# TAG: ftp_eprt
-# FTP Protocol extensions permit the use of a special "EPRT" command.
-#
-# This extension provides a protocol neutral alternative to the
-# IPv4-only PORT command. When supported it enables active FTP data
-# channels over IPv6 and efficient NAT handling.
-#
-# Turning this OFF will prevent EPRT being attempted and will skip
-# straight to using PORT for IPv4 servers.
-#
-# Some devices are known to not handle this extension correctly and
-# may result in crashes. Devices which suport EPRT enough to fail
-# cleanly will result in Squid attempting PORT anyway. This directive
-# should only be disabled when EPRT results in device failures.
-#
-# WARNING: Doing so will convert Squid back to the old behavior with all
-# the related problems with external NAT devices/layers and IPv4-only FTP.
-#Default:
-# ftp_eprt on
-
-# TAG: ftp_sanitycheck
-# For security and data integrity reasons Squid by default performs
-# sanity checks of the addresses of FTP data connections ensure the
-# data connection is to the requested server. If you need to allow
-# FTP connections to servers using another IP address for the data
-# connection turn this off.
-#Default:
-# ftp_sanitycheck on
-
-# TAG: ftp_telnet_protocol
-# The FTP protocol is officially defined to use the telnet protocol
-# as transport channel for the control connection. However, many
-# implementations are broken and does not respect this aspect of
-# the FTP protocol.
-#
-# If you have trouble accessing files with ASCII code 255 in the
-# path or similar problems involving this ASCII code you can
-# try setting this directive to off. If that helps, report to the
-# operator of the FTP server in question that their FTP server
-# is broken and does not follow the FTP standard.
-#Default:
-# ftp_telnet_protocol on
-
-# OPTIONS FOR EXTERNAL SUPPORT PROGRAMS
-# -----------------------------------------------------------------------------
-
-# TAG: diskd_program
-# Specify the location of the diskd executable.
-# Note this is only useful if you have compiled in
-# diskd as one of the store io modules.
-#Default:
-# diskd_program /usr/libexec/diskd
-
-# TAG: unlinkd_program
-# Specify the location of the executable for file deletion process.
-#Default:
-# unlinkd_program /usr/libexec/unlinkd
-
-# TAG: pinger_program
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icmp
-#
-# Specify the location of the executable for the pinger process.
-#Default:
-# pinger_program /usr/libexec/pinger
-
-# TAG: pinger_enable
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icmp
-#
-# Control whether the pinger is active at run-time.
-# Enables turning ICMP pinger on and off with a simple
-# squid -k reconfigure.
-#Default:
-# pinger_enable on
-
-# OPTIONS FOR URL REWRITING
-# -----------------------------------------------------------------------------
-
-# TAG: url_rewrite_program
-# Specify the location of the executable URL rewriter to use.
-# Since they can perform almost any function there isn't one included.
-#
-# For each requested URL, the rewriter will receive on line with the format
-#
-# [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
-#
-#
-# After processing the request the helper must reply using the following format:
-#
-# [channel-ID <SP>] result [<SP> kv-pairs]
-#
-# The result code can be:
-#
-# OK status=30N url="..."
-# Redirect the URL to the one supplied in 'url='.
-# 'status=' is optional and contains the status code to send
-# the client in Squids HTTP response. It must be one of the
-# HTTP redirect status codes: 301, 302, 303, 307, 308.
-# When no status is given Squid will use 302.
-#
-# OK rewrite-url="..."
-# Rewrite the URL to the one supplied in 'rewrite-url='.
-# The new URL is fetched directly by Squid and returned to
-# the client as the response to its request.
-#
-# OK
-# When neither of url= and rewrite-url= are sent Squid does
-# not change the URL.
-#
-# ERR
-# Do not change the URL.
-#
-# BH
-# An internal error occurred in the helper, preventing
-# a result being identified. The 'message=' key name is
-# reserved for delivering a log message.
-#
-#
-# In the future, the interface protocol will be extended with
-# key=value pairs ("kv-pairs" shown above). Helper programs
-# should be prepared to receive and possibly ignore additional
-# whitespace-separated tokens on each input line.
-#
-# When using the concurrency= option the protocol is changed by
-# introducing a query channel tag in front of the request/response.
-# The query channel tag is a number between 0 and concurrency-1.
-# This value must be echoed back unchanged to Squid as the first part
-# of the response relating to its request.
-#
-# WARNING: URL re-writing ability should be avoided whenever possible.
-# Use the URL redirect form of response instead.
-#
-# Re-write creates a difference in the state held by the client
-# and server. Possibly causing confusion when the server response
-# contains snippets of its view state. Embeded URLs, response
-# and content Location headers, etc. are not re-written by this
-# interface.
-#
-# By default, a URL rewriter is not used.
-#Default:
-# none
-
-# TAG: url_rewrite_children
-# The maximum number of redirector processes to spawn. If you limit
-# it too few Squid will have to wait for them to process a backlog of
-# URLs, slowing it down. If you allow too many they will use RAM
-# and other system resources noticably.
-#
-# The startup= and idle= options allow some measure of skew in your
-# tuning.
-#
-# startup=
-#
-# Sets a minimum of how many processes are to be spawned when Squid
-# starts or reconfigures. When set to zero the first request will
-# cause spawning of the first child process to handle it.
-#
-# Starting too few will cause an initial slowdown in traffic as Squid
-# attempts to simultaneously spawn enough processes to cope.
-#
-# idle=
-#
-# Sets a minimum of how many processes Squid is to try and keep available
-# at all times. When traffic begins to rise above what the existing
-# processes can handle this many more will be spawned up to the maximum
-# configured. A minimum setting of 1 is required.
-#
-# concurrency=
-#
-# The number of requests each redirector helper can handle in
-# parallel. Defaults to 0 which indicates the redirector
-# is a old-style single threaded redirector.
-#
-# When this directive is set to a value >= 1 then the protocol
-# used to communicate with the helper is modified to include
-# an ID in front of the request/response. The ID from the request
-# must be echoed back with the response to that request.
-#Default:
-# url_rewrite_children 20 startup=0 idle=1 concurrency=0
-
-# TAG: url_rewrite_host_header
-# To preserve same-origin security policies in browsers and
-# prevent Host: header forgery by redirectors Squid rewrites
-# any Host: header in redirected requests.
-#
-# If you are running an accelerator this may not be a wanted
-# effect of a redirector. This directive enables you disable
-# Host: alteration in reverse-proxy traffic.
-#
-# WARNING: Entries are cached on the result of the URL rewriting
-# process, so be careful if you have domain-virtual hosts.
-#
-# WARNING: Squid and other software verifies the URL and Host
-# are matching, so be careful not to relay through other proxies
-# or inspecting firewalls with this disabled.
-#Default:
-# url_rewrite_host_header on
-
-# TAG: url_rewrite_access
-# If defined, this access list specifies which requests are
-# sent to the redirector processes.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-# TAG: url_rewrite_bypass
-# When this is 'on', a request will not go through the
-# redirector if all the helpers are busy. If this is 'off'
-# and the redirector queue grows too large, Squid will exit
-# with a FATAL error and ask you to increase the number of
-# redirectors. You should only enable this if the redirectors
-# are not critical to your caching system. If you use
-# redirectors for access control, and you enable this option,
-# users may have access to pages they should not
-# be allowed to request.
-#Default:
-# url_rewrite_bypass off
-
-# OPTIONS FOR STORE ID
-# -----------------------------------------------------------------------------
-
-# TAG: store_id_program
-# Specify the location of the executable StoreID helper to use.
-# Since they can perform almost any function there isn't one included.
-#
-# For each requested URL, the helper will receive one line with the format
-#
-# [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
-#
-#
-# After processing the request the helper must reply using the following format:
-#
-# [channel-ID <SP>] result [<SP> kv-pairs]
-#
-# The result code can be:
-#
-# OK store-id="..."
-# Use the StoreID supplied in 'store-id='.
-#
-# ERR
-# The default is to use HTTP request URL as the store ID.
-#
-# BH
-# An internal error occured in the helper, preventing
-# a result being identified.
-#
-#
-# Helper programs should be prepared to receive and possibly ignore additional
-# kv-pairs with keys they do not support.
-#
-# When using the concurrency= option the protocol is changed by
-# introducing a query channel tag in front of the request/response.
-# The query channel tag is a number between 0 and concurrency-1.
-# This value must be echoed back unchanged to Squid as the first part
-# of the response relating to its request.
-#
-# NOTE: when using StoreID refresh_pattern will apply to the StoreID
-# returned from the helper and not the URL.
-#
-# WARNING: Wrong StoreID value returned by a careless helper may result
-# in the wrong cached response returned to the user.
-#
-# By default, a StoreID helper is not used.
-#Default:
-# none
-
-# TAG: store_id_children
-# The maximum number of StoreID helper processes to spawn. If you limit
-# it too few Squid will have to wait for them to process a backlog of
-# requests, slowing it down. If you allow too many they will use RAM
-# and other system resources noticably.
-#
-# The startup= and idle= options allow some measure of skew in your
-# tuning.
-#
-# startup=
-#
-# Sets a minimum of how many processes are to be spawned when Squid
-# starts or reconfigures. When set to zero the first request will
-# cause spawning of the first child process to handle it.
-#
-# Starting too few will cause an initial slowdown in traffic as Squid
-# attempts to simultaneously spawn enough processes to cope.
-#
-# idle=
-#
-# Sets a minimum of how many processes Squid is to try and keep available
-# at all times. When traffic begins to rise above what the existing
-# processes can handle this many more will be spawned up to the maximum
-# configured. A minimum setting of 1 is required.
-#
-# concurrency=
-#
-# The number of requests each storeID helper can handle in
-# parallel. Defaults to 0 which indicates the helper
-# is a old-style single threaded program.
-#
-# When this directive is set to a value >= 1 then the protocol
-# used to communicate with the helper is modified to include
-# an ID in front of the request/response. The ID from the request
-# must be echoed back with the response to that request.
-#Default:
-# store_id_children 20 startup=0 idle=1 concurrency=0
-
-# TAG: store_id_access
-# If defined, this access list specifies which requests are
-# sent to the StoreID processes. By default all requests
-# are sent.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-# TAG: store_id_bypass
-# When this is 'on', a request will not go through the
-# helper if all helpers are busy. If this is 'off'
-# and the helper queue grows too large, Squid will exit
-# with a FATAL error and ask you to increase the number of
-# helpers. You should only enable this if the helperss
-# are not critical to your caching system. If you use
-# helpers for critical caching components, and you enable this
-# option, users may not get objects from cache.
-#Default:
-# store_id_bypass on
-
-# OPTIONS FOR TUNING THE CACHE
-# -----------------------------------------------------------------------------
-
-# TAG: cache
-# A list of ACL elements which, if matched and denied, cause the request to
-# not be satisfied from the cache and the reply to not be cached.
-# In other words, use this to force certain objects to never be cached.
-#
-# You must use the words 'allow' or 'deny' to indicate whether items
-# matching the ACL should be allowed or denied into the cache.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow caching, unless rules exist in squid.conf.
-
-# TAG: max_stale time-units
-# This option puts an upper limit on how stale content Squid
-# will serve from the cache if cache validation fails.
-# Can be overriden by the refresh_pattern max-stale option.
-#Default:
-# max_stale 1 week
-
-# TAG: refresh_pattern
-# usage: refresh_pattern [-i] regex min percent max [options]
-#
-# By default, regular expressions are CASE-SENSITIVE. To make
-# them case-insensitive, use the -i option.
-#
-# 'Min' is the time (in minutes) an object without an explicit
-# expiry time should be considered fresh. The recommended
-# value is 0, any higher values may cause dynamic applications
-# to be erroneously cached unless the application designer
-# has taken the appropriate actions.
-#
-# 'Percent' is a percentage of the objects age (time since last
-# modification age) an object without explicit expiry time
-# will be considered fresh.
-#
-# 'Max' is an upper limit on how long objects without an explicit
-# expiry time will be considered fresh.
-#
-# options: override-expire
-# override-lastmod
-# reload-into-ims
-# ignore-reload
-# ignore-no-store
-# ignore-must-revalidate
-# ignore-private
-# ignore-auth
-# max-stale=NN
-# refresh-ims
-# store-stale
-#
-# override-expire enforces min age even if the server
-# sent an explicit expiry time (e.g., with the
-# Expires: header or Cache-Control: max-age). Doing this
-# VIOLATES the HTTP standard. Enabling this feature
-# could make you liable for problems which it causes.
-#
-# Note: override-expire does not enforce staleness - it only extends
-# freshness / min. If the server returns a Expires time which
-# is longer than your max time, Squid will still consider
-# the object fresh for that period of time.
-#
-# override-lastmod enforces min age even on objects
-# that were modified recently.
-#
-# reload-into-ims changes a client no-cache or ``reload''
-# request for a cached entry into a conditional request using
-# If-Modified-Since and/or If-None-Match headers, provided the
-# cached entry has a Last-Modified and/or a strong ETag header.
-# Doing this VIOLATES the HTTP standard. Enabling this feature
-# could make you liable for problems which it causes.
-#
-# ignore-reload ignores a client no-cache or ``reload''
-# header. Doing this VIOLATES the HTTP standard. Enabling
-# this feature could make you liable for problems which
-# it causes.
-#
-# ignore-no-store ignores any ``Cache-control: no-store''
-# headers received from a server. Doing this VIOLATES
-# the HTTP standard. Enabling this feature could make you
-# liable for problems which it causes.
-#
-# ignore-must-revalidate ignores any ``Cache-Control: must-revalidate``
-# headers received from a server. Doing this VIOLATES
-# the HTTP standard. Enabling this feature could make you
-# liable for problems which it causes.
-#
-# ignore-private ignores any ``Cache-control: private''
-# headers received from a server. Doing this VIOLATES
-# the HTTP standard. Enabling this feature could make you
-# liable for problems which it causes.
-#
-# ignore-auth caches responses to requests with authorization,
-# as if the originserver had sent ``Cache-control: public''
-# in the response header. Doing this VIOLATES the HTTP standard.
-# Enabling this feature could make you liable for problems which
-# it causes.
-#
-# refresh-ims causes squid to contact the origin server
-# when a client issues an If-Modified-Since request. This
-# ensures that the client will receive an updated version
-# if one is available.
-#
-# store-stale stores responses even if they don't have explicit
-# freshness or a validator (i.e., Last-Modified or an ETag)
-# present, or if they're already stale. By default, Squid will
-# not cache such responses because they usually can't be
-# reused. Note that such responses will be stale by default.
-#
-# max-stale=NN provide a maximum staleness factor. Squid won't
-# serve objects more stale than this even if it failed to
-# validate the object. Default: use the max_stale global limit.
-#
-# Basically a cached object is:
-#
-# FRESH if expires < now, else STALE
-# STALE if age > max
-# FRESH if lm-factor < percent, else STALE
-# FRESH if age < min
-# else STALE
-#
-# The refresh_pattern lines are checked in the order listed here.
-# The first entry which matches is used. If none of the entries
-# match the default will be used.
-#
-# Note, you must uncomment all the default lines if you want
-# to change one. The default setting is only active if none is
-# used.
-#
-#
-
-#
-# Add any of your own refresh_pattern entries above these.
-#
-refresh_pattern ^ftp: 1440 20% 10080
-refresh_pattern ^gopher: 1440 0% 1440
-refresh_pattern -i (/cgi-bin/|\?) 0 0% 0
-refresh_pattern . 0 20% 4320
-
-# TAG: quick_abort_min (KB)
-#Default:
-# quick_abort_min 16 KB
-
-# TAG: quick_abort_max (KB)
-#Default:
-# quick_abort_max 16 KB
-
-# TAG: quick_abort_pct (percent)
-# The cache by default continues downloading aborted requests
-# which are almost completed (less than 16 KB remaining). This
-# may be undesirable on slow (e.g. SLIP) links and/or very busy
-# caches. Impatient users may tie up file descriptors and
-# bandwidth by repeatedly requesting and immediately aborting
-# downloads.
-#
-# When the user aborts a request, Squid will check the
-# quick_abort values to the amount of data transferred until
-# then.
-#
-# If the transfer has less than 'quick_abort_min' KB remaining,
-# it will finish the retrieval.
-#
-# If the transfer has more than 'quick_abort_max' KB remaining,
-# it will abort the retrieval.
-#
-# If more than 'quick_abort_pct' of the transfer has completed,
-# it will finish the retrieval.
-#
-# If you do not want any retrieval to continue after the client
-# has aborted, set both 'quick_abort_min' and 'quick_abort_max'
-# to '0 KB'.
-#
-# If you want retrievals to always continue if they are being
-# cached set 'quick_abort_min' to '-1 KB'.
-#Default:
-# quick_abort_pct 95
-
-# TAG: read_ahead_gap buffer-size
-# The amount of data the cache will buffer ahead of what has been
-# sent to the client when retrieving an object from another server.
-#Default:
-# read_ahead_gap 16 KB
-
-# TAG: negative_ttl time-units
-# Set the Default Time-to-Live (TTL) for failed requests.
-# Certain types of failures (such as "connection refused" and
-# "404 Not Found") are able to be negatively-cached for a short time.
-# Modern web servers should provide Expires: header, however if they
-# do not this can provide a minimum TTL.
-# The default is not to cache errors with unknown expiry details.
-#
-# Note that this is different from negative caching of DNS lookups.
-#
-# WARNING: Doing this VIOLATES the HTTP standard. Enabling
-# this feature could make you liable for problems which it
-# causes.
-#Default:
-# negative_ttl 0 seconds
-
-# TAG: positive_dns_ttl time-units
-# Upper limit on how long Squid will cache positive DNS responses.
-# Default is 6 hours (360 minutes). This directive must be set
-# larger than negative_dns_ttl.
-#Default:
-# positive_dns_ttl 6 hours
-
-# TAG: negative_dns_ttl time-units
-# Time-to-Live (TTL) for negative caching of failed DNS lookups.
-# This also sets the lower cache limit on positive lookups.
-# Minimum value is 1 second, and it is not recommendable to go
-# much below 10 seconds.
-#Default:
-# negative_dns_ttl 1 minutes
-
-# TAG: range_offset_limit size [acl acl...]
-# usage: (size) [units] [[!]aclname]
-#
-# Sets an upper limit on how far (number of bytes) into the file
-# a Range request may be to cause Squid to prefetch the whole file.
-# If beyond this limit, Squid forwards the Range request as it is and
-# the result is NOT cached.
-#
-# This is to stop a far ahead range request (lets say start at 17MB)
-# from making Squid fetch the whole object up to that point before
-# sending anything to the client.
-#
-# Multiple range_offset_limit lines may be specified, and they will
-# be searched from top to bottom on each request until a match is found.
-# The first match found will be used. If no line matches a request, the
-# default limit of 0 bytes will be used.
-#
-# 'size' is the limit specified as a number of units.
-#
-# 'units' specifies whether to use bytes, KB, MB, etc.
-# If no units are specified bytes are assumed.
-#
-# A size of 0 causes Squid to never fetch more than the
-# client requested. (default)
-#
-# A size of 'none' causes Squid to always fetch the object from the
-# beginning so it may cache the result. (2.0 style)
-#
-# 'aclname' is the name of a defined ACL.
-#
-# NP: Using 'none' as the byte value here will override any quick_abort settings
-# that may otherwise apply to the range request. The range request will
-# be fully fetched from start to finish regardless of the client
-# actions. This affects bandwidth usage.
-#Default:
-# none
-
-# TAG: minimum_expiry_time (seconds)
-# The minimum caching time according to (Expires - Date)
-# headers Squid honors if the object can't be revalidated.
-# The default is 60 seconds.
-#
-# In reverse proxy environments it might be desirable to honor
-# shorter object lifetimes. It is most likely better to make
-# your server return a meaningful Last-Modified header however.
-#
-# In ESI environments where page fragments often have short
-# lifetimes, this will often be best set to 0.
-#Default:
-# minimum_expiry_time 60 seconds
-
-# TAG: store_avg_object_size (bytes)
-# Average object size, used to estimate number of objects your
-# cache can hold. The default is 13 KB.
-#
-# This is used to pre-seed the cache index memory allocation to
-# reduce expensive reallocate operations while handling clients
-# traffic. Too-large values may result in memory allocation during
-# peak traffic, too-small values will result in wasted memory.
-#
-# Check the cache manager 'info' report metrics for the real
-# object sizes seen by your Squid before tuning this.
-#Default:
-# store_avg_object_size 13 KB
-
-# TAG: store_objects_per_bucket
-# Target number of objects per bucket in the store hash table.
-# Lowering this value increases the total number of buckets and
-# also the storage maintenance rate. The default is 20.
-#Default:
-# store_objects_per_bucket 20
-
-# HTTP OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: request_header_max_size (KB)
-# This specifies the maximum size for HTTP headers in a request.
-# Request headers are usually relatively small (about 512 bytes).
-# Placing a limit on the request header size will catch certain
-# bugs (for example with persistent connections) and possibly
-# buffer-overflow or denial-of-service attacks.
-#Default:
-# request_header_max_size 64 KB
-
-# TAG: reply_header_max_size (KB)
-# This specifies the maximum size for HTTP headers in a reply.
-# Reply headers are usually relatively small (about 512 bytes).
-# Placing a limit on the reply header size will catch certain
-# bugs (for example with persistent connections) and possibly
-# buffer-overflow or denial-of-service attacks.
-#Default:
-# reply_header_max_size 64 KB
-
-# TAG: request_body_max_size (bytes)
-# This specifies the maximum size for an HTTP request body.
-# In other words, the maximum size of a PUT/POST request.
-# A user who attempts to send a request with a body larger
-# than this limit receives an "Invalid Request" error message.
-# If you set this parameter to a zero (the default), there will
-# be no limit imposed.
-#
-# See also client_request_buffer_max_size for an alternative
-# limitation on client uploads which can be configured.
-#Default:
-# No limit.
-
-# TAG: client_request_buffer_max_size (bytes)
-# This specifies the maximum buffer size of a client request.
-# It prevents squid eating too much memory when somebody uploads
-# a large file.
-#Default:
-# client_request_buffer_max_size 512 KB
-
-# TAG: chunked_request_body_max_size (bytes)
-# A broken or confused HTTP/1.1 client may send a chunked HTTP
-# request to Squid. Squid does not have full support for that
-# feature yet. To cope with such requests, Squid buffers the
-# entire request and then dechunks request body to create a
-# plain HTTP/1.0 request with a known content length. The plain
-# request is then used by the rest of Squid code as usual.
-#
-# The option value specifies the maximum size of the buffer used
-# to hold the request before the conversion. If the chunked
-# request size exceeds the specified limit, the conversion
-# fails, and the client receives an "unsupported request" error,
-# as if dechunking was disabled.
-#
-# Dechunking is enabled by default. To disable conversion of
-# chunked requests, set the maximum to zero.
-#
-# Request dechunking feature and this option in particular are a
-# temporary hack. When chunking requests and responses are fully
-# supported, there will be no need to buffer a chunked request.
-#Default:
-# chunked_request_body_max_size 64 KB
-
-# TAG: broken_posts
-# A list of ACL elements which, if matched, causes Squid to send
-# an extra CRLF pair after the body of a PUT/POST request.
-#
-# Some HTTP servers has broken implementations of PUT/POST,
-# and rely on an extra CRLF pair sent by some WWW clients.
-#
-# Quote from RFC2616 section 4.1 on this matter:
-#
-# Note: certain buggy HTTP/1.0 client implementations generate an
-# extra CRLF's after a POST request. To restate what is explicitly
-# forbidden by the BNF, an HTTP/1.1 client must not preface or follow
-# a request with an extra CRLF.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Example:
-# acl buggy_server url_regex ^http://....
-# broken_posts allow buggy_server
-#Default:
-# Obey RFC 2616.
-
-# TAG: adaptation_uses_indirect_client on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-follow-x-forwarded-for and (--enable-icap-client and/or --enable-ecap)
-#
-# Controls whether the indirect client IP address (instead of the direct
-# client IP address) is passed to adaptation services.
-#
-# See also: follow_x_forwarded_for adaptation_send_client_ip
-#Default:
-# adaptation_uses_indirect_client on
-
-# TAG: via on|off
-# If set (default), Squid will include a Via header in requests and
-# replies as required by RFC2616.
-#Default:
-# via on
-
-# TAG: ie_refresh on|off
-# Microsoft Internet Explorer up until version 5.5 Service
-# Pack 1 has an issue with transparent proxies, wherein it
-# is impossible to force a refresh. Turning this on provides
-# a partial fix to the problem, by causing all IMS-REFRESH
-# requests from older IE versions to check the origin server
-# for fresh content. This reduces hit ratio by some amount
-# (~10% in my experience), but allows users to actually get
-# fresh content when they want it. Note because Squid
-# cannot tell if the user is using 5.5 or 5.5SP1, the behavior
-# of 5.5 is unchanged from old versions of Squid (i.e. a
-# forced refresh is impossible). Newer versions of IE will,
-# hopefully, continue to have the new behavior and will be
-# handled based on that assumption. This option defaults to
-# the old Squid behavior, which is better for hit ratios but
-# worse for clients using IE, if they need to be able to
-# force fresh content.
-#Default:
-# ie_refresh off
-
-# TAG: vary_ignore_expire on|off
-# Many HTTP servers supporting Vary gives such objects
-# immediate expiry time with no cache-control header
-# when requested by a HTTP/1.0 client. This option
-# enables Squid to ignore such expiry times until
-# HTTP/1.1 is fully implemented.
-#
-# WARNING: If turned on this may eventually cause some
-# varying objects not intended for caching to get cached.
-#Default:
-# vary_ignore_expire off
-
-# TAG: request_entities
-# Squid defaults to deny GET and HEAD requests with request entities,
-# as the meaning of such requests are undefined in the HTTP standard
-# even if not explicitly forbidden.
-#
-# Set this directive to on if you have clients which insists
-# on sending request entities in GET or HEAD requests. But be warned
-# that there is server software (both proxies and web servers) which
-# can fail to properly process this kind of request which may make you
-# vulnerable to cache pollution attacks if enabled.
-#Default:
-# request_entities off
-
-# TAG: request_header_access
-# Usage: request_header_access header_name allow|deny [!]aclname ...
-#
-# WARNING: Doing this VIOLATES the HTTP standard. Enabling
-# this feature could make you liable for problems which it
-# causes.
-#
-# This option replaces the old 'anonymize_headers' and the
-# older 'http_anonymizer' option with something that is much
-# more configurable. A list of ACLs for each header name allows
-# removal of specific header fields under specific conditions.
-#
-# This option only applies to outgoing HTTP request headers (i.e.,
-# headers sent by Squid to the next HTTP hop such as a cache peer
-# or an origin server). The option has no effect during cache hit
-# detection. The equivalent adaptation vectoring point in ICAP
-# terminology is post-cache REQMOD.
-#
-# The option is applied to individual outgoing request header
-# fields. For each request header field F, Squid uses the first
-# qualifying sets of request_header_access rules:
-#
-# 1. Rules with header_name equal to F's name.
-# 2. Rules with header_name 'Other', provided F's name is not
-# on the hard-coded list of commonly used HTTP header names.
-# 3. Rules with header_name 'All'.
-#
-# Within that qualifying rule set, rule ACLs are checked as usual.
-# If ACLs of an "allow" rule match, the header field is allowed to
-# go through as is. If ACLs of a "deny" rule match, the header is
-# removed and request_header_replace is then checked to identify
-# if the removed header has a replacement. If no rules within the
-# set have matching ACLs, the header field is left as is.
-#
-# For example, to achieve the same behavior as the old
-# 'http_anonymizer standard' option, you should use:
-#
-# request_header_access From deny all
-# request_header_access Referer deny all
-# request_header_access User-Agent deny all
-#
-# Or, to reproduce the old 'http_anonymizer paranoid' feature
-# you should use:
-#
-# request_header_access Authorization allow all
-# request_header_access Proxy-Authorization allow all
-# request_header_access Cache-Control allow all
-# request_header_access Content-Length allow all
-# request_header_access Content-Type allow all
-# request_header_access Date allow all
-# request_header_access Host allow all
-# request_header_access If-Modified-Since allow all
-# request_header_access Pragma allow all
-# request_header_access Accept allow all
-# request_header_access Accept-Charset allow all
-# request_header_access Accept-Encoding allow all
-# request_header_access Accept-Language allow all
-# request_header_access Connection allow all
-# request_header_access All deny all
-#
-# HTTP reply headers are controlled with the reply_header_access directive.
-#
-# By default, all headers are allowed (no anonymizing is performed).
-#Default:
-# No limits.
-
-# TAG: reply_header_access
-# Usage: reply_header_access header_name allow|deny [!]aclname ...
-#
-# WARNING: Doing this VIOLATES the HTTP standard. Enabling
-# this feature could make you liable for problems which it
-# causes.
-#
-# This option only applies to reply headers, i.e., from the
-# server to the client.
-#
-# This is the same as request_header_access, but in the other
-# direction. Please see request_header_access for detailed
-# documentation.
-#
-# For example, to achieve the same behavior as the old
-# 'http_anonymizer standard' option, you should use:
-#
-# reply_header_access Server deny all
-# reply_header_access WWW-Authenticate deny all
-# reply_header_access Link deny all
-#
-# Or, to reproduce the old 'http_anonymizer paranoid' feature
-# you should use:
-#
-# reply_header_access Allow allow all
-# reply_header_access WWW-Authenticate allow all
-# reply_header_access Proxy-Authenticate allow all
-# reply_header_access Cache-Control allow all
-# reply_header_access Content-Encoding allow all
-# reply_header_access Content-Length allow all
-# reply_header_access Content-Type allow all
-# reply_header_access Date allow all
-# reply_header_access Expires allow all
-# reply_header_access Last-Modified allow all
-# reply_header_access Location allow all
-# reply_header_access Pragma allow all
-# reply_header_access Content-Language allow all
-# reply_header_access Retry-After allow all
-# reply_header_access Title allow all
-# reply_header_access Content-Disposition allow all
-# reply_header_access Connection allow all
-# reply_header_access All deny all
-#
-# HTTP request headers are controlled with the request_header_access directive.
-#
-# By default, all headers are allowed (no anonymizing is
-# performed).
-#Default:
-# No limits.
-
-# TAG: request_header_replace
-# Usage: request_header_replace header_name message
-# Example: request_header_replace User-Agent Nutscrape/1.0 (CP/M; 8-bit)
-#
-# This option allows you to change the contents of headers
-# denied with request_header_access above, by replacing them
-# with some fixed string.
-#
-# This only applies to request headers, not reply headers.
-#
-# By default, headers are removed if denied.
-#Default:
-# none
-
-# TAG: reply_header_replace
-# Usage: reply_header_replace header_name message
-# Example: reply_header_replace Server Foo/1.0
-#
-# This option allows you to change the contents of headers
-# denied with reply_header_access above, by replacing them
-# with some fixed string.
-#
-# This only applies to reply headers, not request headers.
-#
-# By default, headers are removed if denied.
-#Default:
-# none
-
-# TAG: request_header_add
-# Usage: request_header_add field-name field-value acl1 [acl2] ...
-# Example: request_header_add X-Client-CA "CA=%ssl::>cert_issuer" all
-#
-# This option adds header fields to outgoing HTTP requests (i.e.,
-# request headers sent by Squid to the next HTTP hop such as a
-# cache peer or an origin server). The option has no effect during
-# cache hit detection. The equivalent adaptation vectoring point
-# in ICAP terminology is post-cache REQMOD.
-#
-# Field-name is a token specifying an HTTP header name. If a
-# standard HTTP header name is used, Squid does not check whether
-# the new header conflicts with any existing headers or violates
-# HTTP rules. If the request to be modified already contains a
-# field with the same name, the old field is preserved but the
-# header field values are not merged.
-#
-# Field-value is either a token or a quoted string. If quoted
-# string format is used, then the surrounding quotes are removed
-# while escape sequences and %macros are processed.
-#
-# In theory, all of the logformat codes can be used as %macros.
-# However, unlike logging (which happens at the very end of
-# transaction lifetime), the transaction may not yet have enough
-# information to expand a macro when the new header value is needed.
-# And some information may already be available to Squid but not yet
-# committed where the macro expansion code can access it (report
-# such instances!). The macro will be expanded into a single dash
-# ('-') in such cases. Not all macros have been tested.
-#
-# One or more Squid ACLs may be specified to restrict header
-# injection to matching requests. As always in squid.conf, all
-# ACLs in an option ACL list must be satisfied for the insertion
-# to happen. The request_header_add option supports fast ACLs
-# only.
-#Default:
-# none
-
-# TAG: note
-# This option used to log custom information about the master
-# transaction. For example, an admin may configure Squid to log
-# which "user group" the transaction belongs to, where "user group"
-# will be determined based on a set of ACLs and not [just]
-# authentication information.
-# Values of key/value pairs can be logged using %{key}note macros:
-#
-# note key value acl ...
-# logformat myFormat ... %{key}note ...
-#Default:
-# none
-
-# TAG: relaxed_header_parser on|off|warn
-# In the default "on" setting Squid accepts certain forms
-# of non-compliant HTTP messages where it is unambiguous
-# what the sending application intended even if the message
-# is not correctly formatted. The messages is then normalized
-# to the correct form when forwarded by Squid.
-#
-# If set to "warn" then a warning will be emitted in cache.log
-# each time such HTTP error is encountered.
-#
-# If set to "off" then such HTTP errors will cause the request
-# or response to be rejected.
-#Default:
-# relaxed_header_parser on
-
-# TIMEOUTS
-# -----------------------------------------------------------------------------
-
-# TAG: forward_timeout time-units
-# This parameter specifies how long Squid should at most attempt in
-# finding a forwarding path for the request before giving up.
-#Default:
-# forward_timeout 4 minutes
-
-# TAG: connect_timeout time-units
-# This parameter specifies how long to wait for the TCP connect to
-# the requested server or peer to complete before Squid should
-# attempt to find another path where to forward the request.
-#Default:
-# connect_timeout 1 minute
-
-# TAG: peer_connect_timeout time-units
-# This parameter specifies how long to wait for a pending TCP
-# connection to a peer cache. The default is 30 seconds. You
-# may also set different timeout values for individual neighbors
-# with the 'connect-timeout' option on a 'cache_peer' line.
-#Default:
-# peer_connect_timeout 30 seconds
-
-# TAG: read_timeout time-units
-# The read_timeout is applied on server-side connections. After
-# each successful read(), the timeout will be extended by this
-# amount. If no data is read again after this amount of time,
-# the request is aborted and logged with ERR_READ_TIMEOUT. The
-# default is 15 minutes.
-#Default:
-# read_timeout 15 minutes
-
-# TAG: write_timeout time-units
-# This timeout is tracked for all connections that have data
-# available for writing and are waiting for the socket to become
-# ready. After each successful write, the timeout is extended by
-# the configured amount. If Squid has data to write but the
-# connection is not ready for the configured duration, the
-# transaction associated with the connection is terminated. The
-# default is 15 minutes.
-#Default:
-# write_timeout 15 minutes
-
-# TAG: request_timeout
-# How long to wait for complete HTTP request headers after initial
-# connection establishment.
-#Default:
-# request_timeout 5 minutes
-
-# TAG: client_idle_pconn_timeout
-# How long to wait for the next HTTP request on a persistent
-# client connection after the previous request completes.
-#Default:
-# client_idle_pconn_timeout 2 minutes
-
-# TAG: client_lifetime time-units
-# The maximum amount of time a client (browser) is allowed to
-# remain connected to the cache process. This protects the Cache
-# from having a lot of sockets (and hence file descriptors) tied up
-# in a CLOSE_WAIT state from remote clients that go away without
-# properly shutting down (either because of a network failure or
-# because of a poor client implementation). The default is one
-# day, 1440 minutes.
-#
-# NOTE: The default value is intended to be much larger than any
-# client would ever need to be connected to your cache. You
-# should probably change client_lifetime only as a last resort.
-# If you seem to have many client connections tying up
-# filedescriptors, we recommend first tuning the read_timeout,
-# request_timeout, persistent_request_timeout and quick_abort values.
-#Default:
-# client_lifetime 1 day
-
-# TAG: half_closed_clients
-# Some clients may shutdown the sending side of their TCP
-# connections, while leaving their receiving sides open. Sometimes,
-# Squid can not tell the difference between a half-closed and a
-# fully-closed TCP connection.
-#
-# By default, Squid will immediately close client connections when
-# read(2) returns "no more data to read."
-#
-# Change this option to 'on' and Squid will keep open connections
-# until a read(2) or write(2) on the socket returns an error.
-# This may show some benefits for reverse proxies. But if not
-# it is recommended to leave OFF.
-#Default:
-# half_closed_clients off
-
-# TAG: server_idle_pconn_timeout
-# Timeout for idle persistent connections to servers and other
-# proxies.
-#Default:
-# server_idle_pconn_timeout 1 minute
-
-# TAG: ident_timeout
-# Maximum time to wait for IDENT lookups to complete.
-#
-# If this is too high, and you enabled IDENT lookups from untrusted
-# users, you might be susceptible to denial-of-service by having
-# many ident requests going at once.
-#Default:
-# ident_timeout 10 seconds
-
-# TAG: shutdown_lifetime time-units
-# When SIGTERM or SIGHUP is received, the cache is put into
-# "shutdown pending" mode until all active sockets are closed.
-# This value is the lifetime to set for all open descriptors
-# during shutdown mode. Any active clients after this many
-# seconds will receive a 'timeout' message.
-#Default:
-# shutdown_lifetime 30 seconds
-
-# ADMINISTRATIVE PARAMETERS
-# -----------------------------------------------------------------------------
-
-# TAG: cache_mgr
-# Email-address of local cache manager who will receive
-# mail if the cache dies. The default is "webmaster".
-#Default:
-# cache_mgr webmaster
-
-# TAG: mail_from
-# From: email-address for mail sent when the cache dies.
-# The default is to use 'squid@unique_hostname'.
-#
-# See also: unique_hostname directive.
-#Default:
-# none
-
-# TAG: mail_program
-# Email program used to send mail if the cache dies.
-# The default is "mail". The specified program must comply
-# with the standard Unix mail syntax:
-# mail-program recipient < mailfile
-#
-# Optional command line options can be specified.
-#Default:
-# mail_program mail
-
-# TAG: cache_effective_user
-# If you start Squid as root, it will change its effective/real
-# UID/GID to the user specified below. The default is to change
-# to UID of nobody.
-# see also; cache_effective_group
-#Default:
-# cache_effective_user nobody
-
-# TAG: cache_effective_group
-# Squid sets the GID to the effective user's default group ID
-# (taken from the password file) and supplementary group list
-# from the groups membership.
-#
-# If you want Squid to run with a specific GID regardless of
-# the group memberships of the effective user then set this
-# to the group (or GID) you want Squid to run as. When set
-# all other group privileges of the effective user are ignored
-# and only this GID is effective. If Squid is not started as
-# root the user starting Squid MUST be member of the specified
-# group.
-#
-# This option is not recommended by the Squid Team.
-# Our preference is for administrators to configure a secure
-# user account for squid with UID/GID matching system policies.
-#Default:
-# Use system group memberships of the cache_effective_user account
-
-# TAG: httpd_suppress_version_string on|off
-# Suppress Squid version string info in HTTP headers and HTML error pages.
-#Default:
-# httpd_suppress_version_string off
-
-# TAG: visible_hostname
-# If you want to present a special hostname in error messages, etc,
-# define this. Otherwise, the return value of gethostname()
-# will be used. If you have multiple caches in a cluster and
-# get errors about IP-forwarding you must set them to have individual
-# names with this setting.
-#Default:
-# Automatically detect the system host name
-
-# TAG: unique_hostname
-# If you want to have multiple machines with the same
-# 'visible_hostname' you must give each machine a different
-# 'unique_hostname' so forwarding loops can be detected.
-#Default:
-# Copy the value from visible_hostname
-
-# TAG: hostname_aliases
-# A list of other DNS names your cache has.
-#Default:
-# none
-
-# TAG: umask
-# Minimum umask which should be enforced while the proxy
-# is running, in addition to the umask set at startup.
-#
-# For a traditional octal representation of umasks, start
-# your value with 0.
-#Default:
-# umask 027
-
-# OPTIONS FOR THE CACHE REGISTRATION SERVICE
-# -----------------------------------------------------------------------------
-#
-# This section contains parameters for the (optional) cache
-# announcement service. This service is provided to help
-# cache administrators locate one another in order to join or
-# create cache hierarchies.
-#
-# An 'announcement' message is sent (via UDP) to the registration
-# service by Squid. By default, the announcement message is NOT
-# SENT unless you enable it with 'announce_period' below.
-#
-# The announcement message includes your hostname, plus the
-# following information from this configuration file:
-#
-# http_port
-# icp_port
-# cache_mgr
-#
-# All current information is processed regularly and made
-# available on the Web at http://www.ircache.net/Cache/Tracker/.
-
-# TAG: announce_period
-# This is how frequently to send cache announcements.
-#
-# To enable announcing your cache, just set an announce period.
-#
-# Example:
-# announce_period 1 day
-#Default:
-# Announcement messages disabled.
-
-# TAG: announce_host
-# Set the hostname where announce registration messages will be sent.
-#
-# See also announce_port and announce_file
-#Default:
-# announce_host tracker.ircache.net
-
-# TAG: announce_file
-# The contents of this file will be included in the announce
-# registration messages.
-#Default:
-# none
-
-# TAG: announce_port
-# Set the port where announce registration messages will be sent.
-#
-# See also announce_host and announce_file
-#Default:
-# announce_port 3131
-
-# HTTPD-ACCELERATOR OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: httpd_accel_surrogate_id
-# Surrogates (http://www.esi.org/architecture_spec_1.0.html)
-# need an identification token to allow control targeting. Because
-# a farm of surrogates may all perform the same tasks, they may share
-# an identification token.
-#Default:
-# visible_hostname is used if no specific ID is set.
-
-# TAG: http_accel_surrogate_remote on|off
-# Remote surrogates (such as those in a CDN) honour the header
-# "Surrogate-Control: no-store-remote".
-#
-# Set this to on to have squid behave as a remote surrogate.
-#Default:
-# http_accel_surrogate_remote off
-
-# TAG: esi_parser libxml2|expat|custom
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-esi
-#
-# ESI markup is not strictly XML compatible. The custom ESI parser
-# will give higher performance, but cannot handle non ASCII character
-# encodings.
-#Default:
-# esi_parser custom
-
-# DELAY POOL PARAMETERS
-# -----------------------------------------------------------------------------
-
-# TAG: delay_pools
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This represents the number of delay pools to be used. For example,
-# if you have one class 2 delay pool and one class 3 delays pool, you
-# have a total of 2 delay pools.
-#
-# See also delay_parameters, delay_class, delay_access for pool
-# configuration details.
-#Default:
-# delay_pools 0
-
-# TAG: delay_class
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This defines the class of each delay pool. There must be exactly one
-# delay_class line for each delay pool. For example, to define two
-# delay pools, one of class 2 and one of class 3, the settings above
-# and here would be:
-#
-# Example:
-# delay_pools 4 # 4 delay pools
-# delay_class 1 2 # pool 1 is a class 2 pool
-# delay_class 2 3 # pool 2 is a class 3 pool
-# delay_class 3 4 # pool 3 is a class 4 pool
-# delay_class 4 5 # pool 4 is a class 5 pool
-#
-# The delay pool classes are:
-#
-# class 1 Everything is limited by a single aggregate
-# bucket.
-#
-# class 2 Everything is limited by a single aggregate
-# bucket as well as an "individual" bucket chosen
-# from bits 25 through 32 of the IPv4 address.
-#
-# class 3 Everything is limited by a single aggregate
-# bucket as well as a "network" bucket chosen
-# from bits 17 through 24 of the IP address and a
-# "individual" bucket chosen from bits 17 through
-# 32 of the IPv4 address.
-#
-# class 4 Everything in a class 3 delay pool, with an
-# additional limit on a per user basis. This
-# only takes effect if the username is established
-# in advance - by forcing authentication in your
-# http_access rules.
-#
-# class 5 Requests are grouped according their tag (see
-# external_acl's tag= reply).
-#
-#
-# Each pool also requires a delay_parameters directive to configure the pool size
-# and speed limits used whenever the pool is applied to a request. Along with
-# a set of delay_access directives to determine when it is used.
-#
-# NOTE: If an IP address is a.b.c.d
-# -> bits 25 through 32 are "d"
-# -> bits 17 through 24 are "c"
-# -> bits 17 through 32 are "c * 256 + d"
-#
-# NOTE-2: Due to the use of bitmasks in class 2,3,4 pools they only apply to
-# IPv4 traffic. Class 1 and 5 pools may be used with IPv6 traffic.
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-# See also delay_parameters and delay_access.
-#Default:
-# none
-
-# TAG: delay_access
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This is used to determine which delay pool a request falls into.
-#
-# delay_access is sorted per pool and the matching starts with pool 1,
-# then pool 2, ..., and finally pool N. The first delay pool where the
-# request is allowed is selected for the request. If it does not allow
-# the request to any pool then the request is not delayed (default).
-#
-# For example, if you want some_big_clients in delay
-# pool 1 and lotsa_little_clients in delay pool 2:
-#
-# delay_access 1 allow some_big_clients
-# delay_access 1 deny all
-# delay_access 2 allow lotsa_little_clients
-# delay_access 2 deny all
-# delay_access 3 allow authenticated_clients
-#
-# See also delay_parameters and delay_class.
-#
-#Default:
-# Deny using the pool, unless allow rules exist in squid.conf for the pool.
-
-# TAG: delay_parameters
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This defines the parameters for a delay pool. Each delay pool has
-# a number of "buckets" associated with it, as explained in the
-# description of delay_class.
-#
-# For a class 1 delay pool, the syntax is:
-# delay_pools pool 1
-# delay_parameters pool aggregate
-#
-# For a class 2 delay pool:
-# delay_pools pool 2
-# delay_parameters pool aggregate individual
-#
-# For a class 3 delay pool:
-# delay_pools pool 3
-# delay_parameters pool aggregate network individual
-#
-# For a class 4 delay pool:
-# delay_pools pool 4
-# delay_parameters pool aggregate network individual user
-#
-# For a class 5 delay pool:
-# delay_pools pool 5
-# delay_parameters pool tagrate
-#
-# The option variables are:
-#
-# pool a pool number - ie, a number between 1 and the
-# number specified in delay_pools as used in
-# delay_class lines.
-#
-# aggregate the speed limit parameters for the aggregate bucket
-# (class 1, 2, 3).
-#
-# individual the speed limit parameters for the individual
-# buckets (class 2, 3).
-#
-# network the speed limit parameters for the network buckets
-# (class 3).
-#
-# user the speed limit parameters for the user buckets
-# (class 4).
-#
-# tagrate the speed limit parameters for the tag buckets
-# (class 5).
-#
-# A pair of delay parameters is written restore/maximum, where restore is
-# the number of bytes (not bits - modem and network speeds are usually
-# quoted in bits) per second placed into the bucket, and maximum is the
-# maximum number of bytes which can be in the bucket at any time.
-#
-# There must be one delay_parameters line for each delay pool.
-#
-#
-# For example, if delay pool number 1 is a class 2 delay pool as in the
-# above example, and is being used to strictly limit each host to 64Kbit/sec
-# (plus overheads), with no overall limit, the line is:
-#
-# delay_parameters 1 -1/-1 8000/8000
-#
-# Note that 8 x 8000 KByte/sec -> 64Kbit/sec.
-#
-# Note that the figure -1 is used to represent "unlimited".
-#
-#
-# And, if delay pool number 2 is a class 3 delay pool as in the above
-# example, and you want to limit it to a total of 256Kbit/sec (strict limit)
-# with each 8-bit network permitted 64Kbit/sec (strict limit) and each
-# individual host permitted 4800bit/sec with a bucket maximum size of 64Kbits
-# to permit a decent web page to be downloaded at a decent speed
-# (if the network is not being limited due to overuse) but slow down
-# large downloads more significantly:
-#
-# delay_parameters 2 32000/32000 8000/8000 600/8000
-#
-# Note that 8 x 32000 KByte/sec -> 256Kbit/sec.
-# 8 x 8000 KByte/sec -> 64Kbit/sec.
-# 8 x 600 Byte/sec -> 4800bit/sec.
-#
-#
-# Finally, for a class 4 delay pool as in the example - each user will
-# be limited to 128Kbits/sec no matter how many workstations they are logged into.:
-#
-# delay_parameters 4 32000/32000 8000/8000 600/64000 16000/16000
-#
-#
-# See also delay_class and delay_access.
-#
-#Default:
-# none
-
-# TAG: delay_initial_bucket_level (percent, 0-100)
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# The initial bucket percentage is used to determine how much is put
-# in each bucket when squid starts, is reconfigured, or first notices
-# a host accessing it (in class 2 and class 3, individual hosts and
-# networks only have buckets associated with them once they have been
-# "seen" by squid).
-#Default:
-# delay_initial_bucket_level 50
-
-# CLIENT DELAY POOL PARAMETERS
-# -----------------------------------------------------------------------------
-
-# TAG: client_delay_pools
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This option specifies the number of client delay pools used. It must
-# preceed other client_delay_* options.
-#
-# Example:
-# client_delay_pools 2
-#
-# See also client_delay_parameters and client_delay_access.
-#Default:
-# client_delay_pools 0
-
-# TAG: client_delay_initial_bucket_level (percent, 0-no_limit)
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This option determines the initial bucket size as a percentage of
-# max_bucket_size from client_delay_parameters. Buckets are created
-# at the time of the "first" connection from the matching IP. Idle
-# buckets are periodically deleted up.
-#
-# You can specify more than 100 percent but note that such "oversized"
-# buckets are not refilled until their size goes down to max_bucket_size
-# from client_delay_parameters.
-#
-# Example:
-# client_delay_initial_bucket_level 50
-#Default:
-# client_delay_initial_bucket_level 50
-
-# TAG: client_delay_parameters
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-#
-# This option configures client-side bandwidth limits using the
-# following format:
-#
-# client_delay_parameters pool speed_limit max_bucket_size
-#
-# pool is an integer ID used for client_delay_access matching.
-#
-# speed_limit is bytes added to the bucket per second.
-#
-# max_bucket_size is the maximum size of a bucket, enforced after any
-# speed_limit additions.
-#
-# Please see the delay_parameters option for more information and
-# examples.
-#
-# Example:
-# client_delay_parameters 1 1024 2048
-# client_delay_parameters 2 51200 16384
-#
-# See also client_delay_access.
-#
-#Default:
-# none
-
-# TAG: client_delay_access
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-delay-pools
-#
-# This option determines the client-side delay pool for the
-# request:
-#
-# client_delay_access pool_ID allow|deny acl_name
-#
-# All client_delay_access options are checked in their pool ID
-# order, starting with pool 1. The first checked pool with allowed
-# request is selected for the request. If no ACL matches or there
-# are no client_delay_access options, the request bandwidth is not
-# limited.
-#
-# The ACL-selected pool is then used to find the
-# client_delay_parameters for the request. Client-side pools are
-# not used to aggregate clients. Clients are always aggregated
-# based on their source IP addresses (one bucket per source IP).
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-# Additionally, only the client TCP connection details are available.
-# ACLs testing HTTP properties will not work.
-#
-# Please see delay_access for more examples.
-#
-# Example:
-# client_delay_access 1 allow low_rate_network
-# client_delay_access 2 allow vips_network
-#
-#
-# See also client_delay_parameters and client_delay_pools.
-#Default:
-# Deny use of the pool, unless allow rules exist in squid.conf for the pool.
-
-# WCCPv1 AND WCCPv2 CONFIGURATION OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: wccp_router
-# Use this option to define your WCCP ``home'' router for
-# Squid.
-#
-# wccp_router supports a single WCCP(v1) router
-#
-# wccp2_router supports multiple WCCPv2 routers
-#
-# only one of the two may be used at the same time and defines
-# which version of WCCP to use.
-#Default:
-# WCCP disabled.
-
-# TAG: wccp2_router
-# Use this option to define your WCCP ``home'' router for
-# Squid.
-#
-# wccp_router supports a single WCCP(v1) router
-#
-# wccp2_router supports multiple WCCPv2 routers
-#
-# only one of the two may be used at the same time and defines
-# which version of WCCP to use.
-#Default:
-# WCCPv2 disabled.
-
-# TAG: wccp_version
-# This directive is only relevant if you need to set up WCCP(v1)
-# to some very old and end-of-life Cisco routers. In all other
-# setups it must be left unset or at the default setting.
-# It defines an internal version in the WCCP(v1) protocol,
-# with version 4 being the officially documented protocol.
-#
-# According to some users, Cisco IOS 11.2 and earlier only
-# support WCCP version 3. If you're using that or an earlier
-# version of IOS, you may need to change this value to 3, otherwise
-# do not specify this parameter.
-#Default:
-# wccp_version 4
-
-# TAG: wccp2_rebuild_wait
-# If this is enabled Squid will wait for the cache dir rebuild to finish
-# before sending the first wccp2 HereIAm packet
-#Default:
-# wccp2_rebuild_wait on
-
-# TAG: wccp2_forwarding_method
-# WCCP2 allows the setting of forwarding methods between the
-# router/switch and the cache. Valid values are as follows:
-#
-# gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
-# l2 - L2 redirect (forward the packet using Layer 2/MAC rewriting)
-#
-# Currently (as of IOS 12.4) cisco routers only support GRE.
-# Cisco switches only support the L2 redirect assignment method.
-#Default:
-# wccp2_forwarding_method gre
-
-# TAG: wccp2_return_method
-# WCCP2 allows the setting of return methods between the
-# router/switch and the cache for packets that the cache
-# decides not to handle. Valid values are as follows:
-#
-# gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
-# l2 - L2 redirect (forward the packet using Layer 2/MAC rewriting)
-#
-# Currently (as of IOS 12.4) cisco routers only support GRE.
-# Cisco switches only support the L2 redirect assignment.
-#
-# If the "ip wccp redirect exclude in" command has been
-# enabled on the cache interface, then it is still safe for
-# the proxy server to use a l2 redirect method even if this
-# option is set to GRE.
-#Default:
-# wccp2_return_method gre
-
-# TAG: wccp2_assignment_method
-# WCCP2 allows the setting of methods to assign the WCCP hash
-# Valid values are as follows:
-#
-# hash - Hash assignment
-# mask - Mask assignment
-#
-# As a general rule, cisco routers support the hash assignment method
-# and cisco switches support the mask assignment method.
-#Default:
-# wccp2_assignment_method hash
-
-# TAG: wccp2_service
-# WCCP2 allows for multiple traffic services. There are two
-# types: "standard" and "dynamic". The standard type defines
-# one service id - http (id 0). The dynamic service ids can be from
-# 51 to 255 inclusive. In order to use a dynamic service id
-# one must define the type of traffic to be redirected; this is done
-# using the wccp2_service_info option.
-#
-# The "standard" type does not require a wccp2_service_info option,
-# just specifying the service id will suffice.
-#
-# MD5 service authentication can be enabled by adding
-# "password=<password>" to the end of this service declaration.
-#
-# Examples:
-#
-# wccp2_service standard 0 # for the 'web-cache' standard service
-# wccp2_service dynamic 80 # a dynamic service type which will be
-# # fleshed out with subsequent options.
-# wccp2_service standard 0 password=foo
-#Default:
-# Use the 'web-cache' standard service.
-
-# TAG: wccp2_service_info
-# Dynamic WCCPv2 services require further information to define the
-# traffic you wish to have diverted.
-#
-# The format is:
-#
-# wccp2_service_info <id> protocol=<protocol> flags=<flag>,<flag>..
-# priority=<priority> ports=<port>,<port>..
-#
-# The relevant WCCPv2 flags:
-# + src_ip_hash, dst_ip_hash
-# + source_port_hash, dst_port_hash
-# + src_ip_alt_hash, dst_ip_alt_hash
-# + src_port_alt_hash, dst_port_alt_hash
-# + ports_source
-#
-# The port list can be one to eight entries.
-#
-# Example:
-#
-# wccp2_service_info 80 protocol=tcp flags=src_ip_hash,ports_source
-# priority=240 ports=80
-#
-# Note: the service id must have been defined by a previous
-# 'wccp2_service dynamic <id>' entry.
-#Default:
-# none
-
-# TAG: wccp2_weight
-# Each cache server gets assigned a set of the destination
-# hash proportional to their weight.
-#Default:
-# wccp2_weight 10000
-
-# TAG: wccp_address
-# Use this option if you require WCCPv2 to use a specific
-# interface address.
-#
-# The default behavior is to not bind to any specific address.
-#Default:
-# Address selected by the operating system.
-
-# TAG: wccp2_address
-# Use this option if you require WCCP to use a specific
-# interface address.
-#
-# The default behavior is to not bind to any specific address.
-#Default:
-# Address selected by the operating system.
-
-# PERSISTENT CONNECTION HANDLING
-# -----------------------------------------------------------------------------
-#
-# Also see "pconn_timeout" in the TIMEOUTS section
-
-# TAG: client_persistent_connections
-# Persistent connection support for clients.
-# Squid uses persistent connections (when allowed). You can use
-# this option to disable persistent connections with clients.
-#Default:
-# client_persistent_connections on
-
-# TAG: server_persistent_connections
-# Persistent connection support for servers.
-# Squid uses persistent connections (when allowed). You can use
-# this option to disable persistent connections with servers.
-#Default:
-# server_persistent_connections on
-
-# TAG: persistent_connection_after_error
-# With this directive the use of persistent connections after
-# HTTP errors can be disabled. Useful if you have clients
-# who fail to handle errors on persistent connections proper.
-#Default:
-# persistent_connection_after_error on
-
-# TAG: detect_broken_pconn
-# Some servers have been found to incorrectly signal the use
-# of HTTP/1.0 persistent connections even on replies not
-# compatible, causing significant delays. This server problem
-# has mostly been seen on redirects.
-#
-# By enabling this directive Squid attempts to detect such
-# broken replies and automatically assume the reply is finished
-# after 10 seconds timeout.
-#Default:
-# detect_broken_pconn off
-
-# CACHE DIGEST OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: digest_generation
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-cache-digests
-#
-# This controls whether the server will generate a Cache Digest
-# of its contents. By default, Cache Digest generation is
-# enabled if Squid is compiled with --enable-cache-digests defined.
-#Default:
-# digest_generation on
-
-# TAG: digest_bits_per_entry
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-cache-digests
-#
-# This is the number of bits of the server's Cache Digest which
-# will be associated with the Digest entry for a given HTTP
-# Method and URL (public key) combination. The default is 5.
-#Default:
-# digest_bits_per_entry 5
-
-# TAG: digest_rebuild_period (seconds)
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-cache-digests
-#
-# This is the wait time between Cache Digest rebuilds.
-#Default:
-# digest_rebuild_period 1 hour
-
-# TAG: digest_rewrite_period (seconds)
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-cache-digests
-#
-# This is the wait time between Cache Digest writes to
-# disk.
-#Default:
-# digest_rewrite_period 1 hour
-
-# TAG: digest_swapout_chunk_size (bytes)
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-cache-digests
-#
-# This is the number of bytes of the Cache Digest to write to
-# disk at a time. It defaults to 4096 bytes (4KB), the Squid
-# default swap page.
-#Default:
-# digest_swapout_chunk_size 4096 bytes
-
-# TAG: digest_rebuild_chunk_percentage (percent, 0-100)
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-cache-digests
-#
-# This is the percentage of the Cache Digest to be scanned at a
-# time. By default it is set to 10% of the Cache Digest.
-#Default:
-# digest_rebuild_chunk_percentage 10
-
-# SNMP OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: snmp_port
-# The port number where Squid listens for SNMP requests. To enable
-# SNMP support set this to a suitable port number. Port number
-# 3401 is often used for the Squid SNMP agent. By default it's
-# set to "0" (disabled)
-#
-# Example:
-# snmp_port 3401
-#Default:
-# SNMP disabled.
-
-# TAG: snmp_access
-# Allowing or denying access to the SNMP port.
-#
-# All access to the agent is denied by default.
-# usage:
-#
-# snmp_access allow|deny [!]aclname ...
-#
-# This clause only supports fast acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Example:
-# snmp_access allow snmppublic localhost
-# snmp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-# TAG: snmp_incoming_address
-# Just like 'udp_incoming_address', but for the SNMP port.
-#
-# snmp_incoming_address is used for the SNMP socket receiving
-# messages from SNMP agents.
-#
-# The default snmp_incoming_address is to listen on all
-# available network interfaces.
-#Default:
-# Accept SNMP packets from all machine interfaces.
-
-# TAG: snmp_outgoing_address
-# Just like 'udp_outgoing_address', but for the SNMP port.
-#
-# snmp_outgoing_address is used for SNMP packets returned to SNMP
-# agents.
-#
-# If snmp_outgoing_address is not set it will use the same socket
-# as snmp_incoming_address. Only change this if you want to have
-# SNMP replies sent using another address than where this Squid
-# listens for SNMP queries.
-#
-# NOTE, snmp_incoming_address and snmp_outgoing_address can not have
-# the same value since they both use the same port.
-#Default:
-# Use snmp_incoming_address or an address selected by the operating system.
-
-# ICP OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: icp_port
-# The port number where Squid sends and receives ICP queries to
-# and from neighbor caches. The standard UDP port for ICP is 3130.
-#
-# Example:
-# icp_port 3130
-#Default:
-# ICP disabled.
-
-# TAG: htcp_port
-# The port number where Squid sends and receives HTCP queries to
-# and from neighbor caches. To turn it on you want to set it to
-# 4827.
-#
-# Example:
-# htcp_port 4827
-#Default:
-# HTCP disabled.
-
-# TAG: log_icp_queries on|off
-# If set, ICP queries are logged to access.log. You may wish
-# do disable this if your ICP load is VERY high to speed things
-# up or to simplify log analysis.
-#Default:
-# log_icp_queries on
-
-# TAG: udp_incoming_address
-# udp_incoming_address is used for UDP packets received from other
-# caches.
-#
-# The default behavior is to not bind to any specific address.
-#
-# Only change this if you want to have all UDP queries received on
-# a specific interface/address.
-#
-# NOTE: udp_incoming_address is used by the ICP, HTCP, and DNS
-# modules. Altering it will affect all of them in the same manner.
-#
-# see also; udp_outgoing_address
-#
-# NOTE, udp_incoming_address and udp_outgoing_address can not
-# have the same value since they both use the same port.
-#Default:
-# Accept packets from all machine interfaces.
-
-# TAG: udp_outgoing_address
-# udp_outgoing_address is used for UDP packets sent out to other
-# caches.
-#
-# The default behavior is to not bind to any specific address.
-#
-# Instead it will use the same socket as udp_incoming_address.
-# Only change this if you want to have UDP queries sent using another
-# address than where this Squid listens for UDP queries from other
-# caches.
-#
-# NOTE: udp_outgoing_address is used by the ICP, HTCP, and DNS
-# modules. Altering it will affect all of them in the same manner.
-#
-# see also; udp_incoming_address
-#
-# NOTE, udp_incoming_address and udp_outgoing_address can not
-# have the same value since they both use the same port.
-#Default:
-# Use udp_incoming_address or an address selected by the operating system.
-
-# TAG: icp_hit_stale on|off
-# If you want to return ICP_HIT for stale cache objects, set this
-# option to 'on'. If you have sibling relationships with caches
-# in other administrative domains, this should be 'off'. If you only
-# have sibling relationships with caches under your control,
-# it is probably okay to set this to 'on'.
-# If set to 'on', your siblings should use the option "allow-miss"
-# on their cache_peer lines for connecting to you.
-#Default:
-# icp_hit_stale off
-
-# TAG: minimum_direct_hops
-# If using the ICMP pinging stuff, do direct fetches for sites
-# which are no more than this many hops away.
-#Default:
-# minimum_direct_hops 4
-
-# TAG: minimum_direct_rtt (msec)
-# If using the ICMP pinging stuff, do direct fetches for sites
-# which are no more than this many rtt milliseconds away.
-#Default:
-# minimum_direct_rtt 400
-
-# TAG: netdb_low
-# The low water mark for the ICMP measurement database.
-#
-# Note: high watermark controlled by netdb_high directive.
-#
-# These watermarks are counts, not percents. The defaults are
-# (low) 900 and (high) 1000. When the high water mark is
-# reached, database entries will be deleted until the low
-# mark is reached.
-#Default:
-# netdb_low 900
-
-# TAG: netdb_high
-# The high water mark for the ICMP measurement database.
-#
-# Note: low watermark controlled by netdb_low directive.
-#
-# These watermarks are counts, not percents. The defaults are
-# (low) 900 and (high) 1000. When the high water mark is
-# reached, database entries will be deleted until the low
-# mark is reached.
-#Default:
-# netdb_high 1000
-
-# TAG: netdb_ping_period
-# The minimum period for measuring a site. There will be at
-# least this much delay between successive pings to the same
-# network. The default is five minutes.
-#Default:
-# netdb_ping_period 5 minutes
-
-# TAG: query_icmp on|off
-# If you want to ask your peers to include ICMP data in their ICP
-# replies, enable this option.
-#
-# If your peer has configured Squid (during compilation) with
-# '--enable-icmp' that peer will send ICMP pings to origin server
-# sites of the URLs it receives. If you enable this option the
-# ICP replies from that peer will include the ICMP data (if available).
-# Then, when choosing a parent cache, Squid will choose the parent with
-# the minimal RTT to the origin server. When this happens, the
-# hierarchy field of the access.log will be
-# "CLOSEST_PARENT_MISS". This option is off by default.
-#Default:
-# query_icmp off
-
-# TAG: test_reachability on|off
-# When this is 'on', ICP MISS replies will be ICP_MISS_NOFETCH
-# instead of ICP_MISS if the target host is NOT in the ICMP
-# database, or has a zero RTT.
-#Default:
-# test_reachability off
-
-# TAG: icp_query_timeout (msec)
-# Normally Squid will automatically determine an optimal ICP
-# query timeout value based on the round-trip-time of recent ICP
-# queries. If you want to override the value determined by
-# Squid, set this 'icp_query_timeout' to a non-zero value. This
-# value is specified in MILLISECONDS, so, to use a 2-second
-# timeout (the old default), you would write:
-#
-# icp_query_timeout 2000
-#Default:
-# Dynamic detection.
-
-# TAG: maximum_icp_query_timeout (msec)
-# Normally the ICP query timeout is determined dynamically. But
-# sometimes it can lead to very large values (say 5 seconds).
-# Use this option to put an upper limit on the dynamic timeout
-# value. Do NOT use this option to always use a fixed (instead
-# of a dynamic) timeout value. To set a fixed timeout see the
-# 'icp_query_timeout' directive.
-#Default:
-# maximum_icp_query_timeout 2000
-
-# TAG: minimum_icp_query_timeout (msec)
-# Normally the ICP query timeout is determined dynamically. But
-# sometimes it can lead to very small timeouts, even lower than
-# the normal latency variance on your link due to traffic.
-# Use this option to put an lower limit on the dynamic timeout
-# value. Do NOT use this option to always use a fixed (instead
-# of a dynamic) timeout value. To set a fixed timeout see the
-# 'icp_query_timeout' directive.
-#Default:
-# minimum_icp_query_timeout 5
-
-# TAG: background_ping_rate time-units
-# Controls how often the ICP pings are sent to siblings that
-# have background-ping set.
-#Default:
-# background_ping_rate 10 seconds
-
-# MULTICAST ICP OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: mcast_groups
-# This tag specifies a list of multicast groups which your server
-# should join to receive multicasted ICP queries.
-#
-# NOTE! Be very careful what you put here! Be sure you
-# understand the difference between an ICP _query_ and an ICP
-# _reply_. This option is to be set only if you want to RECEIVE
-# multicast queries. Do NOT set this option to SEND multicast
-# ICP (use cache_peer for that). ICP replies are always sent via
-# unicast, so this option does not affect whether or not you will
-# receive replies from multicast group members.
-#
-# You must be very careful to NOT use a multicast address which
-# is already in use by another group of caches.
-#
-# If you are unsure about multicast, please read the Multicast
-# chapter in the Squid FAQ (http://www.squid-cache.org/FAQ/).
-#
-# Usage: mcast_groups 239.128.16.128 224.0.1.20
-#
-# By default, Squid doesn't listen on any multicast groups.
-#Default:
-# none
-
-# TAG: mcast_miss_addr
-# Note: This option is only available if Squid is rebuilt with the
-# -DMULTICAST_MISS_STREAM define
-#
-# If you enable this option, every "cache miss" URL will
-# be sent out on the specified multicast address.
-#
-# Do not enable this option unless you are are absolutely
-# certain you understand what you are doing.
-#Default:
-# disabled.
-
-# TAG: mcast_miss_ttl
-# Note: This option is only available if Squid is rebuilt with the
-# -DMULTICAST_MISS_STREAM define
-#
-# This is the time-to-live value for packets multicasted
-# when multicasting off cache miss URLs is enabled. By
-# default this is set to 'site scope', i.e. 16.
-#Default:
-# mcast_miss_ttl 16
-
-# TAG: mcast_miss_port
-# Note: This option is only available if Squid is rebuilt with the
-# -DMULTICAST_MISS_STREAM define
-#
-# This is the port number to be used in conjunction with
-# 'mcast_miss_addr'.
-#Default:
-# mcast_miss_port 3135
-
-# TAG: mcast_miss_encode_key
-# Note: This option is only available if Squid is rebuilt with the
-# -DMULTICAST_MISS_STREAM define
-#
-# The URLs that are sent in the multicast miss stream are
-# encrypted. This is the encryption key.
-#Default:
-# mcast_miss_encode_key XXXXXXXXXXXXXXXX
-
-# TAG: mcast_icp_query_timeout (msec)
-# For multicast peers, Squid regularly sends out ICP "probes" to
-# count how many other peers are listening on the given multicast
-# address. This value specifies how long Squid should wait to
-# count all the replies. The default is 2000 msec, or 2
-# seconds.
-#Default:
-# mcast_icp_query_timeout 2000
-
-# INTERNAL ICON OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: icon_directory
-# Where the icons are stored. These are normally kept in
-# /usr/share/squid/icons
-#Default:
-# icon_directory /usr/share/squid/icons
-
-# TAG: global_internal_static
-# This directive controls is Squid should intercept all requests for
-# /squid-internal-static/ no matter which host the URL is requesting
-# (default on setting), or if nothing special should be done for
-# such URLs (off setting). The purpose of this directive is to make
-# icons etc work better in complex cache hierarchies where it may
-# not always be possible for all corners in the cache mesh to reach
-# the server generating a directory listing.
-#Default:
-# global_internal_static on
-
-# TAG: short_icon_urls
-# If this is enabled Squid will use short URLs for icons.
-# If disabled it will revert to the old behavior of including
-# it's own name and port in the URL.
-#
-# If you run a complex cache hierarchy with a mix of Squid and
-# other proxies you may need to disable this directive.
-#Default:
-# short_icon_urls on
-
-# ERROR PAGE OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: error_directory
-# If you wish to create your own versions of the default
-# error files to customize them to suit your company copy
-# the error/template files to another directory and point
-# this tag at them.
-#
-# WARNING: This option will disable multi-language support
-# on error pages if used.
-#
-# The squid developers are interested in making squid available in
-# a wide variety of languages. If you are making translations for a
-# language that Squid does not currently provide please consider
-# contributing your translation back to the project.
-# http://wiki.squid-cache.org/Translations
-#
-# The squid developers working on translations are happy to supply drop-in
-# translated error files in exchange for any new language contributions.
-#Default:
-# Send error pages in the clients preferred language
-
-# TAG: error_default_language
-# Set the default language which squid will send error pages in
-# if no existing translation matches the clients language
-# preferences.
-#
-# If unset (default) generic English will be used.
-#
-# The squid developers are interested in making squid available in
-# a wide variety of languages. If you are interested in making
-# translations for any language see the squid wiki for details.
-# http://wiki.squid-cache.org/Translations
-#Default:
-# Generate English language pages.
-
-# TAG: error_log_languages
-# Log to cache.log what languages users are attempting to
-# auto-negotiate for translations.
-#
-# Successful negotiations are not logged. Only failures
-# have meaning to indicate that Squid may need an upgrade
-# of its error page translations.
-#Default:
-# error_log_languages on
-
-# TAG: err_page_stylesheet
-# CSS Stylesheet to pattern the display of Squid default error pages.
-#
-# For information on CSS see http://www.w3.org/Style/CSS/
-#Default:
-# err_page_stylesheet /etc/squid/errorpage.css
-
-# TAG: err_html_text
-# HTML text to include in error messages. Make this a "mailto"
-# URL to your admin address, or maybe just a link to your
-# organizations Web page.
-#
-# To include this in your error messages, you must rewrite
-# the error template files (found in the "errors" directory).
-# Wherever you want the 'err_html_text' line to appear,
-# insert a %L tag in the error template file.
-#Default:
-# none
-
-# TAG: email_err_data on|off
-# If enabled, information about the occurred error will be
-# included in the mailto links of the ERR pages (if %W is set)
-# so that the email body contains the data.
-# Syntax is <A HREF="mailto:%w%W">%w</A>
-#Default:
-# email_err_data on
-
-# TAG: deny_info
-# Usage: deny_info err_page_name acl
-# or deny_info http://... acl
-# or deny_info TCP_RESET acl
-#
-# This can be used to return a ERR_ page for requests which
-# do not pass the 'http_access' rules. Squid remembers the last
-# acl it evaluated in http_access, and if a 'deny_info' line exists
-# for that ACL Squid returns a corresponding error page.
-#
-# The acl is typically the last acl on the http_access deny line which
-# denied access. The exceptions to this rule are:
-# - When Squid needs to request authentication credentials. It's then
-# the first authentication related acl encountered
-# - When none of the http_access lines matches. It's then the last
-# acl processed on the last http_access line.
-# - When the decision to deny access was made by an adaptation service,
-# the acl name is the corresponding eCAP or ICAP service_name.
-#
-# NP: If providing your own custom error pages with error_directory
-# you may also specify them by your custom file name:
-# Example: deny_info ERR_CUSTOM_ACCESS_DENIED bad_guys
-#
-# By defaut Squid will send "403 Forbidden". A different 4xx or 5xx
-# may be specified by prefixing the file name with the code and a colon.
-# e.g. 404:ERR_CUSTOM_ACCESS_DENIED
-#
-# Alternatively you can tell Squid to reset the TCP connection
-# by specifying TCP_RESET.
-#
-# Or you can specify an error URL or URL pattern. The browsers will
-# get redirected to the specified URL after formatting tags have
-# been replaced. Redirect will be done with 302 or 307 according to
-# HTTP/1.1 specs. A different 3xx code may be specified by prefixing
-# the URL. e.g. 303:http://example.com/
-#
-# URL FORMAT TAGS:
-# %a - username (if available. Password NOT included)
-# %B - FTP path URL
-# %e - Error number
-# %E - Error description
-# %h - Squid hostname
-# %H - Request domain name
-# %i - Client IP Address
-# %M - Request Method
-# %o - Message result from external ACL helper
-# %p - Request Port number
-# %P - Request Protocol name
-# %R - Request URL path
-# %T - Timestamp in RFC 1123 format
-# %U - Full canonical URL from client
-# (HTTPS URLs terminate with *)
-# %u - Full canonical URL from client
-# %w - Admin email from squid.conf
-# %x - Error name
-# %% - Literal percent (%) code
-#
-#Default:
-# none
-
-# OPTIONS INFLUENCING REQUEST FORWARDING
-# -----------------------------------------------------------------------------
-
-# TAG: nonhierarchical_direct
-# By default, Squid will send any non-hierarchical requests
-# (matching hierarchy_stoplist or not cacheable request type) direct
-# to origin servers.
-#
-# When this is set to "off", Squid will prefer to send these
-# requests to parents.
-#
-# Note that in most configurations, by turning this off you will only
-# add latency to these request without any improvement in global hit
-# ratio.
-#
-# This option only sets a preference. If the parent is unavailable a
-# direct connection to the origin server may still be attempted. To
-# completely prevent direct connections use never_direct.
-#Default:
-# nonhierarchical_direct on
-
-# TAG: prefer_direct
-# Normally Squid tries to use parents for most requests. If you for some
-# reason like it to first try going direct and only use a parent if
-# going direct fails set this to on.
-#
-# By combining nonhierarchical_direct off and prefer_direct on you
-# can set up Squid to use a parent as a backup path if going direct
-# fails.
-#
-# Note: If you want Squid to use parents for all requests see
-# the never_direct directive. prefer_direct only modifies how Squid
-# acts on cacheable requests.
-#Default:
-# prefer_direct off
-
-# TAG: cache_miss_revalidate on|off
-# RFC 7232 defines a conditional request mechanism to prevent
-# response objects being unnecessarily transferred over the network.
-# If that mechanism is used by the client and a cache MISS occurs
-# it can prevent new cache entries being created.
-#
-# This option determines whether Squid on cache MISS will pass the
-# client revalidation request to the server or tries to fetch new
-# content for caching. It can be useful while the cache is mostly
-# empty to more quickly have the cache populated by generating
-# non-conditional GETs.
-#
-# When set to 'on' (default), Squid will pass all client If-* headers
-# to the server. This permits server responses without a cacheable
-# payload to be delivered and on MISS no new cache entry is created.
-#
-# When set to 'off' and if the request is cacheable, Squid will
-# remove the clients If-Modified-Since and If-None-Match headers from
-# the request sent to the server. This requests a 200 status response
-# from the server to create a new cache entry with.
-#Default:
-# cache_miss_revalidate on
-
-# TAG: always_direct
-# Usage: always_direct allow|deny [!]aclname ...
-#
-# Here you can use ACL elements to specify requests which should
-# ALWAYS be forwarded by Squid to the origin servers without using
-# any peers. For example, to always directly forward requests for
-# local servers ignoring any parents or siblings you may have use
-# something like:
-#
-# acl local-servers dstdomain my.domain.net
-# always_direct allow local-servers
-#
-# To always forward FTP requests directly, use
-#
-# acl FTP proto FTP
-# always_direct allow FTP
-#
-# NOTE: There is a similar, but opposite option named
-# 'never_direct'. You need to be aware that "always_direct deny
-# foo" is NOT the same thing as "never_direct allow foo". You
-# may need to use a deny rule to exclude a more-specific case of
-# some other rule. Example:
-#
-# acl local-external dstdomain external.foo.net
-# acl local-servers dstdomain .foo.net
-# always_direct deny local-external
-# always_direct allow local-servers
-#
-# NOTE: If your goal is to make the client forward the request
-# directly to the origin server bypassing Squid then this needs
-# to be done in the client configuration. Squid configuration
-# can only tell Squid how Squid should fetch the object.
-#
-# NOTE: This directive is not related to caching. The replies
-# is cached as usual even if you use always_direct. To not cache
-# the replies see the 'cache' directive.
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Prevent any cache_peer being used for this request.
-
-# TAG: never_direct
-# Usage: never_direct allow|deny [!]aclname ...
-#
-# never_direct is the opposite of always_direct. Please read
-# the description for always_direct if you have not already.
-#
-# With 'never_direct' you can use ACL elements to specify
-# requests which should NEVER be forwarded directly to origin
-# servers. For example, to force the use of a proxy for all
-# requests, except those in your local domain use something like:
-#
-# acl local-servers dstdomain .foo.net
-# never_direct deny local-servers
-# never_direct allow all
-#
-# or if Squid is inside a firewall and there are local intranet
-# servers inside the firewall use something like:
-#
-# acl local-intranet dstdomain .foo.net
-# acl local-external dstdomain external.foo.net
-# always_direct deny local-external
-# always_direct allow local-intranet
-# never_direct allow all
-#
-# This clause supports both fast and slow acl types.
-# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow DNS results to be used for this request.
-
-# ADVANCED NETWORKING OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: incoming_udp_average
-# Heavy voodoo here. I can't even believe you are reading this.
-# Are you crazy? Don't even think about adjusting these unless
-# you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_udp_average 6
-
-# TAG: incoming_tcp_average
-# Heavy voodoo here. I can't even believe you are reading this.
-# Are you crazy? Don't even think about adjusting these unless
-# you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_tcp_average 4
-
-# TAG: incoming_dns_average
-# Heavy voodoo here. I can't even believe you are reading this.
-# Are you crazy? Don't even think about adjusting these unless
-# you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_dns_average 4
-
-# TAG: min_udp_poll_cnt
-# Heavy voodoo here. I can't even believe you are reading this.
-# Are you crazy? Don't even think about adjusting these unless
-# you understand the algorithms in comm_select.c first!
-#Default:
-# min_udp_poll_cnt 8
-
-# TAG: min_dns_poll_cnt
-# Heavy voodoo here. I can't even believe you are reading this.
-# Are you crazy? Don't even think about adjusting these unless
-# you understand the algorithms in comm_select.c first!
-#Default:
-# min_dns_poll_cnt 8
-
-# TAG: min_tcp_poll_cnt
-# Heavy voodoo here. I can't even believe you are reading this.
-# Are you crazy? Don't even think about adjusting these unless
-# you understand the algorithms in comm_select.c first!
-#Default:
-# min_tcp_poll_cnt 8
-
-# TAG: accept_filter
-# FreeBSD:
-#
-# The name of an accept(2) filter to install on Squid's
-# listen socket(s). This feature is perhaps specific to
-# FreeBSD and requires support in the kernel.
-#
-# The 'httpready' filter delays delivering new connections
-# to Squid until a full HTTP request has been received.
-# See the accf_http(9) man page for details.
-#
-# The 'dataready' filter delays delivering new connections
-# to Squid until there is some data to process.
-# See the accf_dataready(9) man page for details.
-#
-# Linux:
-#
-# The 'data' filter delays delivering of new connections
-# to Squid until there is some data to process by TCP_ACCEPT_DEFER.
-# You may optionally specify a number of seconds to wait by
-# 'data=N' where N is the number of seconds. Defaults to 30
-# if not specified. See the tcp(7) man page for details.
-#EXAMPLE:
-## FreeBSD
-#accept_filter httpready
-## Linux
-#accept_filter data
-#Default:
-# none
-
-# TAG: client_ip_max_connections
-# Set an absolute limit on the number of connections a single
-# client IP can use. Any more than this and Squid will begin to drop
-# new connections from the client until it closes some links.
-#
-# Note that this is a global limit. It affects all HTTP, HTCP, Gopher and FTP
-# connections from the client. For finer control use the ACL access controls.
-#
-# Requires client_db to be enabled (the default).
-#
-# WARNING: This may noticably slow down traffic received via external proxies
-# or NAT devices and cause them to rebound error messages back to their clients.
-#Default:
-# No limit.
-
-# TAG: tcp_recv_bufsize (bytes)
-# Size of receive buffer to set for TCP sockets. Probably just
-# as easy to change your kernel's default.
-# Omit from squid.conf to use the default buffer size.
-#Default:
-# Use operating system TCP defaults.
-
-# ICAP OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: icap_enable on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# If you want to enable the ICAP module support, set this to on.
-#Default:
-# icap_enable off
-
-# TAG: icap_connect_timeout
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# This parameter specifies how long to wait for the TCP connect to
-# the requested ICAP server to complete before giving up and either
-# terminating the HTTP transaction or bypassing the failure.
-#
-# The default for optional services is peer_connect_timeout.
-# The default for essential services is connect_timeout.
-# If this option is explicitly set, its value applies to all services.
-#Default:
-# none
-
-# TAG: icap_io_timeout time-units
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# This parameter specifies how long to wait for an I/O activity on
-# an established, active ICAP connection before giving up and
-# either terminating the HTTP transaction or bypassing the
-# failure.
-#Default:
-# Use read_timeout.
-
-# TAG: icap_service_failure_limit limit [in memory-depth time-units]
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# The limit specifies the number of failures that Squid tolerates
-# when establishing a new TCP connection with an ICAP service. If
-# the number of failures exceeds the limit, the ICAP service is
-# not used for new ICAP requests until it is time to refresh its
-# OPTIONS.
-#
-# A negative value disables the limit. Without the limit, an ICAP
-# service will not be considered down due to connectivity failures
-# between ICAP OPTIONS requests.
-#
-# Squid forgets ICAP service failures older than the specified
-# value of memory-depth. The memory fading algorithm
-# is approximate because Squid does not remember individual
-# errors but groups them instead, splitting the option
-# value into ten time slots of equal length.
-#
-# When memory-depth is 0 and by default this option has no
-# effect on service failure expiration.
-#
-# Squid always forgets failures when updating service settings
-# using an ICAP OPTIONS transaction, regardless of this option
-# setting.
-#
-# For example,
-# # suspend service usage after 10 failures in 5 seconds:
-# icap_service_failure_limit 10 in 5 seconds
-#Default:
-# icap_service_failure_limit 10
-
-# TAG: icap_service_revival_delay
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# The delay specifies the number of seconds to wait after an ICAP
-# OPTIONS request failure before requesting the options again. The
-# failed ICAP service is considered "down" until fresh OPTIONS are
-# fetched.
-#
-# The actual delay cannot be smaller than the hardcoded minimum
-# delay of 30 seconds.
-#Default:
-# icap_service_revival_delay 180
-
-# TAG: icap_preview_enable on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# The ICAP Preview feature allows the ICAP server to handle the
-# HTTP message by looking only at the beginning of the message body
-# or even without receiving the body at all. In some environments,
-# previews greatly speedup ICAP processing.
-#
-# During an ICAP OPTIONS transaction, the server may tell Squid what
-# HTTP messages should be previewed and how big the preview should be.
-# Squid will not use Preview if the server did not request one.
-#
-# To disable ICAP Preview for all ICAP services, regardless of
-# individual ICAP server OPTIONS responses, set this option to "off".
-#Example:
-#icap_preview_enable off
-#Default:
-# icap_preview_enable on
-
-# TAG: icap_preview_size
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# The default size of preview data to be sent to the ICAP server.
-# This value might be overwritten on a per server basis by OPTIONS requests.
-#Default:
-# No preview sent.
-
-# TAG: icap_206_enable on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# 206 (Partial Content) responses is an ICAP extension that allows the
-# ICAP agents to optionally combine adapted and original HTTP message
-# content. The decision to combine is postponed until the end of the
-# ICAP response. Squid supports Partial Content extension by default.
-#
-# Activation of the Partial Content extension is negotiated with each
-# ICAP service during OPTIONS exchange. Most ICAP servers should handle
-# negotation correctly even if they do not support the extension, but
-# some might fail. To disable Partial Content support for all ICAP
-# services and to avoid any negotiation, set this option to "off".
-#
-# Example:
-# icap_206_enable off
-#Default:
-# icap_206_enable on
-
-# TAG: icap_default_options_ttl
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# The default TTL value for ICAP OPTIONS responses that don't have
-# an Options-TTL header.
-#Default:
-# icap_default_options_ttl 60
-
-# TAG: icap_persistent_connections on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# Whether or not Squid should use persistent connections to
-# an ICAP server.
-#Default:
-# icap_persistent_connections on
-
-# TAG: adaptation_send_client_ip on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-# If enabled, Squid shares HTTP client IP information with adaptation
-# services. For ICAP, Squid adds the X-Client-IP header to ICAP requests.
-# For eCAP, Squid sets the libecap::metaClientIp transaction option.
-#
-# See also: adaptation_uses_indirect_client
-#Default:
-# adaptation_send_client_ip off
-
-# TAG: adaptation_send_username on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-# This sends authenticated HTTP client username (if available) to
-# the adaptation service.
-#
-# For ICAP, the username value is encoded based on the
-# icap_client_username_encode option and is sent using the header
-# specified by the icap_client_username_header option.
-#Default:
-# adaptation_send_username off
-
-# TAG: icap_client_username_header
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# ICAP request header name to use for adaptation_send_username.
-#Default:
-# icap_client_username_header X-Client-Username
-
-# TAG: icap_client_username_encode on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# Whether to base64 encode the authenticated client username.
-#Default:
-# icap_client_username_encode off
-
-# TAG: icap_service
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# Defines a single ICAP service using the following format:
-#
-# icap_service id vectoring_point uri [option ...]
-#
-# id: ID
-# an opaque identifier or name which is used to direct traffic to
-# this specific service. Must be unique among all adaptation
-# services in squid.conf.
-#
-# vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache
-# This specifies at which point of transaction processing the
-# ICAP service should be activated. *_postcache vectoring points
-# are not yet supported.
-#
-# uri: icap://servername:port/servicepath
-# ICAP server and service location.
-#
-# ICAP does not allow a single service to handle both REQMOD and RESPMOD
-# transactions. Squid does not enforce that requirement. You can specify
-# services with the same service_url and different vectoring_points. You
-# can even specify multiple identical services as long as their
-# service_names differ.
-#
-# To activate a service, use the adaptation_access directive. To group
-# services, use adaptation_service_chain and adaptation_service_set.
-#
-# Service options are separated by white space. ICAP services support
-# the following name=value options:
-#
-# bypass=on|off|1|0
-# If set to 'on' or '1', the ICAP service is treated as
-# optional. If the service cannot be reached or malfunctions,
-# Squid will try to ignore any errors and process the message as
-# if the service was not enabled. No all ICAP errors can be
-# bypassed. If set to 0, the ICAP service is treated as
-# essential and all ICAP errors will result in an error page
-# returned to the HTTP client.
-#
-# Bypass is off by default: services are treated as essential.
-#
-# routing=on|off|1|0
-# If set to 'on' or '1', the ICAP service is allowed to
-# dynamically change the current message adaptation plan by
-# returning a chain of services to be used next. The services
-# are specified using the X-Next-Services ICAP response header
-# value, formatted as a comma-separated list of service names.
-# Each named service should be configured in squid.conf. Other
-# services are ignored. An empty X-Next-Services value results
-# in an empty plan which ends the current adaptation.
-#
-# Dynamic adaptation plan may cross or cover multiple supported
-# vectoring points in their natural processing order.
-#
-# Routing is not allowed by default: the ICAP X-Next-Services
-# response header is ignored.
-#
-# ipv6=on|off
-# Only has effect on split-stack systems. The default on those systems
-# is to use IPv4-only connections. When set to 'on' this option will
-# make Squid use IPv6-only connections to contact this ICAP service.
-#
-# on-overload=block|bypass|wait|force
-# If the service Max-Connections limit has been reached, do
-# one of the following for each new ICAP transaction:
-# * block: send an HTTP error response to the client
-# * bypass: ignore the "over-connected" ICAP service
-# * wait: wait (in a FIFO queue) for an ICAP connection slot
-# * force: proceed, ignoring the Max-Connections limit
-#
-# In SMP mode with N workers, each worker assumes the service
-# connection limit is Max-Connections/N, even though not all
-# workers may use a given service.
-#
-# The default value is "bypass" if service is bypassable,
-# otherwise it is set to "wait".
-#
-#
-# max-conn=number
-# Use the given number as the Max-Connections limit, regardless
-# of the Max-Connections value given by the service, if any.
-#
-# Older icap_service format without optional named parameters is
-# deprecated but supported for backward compatibility.
-#
-#Example:
-#icap_service svcBlocker reqmod_precache icap://icap1.mydomain.net:1344/reqmod bypass=0
-#icap_service svcLogger reqmod_precache icap://icap2.mydomain.net:1344/respmod routing=on
-#Default:
-# none
-
-# TAG: icap_class
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# This deprecated option was documented to define an ICAP service
-# chain, even though it actually defined a set of similar, redundant
-# services, and the chains were not supported.
-#
-# To define a set of redundant services, please use the
-# adaptation_service_set directive. For service chains, use
-# adaptation_service_chain.
-#Default:
-# none
-
-# TAG: icap_access
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# This option is deprecated. Please use adaptation_access, which
-# has the same ICAP functionality, but comes with better
-# documentation, and eCAP support.
-#Default:
-# none
-
-# eCAP OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: ecap_enable on|off
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap
-#
-# Controls whether eCAP support is enabled.
-#Default:
-# ecap_enable off
-
-# TAG: ecap_service
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap
-#
-# Defines a single eCAP service
-#
-# ecap_service id vectoring_point uri [option ...]
-#
-# id: ID
-# an opaque identifier or name which is used to direct traffic to
-# this specific service. Must be unique among all adaptation
-# services in squid.conf.
-#
-# vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache
-# This specifies at which point of transaction processing the
-# eCAP service should be activated. *_postcache vectoring points
-# are not yet supported.
-#
-# uri: ecap://vendor/service_name?custom&cgi=style&parameters=optional
-# Squid uses the eCAP service URI to match this configuration
-# line with one of the dynamically loaded services. Each loaded
-# eCAP service must have a unique URI. Obtain the right URI from
-# the service provider.
-#
-# To activate a service, use the adaptation_access directive. To group
-# services, use adaptation_service_chain and adaptation_service_set.
-#
-# Service options are separated by white space. eCAP services support
-# the following name=value options:
-#
-# bypass=on|off|1|0
-# If set to 'on' or '1', the eCAP service is treated as optional.
-# If the service cannot be reached or malfunctions, Squid will try
-# to ignore any errors and process the message as if the service
-# was not enabled. No all eCAP errors can be bypassed.
-# If set to 'off' or '0', the eCAP service is treated as essential
-# and all eCAP errors will result in an error page returned to the
-# HTTP client.
-#
-# Bypass is off by default: services are treated as essential.
-#
-# routing=on|off|1|0
-# If set to 'on' or '1', the eCAP service is allowed to
-# dynamically change the current message adaptation plan by
-# returning a chain of services to be used next.
-#
-# Dynamic adaptation plan may cross or cover multiple supported
-# vectoring points in their natural processing order.
-#
-# Routing is not allowed by default.
-#
-# Older ecap_service format without optional named parameters is
-# deprecated but supported for backward compatibility.
-#
-#
-#Example:
-#ecap_service s1 reqmod_precache ecap://filters.R.us/leakDetector?on_error=block bypass=off
-#ecap_service s2 respmod_precache ecap://filters.R.us/virusFilter config=/etc/vf.cfg bypass=on
-#Default:
-# none
-
-# TAG: loadable_modules
-# Instructs Squid to load the specified dynamic module(s) or activate
-# preloaded module(s).
-#Example:
-#loadable_modules /usr/lib/MinimalAdapter.so
-#Default:
-# none
-
-# MESSAGE ADAPTATION OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: adaptation_service_set
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-#
-# Configures an ordered set of similar, redundant services. This is
-# useful when hot standby or backup adaptation servers are available.
-#
-# adaptation_service_set set_name service_name1 service_name2 ...
-#
-# The named services are used in the set declaration order. The first
-# applicable adaptation service from the set is used first. The next
-# applicable service is tried if and only if the transaction with the
-# previous service fails and the message waiting to be adapted is still
-# intact.
-#
-# When adaptation starts, broken services are ignored as if they were
-# not a part of the set. A broken service is a down optional service.
-#
-# The services in a set must be attached to the same vectoring point
-# (e.g., pre-cache) and use the same adaptation method (e.g., REQMOD).
-#
-# If all services in a set are optional then adaptation failures are
-# bypassable. If all services in the set are essential, then a
-# transaction failure with one service may still be retried using
-# another service from the set, but when all services fail, the master
-# transaction fails as well.
-#
-# A set may contain a mix of optional and essential services, but that
-# is likely to lead to surprising results because broken services become
-# ignored (see above), making previously bypassable failures fatal.
-# Technically, it is the bypassability of the last failed service that
-# matters.
-#
-# See also: adaptation_access adaptation_service_chain
-#
-#Example:
-#adaptation_service_set svcBlocker urlFilterPrimary urlFilterBackup
-#adaptation service_set svcLogger loggerLocal loggerRemote
-#Default:
-# none
-
-# TAG: adaptation_service_chain
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-#
-# Configures a list of complementary services that will be applied
-# one-by-one, forming an adaptation chain or pipeline. This is useful
-# when Squid must perform different adaptations on the same message.
-#
-# adaptation_service_chain chain_name service_name1 svc_name2 ...
-#
-# The named services are used in the chain declaration order. The first
-# applicable adaptation service from the chain is used first. The next
-# applicable service is applied to the successful adaptation results of
-# the previous service in the chain.
-#
-# When adaptation starts, broken services are ignored as if they were
-# not a part of the chain. A broken service is a down optional service.
-#
-# Request satisfaction terminates the adaptation chain because Squid
-# does not currently allow declaration of RESPMOD services at the
-# "reqmod_precache" vectoring point (see icap_service or ecap_service).
-#
-# The services in a chain must be attached to the same vectoring point
-# (e.g., pre-cache) and use the same adaptation method (e.g., REQMOD).
-#
-# A chain may contain a mix of optional and essential services. If an
-# essential adaptation fails (or the failure cannot be bypassed for
-# other reasons), the master transaction fails. Otherwise, the failure
-# is bypassed as if the failed adaptation service was not in the chain.
-#
-# See also: adaptation_access adaptation_service_set
-#
-#Example:
-#adaptation_service_chain svcRequest requestLogger urlFilter leakDetector
-#Default:
-# none
-
-# TAG: adaptation_access
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-# Sends an HTTP transaction to an ICAP or eCAP adaptation service.
-#
-# adaptation_access service_name allow|deny [!]aclname...
-# adaptation_access set_name allow|deny [!]aclname...
-#
-# At each supported vectoring point, the adaptation_access
-# statements are processed in the order they appear in this
-# configuration file. Statements pointing to the following services
-# are ignored (i.e., skipped without checking their ACL):
-#
-# - services serving different vectoring points
-# - "broken-but-bypassable" services
-# - "up" services configured to ignore such transactions
-# (e.g., based on the ICAP Transfer-Ignore header).
-#
-# When a set_name is used, all services in the set are checked
-# using the same rules, to find the first applicable one. See
-# adaptation_service_set for details.
-#
-# If an access list is checked and there is a match, the
-# processing stops: For an "allow" rule, the corresponding
-# adaptation service is used for the transaction. For a "deny"
-# rule, no adaptation service is activated.
-#
-# It is currently not possible to apply more than one adaptation
-# service at the same vectoring point to the same HTTP transaction.
-#
-# See also: icap_service and ecap_service
-#
-#Example:
-#adaptation_access service_1 allow all
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-# TAG: adaptation_service_iteration_limit
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-# Limits the number of iterations allowed when applying adaptation
-# services to a message. If your longest adaptation set or chain
-# may have more than 16 services, increase the limit beyond its
-# default value of 16. If detecting infinite iteration loops sooner
-# is critical, make the iteration limit match the actual number
-# of services in your longest adaptation set or chain.
-#
-# Infinite adaptation loops are most likely with routing services.
-#
-# See also: icap_service routing=1
-#Default:
-# adaptation_service_iteration_limit 16
-
-# TAG: adaptation_masterx_shared_names
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-# For each master transaction (i.e., the HTTP request and response
-# sequence, including all related ICAP and eCAP exchanges), Squid
-# maintains a table of metadata. The table entries are (name, value)
-# pairs shared among eCAP and ICAP exchanges. The table is destroyed
-# with the master transaction.
-#
-# This option specifies the table entry names that Squid must accept
-# from and forward to the adaptation transactions.
-#
-# An ICAP REQMOD or RESPMOD transaction may set an entry in the
-# shared table by returning an ICAP header field with a name
-# specified in adaptation_masterx_shared_names.
-#
-# An eCAP REQMOD or RESPMOD transaction may set an entry in the
-# shared table by implementing the libecap::visitEachOption() API
-# to provide an option with a name specified in
-# adaptation_masterx_shared_names.
-#
-# Squid will store and forward the set entry to subsequent adaptation
-# transactions within the same master transaction scope.
-#
-# Only one shared entry name is supported at this time.
-#
-#Example:
-## share authentication information among ICAP services
-#adaptation_masterx_shared_names X-Subscriber-ID
-#Default:
-# none
-
-# TAG: adaptation_meta
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-ecap or --enable-icap-client
-#
-# This option allows Squid administrator to add custom ICAP request
-# headers or eCAP options to Squid ICAP requests or eCAP transactions.
-# Use it to pass custom authentication tokens and other
-# transaction-state related meta information to an ICAP/eCAP service.
-#
-# The addition of a meta header is ACL-driven:
-# adaptation_meta name value [!]aclname ...
-#
-# Processing for a given header name stops after the first ACL list match.
-# Thus, it is impossible to add two headers with the same name. If no ACL
-# lists match for a given header name, no such header is added. For
-# example:
-#
-# # do not debug transactions except for those that need debugging
-# adaptation_meta X-Debug 1 needs_debugging
-#
-# # log all transactions except for those that must remain secret
-# adaptation_meta X-Log 1 !keep_secret
-#
-# # mark transactions from users in the "G 1" group
-# adaptation_meta X-Authenticated-Groups "G 1" authed_as_G1
-#
-# The "value" parameter may be a regular squid.conf token or a "double
-# quoted string". Within the quoted string, use backslash (\) to escape
-# any character, which is currently only useful for escaping backslashes
-# and double quotes. For example,
-# "this string has one backslash (\\) and two \"quotes\""
-#
-# Used adaptation_meta header values may be logged via %note
-# logformat code. If multiple adaptation_meta headers with the same name
-# are used during master transaction lifetime, the header values are
-# logged in the order they were used and duplicate values are ignored
-# (only the first repeated value will be logged).
-#Default:
-# none
-
-# TAG: icap_retry
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# This ACL determines which retriable ICAP transactions are
-# retried. Transactions that received a complete ICAP response
-# and did not have to consume or produce HTTP bodies to receive
-# that response are usually retriable.
-#
-# icap_retry allow|deny [!]aclname ...
-#
-# Squid automatically retries some ICAP I/O timeouts and errors
-# due to persistent connection race conditions.
-#
-# See also: icap_retry_limit
-#Default:
-# icap_retry deny all
-
-# TAG: icap_retry_limit
-# Note: This option is only available if Squid is rebuilt with the
-# --enable-icap-client
-#
-# Limits the number of retries allowed.
-#
-# Communication errors due to persistent connection race
-# conditions are unavoidable, automatically retried, and do not
-# count against this limit.
-#
-# See also: icap_retry
-#Default:
-# No retries are allowed.
-
-# DNS OPTIONS
-# -----------------------------------------------------------------------------
-
-# TAG: check_hostnames
-# For security and stability reasons Squid can check
-# hostnames for Internet standard RFC compliance. If you want
-# Squid to perform these checks turn this directive on.
-#Default:
-# check_hostnames off
-
-# TAG: allow_underscore
-# Underscore characters is not strictly allowed in Internet hostnames
-# but nevertheless used by many sites. Set this to off if you want
-# Squid to be strict about the standard.
-# This check is performed only when check_hostnames is set to on.
-#Default:
-# allow_underscore on
-
-# TAG: cache_dns_program
-# Note: This option is only available if Squid is rebuilt with the
-# --disable-internal-dns
-#
-# Specify the location of the executable for dnslookup process.
-#Default:
-# cache_dns_program /usr/libexec/dnsserver
-
-# TAG: dns_children
-# Note: This option is only available if Squid is rebuilt with the
-# --disable-internal-dns
-#
-# The maximum number of processes spawn to service DNS name lookups.
-# If you limit it too few Squid will have to wait for them to process
-# a backlog of requests, slowing it down. If you allow too many they
-# will use RAM and other system resources noticably.
-# The maximum this may be safely set to is 32.
-#
-# The startup= and idle= options allow some measure of skew in your
-# tuning.
-#
-# startup=
-#
-# Sets a minimum of how many processes are to be spawned when Squid
-# starts or reconfigures. When set to zero the first request will
-# cause spawning of the first child process to handle it.
-#
-# Starting too few will cause an initial slowdown in traffic as Squid
-# attempts to simultaneously spawn enough processes to cope.
-#
-# idle=
-#
-# Sets a minimum of how many processes Squid is to try and keep available
-# at all times. When traffic begins to rise above what the existing
-# processes can handle this many more will be spawned up to the maximum
-# configured. A minimum setting of 1 is required.
-#Default:
-# dns_children 32 startup=1 idle=1
-
-# TAG: dns_retransmit_interval
-# Initial retransmit interval for DNS queries. The interval is
-# doubled each time all configured DNS servers have been tried.
-#Default:
-# dns_retransmit_interval 5 seconds
-
-# TAG: dns_timeout
-# DNS Query timeout. If no response is received to a DNS query
-# within this time all DNS servers for the queried domain
-# are assumed to be unavailable.
-#Default:
-# dns_timeout 30 seconds
-
-# TAG: dns_packet_max
-# Maximum number of bytes packet size to advertise via EDNS.
-# Set to "none" to disable EDNS large packet support.
-#
-# For legacy reasons DNS UDP replies will default to 512 bytes which
-# is too small for many responses. EDNS provides a means for Squid to
-# negotiate receiving larger responses back immediately without having
-# to failover with repeat requests. Responses larger than this limit
-# will retain the old behaviour of failover to TCP DNS.
-#
-# Squid has no real fixed limit internally, but allowing packet sizes
-# over 1500 bytes requires network jumbogram support and is usually not
-# necessary.
-#
-# WARNING: The RFC also indicates that some older resolvers will reply
-# with failure of the whole request if the extension is added. Some
-# resolvers have already been identified which will reply with mangled
-# EDNS response on occasion. Usually in response to many-KB jumbogram
-# sizes being advertised by Squid.
-# Squid will currently treat these both as an unable-to-resolve domain
-# even if it would be resolvable without EDNS.
-#Default:
-# EDNS disabled
-
-# TAG: dns_defnames on|off
-# Normally the RES_DEFNAMES resolver option is disabled
-# (see res_init(3)). This prevents caches in a hierarchy
-# from interpreting single-component hostnames locally. To allow
-# Squid to handle single-component names, enable this option.
-#Default:
-# Search for single-label domain names is disabled.
-
-# TAG: dns_multicast_local on|off
-# When set to on, Squid sends multicast DNS lookups on the local
-# network for domains ending in .local and .arpa.
-# This enables local servers and devices to be contacted in an
-# ad-hoc or zero-configuration network environment.
-#Default:
-# Search for .local and .arpa names is disabled.
-
-# TAG: dns_nameservers
-# Use this if you want to specify a list of DNS name servers
-# (IP addresses) to use instead of those given in your
-# /etc/resolv.conf file.
-#
-# On Windows platforms, if no value is specified here or in
-# the /etc/resolv.conf file, the list of DNS name servers are
-# taken from the Windows registry, both static and dynamic DHCP
-# configurations are supported.
-#
-# Example: dns_nameservers 10.0.0.1 192.172.0.4
-#Default:
-# Use operating system definitions
-
-# TAG: hosts_file
-# Location of the host-local IP name-address associations
-# database. Most Operating Systems have such a file on different
-# default locations:
-# - Un*X & Linux: /etc/hosts
-# - Windows NT/2000: %SystemRoot%\system32\drivers\etc\hosts
-# (%SystemRoot% value install default is c:\winnt)
-# - Windows XP/2003: %SystemRoot%\system32\drivers\etc\hosts
-# (%SystemRoot% value install default is c:\windows)
-# - Windows 9x/Me: %windir%\hosts
-# (%windir% value is usually c:\windows)
-# - Cygwin: /etc/hosts
-#
-# The file contains newline-separated definitions, in the
-# form ip_address_in_dotted_form name [name ...] names are
-# whitespace-separated. Lines beginning with an hash (#)
-# character are comments.
-#
-# The file is checked at startup and upon configuration.
-# If set to 'none', it won't be checked.
-# If append_domain is used, that domain will be added to
-# domain-local (i.e. not containing any dot character) host
-# definitions.
-#Default:
-# hosts_file /etc/hosts
-
-# TAG: append_domain
-# Appends local domain name to hostnames without any dots in
-# them. append_domain must begin with a period.
-#
-# Be warned there are now Internet names with no dots in
-# them using only top-domain names, so setting this may
-# cause some Internet sites to become unavailable.
-#
-#Example:
-# append_domain .yourdomain.com
-#Default:
-# Use operating system definitions
-
-# TAG: ignore_unknown_nameservers
-# By default Squid checks that DNS responses are received
-# from the same IP addresses they are sent to. If they
-# don't match, Squid ignores the response and writes a warning
-# message to cache.log. You can allow responses from unknown
-# nameservers by setting this option to 'off'.
-#Default:
-# ignore_unknown_nameservers on
-
-# TAG: dns_v4_first
-# With the IPv6 Internet being as fast or faster than IPv4 Internet
-# for most networks Squid prefers to contact websites over IPv6.
-#
-# This option reverses the order of preference to make Squid contact
-# dual-stack websites over IPv4 first. Squid will still perform both
-# IPv6 and IPv4 DNS lookups before connecting.
-#
-# WARNING:
-# This option will restrict the situations under which IPv6
-# connectivity is used (and tested). Hiding network problems
-# which would otherwise be detected and warned about.
-#Default:
-# dns_v4_first off
-
-# TAG: ipcache_size (number of entries)
-# Maximum number of DNS IP cache entries.
-#Default:
-# ipcache_size 1024
-
-# TAG: ipcache_low (percent)
-#Default:
-# ipcache_low 90
-
-# TAG: ipcache_high (percent)
-# The size, low-, and high-water marks for the IP cache.
-#Default:
-# ipcache_high 95
-
-# TAG: fqdncache_size (number of entries)
-# Maximum number of FQDN cache entries.
-#Default:
-# fqdncache_size 1024
-
-# MISCELLANEOUS
-# -----------------------------------------------------------------------------
-
-# TAG: configuration_includes_quoted_values on|off
-# Previous Squid versions have defined "quoted/string" as syntax for
-# ACL to signifiy the value is an included file containing values and
-# has treated the " characters in other places of the configuration file
-# as part of the parameter value it was used for.
-#
-# For compatibility with existing installations that behaviour
-# remains the default.
-#
-# If this directive is set to 'on', Squid will start parsing each
-# "quoted string" as a single configuration directive parameter. The
-# quotes are stripped before the parameter value is interpreted or use.
-#
-# That will continue for all lines until this directive is set to 'off',
-# where Squid will return to the default configuration parsing.
-#
-# For example;
-#
-# configuration_includes_quoted_values on
-# acl group external groupCheck Administrators "Internet Users" Guest
-# configuration_includes_quoted_values off
-#
-#Default:
-# configuration_includes_quoted_values off
-
-# TAG: memory_pools on|off
-# If set, Squid will keep pools of allocated (but unused) memory
-# available for future use. If memory is a premium on your
-# system and you believe your malloc library outperforms Squid
-# routines, disable this.
-#Default:
-# memory_pools on
-
-# TAG: memory_pools_limit (bytes)
-# Used only with memory_pools on:
-# memory_pools_limit 50 MB
-#
-# If set to a non-zero value, Squid will keep at most the specified
-# limit of allocated (but unused) memory in memory pools. All free()
-# requests that exceed this limit will be handled by your malloc
-# library. Squid does not pre-allocate any memory, just safe-keeps
-# objects that otherwise would be free()d. Thus, it is safe to set
-# memory_pools_limit to a reasonably high value even if your
-# configuration will use less memory.
-#
-# If set to none, Squid will keep all memory it can. That is, there
-# will be no limit on the total amount of memory used for safe-keeping.
-#
-# To disable memory allocation optimization, do not set
-# memory_pools_limit to 0 or none. Set memory_pools to "off" instead.
-#
-# An overhead for maintaining memory pools is not taken into account
-# when the limit is checked. This overhead is close to four bytes per
-# object kept. However, pools may actually _save_ memory because of
-# reduced memory thrashing in your malloc library.
-#Default:
-# memory_pools_limit 5 MB
-
-# TAG: forwarded_for on|off|transparent|truncate|delete
-# If set to "on", Squid will append your client's IP address
-# in the HTTP requests it forwards. By default it looks like:
-#
-# X-Forwarded-For: 192.1.2.3
-#
-# If set to "off", it will appear as
-#
-# X-Forwarded-For: unknown
-#
-# If set to "transparent", Squid will not alter the
-# X-Forwarded-For header in any way.
-#
-# If set to "delete", Squid will delete the entire
-# X-Forwarded-For header.
-#
-# If set to "truncate", Squid will remove all existing
-# X-Forwarded-For entries, and place the client IP as the sole entry.
-#Default:
-# forwarded_for on
-
-# TAG: cachemgr_passwd
-# Specify passwords for cachemgr operations.
-#
-# Usage: cachemgr_passwd password action action ...
-#
-# Some valid actions are (see cache manager menu for a full list):
-# 5min
-# 60min
-# asndb
-# authenticator
-# cbdata
-# client_list
-# comm_incoming
-# config *
-# counters
-# delay
-# digest_stats
-# dns
-# events
-# filedescriptors
-# fqdncache
-# histograms
-# http_headers
-# info
-# io
-# ipcache
-# mem
-# menu
-# netdb
-# non_peers
-# objects
-# offline_toggle *
-# pconn
-# peer_select
-# reconfigure *
-# redirector
-# refresh
-# server_list
-# shutdown *
-# store_digest
-# storedir
-# utilization
-# via_headers
-# vm_objects
-#
-# * Indicates actions which will not be performed without a
-# valid password, others can be performed if not listed here.
-#
-# To disable an action, set the password to "disable".
-# To allow performing an action without a password, set the
-# password to "none".
-#
-# Use the keyword "all" to set the same password for all actions.
-#
-#Example:
-# cachemgr_passwd secret shutdown
-# cachemgr_passwd lesssssssecret info stats/objects
-# cachemgr_passwd disable all
-#Default:
-# No password. Actions which require password are denied.
-
-# TAG: client_db on|off
-# If you want to disable collecting per-client statistics,
-# turn off client_db here.
-#Default:
-# client_db on
-
-# TAG: refresh_all_ims on|off
-# When you enable this option, squid will always check
-# the origin server for an update when a client sends an
-# If-Modified-Since request. Many browsers use IMS
-# requests when the user requests a reload, and this
-# ensures those clients receive the latest version.
-#
-# By default (off), squid may return a Not Modified response
-# based on the age of the cached version.
-#Default:
-# refresh_all_ims off
-
-# TAG: reload_into_ims on|off
-# When you enable this option, client no-cache or ``reload''
-# requests will be changed to If-Modified-Since requests.
-# Doing this VIOLATES the HTTP standard. Enabling this
-# feature could make you liable for problems which it
-# causes.
-#
-# see also refresh_pattern for a more selective approach.
-#Default:
-# reload_into_ims off
-
-# TAG: connect_retries
-# This sets the maximum number of connection attempts made for each
-# TCP connection. The connect_retries attempts must all still
-# complete within the connection timeout period.
-#
-# The default is not to re-try if the first connection attempt fails.
-# The (not recommended) maximum is 10 tries.
-#
-# A warning message will be generated if it is set to a too-high
-# value and the configured value will be over-ridden.
-#
-# Note: These re-tries are in addition to forward_max_tries
-# which limit how many different addresses may be tried to find
-# a useful server.
-#Default:
-# Do not retry failed connections.
-
-# TAG: retry_on_error
-# If set to ON Squid will automatically retry requests when
-# receiving an error response with status 403 (Forbidden),
-# 500 (Internal Error), 501 or 503 (Service not available).
-# Status 502 and 504 (Gateway errors) are always retried.
-#
-# This is mainly useful if you are in a complex cache hierarchy to
-# work around access control errors.
-#
-# NOTE: This retry will attempt to find another working destination.
-# Which is different from the server which just failed.
-#Default:
-# retry_on_error off
-
-# TAG: as_whois_server
-# WHOIS server to query for AS numbers. NOTE: AS numbers are
-# queried only when Squid starts up, not for every request.
-#Default:
-# as_whois_server whois.ra.net
-
-# TAG: offline_mode
-# Enable this option and Squid will never try to validate cached
-# objects.
-#Default:
-# offline_mode off
-
-# TAG: uri_whitespace
-# What to do with requests that have whitespace characters in the
-# URI. Options:
-#
-# strip: The whitespace characters are stripped out of the URL.
-# This is the behavior recommended by RFC2396 and RFC3986
-# for tolerant handling of generic URI.
-# NOTE: This is one difference between generic URI and HTTP URLs.
-#
-# deny: The request is denied. The user receives an "Invalid
-# Request" message.
-# This is the behaviour recommended by RFC2616 for safe
-# handling of HTTP request URL.
-#
-# allow: The request is allowed and the URI is not changed. The
-# whitespace characters remain in the URI. Note the
-# whitespace is passed to redirector processes if they
-# are in use.
-# Note this may be considered a violation of RFC2616
-# request parsing where whitespace is prohibited in the
-# URL field.
-#
-# encode: The request is allowed and the whitespace characters are
-# encoded according to RFC1738.
-#
-# chop: The request is allowed and the URI is chopped at the
-# first whitespace.
-#
-#
-# NOTE the current Squid implementation of encode and chop violates
-# RFC2616 by not using a 301 redirect after altering the URL.
-#Default:
-# uri_whitespace strip
-
-# TAG: chroot
-# Specifies a directory where Squid should do a chroot() while
-# initializing. This also causes Squid to fully drop root
-# privileges after initializing. This means, for example, if you
-# use a HTTP port less than 1024 and try to reconfigure, you may
-# get an error saying that Squid can not open the port.
-#Default:
-# none
-
-# TAG: balance_on_multiple_ip
-# Modern IP resolvers in squid sort lookup results by preferred access.
-# By default squid will use these IP in order and only rotates to
-# the next listed when the most preffered fails.
-#
-# Some load balancing servers based on round robin DNS have been
-# found not to preserve user session state across requests
-# to different IP addresses.
-#
-# Enabling this directive Squid rotates IP's per request.
-#Default:
-# balance_on_multiple_ip off
-
-# TAG: pipeline_prefetch
-# HTTP clients may send a pipeline of 1+N requests to Squid using a
-# single connection, without waiting for Squid to respond to the first
-# of those requests. This option limits the number of concurrent
-# requests Squid will try to handle in parallel. If set to N, Squid
-# will try to receive and process up to 1+N requests on the same
-# connection concurrently.
-#
-# Defaults to 0 (off) for bandwidth management and access logging
-# reasons.
-#
-# NOTE: pipelining requires persistent connections to clients.
-#
-# WARNING: pipelining breaks NTLM and Negotiate/Kerberos authentication.
-#Default:
-# Do not pre-parse pipelined requests.
-
-# TAG: high_response_time_warning (msec)
-# If the one-minute median response time exceeds this value,
-# Squid prints a WARNING with debug level 0 to get the
-# administrators attention. The value is in milliseconds.
-#Default:
-# disabled.
-
-# TAG: high_page_fault_warning
-# If the one-minute average page fault rate exceeds this
-# value, Squid prints a WARNING with debug level 0 to get
-# the administrators attention. The value is in page faults
-# per second.
-#Default:
-# disabled.
-
-# TAG: high_memory_warning
-# Note: This option is only available if Squid is rebuilt with the
-# GNU Malloc with mstats()
-#
-# If the memory usage (as determined by mallinfo) exceeds
-# this amount, Squid prints a WARNING with debug level 0 to get
-# the administrators attention.
-#Default:
-# disabled.
-
-# TAG: sleep_after_fork (microseconds)
-# When this is set to a non-zero value, the main Squid process
-# sleeps the specified number of microseconds after a fork()
-# system call. This sleep may help the situation where your
-# system reports fork() failures due to lack of (virtual)
-# memory. Note, however, if you have a lot of child
-# processes, these sleep delays will add up and your
-# Squid will not service requests for some amount of time
-# until all the child processes have been started.
-# On Windows value less then 1000 (1 milliseconds) are
-# rounded to 1000.
-#Default:
-# sleep_after_fork 0
-
-# TAG: windows_ipaddrchangemonitor on|off
-# Note: This option is only available if Squid is rebuilt with the
-# MS Windows
-#
-# On Windows Squid by default will monitor IP address changes and will
-# reconfigure itself after any detected event. This is very useful for
-# proxies connected to internet with dial-up interfaces.
-# In some cases (a Proxy server acting as VPN gateway is one) it could be
-# desiderable to disable this behaviour setting this to 'off'.
-# Note: after changing this, Squid service must be restarted.
-#Default:
-# windows_ipaddrchangemonitor on
-
-# TAG: eui_lookup
-# Whether to lookup the EUI or MAC address of a connected client.
-#Default:
-# eui_lookup on
-
-# TAG: max_filedescriptors
-# Reduce the maximum number of filedescriptors supported below
-# the usual operating system defaults.
-#
-# Remove from squid.conf to inherit the current ulimit setting.
-#
-# Note: Changing this requires a restart of Squid. Also
-# not all I/O types supports large values (eg on Windows).
-#Default:
-# Use operating system limits set by ulimit.
-
-# TAG: workers
-# Number of main Squid processes or "workers" to fork and maintain.
-# 0: "no daemon" mode, like running "squid -N ..."
-# 1: "no SMP" mode, start one main Squid process daemon (default)
-# N: start N main Squid process daemons (i.e., SMP mode)
-#
-# In SMP mode, each worker does nearly all what a single Squid daemon
-# does (e.g., listen on http_port and forward HTTP requests).
-#Default:
-# SMP support disabled.
-
-# TAG: cpu_affinity_map
-# Usage: cpu_affinity_map process_numbers=P1,P2,... cores=C1,C2,...
-#
-# Sets 1:1 mapping between Squid processes and CPU cores. For example,
-#
-# cpu_affinity_map process_numbers=1,2,3,4 cores=1,3,5,7
-#
-# affects processes 1 through 4 only and places them on the first
-# four even cores, starting with core #1.
-#
-# CPU cores are numbered starting from 1. Requires support for
-# sched_getaffinity(2) and sched_setaffinity(2) system calls.
-#
-# Multiple cpu_affinity_map options are merged.
-#
-# See also: workers
-#Default:
-# Let operating system decide.
-
diff --git a/network/squid/squid.info b/network/squid/squid.info
index 720212f47b..b8cace6555 100644
--- a/network/squid/squid.info
+++ b/network/squid/squid.info
@@ -1,8 +1,8 @@
PRGNAM="squid"
-VERSION="3.5.26"
+VERSION="4.13"
HOMEPAGE="http://www.squid-cache.org/"
-DOWNLOAD="http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.26.tar.xz"
-MD5SUM="510e2c84773879c00d0e7ced997864d9"
+DOWNLOAD="http://www.squid-cache.org/Versions/v4/squid-4.13.tar.xz"
+MD5SUM="492e54afc15821141ff1d1d9903854d6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/squid/squid.logrotate b/network/squid/squid.logrotate
index eeca36223f..9c2b9c2816 100644
--- a/network/squid/squid.logrotate
+++ b/network/squid/squid.logrotate
@@ -7,7 +7,7 @@
# reopen squid.log, effectively using the new logfile. The old logfile
# (squid.log.1) will be compressed by logrotate's next invocation.
/var/log/squid/*.log {
- su @USER@ @GROUP@
+ su @SQUIDUSER@ @SQUIDGROUP@
weekly
rotate 5
compress
diff --git a/network/sshfs-fuse/README b/network/sshfs-fuse/README
deleted file mode 100644
index 4b484d5915..0000000000
--- a/network/sshfs-fuse/README
+++ /dev/null
@@ -1,12 +0,0 @@
-sshfs-fuse (ssh file system module for FUSE)
-
-SSHFS (Secure SHell FileSystem) is a file system for Linux capable of
-operating on files on a remote computer using just a secure shell login
-on the remote computer. On the local computer where the SSHFS is mounted,
-the implementation makes use of the FUSE (Filesystem in Userspace)
-kernel module.
-
-The practical effect of this is that the end user can seamlessly interact
-with remote files being securely served over SSH just as if they were
-local files on his/her computer. On the remote computer the SFTP subsystem
-of SSH is used.
diff --git a/network/sshfs-fuse/slack-desc b/network/sshfs-fuse/slack-desc
deleted file mode 100644
index 7e342f6fac..0000000000
--- a/network/sshfs-fuse/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-sshfs-fuse: sshfs-fuse (ssh file system module for FUSE)
-sshfs-fuse:
-sshfs-fuse: This is a filesystem client based on the SSH File Transfer
-sshfs-fuse: Protocol. Since most SSH servers already support this protocol it
-sshfs-fuse: is very easy to set up: i.e. on the server side there's nothing
-sshfs-fuse: to do. On the client side mounting the filesystem is as easy as
-sshfs-fuse: logging into the server with ssh.
-sshfs-fuse:
-sshfs-fuse:
-sshfs-fuse:
-sshfs-fuse:
diff --git a/network/sshfs-fuse/sshfs-fuse.SlackBuild b/network/sshfs-fuse/sshfs-fuse.SlackBuild
deleted file mode 100644
index 57cb03c150..0000000000
--- a/network/sshfs-fuse/sshfs-fuse.SlackBuild
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006-2009 Alan Hicks, Lizella, GA
-# Copyright 2012, Michiel van Wessem, Leicester, United Kingdom
-# Copyright 2020, B. Watson
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Now maintained by B. Watson <yalhcru@gmail.com>
-
-# 20200804 bkw: update for v3.7.0.
-# 20200101 bkw:
-# - take over maintenance
-# - update for v3.6.0. too many changes to build old versions.
-
-PRGNAM=sshfs-fuse
-SRCNAM=sshfs
-VERSION=${VERSION:-3.7.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-mkdir build
-cd build
- CFLAGS="-Wl,-s $SLKCFLAGS" \
- CXXFLAGS="-Wl,-s $SLKCFLAGS" \
- meson .. \
- --buildtype=release \
- --infodir=/usr/info \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --localstatedir=/var \
- --mandir=/usr/man \
- --prefix=/usr \
- --sysconfdir=/etc
- ninja
- DESTDIR=$PKG ninja install
-cd ..
-
-# Use prebuilt man page, so this build doesn't depend on docutils.
-# Don't use the one installed by ninja, if there was one.
-MANDIR=$PKG/usr/man/man1
-rm -f $MANDIR/$SRCNAM.1
-mkdir -p $MANDIR
-cat $CWD/$SRCNAM.1.gz > $MANDIR/$SRCNAM.1.gz
-
-# We got symlinks for commands, so link the man pages too. Slightly
-# wrong, as the linked commands are in /usr/sbin, but the man page
-# is section 1 (not 8). I can live with it.
-ln -s $SRCNAM.1.gz $MANDIR/mount.fuse.sshfs.1.gz
-ln -s $SRCNAM.1.gz $MANDIR/mount.sshfs.1.gz
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog* README* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/sshfs-fuse/sshfs-fuse.info b/network/sshfs-fuse/sshfs-fuse.info
deleted file mode 100644
index fd6101a05a..0000000000
--- a/network/sshfs-fuse/sshfs-fuse.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sshfs-fuse"
-VERSION="3.7.0"
-HOMEPAGE="https://github.com/libfuse/sshfs"
-DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs-3.7.0/sshfs-3.7.0.tar.xz"
-MD5SUM="0a1414bfad323d9f3d7aaccdec671e06"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="meson fuse3"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/network/sshfs-fuse/sshfs.1.gz b/network/sshfs-fuse/sshfs.1.gz
deleted file mode 100644
index 182444d7a1..0000000000
--- a/network/sshfs-fuse/sshfs.1.gz
+++ /dev/null
Binary files differ
diff --git a/network/synergy/030_openssl.diff b/network/synergy/030_openssl.diff
new file mode 100644
index 0000000000..9aefa07d7d
--- /dev/null
+++ b/network/synergy/030_openssl.diff
@@ -0,0 +1,11 @@
+--- src/lib/net/SecureSocket.cpp.orig 2020-05-06 17:55:18.744800427 -0500
++++ src/lib/net/SecureSocket.cpp 2020-05-06 17:55:05.529584786 -0500
+@@ -807,7 +807,7 @@
+
+ // m_ssl->m_ssl->session->ciphers is not forward compatable, In future release
+ // of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead
+- STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;
++ STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl);
+ if (cStack == NULL) {
+ LOG((CLOG_DEBUG1 "remote cipher list not available"));
+ }
diff --git a/network/synergy/synergy.SlackBuild b/network/synergy/synergy.SlackBuild
index 21d6a34f49..5dba4659ae 100644
--- a/network/synergy/synergy.SlackBuild
+++ b/network/synergy/synergy.SlackBuild
@@ -68,6 +68,7 @@ tar xvf $CWD/$SRCNAM-$VERSION-stable.tar.gz
cd $SRCNAM-$VERSION-stable
patch -p0 < $CWD/010_include_dns_sd.diff
patch -p0 < $CWD/020_toolchain_commands.diff
+patch -p0 < $CWD/030_openssl.diff
chown -R root:root .
find -L . \
diff --git a/network/tor/rc.tor b/network/tor/rc.tor
index 11daf8a95a..53ab0ed110 100644
--- a/network/tor/rc.tor
+++ b/network/tor/rc.tor
@@ -34,6 +34,8 @@ else
fi
tor_start() {
+ mkdir -p /var/run/tor
+ chown tor.tor /var/run/tor
if [ -n "$MAX_FILEDESCRIPTORS" ]; then
echo -n "Raising maximum number of filedescriptors (ulimit -n) to $MAX_FILEDESCRIPTORS"
if ulimit -n "$MAX_FILEDESCRIPTORS" ; then
diff --git a/network/vde2/vde2.SlackBuild b/network/vde2/vde2.SlackBuild
index f0d9d64035..910dbd409f 100644
--- a/network/vde2/vde2.SlackBuild
+++ b/network/vde2/vde2.SlackBuild
@@ -71,6 +71,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Patch to build against openssl-1.1.x - thanks archlinux!
+patch -p1 < $CWD/vde_cryptcab-compile-against-openssl-1.1.0.patch
+
EXPERIMENTAL=${EXPERIMENTAL:-false}
OPTIONS=""
diff --git a/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch b/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch
new file mode 100644
index 0000000000..227312eabb
--- /dev/null
+++ b/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch
@@ -0,0 +1,92 @@
+--- a/src/vde_cryptcab/cryptcab.c 2011-11-23 16:41:17.000000000 +0000
++++ b/src/vde_cryptcab/cryptcab.c 2017-03-20 22:54:20.452975075 +0000
+@@ -22,7 +22,7 @@
+ exit(1);
+ }
+
+-static EVP_CIPHER_CTX ctx;
++static EVP_CIPHER_CTX *ctx;
+ static int ctx_initialized = 0;
+ static int encryption_disabled = 0;
+ static int nfd;
+@@ -30,6 +30,10 @@
+ static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700};
+ static int verbose = 0;
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++#define EVP_CIPHER_CTX_reset(x) EVP_CIPHER_CTX_cleanup(x)
++#endif
++
+ void vc_printlog(int priority, const char *format, ...)
+ {
+ va_list arg;
+@@ -103,19 +107,21 @@
+ }
+
+ if (!ctx_initialized) {
+- EVP_CIPHER_CTX_init (&ctx);
++ ctx = EVP_CIPHER_CTX_new ();
++ if (!ctx)
++ return -1;
+ ctx_initialized = 1;
+ }
+
+- EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+- if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1)
++ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++ if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1)
+ {
+ fprintf (stderr,"error in encrypt update\n");
+ olen = -1;
+ goto cleanup;
+ }
+
+- if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1)
++ if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1)
+ {
+ fprintf (stderr,"error in encrypt final\n");
+ olen = -1;
+@@ -124,7 +130,7 @@
+ olen += tlen;
+
+ cleanup:
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ EVP_CIPHER_CTX_reset(ctx);
+ return olen;
+ }
+
+@@ -138,19 +144,21 @@
+ }
+
+ if (!ctx_initialized) {
+- EVP_CIPHER_CTX_init (&ctx);
++ ctx = EVP_CIPHER_CTX_new ();
++ if (!ctx)
++ return -1;
+ ctx_initialized = 1;
+ }
+
+- EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+- if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1)
++ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++ if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1)
+ {
+ fprintf (stderr,"error in decrypt update\n");
+ olen = -1;
+ goto cleanup;
+ }
+
+- if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1)
++ if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1)
+ {
+ fprintf (stderr,"error in decrypt final\n");
+ olen = -1;
+@@ -159,7 +167,7 @@
+ olen += tlen;
+
+ cleanup:
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ EVP_CIPHER_CTX_reset (ctx);
+ return olen;
+ }
+
diff --git a/network/verlihub/verlihub-gcc7.patch b/network/verlihub/verlihub-gcc7.patch
new file mode 100644
index 0000000000..4b2ede4d42
--- /dev/null
+++ b/network/verlihub/verlihub-gcc7.patch
@@ -0,0 +1,18 @@
+diff -Naur verlihub-0.9.8e-r2.orig/src/script_api.cpp verlihub-0.9.8e-r2/src/script_api.cpp
+--- verlihub-0.9.8e-r2.orig/src/script_api.cpp 2009-05-16 16:42:07.000000000 +0200
++++ verlihub-0.9.8e-r2/src/script_api.cpp 2017-06-01 20:33:58.923440440 +0200
+@@ -218,12 +218,12 @@
+ cServerDC *server = GetCurrentVerlihub();
+ if(!server) {
+ cerr << "Server verlihub is unfortunately not running or not found." << endl;
+- return false;
++ return NULL;
+ }
+ cUser *usr = GetUser((char *) server->mC.hub_security.c_str());
+ printf("%p\n", usr);
+ printf("%p", usr->mxConn);
+- if ((!usr) || (usr && !usr->mxConn)) return false;
++ if ((!usr) || (usr && !usr->mxConn)) return NULL;
+ cout << "here" << endl;
+ if (!server->mP.ParseForCommands(command_line, usr->mxConn)) {
+ // unknown command
diff --git a/network/verlihub/verlihub.SlackBuild b/network/verlihub/verlihub.SlackBuild
index 25c0729a42..e9d5f550c4 100644
--- a/network/verlihub/verlihub.SlackBuild
+++ b/network/verlihub/verlihub.SlackBuild
@@ -71,6 +71,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# https://gcc.gnu.org/gcc-7/porting_to.html
+patch -p1 < $CWD/verlihub-gcc7.patch
+
patch -p1 < $CWD/verlihub-header.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/x11spice/README b/network/x11spice/README
new file mode 100644
index 0000000000..a273afe9a7
--- /dev/null
+++ b/network/x11spice/README
@@ -0,0 +1,16 @@
+x11spice connects a running X server as a Spice server.
+
+It owes a debt to the excellent x11vnc project, from the libvncserver
+project. That project proved that this could be done, and done well.
+Some of the logic, notably that of scan.c, was inspired by the code
+in x11vnc.
+
+Example: launch a spice server on a remote pc (where x11spice is
+installed) via ssh, redirect the output locally and connect to it with
+spicy
+
+ ssh $remote_host -L 5900:localhost:5900 "x11spice --allow-control --display :0 --password=whatever"
+
+and then locally
+
+ spicy -h localhost -p 5900
diff --git a/network/x11spice/slack-desc b/network/x11spice/slack-desc
new file mode 100644
index 0000000000..af47ca2f35
--- /dev/null
+++ b/network/x11spice/slack-desc
@@ -0,0 +1,11 @@
+x11spice: x11spice (export X via spice)
+x11spice:
+x11spice: x11spice connects a running X server as a Spice server.
+x11spice:
+x11spice: It owes a debt to the excellent x11vnc project, from the libvncserver
+x11spice: project. That project proved that this could be done, and done well.
+x11spice: Some of the logic, notably that of scan.c, was inspired by the code
+x11spice: in x11vnc.
+x11spice:
+x11spice: homepage: https://gitlab.freedesktop.org/spice/x11spice
+x11spice:
diff --git a/network/x11spice/x11spice.SlackBuild b/network/x11spice/x11spice.SlackBuild
new file mode 100644
index 0000000000..5e984c8a70
--- /dev/null
+++ b/network/x11spice/x11spice.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# Slackware build script for x11spice
+
+# Copyright 2018-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=x11spice
+VERSION=${VERSION:-20190820_51d2a8b}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+DOCS="AUTHORS COPYING ChangeLog NEWS README"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+autoreconf -vi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/x11spice/x11spice.info b/network/x11spice/x11spice.info
new file mode 100644
index 0000000000..9d4d29bd7d
--- /dev/null
+++ b/network/x11spice/x11spice.info
@@ -0,0 +1,10 @@
+PRGNAM="x11spice"
+VERSION="20190820_51d2a8b"
+HOMEPAGE="https://gitlab.freedesktop.org/spice/x11spice"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/x11spice-20190820_51d2a8b.tar.xz"
+MD5SUM="ad1d8aea83a15a1e9130f347186fd4ef"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="spice"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/network/x2goserver/x2goserver.SlackBuild b/network/x2goserver/x2goserver.SlackBuild
index ba82397547..be73d470eb 100644
--- a/network/x2goserver/x2goserver.SlackBuild
+++ b/network/x2goserver/x2goserver.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=x2goserver
-VERSION=${VERSION:-20190625_b3ec119}
+VERSION=${VERSION:-20200228_c218264}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/x2goserver/x2goserver.info b/network/x2goserver/x2goserver.info
index 9e20cd4df2..b15dfb3825 100644
--- a/network/x2goserver/x2goserver.info
+++ b/network/x2goserver/x2goserver.info
@@ -1,8 +1,8 @@
PRGNAM="x2goserver"
-VERSION="20190625_b3ec119"
+VERSION="20200228_c218264"
HOMEPAGE="http://www.x2go.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/x2goserver-20190625_b3ec119.tar.xz"
-MD5SUM="031e3d92dfd06f22de3052360c524367"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/x2goserver-20200228_c218264.tar.xz"
+MD5SUM="e86b39106780f53a154d82520a60e024"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="nx-libs perl-Config-Simple perl-File-ReadBackwards perl-DBD-SQLite perl-Capture-Tiny perl-Try-Tiny perl-Unix-Syslog perl-file-basedir perl-Switch"
diff --git a/network/zeek/zeek.SlackBuild b/network/zeek/zeek.SlackBuild
index ccdf4107b9..83103239a5 100644
--- a/network/zeek/zeek.SlackBuild
+++ b/network/zeek/zeek.SlackBuild
@@ -69,11 +69,18 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+LIBS="-L/usr/lib$LIBDIRSUFFIX/openssl-1.0" \
+CPPFLAGS="/usr/include/openssl-1.0" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/opt/$PRGNAM
+# Temporary fix until openssl-1.1 is supported
+sed -i "s/^OPENSSL_CRYPTO_LIBRARY.*/OPENSSL_CRYPTO_LIBRARY:FILEPATH=\/usr\/lib$LIBDIRSUFFIX\/openssl-1.0\/libcrypto.so/" build/CMakeCache.txt
+sed -i "s/^OPENSSL_INCLUDE_DIR.*/OPENSSL_INCLUDE_DIR:PATH=\/usr\/include\/openssl-1.0/" build/CMakeCache.txt
+sed -i "s/^OPENSSL_SSL_LIBRARY.*/OPENSSL_SSL_LIBRARY:FILEPATH=\/usr\/lib$LIBDIRSUFFIX\/openssl-1.0\/libssl.so/" build/CMakeCache.txt
+
make
make install DESTDIR=$PKG
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 14fd0f2042..2747bc62a1 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -4,7 +4,7 @@
# Slackware build script for LibreOffice
-# Copyright 2015-2019 Christoph Willing Brisbane, Australia
+# Copyright 2015-2020 Christoph Willing Brisbane, Australia
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
PRGNAM=LibreOffice
SRCNAM=libreoffice
-VERSION=${VERSION:-6.2.8.2}
+VERSION=${VERSION:-7.0.0.3}
SHORT_VERSION=${VERSION%.*.*}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -91,15 +91,15 @@ jval="$(echo $MAKEFLAGS |grep -o "\-j *[0-9]*" | grep -o "[0-9]*")" || true
# If PARALLEL environment variable is set, use that to override everything.
[ "${PARALLEL:-0}" != "0" ] && parallel="--with-parallelism=$PARALLEL"
-JAVA=${JAVA:-openjdk7}
+JAVA=${JAVA:-jdk11}
if [ "$JAVA" = "openjdk7" ]; then
. /etc/profile.d/openjdk7.sh
use_java="--with-java=java"
elif [ "$JAVA" = "openjdk8" ]; then
. /etc/profile.d/openjdk8.sh
use_java="--with-java=java"
-elif [ "$JAVA" = "jdk" ]; then
- . /etc/profile.d/jdk.sh
+elif [ "$JAVA" = "jdk11" ]; then
+ . /etc/profile.d/jdk11.sh
use_java="--with-java=java"
elif [ "$JAVA" = "no" ]; then
use_java="--with-java=no"
@@ -154,7 +154,6 @@ if pkg-config --exists python3 ; then Python3="--enable-python=system" ; else Py
if pkg-config --exists Qt5 ; then qt5="--enable-qt5" ; else qt5="" ; fi
if pkg-config --exists valgrind ; then valgrind="--with-valgrind" ; else valgrind="" ; fi
-kde4="--enable-kde4" ; [ "${KDE4:-yes}" != "yes" ] && kde4="--disable-kde4"
use_ccache="--disable-ccache" ; [ "${USE_CCACHE:-no}" != "no" ] && use_ccache=""
# Extensions
@@ -168,7 +167,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] &
./autogen.sh \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
- NSS_CFLAGS="$(pkg-config --cflags-only-I mozilla-nss)"\
--prefix=/usr \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -188,7 +186,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] &
$avahi \
$Python3 \
$vlc \
- $kde4 \
$use_ccache \
$use_java \
$parallel \
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index fc9a4c48ec..0bd741bde9 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -1,12 +1,12 @@
PRGNAM="LibreOffice"
-VERSION="6.2.8.2"
+VERSION="7.0.0.3"
HOMEPAGE="https://www.libreoffice.org"
-DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/6.2.8/libreoffice-6.2.8.2.tar.xz \
- http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-6.2.8.2-srcs.tar.xz"
-MD5SUM="1438fdfae3076b8b1b1460054a318f0b \
- b5d5e57832056d8a5625b1d5dc3aa024"
+DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/7.0.0/libreoffice-7.0.0.3.tar.xz \
+ http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-7.0.0.3-srcs.tar.xz"
+MD5SUM="5326d58cf100ec0e9796afe4536f177d \
+ 8d05fa43ce5c036d8273982f3d81606a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="python3 openjdk7 apache-ant perl-Archive-Zip"
+REQUIRES="apache-ant perl-Archive-Zip jdk11"
MAINTAINER="Christoph Willing"
EMAIL="chris.willing@linux.com"
diff --git a/office/LibreOffice/README b/office/LibreOffice/README
index dc7ee5981e..12c452a089 100644
--- a/office/LibreOffice/README
+++ b/office/LibreOffice/README
@@ -35,30 +35,22 @@ Build time environment variables that may be set to vary features are as follows
VLC="yes"
This requires the vlc package (available from SBo) to be installed.
-2. disable kde4 support (enabled by default) with:
- KDE4="no"
-
-3. support additional languages by overriding the LOLANGS variable, whose
+2. support additional languages by overriding the LOLANGS variable, whose
default setting is LOLANGS="de es fr id it ja nl vi zh-CN". Note that en-US
is always added to whatever LOLANGS is set. Thus building with, for example,
- LOLANGS="de" sh LibreOffice
+ LOLANGS="de" sh LibreOffice.SlackBuild
would build LibreOffice with support for german and US english languages.
Additionally, setting LOLANGS="ALL" will build in support for all available
languages.
-4. A number of Java Development Kits are suitable for building LibreOffice.
- The default JDK for this SlackBuild is openjdk7. Others may be chosen by
- setting the JAVA environment variable when running the SlackBuild. Recognised
- values are openjdk7 (the default, not explicitly required), openjdk8 and jdk
- e.g. JAVA=jdk (to use SBo jdk package with Oracle binary version). Using an
- alternate JDK will require presence of the appropriate package when building
- LibreOffice. Since the apache-ant package is already required by openjdk7,
- hence openjdk8, its listing in the REQUIRES field is redundant in these cases.
- However it remains listed to accomodate the case of JAVA=jdk, in which the
- apache-ant package is needed to build LibreOffice.
- Finally, setting JAVA=no will build LibreOffice without any Java support.
+3. Previously, a number of Java Development Kits have been suitable for building
+ LibreOffice. At the moment however (since, at least, LO version 7.0.0.3) this
+ build has been tested only with jdk11 - this is now the default. If the jdk11
+ prerequisite is not acceptable for some reason, it is still possible to build
+ LibreOffice (with somewhat reduced capability in LO Base) by running:
+ JAVA=no sh LibreOffice.SlackBuild
-5. The number of parallel make jobs used by the LibreOffice build system defaults
+4. The number of parallel make jobs used by the LibreOffice build system defaults
to the number of available cpu cores. If the MAKEFLAGS environment variable
contains the -j option e.g.
MAKEFLAGS=-j6
@@ -69,7 +61,7 @@ Build time environment variables that may be set to vary features are as follows
which would limit building to a single make process, overriding any value set
with the -j option in MAKEFLAGS.
-6. Use of ccache during building is turned off by default to save disk space (and
+5. Use of ccache during building is turned off by default to save disk space (and
possible build failure due to lack of disk space). It may be reinstated by
setting the USE_CCACHE environment to "yes" e.g.
USE_CCACHE=yes sh LibreOffice.SlackBuild
diff --git a/office/LibreOffice/no-check-if-root.diff b/office/LibreOffice/no-check-if-root.diff
index ff63ada2f7..3d1cc6907f 100644
--- a/office/LibreOffice/no-check-if-root.diff
+++ b/office/LibreOffice/no-check-if-root.diff
@@ -1,20 +1,10 @@
---- Makefile.orig 2018-02-07 22:18:13.161535968 +1000
-+++ Makefile 2018-02-07 22:17:41.560533422 +1000
-@@ -9,7 +9,7 @@
-
- gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
-
--.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
-+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
-
- MAKECMDGOALS?=all
- build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
-@@ -254,7 +254,7 @@
- #
- # Bootstrap
- #
--bootstrap: check-if-root compilerplugins
-+bootstrap: compilerplugins
-
- #
- # Build
+--- Makefile.orig 2020-08-24 20:32:27.135000000 +1000
++++ Makefile 2020-08-24 20:33:56.988000000 +1000
+@@ -63,7 +63,6 @@
+ echo; \
+ echo 'Building LibreOffice as root is a very bad idea, use a regular user.'; \
+ echo; \
+- exit 1; \
+ fi
+
+ gb_Side ?= host
diff --git a/office/apvlv/apvlv.SlackBuild b/office/apvlv/apvlv.SlackBuild
index 5246eb400f..62eff77de8 100644
--- a/office/apvlv/apvlv.SlackBuild
+++ b/office/apvlv/apvlv.SlackBuild
@@ -23,15 +23,14 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
PRGNAM=apvlv
-VERSION=${VERSION:-0.1.4}
+VERSION=${VERSION:-20160627_9ab7626}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,21 +60,21 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION-Source
-tar xvf $CWD/$PRGNAM-$VERSION-Source.tar.gz
-cd $PRGNAM-$VERSION-Source
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
mkdir -p build
cd build
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS -fpermissive" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DAPVLV_WITH_UMD=false \
-DMANDIR=/usr/man \
diff --git a/office/apvlv/apvlv.info b/office/apvlv/apvlv.info
index da882def19..4df540a600 100644
--- a/office/apvlv/apvlv.info
+++ b/office/apvlv/apvlv.info
@@ -1,8 +1,8 @@
PRGNAM="apvlv"
-VERSION="0.1.4"
+VERSION="20160627_9ab7626"
HOMEPAGE="http://naihe2010.github.com/apvlv/"
-DOWNLOAD="https://github.com/downloads/naihe2010/apvlv/apvlv-0.1.4-Source.tar.gz"
-MD5SUM="bcd3e96350a2378662e2f2d0fa02d342"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/apvlv-20160627_9ab7626.tar.xz"
+MD5SUM="e7a285ca7ac4d3abc1842519c0f20987"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/office/asymptote/asymptote.SlackBuild b/office/asymptote/asymptote.SlackBuild
index c591eca5ff..f5ac8e6c59 100644
--- a/office/asymptote/asymptote.SlackBuild
+++ b/office/asymptote/asymptote.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=asymptote
-VERSION=${VERSION:-2.44}
+VERSION=${VERSION:-2.65}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/office/asymptote/asymptote.info b/office/asymptote/asymptote.info
index 2d7de25278..c7392afa3d 100644
--- a/office/asymptote/asymptote.info
+++ b/office/asymptote/asymptote.info
@@ -1,10 +1,10 @@
PRGNAM="asymptote"
-VERSION="2.44"
+VERSION="2.65"
HOMEPAGE="http://asymptote.sourceforge.net/"
-DOWNLOAD="https://downloads.sourceforge.net/sourceforge/asymptote/asymptote-2.44.src.tgz"
-MD5SUM="98cd8858841e6e833039b85e0b814257"
+DOWNLOAD="https://downloads.sourceforge.net/asymptote/asymptote-2.65.src.tgz"
+MD5SUM="97b80ad03dfbcad7cae0fdb2c666fdb5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="texlive"
+REQUIRES="glm texlive"
MAINTAINER="Johannes Schoepfer"
EMAIL="slackbuilds[at]schoepfer[dot]info"
diff --git a/office/calibre/calibre.SlackBuild b/office/calibre/calibre.SlackBuild
index 048798bcf9..a3ea02f20d 100644
--- a/office/calibre/calibre.SlackBuild
+++ b/office/calibre/calibre.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=calibre
-VERSION=${VERSION:-3.34.0}
+VERSION=${VERSION:-3.48.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -70,6 +70,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Patch for qt-5.15.x
+patch -p1 < $CWD/patches/qt-5.15.patch
# Remove desktop integration. We'll do that later.
patch -p1 < $CWD/patches/remove-desktop-integration.patch
# Fix calibre module location.
@@ -79,10 +81,6 @@ patch -p1 < $CWD/patches/calibre-no-update.patch
# Remove calibre portable scripts.
rm -f resources/calibre-portable.*
-PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
-export SIP_BIN=/usr/bin/python2-sip
-export SIP_INC_DIR="/usr/include/python$PYTHONVER/python2-sip"
-
OVERRIDE_CFLAGS="$SLKCFLAGS" \
OVERRIDE_LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
python setup.py build
diff --git a/office/calibre/calibre.info b/office/calibre/calibre.info
index ef7454be15..a2716dfff7 100644
--- a/office/calibre/calibre.info
+++ b/office/calibre/calibre.info
@@ -1,10 +1,10 @@
PRGNAM="calibre"
-VERSION="3.34.0"
+VERSION="3.48.0"
HOMEPAGE="https://calibre-ebook.com"
-DOWNLOAD="https://download.calibre-ebook.com/3.34.0/calibre-3.34.0.tar.xz"
-MD5SUM="8d462959dba64b829529b63fd3f78b8c"
+DOWNLOAD="https://download.calibre-ebook.com/3.48.0/calibre-3.48.0.tar.xz"
+MD5SUM="ec7431dcdeea8a9d8eca3edc83bdec42"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="cssutils dnspython mechanize podofo python-dateutil netifaces psutil cssselect apsw optipng PyQt5 Pygments msgpack-python regex html5-parser dukpy unrardll"
+REQUIRES="css-parser dnspython mechanize podofo python-dateutil netifaces psutil cssselect apsw optipng PyQt5 Pygments msgpack-python regex html5-parser dukpy unrardll python2-pillow"
MAINTAINER="Larry Hajali"
EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/office/calibre/patches/qt-5.15.patch b/office/calibre/patches/qt-5.15.patch
new file mode 100644
index 0000000000..bfcb486e9b
--- /dev/null
+++ b/office/calibre/patches/qt-5.15.patch
@@ -0,0 +1,40 @@
+From db7007a25faefb0cc90e64dda1c0793393b9512d Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Tue, 26 May 2020 20:10:48 +0200
+Subject: [PATCH] Update fontconfig database for Qt 5.15
+
+---
+ src/calibre/headless/fontconfig_database.cpp | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/src/calibre/headless/fontconfig_database.cpp b/src/calibre/headless/fontconfig_database.cpp
+index d867f02948..96a6365ba2 100644
+--- a/src/calibre/headless/fontconfig_database.cpp
++++ b/src/calibre/headless/fontconfig_database.cpp
+@@ -295,7 +295,26 @@ static const char specialLanguages[][6] = {
+ "", // MasaramGondi
+ "", // Nushu
+ "", // Soyombo
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
++ "", // ZanabazarSquare
++ "", // Dogra
++ "", // GunjalaGondi
++ "", // HanifiRohingya
++ "", // Makasar
++ "", // Medefaidrin
++ "", // OldSogdian
++ "", // Sogdian
++ "", // Elymaic
++ "", // Nandinagari
++ "", // NyiakengPuachueHmong
++ "", // Wancho
++ "", // Chorasmian
++ "", // DivesAkuru
++ "", // KhitanSmallScript
++ "" // Yezidi
++#else
+ "" // ZanabazarSquare
++#endif // Qt >= 5.15
+ #else
+ "" // SignWriting
+ #endif // Qt >= 5.11
diff --git a/office/calibre/patches/remove-desktop-integration.patch b/office/calibre/patches/remove-desktop-integration.patch
index dbf54d6cb0..0272a7c6eb 100644
--- a/office/calibre/patches/remove-desktop-integration.patch
+++ b/office/calibre/patches/remove-desktop-integration.patch
@@ -1,13 +1,14 @@
-diff -Naur calibre.orig/src/calibre/linux.py calibre/src/calibre/linux.py
---- calibre.orig/src/calibre/linux.py 2012-06-29 04:53:39.000000000 +0000
-+++ calibre/src/calibre/linux.py 2012-07-03 02:57:13.834849391 +0000
-@@ -177,9 +177,6 @@
- self.mime_resources = []
+diff -Naur calibre-3.48.0.orig/src/calibre/linux.py calibre-3.48.0/src/calibre/linux.py
+--- calibre-3.48.0.orig/src/calibre/linux.py 2019-09-13 04:46:46.000000000 +0200
++++ calibre-3.48.0/src/calibre/linux.py 2020-03-04 15:02:49.789055000 +0100
+@@ -725,10 +725,6 @@
+ self.appdata_resources = []
if islinux or isbsd:
self.setup_completion()
- if islinux or isbsd:
- self.setup_desktop_integration()
-- self.create_uninstaller()
+- if not getattr(self.opts, 'staged_install', False):
+- self.create_uninstaller()
from calibre.utils.config import config_dir
if os.path.exists(config_dir):
diff --git a/office/coolreader/coolreader.SlackBuild b/office/coolreader/coolreader.SlackBuild
index ce30ee6681..991db8b37f 100644
--- a/office/coolreader/coolreader.SlackBuild
+++ b/office/coolreader/coolreader.SlackBuild
@@ -31,16 +31,13 @@
# - add supported filetypes to README and slack-desc
# - save/load settings (.ini file) to ~/.cr3, not /usr/share/cr3.
+# Upsteam url: https://sourceforge.net/p/crengine/crengine/ci/master/tree/
+
PRGNAM=coolreader
-VERSION=${VERSION:-3.0.56}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20180814_b28e194}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-ORIG_PRGNAM=cr3
-ORIG_VERSION=$VERSION-7
-ORIG_DIRNAME=cr$ORIG_VERSION
-ORIG_FILENAME=${ORIG_PRGNAM}_$VERSION.orig.tar.gz
-
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i586 ;;
@@ -68,21 +65,25 @@ else
LIBDIRSUFFIX=""
fi
+ORIG_PRGNAM=cr3
+
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $ORIG_DIRNAME
-tar xvf $CWD/$ORIG_FILENAME
-cd $ORIG_DIRNAME
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Fix upstream typo
-sed -i 's,documetn,document,g' cr3qt/src/*.ui cr3qt/src/i18n/*.ts
-
-# Don't try to load/save .ini file from /usr/share
-patch -p1 < $CWD/inifile.diff
+sed -i 's,documetn,document,g' cr3qt/src/*.ui cr3qt/src/i18n/*.ts || exit 1
mkdir -p build
cd build
diff --git a/office/coolreader/coolreader.info b/office/coolreader/coolreader.info
index 2a462222f6..89d8d5a773 100644
--- a/office/coolreader/coolreader.info
+++ b/office/coolreader/coolreader.info
@@ -1,8 +1,8 @@
PRGNAM="coolreader"
-VERSION="3.0.56"
+VERSION="20180814_b28e194"
HOMEPAGE="https://sourceforge.net/projects/crengine/"
-DOWNLOAD="https://downloads.sourceforge.net/crengine/CoolReader3/cr3_3.0.56.orig.tar.gz"
-MD5SUM="cc221a608a1b5fea2db5a519c14eeb39"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/coolreader-20180814_b28e194.tar.xz"
+MD5SUM="52c422c04a5f4faa004bb4dc3cbcfe51"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/office/coolreader/inifile.diff b/office/coolreader/inifile.diff
deleted file mode 100644
index 9290599e69..0000000000
--- a/office/coolreader/inifile.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur cr3.0.56-7/cr3qt/src/mainwindow.cpp cr3.0.56-7.patched/cr3qt/src/mainwindow.cpp
---- cr3.0.56-7/cr3qt/src/mainwindow.cpp 2012-03-21 01:39:19.000000000 -0400
-+++ cr3.0.56-7.patched/cr3qt/src/mainwindow.cpp 2020-01-26 19:26:09.590595122 -0500
-@@ -79,7 +79,6 @@
- QString bookmarksDir = homeDir + "bookmarks";
- QString histFile = exeDir + "cr3hist.bmk";
- QString histFile2 = homeDir + "cr3hist.bmk";
-- QString iniFile2 = exeDir + "cr3.ini";
- QString iniFile = homeDir + "cr3.ini";
- QString cssFile = homeDir + "fb2.css";
- QString cssFile2 = exeDir + "fb2.css";
-@@ -91,8 +90,7 @@
-
- ldomDocCache::init( qt2cr( cacheDir ), DOC_CACHE_SIZE );
- ui->view->setPropsChangeCallback( this );
-- if ( !ui->view->loadSettings( iniFile ) )
-- ui->view->loadSettings( iniFile2 );
-+ ui->view->loadSettings( iniFile );
- if ( !ui->view->loadHistory( histFile ) )
- ui->view->loadHistory( histFile2 );
- if ( !ui->view->loadCSS( cssFile ) )
diff --git a/office/evince/evince.SlackBuild b/office/evince/evince.SlackBuild
index a1f6e48489..b944aacad0 100644
--- a/office/evince/evince.SlackBuild
+++ b/office/evince/evince.SlackBuild
@@ -33,7 +33,7 @@
# some fugly hackery to work, see shim.h for gory details and polemic.
PRGNAM=evince
-VERSION=${VERSION:-3.28.5}
+VERSION=${VERSION:-3.34.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -89,20 +89,6 @@ if [ "$NLS" != "YES" ]; then
-e 's/ENABLE_NLS 1/ENABLE_NLS 0/g' configure
fi
-# 20200101 bkw: "shim" to let us actually compile with gtk+-3.18 and
-# glib-2.46.2. Supposedly these versions are supported by evince-3.28.5,
-# but upstream uses a couple of functions that are new in gtk+-3.22
-# and glib-2.52. Fortunately it's stuff we can work around with a few
-# #defines.
-SLKCFLAGS="$SLKCFLAGS -include $CWD/shim.h"
-
-# 20200101 bkw: 14.2's mime stuff identifies djvu files as
-# image/vnd.djvu only, but evince wants image/vnd.djvu+multipage.
-sed -i '/^ *DJVU_MIME_TYPES/s|="|&image/vnd.djvu;|' configure
-
-# If we were building 3.30.x, we'd need this:
-# --without-gspell \
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -126,23 +112,18 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-static \
--disable-nautilus \
--disable-maintainer-mode \
+ --without-gspell \
--with-systemduserunitdir=no \
--build=$ARCH-slackware-linux
-# ugh. glib-genmarshal's flags changed gratuitously.
-sed -i 's,--prototypes,--header,' libview/Makefile
-
make V=1
make install-strip DESTDIR=$PKG
-# Fix desktop entry
-sed -i "/NoDisplay=true/d" $PKG/usr/share/applications/evince.desktop
-
gzip -9 $PKG/usr/man/man1/$PRGNAM.1
rm -rf $PKG/{usr/share/gtk-doc,etc}
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS README MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README.md MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/office/evince/evince.info b/office/evince/evince.info
index 91a6eca4f1..a5814eea74 100644
--- a/office/evince/evince.info
+++ b/office/evince/evince.info
@@ -1,8 +1,8 @@
PRGNAM="evince"
-VERSION="3.28.5"
+VERSION="3.34.2"
HOMEPAGE="http://projects.gnome.org/evince/"
-DOWNLOAD="https://download.gnome.org/sources/evince/3.28/evince-3.28.5.tar.xz"
-MD5SUM="855600d64544a959add349e32f5185e0"
+DOWNLOAD="https://download.gnome.org/sources/evince/3.34/evince-3.34.2.tar.xz"
+MD5SUM="9e9e82fa8f6045ad7817157d9335d185"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/office/evince/shim.h b/office/evince/shim.h
deleted file mode 100644
index 8439c34ac5..0000000000
--- a/office/evince/shim.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 20191231 bkw: This seems like stupidity: g_content_type_is_mime_type
- is a new function in glib-2.52, which literally just calls the
- g_content_type_is_a function from older glibs, and returns its
- result. Here's the function from the glib-2.52 source:
-
- gboolean
- g_content_type_is_mime_type (const gchar *type,
- const gchar *mime_type)
- {
- return g_content_type_is_a (type, mime_type);
- }
-
- The docs describe it as a "convenience wrapper" but there's
- nothing more or less convenient about it, except that it breaks builds
- with older glib versions. Why does it even exist?
- */
-#define g_content_type_is_mime_type(x,y) g_content_type_is_a(x,y)
-
-/* 20191231 bkw: We'd need gtk+-3.22 to have gtk_popover_popup and
- gtk_popover_popdown. They're functionally the same as gtk_widget_show
- and gtk_widget_hide, except they have a "transition" (fade-in/out).
- Some folks might actually prefer it without the fade.
- */
-#define gtk_popover_popup(x) gtk_widget_show(GTK_WIDGET(x))
-#define gtk_popover_popdown(x) gtk_widget_hide(GTK_WIDGET(x))
diff --git a/office/fbreader/fbreader.SlackBuild b/office/fbreader/fbreader.SlackBuild
index d5c54adeac..d19b2904a3 100644
--- a/office/fbreader/fbreader.SlackBuild
+++ b/office/fbreader/fbreader.SlackBuild
@@ -56,6 +56,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Needed for gcc >= 6.x
+sed -i "s|-Wall|-Wall -Wno-narrowing|" makefiles/arch/desktop.mk
+
patch -p1 < $CWD/fbreader-0.99.4.patch
export TARGET_ARCH=desktop
diff --git a/office/gbgoffice/gbgoffice.SlackBuild b/office/gbgoffice/gbgoffice.SlackBuild
index 08a3eac59b..268a1f6f00 100644
--- a/office/gbgoffice/gbgoffice.SlackBuild
+++ b/office/gbgoffice/gbgoffice.SlackBuild
@@ -78,6 +78,7 @@ patch -p1 -i $CWD/patches/08_fix_const_conversion.patch
patch -p1 -i $CWD/patches/09_deprecated_SigC.patch
patch -p1 -i $CWD/patches/10_workhelper-buttonbox.patch
patch -p1 -i $CWD/patches/11_explicit-linkage.patch
+patch -p1 -i $CWD/patches/12_gcc6.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS -std=c++11" \
diff --git a/office/gbgoffice/patches/12_gcc6.patch b/office/gbgoffice/patches/12_gcc6.patch
new file mode 100644
index 0000000000..2ec2c344f4
--- /dev/null
+++ b/office/gbgoffice/patches/12_gcc6.patch
@@ -0,0 +1,21 @@
+Description: fixes compilation with GCC-6
+ return type must be Translator* and can't be boolean
+Author: Damyan Ivanov <dmn@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811619
+
+--- a/src/translator_manager.cpp
++++ b/src/translator_manager.cpp
+@@ -176,11 +176,11 @@ Translator *TranslatorManager::getTestDi
+ isDataOk = isDataOk && tr->init(tr->BG_EN, string(string(prop->getDirectory()) + prop->getString("data")).c_str());
+ } else {
+ cerr << "TranslatorManager::getTestDictionaryObject - Wrong description file: " << testDictionaries[index].fileName << "\n";
+- return false;
++ return NULL;
+ }
+ if (!isDataOk) {
+ cerr << "TranslatorManager::getTestDictionaryObject - Problem initialazing dictionary: " << testDictionaries[index].fileName << "\n";
+- return false;
++ return NULL;
+ }
+ char c[16];
+ sprintf(c, "%d", level);
diff --git a/office/gnokii/gnokii-0.6.31-gcc7.patch b/office/gnokii/gnokii-0.6.31-gcc7.patch
new file mode 100644
index 0000000000..6637a6af62
--- /dev/null
+++ b/office/gnokii/gnokii-0.6.31-gcc7.patch
@@ -0,0 +1,17 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for gnokii <= 0.6.31 to avoid
+build failures with GCC 7.x as "../common/.libs/libgnokii.so: undefined reference
+to `local_atoi'". The "inline" is only a hint that the compiler doesn't complain
+about double defined symbols, but does not guarantee that a function is inlined
+or that a symbol is generated when needed.
+
+--- gnokii-0.6.31/common/gsm-filetypes.c 2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/common/gsm-filetypes.c.gcc7 2017-02-12 00:55:39.000000000 +0100
+@@ -1409,7 +1409,7 @@
+ #define GET_NEXT_TOKEN() o = get_next_token(line + offset, ';')
+ #define STORE_TOKEN(a) strip_slashes(a, line + offset, sizeof(a) - 1, o - 1)
+
+-inline int local_atoi(char *str, int len)
++static int local_atoi(char *str, int len)
+ {
+ int retval;
+ char *aux = strndup(str, len);
diff --git a/office/gnokii/gnokii.SlackBuild b/office/gnokii/gnokii.SlackBuild
index eb3b4f1519..5301e1c7cf 100644
--- a/office/gnokii/gnokii.SlackBuild
+++ b/office/gnokii/gnokii.SlackBuild
@@ -73,6 +73,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Thnx to fedora for this patch
+patch -p1 < $CWD/gnokii-0.6.31-gcc7.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/office/gnucash-docs/README b/office/gnucash-docs/README
index 0dbc6ce019..cb542cedc1 100644
--- a/office/gnucash-docs/README
+++ b/office/gnucash-docs/README
@@ -25,6 +25,6 @@ Note 1: This script builds the internal guides in all available
languages, but the HTML guides are only in the spacified language
to save space and avoid excessive package bloat.
-Note 2: This builds the docs for version 3.x of Gnucash. If you
+Note 2: This builds the docs for version 4.x of Gnucash. If you
need the old stable 2.6 branch, use gnucash-legacy-docs, also
available on SBo.
diff --git a/office/gnucash-docs/gnucash-docs.SlackBuild b/office/gnucash-docs/gnucash-docs.SlackBuild
index d43e8ff27f..f533faff82 100644
--- a/office/gnucash-docs/gnucash-docs.SlackBuild
+++ b/office/gnucash-docs/gnucash-docs.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=gnucash-docs
DESTNAM=gnucash
-VERSION=${VERSION:-3.11}
+VERSION=${VERSION:-4.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/office/gnucash-docs/gnucash-docs.info b/office/gnucash-docs/gnucash-docs.info
index e2e666940f..eddcb897b2 100644
--- a/office/gnucash-docs/gnucash-docs.info
+++ b/office/gnucash-docs/gnucash-docs.info
@@ -1,8 +1,8 @@
PRGNAM="gnucash-docs"
-VERSION="3.11"
+VERSION="4.1"
HOMEPAGE="http://www.gnucash.org"
-DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-docs-3.11.tar.gz"
-MD5SUM="1886563b1fc7b2582a19a96484609581"
+DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-docs-4.1.tar.gz"
+MD5SUM="c9e4a2e5673b890cc4adfcdd429bbc47"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="gnucash rarian yelp"
diff --git a/office/gnucash-legacy/gnucash-legacy.info b/office/gnucash-legacy/gnucash-legacy.info
index 7c4ad9d1f9..5449ab2e68 100644
--- a/office/gnucash-legacy/gnucash-legacy.info
+++ b/office/gnucash-legacy/gnucash-legacy.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-2.6.21.tar.bz2"
MD5SUM="63226e9b49e11dc0d7106bd15c09996b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="libgnomecanvas goffice0.8 webkitgtk"
+REQUIRES="libgnomecanvas goffice0.8 guile1.8 webkitgtk"
MAINTAINER="Lenard Spencer"
EMAIL="lenardrspencer@gmail.com"
diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild
index 8599c535fa..e4092e456f 100644
--- a/office/gnucash/gnucash.SlackBuild
+++ b/office/gnucash/gnucash.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gnucash
-VERSION=${VERSION:-3.11}
+VERSION=${VERSION:-4.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/office/gnucash/gnucash.info b/office/gnucash/gnucash.info
index c899627c28..6c231ea806 100644
--- a/office/gnucash/gnucash.info
+++ b/office/gnucash/gnucash.info
@@ -1,8 +1,8 @@
PRGNAM="gnucash"
-VERSION="3.11"
+VERSION="4.1"
HOMEPAGE="http://www.gnucash.org/"
-DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-3.11.tar.bz2"
-MD5SUM="391f07eb0934618154d9e9c7d717d8e6"
+DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-4.1.tar.bz2"
+MD5SUM="3d613853a3bf1b1a29f7ec4cdebda17a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="webkit2gtk pygobject3-python3 gtest"
diff --git a/office/gnumeric/gnumeric.SlackBuild b/office/gnumeric/gnumeric.SlackBuild
index 0a5d0ee899..e87c652629 100644
--- a/office/gnumeric/gnumeric.SlackBuild
+++ b/office/gnumeric/gnumeric.SlackBuild
@@ -66,6 +66,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Avoid the cs help or build will break
+sed -i "s|cs\ de\ es|de es|" doc/Makefile.am || exit 1
+autoreconf -fi
+
# Thanks to mancha for this gem :-)
# The docs will still be missing, but at least we can build the app itself
touch doc/C/gnumeric-C.omf.out
diff --git a/office/juffed/README b/office/juffed/README
deleted file mode 100644
index b322d42743..0000000000
--- a/office/juffed/README
+++ /dev/null
@@ -1,6 +0,0 @@
-JuffEd is a free, cross-platform text editor for programmers and
-advanced users. Has syntax highlighting for many languages, code
-folding, find/replace using plain text and regexps, code completion,
-multiple charsets and many other useful features.
-
-enca is an optional dependency (for auto language detection).
diff --git a/office/juffed/juffed.SlackBuild b/office/juffed/juffed.SlackBuild
deleted file mode 100644
index f37a401a21..0000000000
--- a/office/juffed/juffed.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for juffed
-
-# Copyright 2011-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=juffed
-VERSION=${VERSION:-20180114_9b7af21}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-DOCS="COPYING ChangeLog README"
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DCMAKE_BUILD_TYPE=Release ..
- make
- make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/juffed/juffed.info b/office/juffed/juffed.info
deleted file mode 100644
index 0b6740222a..0000000000
--- a/office/juffed/juffed.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="juffed"
-VERSION="20180114_9b7af21"
-HOMEPAGE="http://juffed.com"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/juffed-20180114_9b7af21.tar.xz"
-MD5SUM="6b6c56fecdcfd408638a8023deda09cf"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
diff --git a/office/juffed/slack-desc b/office/juffed/slack-desc
deleted file mode 100644
index ae39cf2747..0000000000
--- a/office/juffed/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-juffed: juffed (light qt editor)
-juffed:
-juffed: JuffEd is a free, cross-platform text editor for programmers and
-juffed: advanced users. Has syntax highlighting for many languages, code
-juffed: folding, find/replace using plain text and regexps, code completion,
-juffed: multiple charsets and many other useful features.
-juffed:
-juffed: homepage: http://juffed.com
-juffed:
-juffed:
-juffed:
diff --git a/office/kbgoffice/gcc6.patch b/office/kbgoffice/gcc6.patch
new file mode 100644
index 0000000000..6e2d45e572
--- /dev/null
+++ b/office/kbgoffice/gcc6.patch
@@ -0,0 +1,17 @@
+diff -Naur kbgoffice-2.1.orig/src/translator_manager.cpp kbgoffice-2.1/src/translator_manager.cpp
+--- kbgoffice-2.1.orig/src/translator_manager.cpp 2010-04-30 14:37:42.000000000 +0200
++++ kbgoffice-2.1/src/translator_manager.cpp 2017-06-01 18:10:20.308920738 +0200
+@@ -141,11 +141,11 @@
+ isDataOk = isDataOk && tr->init(tr->BG_EN, string(string(dataDir) + prop->getString("data")).c_str());
+ } else {
+ cerr << "TranslatorManager::getTestDictionaryObject - Wrong description file: " << testDictionaries[index].file << "\n";
+- return false;
++ return NULL;
+ }
+ if (!isDataOk) {
+ cerr << "TranslatorManager::getTestDictionaryObject - Problem initialazing dictionary: " << testDictionaries[index].file << "\n";
+- return false;
++ return NULL;
+ }
+ char c[16];
+ sprintf(c, "%d", level);
diff --git a/office/kbgoffice/kbgoffice.SlackBuild b/office/kbgoffice/kbgoffice.SlackBuild
index c4f4cbb1af..91069ba041 100644
--- a/office/kbgoffice/kbgoffice.SlackBuild
+++ b/office/kbgoffice/kbgoffice.SlackBuild
@@ -52,6 +52,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Thanks debian
+patch -p1 < $CWD/gcc6.patch
+
cd src
sed "s:/usr/local:/usr:" -i.orig $PRGNAM.pro
sed "s:/usr/local:/usr:" -i.orig main.cpp
diff --git a/office/mu/mu.SlackBuild b/office/mu/mu.SlackBuild
index c4c856b5bf..3f9a255f3a 100644
--- a/office/mu/mu.SlackBuild
+++ b/office/mu/mu.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=mu
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-1.2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/office/mu/mu.info b/office/mu/mu.info
index 534da643df..18d17d047f 100644
--- a/office/mu/mu.info
+++ b/office/mu/mu.info
@@ -1,8 +1,8 @@
PRGNAM="mu"
-VERSION="1.0"
+VERSION="1.2.0"
HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
-DOWNLOAD="https://github.com/djcb/mu/archive/v1.0.tar.gz"
-MD5SUM="b415f84d4538cf05ec3360a449c1de4d"
+DOWNLOAD="https://github.com/djcb/mu/releases/download/1.2/mu-1.2.0.tar.xz"
+MD5SUM="e90fcd4abfed0e36ff97807d0194e9f9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/office/pdfjam/README b/office/pdfjam/README
deleted file mode 100644
index 7d3d58266c..0000000000
--- a/office/pdfjam/README
+++ /dev/null
@@ -1,4 +0,0 @@
-PDFjam is a collection of shell scripts providing a simple interface
-to functionality of the pdfpages package for pdfLaTeX. PDFjam can
-rotate pages, join PDFs, n-up several pages onto one page, generate a
-printer spread for books, and much much more.
diff --git a/office/pdfjam/pdfjam.SlackBuild b/office/pdfjam/pdfjam.SlackBuild
deleted file mode 100644
index 79a862e459..0000000000
--- a/office/pdfjam/pdfjam.SlackBuild
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for pdfjam
-# Copyright 2016 Klaatu klaatu@member.fsf.org
-#
-# GNU All-Permissive License
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved. This file is offered as-is,
-# without any warranty.
-
-PRGNAM=pdfjam
-VERSION=${VERSION:-2.08}
-VERTAR=${VERTAR:-latest}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-ARCH='noarch'
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/"$PRGNAM"_"$VERTAR".tgz
-cd $PRGNAM
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# already in PRGNAM
-mkdir $PKG/usr
-mv bin $PKG/usr/bin
-mkdir -p $PKG/usr/man/man1
-mkdir $PKG/etc
-mv pdfjam.conf $PKG/etc
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-
-for i in man1/* ; do gzip -9c "$i" > $PKG/usr/man/"$i".gz ; done
-
-cp -a COPYING VERSION tests.zip PDFjam-README.html pdfdroplets.png \
- $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/pdfjam/pdfjam.info b/office/pdfjam/pdfjam.info
deleted file mode 100644
index d97fbbdeed..0000000000
--- a/office/pdfjam/pdfjam.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pdfjam"
-VERSION="2.08"
-HOMEPAGE="https://www2.warwick.ac.uk/fac/sci/statistics/staff/academic-research/firth/software/pdfjam"
-DOWNLOAD="https://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam/pdfjam_latest.tgz"
-MD5SUM="7df075df7f129091f826275ce8c1f374"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Klaatu"
-EMAIL="klaatu@member.fsf.org"
diff --git a/office/pdfjam/slack-desc b/office/pdfjam/slack-desc
deleted file mode 100644
index 8f35a106b2..0000000000
--- a/office/pdfjam/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-pdfjam: pdfjam (pdf toolkit)
-pdfjam:
-pdfjam: PDFjam is a collection of shell scripts for PDF manipulation, like
-pdfjam: joining, rotating, modifying page layout, generating printer
-pdfjam: spreads, and more.
-pdfjam:
-pdfjam: https://www2.warwick.ac.uk/fac/sci/statistics/staff/\
-pdfjam: academic-research/firth/software/pdfjam/
-pdfjam:
-pdfjam:
-pdfjam:
diff --git a/office/pdftk/README b/office/pdftk/README
index c84c0b6589..6f0d6399e0 100644
--- a/office/pdftk/README
+++ b/office/pdftk/README
@@ -4,3 +4,10 @@ command-line tool for doing everyday things with PDF documents. Keep one
in the top drawer of your desktop and use it to merge PDF documents,
split PDF documents, apply watermarks, repair corrupt PDF, update PDF
metadata, and more. pdftk does not require Acrobat and is free software.
+
+NOTE: Starting with Slackware 15.0 pdftk compilation requires SBo gcc-5
+because gcc-java was dropped from the GNU Compiler Collection as of gcc-7:
+don't forget to source /etc/profile.d/gcc5.sh before starting to build
+this, like
+
+ . /etc/profile.d/gcc5.sh
diff --git a/office/pdftk/pdftk-1.44-add_custom_optflags.patch b/office/pdftk/pdftk-1.44-add_custom_optflags.patch
deleted file mode 100644
index 660073115f..0000000000
--- a/office/pdftk/pdftk-1.44-add_custom_optflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nurp pdftk-1.44-dist-orig/pdftk/Makefile.Slackware-13.1 pdftk-1.44-dist/pdftk/Makefile.Slackware-13.1
---- pdftk-1.44-dist-orig/pdftk/Makefile.Slackware-13.1 2010-10-25 20:04:51.000000000 +0100
-+++ pdftk-1.44-dist/pdftk/Makefile.Slackware-13.1 2010-10-31 01:44:31.000000000 +0000
-@@ -34,7 +34,7 @@ export CXX= $(TOOLPATH)g++
- export GCJ= $(TOOLPATH)gcj
- export GCJH= $(TOOLPATH)gcjh
- export GJAR= $(TOOLPATH)gjar
--export LIBGCJ= /usr/share/java/libgcj$(VERSUFF).jar
-+export LIBGCJ= /usr/share/java
- export AR= ar
- export RM= rm
- export ARFLAGS= rs
-@@ -71,9 +71,10 @@ export RMFLAGS= -vf
- # only effects libraries following option on the command line
- #
- #
--export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
--export CXXFLAGS= -Wall -Wextra -Weffc++ -O2
--export GCJFLAGS= -Wall -fsource=1.3 -O2
-+export OPT= -O2
-+export CPPFLAGS= $(OPT) -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
-+export CXXFLAGS= $(OPT) -Wall -Wextra -Weffc++
-+export GCJFLAGS= $(OPT) -Wall -fsource=1.3
- export GCJHFLAGS= -force
- export LDLIBS= -lgcj
-
diff --git a/office/pdftk/pdftk-2.02-use-gcc5.patch b/office/pdftk/pdftk-2.02-use-gcc5.patch
new file mode 100644
index 0000000000..d1e6e124de
--- /dev/null
+++ b/office/pdftk/pdftk-2.02-use-gcc5.patch
@@ -0,0 +1,15 @@
+# diff -Nurp pdftk/Makefile.Slackware-13.1.orig pdftk/Makefile.Slackware-13.1
+--- orig/pdftk/Makefile.Slackware-13.1 2013-07-24 13:27:46.000000000 -0500
++++ pdftk/Makefile.Slackware-13.1 2018-03-04 06:20:55.312900883 -0600
+@@ -21,8 +21,9 @@
+ # tools
+ # need direct path to libgcj for gcjh (starting in gcj 4.1.2 per Aurélien GÃRÃME)
+ TOOLPATH=
+-export VERSUFF=-4.4.4
+-export CXX= $(TOOLPATH)g++
++GCCMAJORTAG=-5 # kjh was here
++export VERSUFF=-5.5.0 # kjh was here
++export CXX= $(TOOLPATH)g++$(GCCMAJORTAG) # kjh was here
+ export GCJ= $(TOOLPATH)gcj
+ export GCJH= $(TOOLPATH)gcjh
+ export GJAR= $(TOOLPATH)gjar
diff --git a/office/pdftk/pdftk.SlackBuild b/office/pdftk/pdftk.SlackBuild
index aa5bad4885..854b6da935 100644
--- a/office/pdftk/pdftk.SlackBuild
+++ b/office/pdftk/pdftk.SlackBuild
@@ -30,7 +30,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -68,10 +68,9 @@ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Use our SLKCFLAGS
-patch -p1 < $CWD/pdftk-1.44-add_custom_optflags.patch
+patch -p1 < $CWD/pdftk-2.02-use-gcc5.patch
cd $PRGNAM
# Hardcode "-j1" since this fails with multiple make jobs
diff --git a/office/pdftk/pdftk.info b/office/pdftk/pdftk.info
index 01151c62f1..b4e36211a9 100644
--- a/office/pdftk/pdftk.info
+++ b/office/pdftk/pdftk.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip
MD5SUM="6534365fd6727724f288a556ede33faa"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="gcc5"
MAINTAINER="ArTourter"
EMAIL="artourter@gmail.com"
diff --git a/office/referencer/referencer-lib_path.patch b/office/referencer/referencer-lib_path.patch
new file mode 100644
index 0000000000..78a1952089
--- /dev/null
+++ b/office/referencer/referencer-lib_path.patch
@@ -0,0 +1,11 @@
+--- referencer-1.2.2/src/Document.C 2014-01-27 03:43:00.000000000 +0700
++++ referencer-1.2.2_/src/Document.C 2016-11-03 16:25:00.698676538 +0700
+@@ -297,7 +297,7 @@
+
+ lib_path = lib_path->get_parent();
+ up_dir_level += "../";
+- if (lib_path == 0) {
++ if (!lib_path) {
+ doc_is_relative_to_library = false;
+ break;
+ }
diff --git a/office/referencer/referencer.SlackBuild b/office/referencer/referencer.SlackBuild
index 8d279093fd..0a3da09354 100644
--- a/office/referencer/referencer.SlackBuild
+++ b/office/referencer/referencer.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Fix comparison with zero - thanks archlinux
+patch -p1 < $CWD/referencer-lib_path.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS -std=c++11" \
./configure \
diff --git a/office/sc-im/README b/office/sc-im/README
deleted file mode 100644
index d63f9fca91..0000000000
--- a/office/sc-im/README
+++ /dev/null
@@ -1,2 +0,0 @@
-SC-IM - Spreadsheet Calculator Improvised -- An ncurses spreadsheet program
-for terminal. SC-IM is a spreadsheet program that is based on SC.
diff --git a/office/sc-im/sc-im.SlackBuild b/office/sc-im/sc-im.SlackBuild
deleted file mode 100644
index 25e318343e..0000000000
--- a/office/sc-im/sc-im.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for sc-im
-
-# Copyright 2016-2018 Jostein Berntsen <jbernts@broadpark.no>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=sc-im
-VERSION=${VERSION:-0.7.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-cd src/
-
-perl -pi -e 's#name = scim#name = sc-im#g|s#prefix = /usr/local#prefix = /usr#g' Makefile
-
-CFLAGS="-DXLS $SLKCFLAGS" \
-CXXFLAGS="-DXLS $SLKCFLAGS" \
-LDLIBS="-lxlsreader" \
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mv $PKG/usr/share/man $PKG/usr
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cd ..
-cp -a BUGS CHANGES HELP KNOWN_ISSUES LICENSE Readme.md USER_REQUESTS WIKI \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/sc-im/sc-im.info b/office/sc-im/sc-im.info
deleted file mode 100644
index 69ea4bfb9b..0000000000
--- a/office/sc-im/sc-im.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sc-im"
-VERSION="0.7.0"
-HOMEPAGE="https://github.com/andmarti1424/sc-im"
-DOWNLOAD="https://github.com/andmarti1424/sc-im/archive/v0.7.0/sc-im-0.7.0.tar.gz"
-MD5SUM="2f270d957a215f0124d15d0a82c5abfa"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libxls libxlsxwriter"
-MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
diff --git a/office/sc-im/slack-desc b/office/sc-im/slack-desc
deleted file mode 100644
index d0321b449a..0000000000
--- a/office/sc-im/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-sc-im: sc-im (spreadsheet)
-sc-im:
-sc-im: SC-IM is a spreadsheet program that is based on SC
-sc-im:
-sc-im: SC-IM - Spreadsheet Calculator Improvised
-sc-im: An ncurses spreadsheet program for terminal
-sc-im:
-sc-im:
-sc-im: https://github.com/andmarti1424/sc-im
-sc-im:
-sc-im:
diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild
index 5842344c68..5f92f22b53 100644
--- a/office/scribus/scribus.SlackBuild
+++ b/office/scribus/scribus.SlackBuild
@@ -27,13 +27,13 @@
# Including input by Yalla-One and some code cleanup by rworkman
PRGNAM=scribus
-VERSION=${VERSION:-1.4.6}
+VERSION=${VERSION:-1.4.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -78,7 +78,7 @@ cmake \
-DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DRENDER_LIB=CAIRO
+ -DRENDER_LIB=CAIRO .
make
make install DESTDIR=$PKG
diff --git a/office/scribus/scribus.info b/office/scribus/scribus.info
index 10e5f6a05f..41872c4856 100644
--- a/office/scribus/scribus.info
+++ b/office/scribus/scribus.info
@@ -1,8 +1,8 @@
PRGNAM="scribus"
-VERSION="1.4.6"
+VERSION="1.4.8"
HOMEPAGE="https://www.scribus.net"
-DOWNLOAD="https://downloads.sourceforge.net/scribus/scribus-1.4.6.tar.xz"
-MD5SUM="f6161785e24755ea77c8f14b319ff1aa"
+DOWNLOAD="https://downloads.sourceforge.net/scribus/scribus-1.4.8.tar.xz"
+MD5SUM="ef61b996b6d07f8a19475f51330d3535"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/office/texlive/README b/office/texlive/README
deleted file mode 100644
index d08796d591..0000000000
--- a/office/texlive/README
+++ /dev/null
@@ -1,14 +0,0 @@
-TeXLive (TeXLive binaries, support files, TeX formats)
-
-This package contains binaries and many support files, TeX formats and
-packages, and other files included in the TeXLive TeX distribution.
-This should be adequate for the needs of most TeX users.
-
-The remaining stuff can be found in texlive-extra and texlive-docs,
-all of which are also available at SlackBuilds.org.
-
-Have a look at the scripts in the prep/ directory to see how the texmf
-archives were created from the original Texlive netarchives.
-
-Note that this package conflicts with the tetex packages in Slackware,
-so you'll need to remove tetex and tetex-doc before installing TeXLive.
diff --git a/office/texlive/README.tlpkg b/office/texlive/README.tlpkg
deleted file mode 100644
index 7a6f790ca8..0000000000
--- a/office/texlive/README.tlpkg
+++ /dev/null
@@ -1,17 +0,0 @@
-The TeXLive Package Manager, i.e. tlmgr(1), is not shipped with this
-TeXLive package, as it's not expected to work properly (if at all).
-The general consensus from the TeXLive users mailing list is that
-distributions should not be shipping tlpkg.
-
-The *proper* way to upgrade the TeXLive Slackware package (or any
-part of it) is through your Slackware's package manager. If you
-elect to try tlmgr(1), and it doesn't work at all, or worse, it messes
-up part of your TeXLive installation, too bad. On the other hand,
-if you are able to document exactly what we need to do in order to
-make it:
- 1) work
- 2) put updates and such in a user-specific directory, i.e.
- *not* alter/replace system package contents
-then we would love to hear from you. :-)
-
---rworkman :-)
diff --git a/office/texlive/doinst.sh b/office/texlive/doinst.sh
deleted file mode 100644
index f864e767d6..0000000000
--- a/office/texlive/doinst.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-chroot . /usr/bin/mktexlsr 1>/dev/null 2>/dev/null
-printf "y\n" | chroot . /usr/bin/updmap-sys --syncwithtrees 1>/dev/null 2>/dev/null
-chroot . /usr/bin/updmap-sys 1>/dev/null 2>/dev/null
-chroot . /usr/bin/fmtutil-sys --all 1>/dev/null 2>/dev/null
-chroot . /usr/bin/mtxrun --generate 1>/dev/null 2>/dev/null
diff --git a/office/texlive/patches/tabu.sty.diff b/office/texlive/patches/tabu.sty.diff
deleted file mode 100644
index 8ebe034d18..0000000000
--- a/office/texlive/patches/tabu.sty.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./tabu.sty.orig 2019-01-14 16:10:48.000000000 -0600
-+++ ./tabu.sty 2019-06-30 16:24:01.975474339 -0500
-@@ -57,7 +57,7 @@
- %%
-
- \NeedsTeXFormat{LaTeX2e}
--\ProvidesPackage{tabu}[2019/01/11 v2.9 - flexible LaTeX tabulars (FC+tabu-fixed)]
-+\ProvidesPackage{tabu}[2019/01/11 v2.9 - flexible LaTeX tabulars (FC+tabu-fixed) + intermediate FMi]
- \RequirePackage{array}[2008/09/09]
- \RequirePackage{varwidth}[2009/03/30]
- \AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined}
-@@ -727,6 +727,10 @@
- \tabu@currentgrouptype\expandafter{\the\currentgrouptype}}%
- \fi
- }% \tabu@init
-+%%TABU-FIXED set up \tabu@currentgrouptype
-+%FMi cancel for nested arrays ...
-+\def\@tabarray{\m@th\def\tabu@currentgrouptype{\currentgrouptype}\@ifnextchar[\@array{\@array[c]}}
-+
- \def\tabu@indent{% correction for indentation
- \ifdim \parindent>\z@\ifx \linewidth\tabudefaulttarget
- \everypar\expandafter{%
-@@ -1663,6 +1667,9 @@
- \ifdim \tabu@temp\p@>\z@ \ifdim \tabu@temp\tabucolX<\tabu@target
- \tabu@target=\tabu@temp\tabucolX \fi\fi
- \setbox\tabu@box \hbox \bgroup
-+%%TABU-FIXED add \color@begingroup
-+%%FMi not yet understood why this one is also needed ...
-+ \color@begingroup
- \begin{varwidth}\tabu@target
- \let\FV@ListProcessLine \tabu@FV@ListProcessLine % \hbox to natural width...
- \narrowragged \arraybackslash \parfillskip \@flushglue
diff --git a/office/texlive/prep/texmf_get.sh b/office/texlive/prep/texmf_get.sh
deleted file mode 100644
index c66a71b7f2..0000000000
--- a/office/texlive/prep/texmf_get.sh
+++ /dev/null
@@ -1,1146 +0,0 @@
-#!/bin/bash
-
-# texmf_get.sh
-#
-# Copyright 2016 - 2020 Johannes Schoepfer, Germany, slackbuilds@schoepfer.info
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# V 15.0.4
-#
-# Prepare xz-compressed tarballs of texlive-texmf-trees based on texlive.tlpdb
-# This script takes care of dependencies(as far as these are present in texlive.tlpdb)
-# of collections and packages, and that every texlive-package is included only once.
-# The editions(base/extra/docs) should contain no binaries(exception biber)
-# -base: the most usefull stuff, most binaries/scripts,
-# manpages for compiled binaries 65mb 2017-11-07
-# -docs: -base documentation only, no manpages/GNU infofiles
-# -extra: remaining stuff and corresponding docs
-#
-# texlive netarchive policy: Every package is included as dependency
-# in exactly one collection. A package may have dependencies on other
-# packages from any collection.
-
-#set -e
-MAJORVERSION=2020
-mirror="http://mirror.ctan.org/systems/texlive/tlnet/"
-TMP=${TMP:-$PWD/tmp}
-
-# Globally excluded packages, which are/contain
-# -useless without tlmgr-installer
-# -non-linux, e.g. texworks
-# -covered by an external package, e.g. asymptote on SBo
-# -obsolete, e.g. omega
-# -binaries provided already by texlive.Slackbuild
-# -binaries which texlive upstream recommends to build natively, e.g. dvisvgm on SBo
-# -only sources, e.g. metatype1, patch, ...
-
-global_exclude="
- 00texlive.config
- 00texlive.image
- 00texlive.installation
- 00texlive.installer
- aleph
- antomega
- asymptote
- bibtexu
- cslatex
- dviout.win32
- lambda
- ocherokee
- oinuit
- omega
- omegaware
- otibet
- texlive-common
- texlive-docindex
- texlive-msg-translations
- texosquery
- texworks
- tlcockpit
- tlshell
- wintools.win32
- dvisvgm
- "
-
- # special packages, move their type1 fonts(if metafonts are present)
- # and/or docs to -extra
-special_packages="
- koma-script
- velthuis
- armtex
- montex
- vntex
- pl
- cc-pl
- cs
- musixtex-fonts
- tipa
- cbfonts
- ptex-fonts
- uptex-fonts
- "
-#Todo: split type1 fonts, or keep subset of type1 fonts in base
-# cm-super
-
-# keep precompiled binaries, list binary, not package name
-keep_precompiled="
- biber
- "
-
-texmf_editions () {
-
- # "excludes from -base", also dependencies are excluded
- PACKAGES="
- cm-super
- biber
- bib2gls
- knitting
- pst-cox
- pst-poker
- pst-vectorian
- pst-geo
- bclogo
- texplate
- texliveonfly
- kerkis
- " texmfget extra || exit 1
-
- # packages/collections and their dependencies for -base
- PACKAGES="
- $(grep ^"name hyphen-.*" $db | cut -d' ' -f2 )
- $special_packages
- etoolbox
- memoir
- ptex
- platex
- revtex
- ucs
- uplatex
- uptex
- velthuis
- wasy
- xcolor
- xypic
- collection-basic
- collection-latex
- collection-metapost
- collection-plaingeneric
- collection-luatex
- collection-context
- collection-fontutils
- collection-langczechslovak
- collection-langeuropean
- collection-langenglish
- collection-langfrench
- collection-langgreek
- collection-langitalian
- collection-langpolish
- collection-langportuguese
- collection-langspanish
- collection-latexrecommended
- $(collection_by_size fontsextra 70000 || exit 1)
- $(collection_by_size latexextra 1000 || exit 1)
- $(collection_by_size langchinese 5000 || exit 1)
- $(collection_by_size langcjk 3000 || exit 1)
- $(collection_by_size pictures 100000 || exit 1)
- $(collection_by_size publishers 10000 || exit 1)
- " texmfget base
-
- # packages/collections and their dependencies for -extra
- PACKAGES="
- $(grep ^"name .*biblatex" $db | cut -d' ' -f2 )
- amiri
- arabi
- arabi-add
- arara
- arev
- bangorcsthesis
- beamer2thesis
- beamertheme-detlevcm
- beamertheme-epyt
- beamertheme-npbt
- beamertheme-saintpetersburg
- beebe
- bhcexam
- bxtexlogo
- collection-fontsextra
- collection-langchinese
- collection-langcjk
- collection-langjapanese
- collection-langkorean
- collection-pictures
- collection-publishers
- collection-texworks
- collection-wintools
- ctan-o-mat
- ctanify
- ctanupload
- dad
- duckuments
- ethiop-t1
- fibeamer
- fithesis
- ghsystem
- gregoriotex
- hustthesis
- ijsra
- iwhdp
- jpsj
- kerkis
- ketcindy
- kpfonts
- langsci
- latex2nemeth
- libertine
- lilyglyphs
- lni
- luatexko
- media9
- musuos
- mwe
- newtx
- nwejm
- padauk
- pdfwin
- pdfx
- powerdot-tuliplab
- powerdot-fuberlin
- quran
- quran-de
- realhats
- resumecls
- sanskrit-t1
- sapthesis
- sduthesis
- seuthesix
- simurgh
- skaknew
- stellenbosch
- suanpan
- texdoctk
- tudscr
- uantwerpendocs
- udesoftec
- universalis
- uowthesis
- wasy-type1
- xduthesis
- xetexko
- xq
- " texmfget extra || exit 1
-
- # What's left, for base again
- PACKAGES="
- collection-fontsrecommended
- collection-xetex
- collection-langcyrillic
- collection-langarabic
- collection-langgerman
- collection-langother
- collection-humanities
- collection-mathscience
- collection-pstricks
- collection-music
- collection-games
- collection-binextra
- collection-bibtexextra
- collection-formatsextra
- collection-latexextra
- " texmfget base || exit 1
-
-}
-
-# ==== Nothing to edit beyond this line ====
-
-usage () {
- echo
- echo "Generate texmf trees/editions based on collections/packages"
- echo "and their (hard)dependencies."
- echo "./texmf_get.sh [base|docs|extra|lint]"
- echo
- echo "-base: texfiles, no docs"
- echo "-docs: docs of -base"
- echo "-extra: remaining texfiles and docs"
- echo "[lint]: compare filename contents of all generated editions,"
- echo " to detect overlapping files"
- echo
- echo "Only new/updated/missing tex packages are downloaded."
- echo "The first run takes \"long\", tex packages(about 3Gb)"
- echo "need to be downloaded."
- echo "To check out a new version/release, delete"
- echo "$db"
- echo "A new ascii index file/database(texlive.tlpdb) is will be"
- echo "pulled on the next run, and a new version yymmdd will be set."
- echo
- echo "All generated tarballs, logs etc. are going to"
- echo "$TMP"
- echo
-}
-
-collection_by_size () {
- # from collection $1, pull packages smaller $2 bytes
- start_n="$(grep -n ^"name collection-$1"$ $db | cut -d':' -f1)"
- # find end of package/collection
- for emptyline in $emptylines
- do
- if [ "$emptyline" -gt "$start_n" ]
- then
- end_n=$emptyline
- break
- fi
- done
- extrapackages="$(sed "${start_n},${end_n}!d" $db | grep ^"depend " | grep -v ^"depend collection" | sed "s/^depend//g" )"
-
- # add if smaller than ...
- for checksize in $extrapackages
- do
- package_meta $checksize || exit 1
- size=$(grep ^"containersize " $texmf/$checksize.meta | cut -d' ' -f2)
- # for $2, e.g. 3000 means 3kb
- [ $size -lt $2 ] && echo $checksize
- done
-}
-
-package_meta () {
- if [ ! -s "$texmf/$1.meta" ]
- then
- # collection start linenumer
- start_n="$(grep -n ^"name ${1}"$ $db | cut -d':' -f1)"
- [ -z "$start_n" ] && echo "$1 was not found in $db, bye." && exit 1
- # find end of package/collection
- for emptyline in $emptylines
- do
- if [ "$emptyline" -gt "$start_n" ]
- then
- end_n=$emptyline
- break
- fi
- done
- # Don't handle collections as dependency of other collections
- sed "${start_n},${end_n}!d;/^depend collection/d" $db > $texmf/$1.meta
- fi
-}
-
-download () {
- # Download packages, if not already available. Not every packages has a corresponding .doc package.
- # Try multiple times if package isn't present or checksum fails
-
- unset checksum_ok
- if [ "$flavour" = ".doc" ]
- then
- sha512="$(grep ^doccontainerchecksum $texmf/$1.meta | cut -d' ' -f2 )"
- else
- sha512="$(grep ^containerchecksum $texmf/$1.meta | cut -d' ' -f2 )"
- fi
-
- cd $texmf
-
- for run in {1..8}
- do
- [ ! -s "${1}${flavour}.tar.xz" ] && \
- wget -q --show-progress -t1 -c ${mirror}archive/${1}${flavour}.tar.xz
- [ ! -s "${1}${flavour}.tar.xz" ] && continue
- if [ "$(sha512sum ${1}${flavour}.tar.xz | cut -d' ' -f1 )" != "$sha512" ]
- then
- echo "sha512sum of ${1}${flavour}.tar.xz doesn't match $texmf/$1.meta"
- echo "deleting ${1}${flavour}.tar.xz"
- rm ${1}${flavour}.tar.xz
- else
- checksum_ok=yes
- break
- fi
- done
-
- # If no success by downloading, write error log
- if [ -z "$checksum_ok" ]
- then
- echo "Downloading ${1}${flavour}.tar.xz or sh512sum check was not successful,\\
- writing to $errorlog"
- echo "Delete ${db}* and try again."
- echo "$VERSION" >> $errorlog
- echo "Error downloading ${1}${flavour}.tar.xz" >> $errorlog
- exit 1
- fi
-}
-
-untar () {
- # leave if $1 has no content
- if [ -s "$1" ]
- then
- while read package
- do
- echo "untar $package$flavour"
- # untar all packages, check for relocation, "relocate 1" -> untar in texmf-dist
- download $package || exit 1
- # untar package, relocate to texmf-dist if necessary, binary packages always need relocation
- relocated='.'
- [ -n "$(grep -w ^"relocated 1" $texmf/$package.meta)" -o -n "$(grep ^"binfiles " $texmf/$package.meta)" ] && relocated="texmf-dist"
- # if not .doc package, investigate files for dependencies/provides
- if [ -n "$flavour" ]
- then
- tar xf ${package}${flavour}.tar.xz --exclude tlpkg -C $relocated || exit 1
- else
- tar vxf ${package}${flavour}.tar.xz \
- --exclude tlpkg/tlpobj \
- -C $relocated | grep -E '\.sty$|\.bbx$|\.cls$' > $texmf/$package.deps
- if [ -n "$texmf/$package.deps" ]
- then
- unset provide
- unset depends
- for depfile in $(cat $texmf/$package.deps)
- do
- filename="$( echo $depfile | rev | cut -d'.' -f2- | cut -d'/' -f1 | rev)"
- # always add $filename as "ProvidesPackage", if it's a .sty
- echo $depfile | grep '\.sty'$ &>/dev/null
- [ $? = 0 ] && provide+="${filename},"
- # remove comments, if there are backslashes ignore that content, except it is \filename
- #provide+="$(sed "s/%.*//g" $texmf/$relocated/$depfile | sed -n "s/.*\\\ProvidesPackage{\([^}]*\)}.*/\1/p" | sed "s/\\\filename/$filename/g;/\\\/d" | sort -u | tr '\n' ',')"
- #sed -z "s/.*\\\Provides\(Package\|ExplPackage\|File\|Class\)*.\n//g" | sed "s/[[:space:]]//
- #provide+="$(sed "s/%.*//g" $texmf/$relocated/$depfile | sed -z "s/.*\\\Provides\(Package\|ExplPackage\|File\|Class\)*.\n//g" | sed "s/[[:space:]]// | sed -n "s/.*\\\Provides\(Package\|ExplPackage\|File\|Class\){\([^}]*\)}.*/\2/p" | sed "s/\\\filename/$filename/g;s/\\\ExplFileName/$filename/g;/\\\/d" | sed "s/\(\.sty$\|\.cls$\)//g" | sort -u | tr '\n' ',')"
- provide+="$(sed "s/%.*//g" $texmf/$relocated/$depfile | sed -z "s/\(Package\|ExplPackage\|File\|Class\)\n/\1/g" | sed "s/[[:space:]]//" | sed -n "s/.*\\\Provides\(Package\|ExplPackage\|File\|Class\){\([^}]*\)}.*/\2/p" | sed "s/\\\filename/$filename/g;s/\\\ExplFileName/$filename/g" | sed "s/\(\.sty$\|\.cls$\)//g" | sort -u | tr '\n' ',')"
- #depends+="$(sed "s/%.*//g" $texmf/$relocated/$depfile | sed -n "s/.*\(\\\require\|\\\use\)package{\([^}]*\)}.*/\2/p" | sed "/\\\/d" | sort -u | tr '\n' ',')"
- depends+="$(sed "s/%.*//g" $texmf/$relocated/$depfile | sed -n "s/.*\(\\\require\|\\\use\)package{\([^}]*\)}.*/\2/p" | sort -u | tr '\n' ',')"
- #depends+="$(sed "s/%.*//g" $texmf/$relocated/$depfile | sed -n "s/.*\\\\(require\|use\)package{\([^}]*\)}.*/\2/p" | sed "/\\\/d" | sort -u | tr '\n' ',')"
- done
- if [ -n "$provide" ]
- then
- echo "$package $provide" >> $TMP/provides.run.$edition
- fi
- if [ -n "$depends" ]
- then
- echo "$package $depends" >> $TMP/depends.run.$edition
- fi
- fi
- fi
-
- # Delete binaries, these are provided
- # by the buildscript, keep symlinks and scripts
-
- for arch in $platforms
- do
- if [ -d $texmf/texmf-dist/bin/$arch ]
- then
- [ ! -d $texmf/texmf-dist/linked_scripts ] && \
- mkdir $texmf/texmf-dist/linked_scripts
- # remove the unfortunate "man" link
- [ -L "$texmf/texmf-dist/bin/$arch/man" ] && \
- rm $texmf/texmf-dist/bin/$arch/man
- for link in $(find $texmf/texmf-dist/bin/$arch -type l)
- do
- link_valid_dest=$texmf/texmf-dist/linked_scripts/${link##*/}
- # move symlink to linked_scripts
- mv $link $link_valid_dest
- # some links have to dangle, because target binaries are coming from the buildscript
- # fix SELFAUTOPARENT in some scripts
- if [ -e "$link_valid_dest" ]
- then
- sed -i "s/kpsewhich -var-value=SELFAUTOPARENT/kpsewhich -var-value=TEXMFROOT/g" \
- $link_valid_dest || exit 1
- fi
- done
-
- # keep only binaries of special packages
- # remove xindy.mem(gzip compresses data) to prevent overwriting
- for bin in $(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + | \
- grep -e "executable" -e "shared object" -e ELF -e "gzip compressed data" | cut -f 1 -d : )
- do
- for binary in $keep_precompiled
- do
- if [ "$(echo $bin | rev | cut -d'/' -f1 | rev)" != "$binary" ]
- then
- rm $bin
- echo -n "$package:" >> $binary_removed.$edition
- echo $bin | rev | cut -d'/' -f1 | rev >> $binary_removed.$edition
- fi
- done
- done
- # move scripts to linked-scripts
- for script in \
- $(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + |\
- grep -wv ELF | cut -f 1 -d : )
- do
- echo "Moving script/bin $script to $texmf/texmf-dist/linked_scripts/"
- mv $script $texmf/texmf-dist/linked_scripts/
- done
- fi
- done
-
- for tlpkg_dir in $texmf/tlpkg $texmf/texmf-dist/tlpkg
- do
- if [ -d $tlpkg_dir ]
- then
- for bin in $(find $tlpkg_dir -type f -exec file '{}' + | \
- grep -e "executable" -e "shared object" -e ELF -e "gzip compressed data" | cut -f 1 -d : )
- do
- echo "Deleting binary $bin found in $tlpkg_dir"
- rm $bin
- echo -n "$package:" >> $binary_removed.$edition
- echo $bin | rev | cut -d'/' -f1 | rev >> $binary_removed.$edition
- done
- [ -d $tlpkg_dir/TeXLive ] && \
- mkdir -p $texmf/texmf-dist/scripts/texlive && \
- mv $tlpkg_dir/TeXLive $texmf/texmf-dist/scripts/texlive
- fi
- done
-
- if [ "$flavour" = ".doc" ]
- then
- size=$(grep ^doccontainersize $texmf/$package.meta | cut -d' ' -f2)
- else
- size=$(grep ^containersize $texmf/$package.meta | cut -d' ' -f2)
- # add maps to updmap.cfg, don't add special_packages map files to -base
- add_map=yes
- if [ $edition = base ]
- then
- for no_map in $special_packages
- do
- [ $no_map = $package ] && add_map=no && break
- done
- fi
- [ $add_map = yes ] && grep ^'execute ' $texmf/$package.meta | grep Map | cut -d' ' -f2- | sed "s/^add//g" >> $updmap.$edition
- fi
- shortdesc="$(grep ^shortdesc $texmf/$package.meta | cut -d' ' -f2- )"
- echo "$size byte, $package$flavour: $shortdesc" >> $output.meta
- # make index of uncompressed size of each package
- echo "$(xz -l --verbose ${package}${flavour}.tar.xz | grep "Uncompressed size" | \
- cut -d'(' -f2 | cut -d' ' -f1 ) byte, $package$flavour: $shortdesc" >> $output.meta.uncompressed
- done < $1
-
- # add a path to updmap
- if [ -s "$texmf/texmf-dist/linked_scripts/updmap" ]
- then
- sed -i '/unshift.*@INC.*/a unshift(@INC, "$TEXMFROOT/texmf-dist/scripts/texlive");' $texmf/texmf-dist/linked_scripts/updmap || exit 1
- fi
-
- # copy packages index to texmf-dist, to have a list of included packages in the final installation
- # don't list binary packages, as the binaries itself are not contained, only the symlinks.
- cat $output.meta | grep -v '\-linux:' >> $output.$edition.meta
- cat $output.meta.uncompressed | grep -v '\-linux:' >> $output.$edition.meta.uncompressed
-
- # cleanup
- [ -f $output.meta ] && rm $output.meta
- [ -f $output.meta.uncompressed ] && rm $output.meta.uncompressed
- fi
-}
-
-remove_cruft () {
- # Remove m$-stuff, ConTeXt single-user-system stuff, empty files/directories and pdf-manpages
- rm -rf $texmf/texmf-dist/source
- rm -rf $texmf/texmf-dist/scripts/context/stubs/source/
- find $texmf/texmf-dist/ -type d -name 'win32' -exec rm -rf {} +
- find $texmf/texmf-dist/ -type d -name 'win64' -exec rm -rf {} +
- find $texmf/texmf-dist/ -type d -name 'mswin' -exec rm -rf {} +
- find $texmf/texmf-dist/ -type d -name 'win' -exec rm -rf {} +
- find $texmf/texmf-dist/ -type d -name 'setup' -exec rm -rf {} +
- find $texmf/texmf-dist/ -type d -name 'install' -exec rm -rf {} +
- find $texmf/texmf-dist/ -type f -name 'uninstall*.sh' -delete
- find $texmf/texmf-dist/ -type f -name '*.bat' -delete
- find $texmf/texmf-dist/ -type f -name '*.bat.w95' -delete
- find $texmf/texmf-dist/ -type f -name '*.vbs' -delete
- find $texmf/texmf-dist/ -type f -name '*win32*' -delete
- find $texmf/texmf-dist/ -type f -name 'winansi*' -delete
- find $texmf/texmf-dist/ -type f -name '*man1.pdf' -delete
- find $texmf/texmf-dist/ -type f -name '*man5.pdf' -delete
- find $texmf/texmf-dist/ -type f -empty -delete
- find $texmf/texmf-dist/ -type d -empty -delete
-}
-
-texmfget () {
- # make sure no package is added more than once.
- echo "Preparing index of packages to be added to -${1} ..."
- echo "$PACKAGES" | sed "s/[[:space:]]//g;/^$/d" > $collections_tobedone
- # Remove outputfile if already present
- >$output
- >$output_doc
-
- # Only do something if $collection wasn't already done before
- while [ -s $collections_tobedone ]
- do
- collection=$(tail -n1 $collections_tobedone)
-
- # continue with next collection if collection was already done
- if [ -s "$collections_done" ]
- then
- grep -w "^${collection}$" $collections_done &> /dev/null
- if [ $? = 0 ]
- then
- # remove from $collections_tobedone
- sed -i "/^$collection$/d" $collections_tobedone
- if [ -n "$(grep "^${collection} added to" $logfile)" ]
- then
- echo "$collection already added " >> $logfile
- fi
- continue
- fi
- fi
-
- package_meta $collection || exit 1
-
- # If $collection is a singel package(not a collection-), add it here
- if [ -n "$(head -n1 $texmf/$collection.meta | grep -v "name collection" )" ]
- then
- unset addpackage
- # if package contains docs, add to docs-packages
- if [ -n "$(grep ^docfiles $texmf/$collection.meta)" ]
- then
- echo "$collection" >> $output_doc
- echo "$collection added to docs $1" >> $logfile
- addpackage=yes
- fi
- # if package contains runfiles, binfiles or depend, add to edition
- if [ \
- -n "$(grep ^runfiles $texmf/$collection.meta)" -o \
- -n "$(grep ^binfiles $texmf/$collection.meta)" -o \
- -n "$(grep ^depend $texmf/$collection.meta)" \
- ]
- then
- echo "$collection" >> $output
- echo "$collection added to -$1" >> $logfile
- addpackage=yes
- fi
- # if package contains only srcfiles, don't add to a edition
- if [ -n "$(grep ^srcfiles $texmf/$collection.meta)" -a -z "$addpackage" ]
- then
- echo "$collection only contains srcfiles, added nowhere" >> $logfile
- addpackage=yes
- fi
- # abort if package seems broken
- if [ -z "$addpackage" ]
- then
- echo "$collection doesn't contain any docfiles/runfiles/binfiles/depends or srcfiles"
- echo "Please exclude package/report to upstream mailinglist tex-live@tug.org, bye."
- exit 1
- fi
- fi
-
- # Don't handle collections as dependency of other collections, as this destroys control over what packages to be added
- # add dependend packages, but no binary(ARCH) and no packages containing a '.'. Packges with dot indicate binary/texlive-manager/windows packages
-
- grep ^"depend " $texmf/$collection.meta | cut -d' ' -f2- > $dependencies
-
- if [ -s "$dependencies" ]
- then
- # check for .ARCH packages which may be binaries, scripts or links
- # Binaries should all come from the sourcebuild(exception biber)
- for dependency in $(cat $dependencies)
- do
- echo $dependency | grep '\.ARCH'$ &>/dev/null
- if [ $? = 0 ]
- then
- for arch in $platforms
- do
- archpackage="$(echo $dependency | sed "s/\.ARCH$/\.$arch/")"
- grep ^"name $archpackage"$ $db &>/dev/null && echo "$archpackage" >> $dependencies.verified_arch
- done
- else
- echo $dependency >> $dependencies.verified_arch
- fi
- done
- if [ -f $dependencies.verified_arch ]
- then
- mv $dependencies.verified_arch $dependencies
- else
- rm $dependencies
- fi
- fi
-
- if [ -s "$dependencies" ]
- then
- echo "----------------" >> $logfile
- echo "Dependencies of $collection: $(cat $dependencies | tr '\n' ' ')" >> $logfile
- for dependency in $(cat $dependencies)
- do
- if [ -n "$(grep ^"${dependency}"$ $collections_done)" ]
- then
- sed -i "/^${dependency}$/d" $dependencies
- continue
- else
- for exclude in $global_exclude
- do
- if [ "$exclude" = "$dependency" ]
- then
- sed -i "/^${exclude}$/d" $dependencies
- echo "$exclude excluded, see \$global_exclude" >> $logfile
- fi
- done
- fi
- done
- cat $dependencies >> $collections_tobedone
- echo "----------------" >> $logfile
- fi
-
- sed -i "/^${collection}$/d" $collections_tobedone
- echo "$collection" >> $collections_done
- done
- # handle package index list per edition
- cat $output >> $TMP/packages.$1
- # handle doc package index, one for each edition
- cat $output_doc >> $TMP/packages.$1.doc
-
- # untar only one $edition, untar docs together with -extra edition
- if [ "$1" = $edition -o docs = $edition ]
- then
- cd $texmf
- # Cleanup tar-directory
- [ -d $texmf/texmf-dist ] && rm -rf $texmf/texmf-dist
- mkdir $texmf/texmf-dist
-
- # Make tarball/checksum reproducible by setting mtime(clamp-mtime),
- # owner, group and sort content.
- # --clamp-mtime --mtime doesn't work with tar 1.13,
- # when makepkg creates the tarball:
- # tar-1.13: time_t value 9223372036854775808 too large (max=68719476735)
- echo "Adding files to $( echo $tarball | rev | cut -d'/' -f1 | rev ) ..."
- case $edition in
- base)
- unset flavour
- untar $output || exit 1
- remove_cruft || exit 1
- tar rf $tarball --owner=0 --group=0 --sort=name texmf-dist || exit 1
- rm -rf texmf-dist
- ;;
- extra)
- unset flavour
- untar $output || exit 1
- export flavour=".doc"
- untar $output_doc || exit 1
- remove_cruft || exit 1
- #tar vrf $tarball --clamp-mtime --mtime --owner=0 --group=0 --sort=name texmf-dist || exit 1
- tar rf $tarball --owner=0 --group=0 --sort=name texmf-dist || exit 1
- rm -rf texmf-dist
- ;;
- docs)
- export flavour=".doc"
- # only add -base docs to -docs
- if [ $1 = base ]
- then
- untar $output_doc || exit 1
- remove_cruft || exit 1
- #tar vrf $tarball --clamp-mtime --mtime --owner=0 --group=0 --sort=name texmf-dist || exit 1
- tar rf $tarball --owner=0 --group=0 --sort=name texmf-dist || exit 1
- rm -rf texmf-dist
- fi
- ;;
- esac
- fi
-}
-
-lint () {
-
-echo "Comparing content of all editions, this may take a while ..."
-cd $TMP
-# check if all editions of same VERSION are there, take -base as reference
-lint_version=$( ls texlive-base-*tar.xz | head -n1 | cut -d'.' -f2 || exit 1)
-if [ -s texlive-extra-$MAJORVERSION.$lint_version.tar.xz \
- -a -s texlive-docs-$MAJORVERSION.$lint_version.tar.xz ]
-then
- for edition in base extra docs
- do
- echo "Extracting index of texlive-${edition}-$MAJORVERSION.$lint_version.tar.xz ..."
- # don't list directories
- tar tf texlive-${edition}-$MAJORVERSION.$lint_version.tar.xz | grep -v '/'$ > $TMP/packages.$edition.lint
- done
-
- # compare content
- for edition in base extra docs
- do
- >$TMP/packages.$edition.lint.dup
- if [ $edition = base ]
- then
- echo "check if files of base are present in another edition"
- while read line
- do
- grep ^"$line"$ $TMP/packages.extra.lint >> $TMP/packages.base.lint.dup
- grep ^"$line"$ $TMP/packages.docs.lint >> $TMP/packages.base.lint.dup
- done < $TMP/packages.$edition.lint
- fi
- done
-else
- echo "Not all editions are present to lint them. Create them first by"
- echo "$0 [base|docs|extra]"
- echo "bye."
- exit 1
-fi
-
-exit 0
-
-}
-
-# Main
-
-LANG=C
-output=$TMP/packages
-output_doc=$TMP/packages.doc.tmp
-errorlog=$TMP/error.log
-texmf=$TMP/texmf
-db=$TMP/texlive.tlpdb
-tmpfile=$TMP/tmpfile
-collections_done=$TMP/done
-collections_tobedone=$TMP/tobedone
-allcollections=$TMP/allcollections
-binary_removed=$TMP/binaries.removed
-manpages=$TMP/manpages
-dependencies=$TMP/deps
-packages_base=$TMP/packages.base
-packages_extra=$TMP/packages.extra
-packages_manpages=$TMP/packages.manpages
-updmap=$TMP/updmap.cfg
-files_split=$TMP/files.split
-platforms="x86_64-linux i386-linux"
-
-mkdir -p $texmf
-cd $TMP
-
-case "$1" in
- base|docs|extra) edition=$1;;
- lint) lint ;;
- *) usage; exit 0 ;;
-esac
-
-echo "Building $edition tarball ..."
-
-# Set VERSION, get texlive.tlpdb and keep unshorten $db.orig
-if [ ! -s ${db}.orig -o ! -s $db -o ! -s VERSION ]
-then
- echo $MAJORVERSION.$(date +%y%m%d) > VERSION
- #wget -q --show-progress -c -O ${db}.orig ${mirror}tlpkg/texlive.tlpdb
- wget -q --show-progress -c -O ${db}.orig.xz ${mirror}tlpkg/texlive.tlpdb.xz
- unxz ${db}.orig.xz
-
- # remove most content from $db to be faster on later processing.
- # keep dependencies/manpages/binfiles/shortdesc/sizes
- grep -E \
- '^\S|^ RELOC/doc/man|^ texmf-dist/doc/man/man|^ RELOC/doc/info/|^ texmf-dist/doc/info/|^ bin|^$' \
- ${db}.orig | grep -v ^longdesc > $db
-
- # As $db might be renewed, remove the all package meta-files
- # to make them be created again based on (new) $db
- rm -rf $texmf/*.meta
-fi
-
-# Get linenumbers of empty lines from $db
-emptylines="$(grep -n ^$ $db | cut -d':' -f1)"
-
-# Make a list of all collections
-grep ^"name collection-" $db | cut -d' ' -f2 > $allcollections
-
-# translate .ARCH to platforms in excludes, to make .ARCH packages excludeable by $global_exclude
-for exclude in $global_exclude
-do
- if [ -n "$(echo $exclude | grep '\.ARCH'$ )" ]
- then
- for arch in $platforms
- do
- global_exclude+=" $(echo $exclude | sed "s/\.ARCH$/\.$arch/")"
- done
- global_exclude=${global_exclude/$exclude/}
- fi
-done
-
-VERSION=$(cat $TMP/VERSION)
-tarball=$TMP/texlive-$edition-$VERSION.tar
-# set logfile
-logfile=$TMP/$VERSION.log
-
-# reset some files
->$logfile
->$tarball
->$collections_done
->$files_split
->$manpages
->$packages_manpages
->$updmap.$edition
->$packages_base
->$packages_extra
->$packages_base.doc
->$packages_extra.doc
->$TMP/packages.$edition.meta
->$TMP/packages.$edition.meta.uncompressed
->$TMP/provides.run.$edition
->$TMP/depends.run.$edition
->$binary_removed.$edition
-
-# put the editions base/extra together
-texmf_editions || exit 1
-
-# Check if all collections are part in at least one edition
-while read collection
-do
- grep -w "$collection" $collections_done &> /dev/null
- if [ $? != 0 ]
- then
- echo "Error: $collection was not handled."
- echo "Edit packages/collections in the texmfget function." | tee -a $logfile
- exit 1
- fi
-done < $allcollections
-
-# cleanup
-rm $allcollections
-rm $collections_done
-rm $collections_tobedone
-rm $output
-rm $output_doc
-rm $dependencies
-
-# untar special- and manpage packages to be splitted/moved to other editions
-# splitting special packages, files index
-echo "Prepare index of to be splitted/moved files from -base"
-[ ! -d texmf-dist ] && mkdir texmf-dist
-for package in $special_packages
-do
- echo "Splitting $package"
- # special packages have to be in -base, as only here are special
- # tasks done to reduce size of -base edition
- if [ -z "$( grep ^"$package"$ $packages_base )" ]
- then
- echo "$package was not found to be part of -base"
- echo "Edit \$special_packages in $0,"
- echo "it should contain only packages from -base, bye."
- exit 1
- fi
- unset relocated
- pathprefix="texmf-dist/"
- [ -n "$(grep -w ^"relocated 1" $texmf/$package.meta)" ] && \
- relocated="-C texmf-dist" && unset pathprefix
- # avoid big pdf docs which are also present as html
- # move (big)type1 fonts to -extra
- # $files_split lists files to be moved from -base to -extra
- if [ $package = "cm-super" ]
- then
- # cm-super minimal for -base, create index of extended cm-super
- tar tf $texmf/$package.tar.xz | sed \
- "/1000\.pfb$/d;/^tlpkg/d;/\.sty$/d;/\.enc$/d;/\.GS$/d" \
- | tee -a $files_split > $files_split.tmp
- else
- tar tf $texmf/${package}.tar.xz | sed \
- -ne "/.*doc\/latex\/.*\.pdf$/p" \
- -ne "/.*fonts\/map\/.*\.map$/p" \
- -ne "/.*fonts\/enc\/.*\.enc$/p" \
- -ne "/.*fonts\/afm\/.*\.\(afm\|afm\.gz\)$/p" \
- -ne "/.*fonts\/type1\/.*\.pfb$/p" \
- -ne "/.*fonts\/vf\/.*\.vf$/p" \
- | tee -a $files_split > $files_split.tmp
- fi
-
- if [ $edition = base ]
- then
- # Calculate package-minimal size, uncompressed and compressed
- mkdir -p calculate/texmf-dist
- tar xf $texmf/$package.tar.xz -C calculate/texmf-dist --exclude-from=$files_split.tmp
- tar cf calculate/calc.tar.xz -I 'xz -9' calculate/texmf-dist
- size_minimal=$(du -bc calculate/calc.tar.xz | tail -n1 | sed "s/[[:space:]].*//")
- size_minimal_uncompressed="$(xz -l --verbose calculate/calc.tar.xz | grep "Uncompressed size" | cut -d'(' -f2 | cut -d' ' -f1 )"
- sed -i \
- -e "s/^[0-9]* byte, $package: /$size_minimal byte, $package-minimal: /" \
- $output.base.meta
- sed -i \
- -e "s/^[0-9]* byte, $package: /$size_minimal_uncompressed byte, $package-minimal: /" \
- $output.base.meta.uncompressed
- rm -rf calculate
- fi
-
- if [ $edition = extra ]
- then
- mkdir -p calculate/texmf-dist
- tar xf $texmf/${package}.tar.xz -C calculate/texmf-dist $(paste $files_split.tmp)
- tar cf calculate/calc.tar.xz -I 'xz -9' calculate/texmf-dist
- size_extended=$(du -bc calculate/calc.tar.xz | tail -n1 | sed "s/[[:space:]].*//")
- size_extended_uncompressed="$(xz -l --verbose calculate/calc.tar.xz | \
- grep "Uncompressed size" | cut -d'(' -f2 | cut -d' ' -f1 )"
-
- # put new sizes in package index uncompressed
- sed -i \
- -e "s/^[0-9]* byte, $package: /$size_extended byte, $package-extended: /" \
- $output.extra.meta
- sed -i \
- -e "s/^[0-9]* byte, $package: /$size_extended_uncompressed byte, $package-extended: /" \
- $output.extra.meta.uncompressed
- rm -rf calculate
-
- # put map files from splitted packages in -extra
- mkdir meta_tmp
- tar xf $texmf/${package}.tar.xz -C meta_tmp tlpkg/tlpobj/$package.tlpobj
- grep ^'execute ' meta_tmp/tlpkg/tlpobj/$package.tlpobj | \
- grep Map | cut -d' ' -f2- | sed "s/^add//g" >> $updmap.$edition
- rm -rf meta_tmp
- fi
-
- # untar to provide files for -extra
- tar xf $texmf/${package}.tar.xz $relocated $(paste $files_split.tmp)
- if [ $package = "cm-super" ]
- then
- # create cm-super- minimal config/maps with 10pt glyphs only
- sed "s/cm-super/cm-super-minimal/g" $texmf/texmf-dist/dvips/cm-super/config.cm-super \
- > $texmf/texmf-dist/dvips/cm-super/config-minimal.cm-super
- for map in t1 t2a t2b t2c ts1 x2
- do
- grep 1000 $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-$map.map \
- > $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-minimal-$map.map
- sed -i "/.*1000\.pfb/d" $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-$map.map
- done
- fi
-done
-
-# cleanup
-rm $files_split.tmp
-
-# fix relocation in index for splitted packages
-sed -i \
- -e "s|^doc|texmf-dist\/doc|g" \
- -e "s|^fonts|texmf-dist\/fonts|g" \
- -e "s|^dvips|texmf-dist\/dvips|g" \
- $files_split
-
-# sort meta data about added packages
-sort -n $output.$edition.meta > $tmpfile
-mv $tmpfile $output.$edition.meta
-sort -n $output.$edition.meta.uncompressed > $tmpfile
-mv $tmpfile $output.$edition.meta.uncompressed
-
-sort -u $binary_removed.$edition > $tmpfile
-mv $tmpfile $binary_removed.$edition
-
-# include manpages/GNU infofiles in -base, write index for later exclusion from other editions.
-# In -extra/-docs there should not be any manpage left.
-echo "Looking for manpages/GNU infofiles to be included in -base ..."
-for package in $(paste -s $packages_base.doc | sort -u)
-do
- if [ -n "$(grep -E "(doc/man/man|doc/info/)" $texmf/$package.meta )" ]
- then
- echo "Adding manpage from $package.doc to -base"
- flavour=".doc" download $package || exit 1
- unset relocated
- pathprefix="texmf-dist/"
- [ -n "$(grep -w ^"relocated 1" $texmf/$package.meta)" ] \
- && relocated="-C texmf-dist" && unset pathprefix
- tar tf $texmf/${package}.doc.tar.xz | sed \
- -ne "/.*doc\/man\/.*\.1$/p" \
- -ne "/.*doc\/man\/.*\.5$/p" \
- -ne "/.*doc\/info\/.*\.info$/p" \
- | tee -a $manpages > $manpages.tmp
- # untar to provide files for -/extra/-docs
- tar xf $texmf/${package}.doc.tar.xz $relocated $(paste $manpages.tmp)
- echo "$package" >> $packages_manpages
- fi
-done
-# cleanup
-rm $manpages.tmp
-sed -i \
- -e "s/^doc/texmf-dist\/doc/g" \
- $manpages
-
-case $edition in
- base)
- # Content info
- cat << EOF | gzip -9 >> $texmf/texmf-dist/packages.$edition.gz
-Content of -$edition:
-$(sed "/-linux$/d" $packages_base | sort)
-EOF
- # create texdoc cache file
- if [ $(command -v texdoc) ]
- then
- mkdir -p texmf-dist/scripts/texdoc || exit 1
- TEXMFVAR=$texmf/texmf-dist \
- texdoc -c texlive_tlpdb=$TMP/texlive.tlpdb.orig \
- -DlM texlive-en >/dev/null 2>&1
- mv texmf-dist/texdoc/cache-tlpdb.lua \
- texmf-dist/scripts/texdoc/Data.tlpdb.lua || exit 1
- # add cache to tarball
- tar rf $tarball --owner=0 --group=0 --sort=name \
- texmf-dist/scripts/texdoc/Data.tlpdb.lua || exit 1
- else
- echo "WARNING: texdoc binary(comming with texlive) is not installed, the texdoc cache"
- echo "Data.tlpdb.lua can't be created and wont't be available."
- echo "Texdoc will not wotk without this."
- echo ""
- echo "Continue with any key or abort with ctrl-c"
- read -n1
- fi
-
- # prepare updmap.cfg
- tar xf $tarball texmf-dist/web2c/updmap.cfg
- end_n="$(grep -n 'end of updmap-hdr' texmf-dist/web2c/updmap.cfg | cut -d':' -f1)"
-
- sed "1,${end_n}!d" texmf-dist/web2c/updmap.cfg > $TMP/updmap.cfg.tmp
- cat $updmap.$edition >> $TMP/updmap.cfg.tmp
- mv $TMP/updmap.cfg.tmp texmf-dist/web2c/updmap.cfg
- tar f $tarball --delete texmf-dist/web2c/updmap.cfg
- tar rf $tarball --owner=0 --group=0 --sort=name \
- texmf-dist/web2c/updmap.cfg
-
-# add manpages/GNU infofiles to the tarball
- tar rf $tarball --owner=0 --group=0 --sort=name \
- texmf-dist/doc/man/ texmf-dist/doc/info/ \
- texmf-dist/packages.$edition.gz \
- || exit 1
-# # add cm-super minimal maps/config
-# tar rf $tarball --owner=0 --group=0 --sort=name \
-# texmf-dist/dvips/cm-super/config-minimal.cm-super \
-# --wildcards texmf-dist/fonts/map/dvips/cm-super/cm-super-minimal-*.map \
-# || exit 1
- echo "Removing files -from base, splitted from special packages to be included in -extra"
- tar f $tarball --delete $(paste $files_split) || exit 1
- ;;
- extra)
- echo "Removing manpages from $edition which now reside in -base"
- tar f $tarball --delete $(paste $manpages) 2>/dev/null
- # content info
- echo "Content of -$edition, including documentation:" > $texmf/texmf-dist/packages.$edition
- sed "/-linux$/d" $TMP/packages.$edition | sort >> $texmf/texmf-dist/packages.$edition
- gzip -9 $texmf/texmf-dist/packages.$edition
-# # remove cm-super minimal config, which resides in -base
-# rm \
-# $texmf/texmf-dist/dvips/cm-super/config-minimal.cm-super \
-# $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-minimal-*.map
-
- # add -extra updmap.cfg
- mkdir -p $texmf/texmf-dist/web2c
- mv $updmap.$edition $texmf/texmf-dist/web2c
- tar rf $tarball --owner=0 --group=0 --sort=name \
- --exclude texmf-dist/doc \
- texmf-dist \
- || exit 1
- ;;
- docs)
- # add docs splittet from base from special packages, add packages index
- # content info, this edition contains all docs from -base
- echo "Content of -$edition, documentation for -base:" > $texmf/texmf-dist/packages.$edition
- sort $packages_base.doc >> $texmf/texmf-dist/packages.$edition
- gzip -9 $texmf/texmf-dist/packages.$edition
- tar rf $tarball --owner=0 --group=0 --sort=name \
- texmf-dist/doc/ \
- texmf-dist/packages.$edition.gz \
- || exit 1
- echo "Removing manpages from $edition which now reside in -base"
- tar f $tarball --delete $(paste $manpages) || exit 1
- ;;
-esac
-
-rm -rf texmf-dist
-[ -f $updmap.$edition ] && rm $updmap.$edition
-
-# compress the tarball as everything is in place now
-echo "Compressing $tarball ..."
-[ -f $tarball.xz ] && rm $tarball.xz
-xz -9 -T0 $tarball || exit 1
-md5sum $tarball.xz
-ls -lh $tarball.xz
-echo "Logfile: $logfile"
diff --git a/office/texlive/slack-desc b/office/texlive/slack-desc
deleted file mode 100644
index 5feea19c55..0000000000
--- a/office/texlive/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-texlive: texlive (TeX binaries, support files, and formats)
-texlive:
-texlive: This package contains binaries, support files, TeX formats and
-texlive: packages,and other files included in the TeXLive TeX distribution.
-texlive: Included are input files for TeX, runtime configuration files,
-texlive: hyphenation tables, manpages, and the computer modern fonts.
-texlive:
-texlive: SlackBuilds.org has more texmf files and documentation in the
-texlive: texlive-extra and texlive-docs packages.
-texlive:
-texlive:
diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
deleted file mode 100644
index f33177ed05..0000000000
--- a/office/texlive/texlive.SlackBuild
+++ /dev/null
@@ -1,253 +0,0 @@
-#!/bin/sh
-
-# TeXLive build script for Slackware
-
-# Copyright 2009, 2017 - 2020 Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2009 - 2014 Robby Workman, Northport, AL, USA
-# Copyright 2016 - 2017 Johannes Schoepfer, Germany
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# URL: ftp://tug.org/historic/systems/texlive/
-# Testrelease: ftp://tug.org/texlive/Images/test/
-# Upstream stable fixes: svn://tug.org/texlive/branches/branch2020/Build/source
-
-PRGNAM=texlive
-SOURCEVERSION=20200327
-VERSION=${VERSION:-2020.200608}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-texlive
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-TEXMFROOT=/usr/share
-
-# NOTE: Using the system version of poppler will require texlive to be
-# recompiled with pretty much every poppler update, as they almost always
-# bump the shared library version. But sometimes you do what you have
-# to do...
-SYSTEMPOPPLER=${SYSTEMPOPPLER:-NO}
-if [ "$SYSTEMPOPPLER" = "NO" ]; then
- POPPLER="--without-system-poppler --without-system-xpdf"
-else
- POPPLER="--with-system-poppler --with-system-xpdf"
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf texlive-$SOURCEVERSION-source
-tar xvf $CWD/texlive-${SOURCEVERSION}-source.tar.xz || exit 1
-cd texlive-$SOURCEVERSION-source || exit 1
-chown -R root:root .
-chmod -R u+w,go-w,a+rX-st .
-
-export LANG=C
-export PATH="$PKG/usr/bin:$PATH"
-export LD_LIBRARY_PATH="$PKG/usr/lib${LIBDIRSUFFIX}:$LD_LIBRARY_PATH"
-
-# set TEXMFROOT and TEXMFLOCAL
-sed -i \
- -e "s|^TEXMFROOT.*|TEXMFROOT = $TEXMFROOT|" \
- -e "s|^TEXMFLOCAL.*|TEXMFLOCAL = \$TEXMFROOT/texmf-local|" \
- texk/kpathsea/texmf.cnf
-
-# prevent compiling Xdvi with libXp
-sed -i 's|-lXp ||' texk/xdvik/configure
-
-mkdir build
-cd build
- CFLAGS="$SLKCFLAGS" \
- CXXFLAGS="$SLKCFLAGS -fpermissive" \
- ../configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --with-banner-add=' on Slackware (SlackBuilds.org)' \
- --disable-native-texlive-build \
- --enable-largefile \
- --enable-shared \
- --disable-static \
- --disable-missing \
- --disable-multiplatform \
- --disable-debug \
- --disable-dialog \
- --disable-bibtexu \
- --disable-xz \
- --with-x \
- --disable-dvisvgm \
- --enable-xindy \
- --disable-xindy-docs \
- --disable-xindy-rules \
- --with-clisp-runtime=system \
- --enable-gc=system \
- --with-system-zlib \
- --with-system-libpng \
- --with-system-t1lib \
- --with-system-gd \
- --with-system-freetype2 \
- --with-system-libgs \
- --with-system-icu \
- --with-system-pixman \
- --with-system-cairo \
- --with-system-gmp \
- --with-system-mpfr \
- --with-system-fontconfig \
- --with-system-ncurses \
- --without-system-harfbuzz \
- --disable-aleph \
- --disable-dump-share \
- --disable-linked-scripts \
- $POPPLER \
- --build=$ARCH-slackware-linux || exit 1
-
- make || exit 1
- #make check || exit 1
- make install-strip DESTDIR=$PKG || exit 1
-
-cd ..
-
-# Don't ship .la files:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
-
-# Remove all files which are covered by tlnet
-rm -rf $PKG$TEXMFROOT $PKG/usr/man $PKG/usr/info
-
-# install the tlnet stuff
-mkdir -p $PKG$TEXMFROOT
-tar xvf $CWD/texlive-base-$VERSION.tar.xz -C $PKG$TEXMFROOT || exit 1
-chown -R root:root $PKG
-chmod -R u+w,go-w,a+rX-st $PKG
-
-# use symlinks/scripts from tlnet
-for link in $PKG$TEXMFROOT/texmf-dist/linked_scripts/* ;do \
- if [ -e "$link" ]; then
- ln -sf $TEXMFROOT/texmf-dist/linked_scripts/bin/${link##*/} $PKG/usr/bin/${link##*/}
- else
- mv $link $PKG/usr/bin/${link##*/}
- fi
-done
-mkdir -p $PKG$TEXMFROOT/texmf-dist/bin
-mv $PKG$TEXMFROOT/texmf-dist/linked_scripts/* $PKG$TEXMFROOT/texmf-dist/bin
-mv $PKG$TEXMFROOT/texmf-dist/bin $PKG$TEXMFROOT/texmf-dist/linked_scripts
-
-# set some paths
-sed -i \
- -e "s|^TEXMFROOT.*|TEXMFROOT = $TEXMFROOT|" \
- -e "s|^TEXMFLOCAL.*|TEXMFLOCAL = \$TEXMFROOT/texmf-local|" \
- -e "s|^OSFONTDIR.*|OSFONTDIR = ~/.fonts:/usr/share/fonts|" \
- $PKG$TEXMFROOT/texmf-dist/web2c/texmf.cnf
-
-# disable obsolete aleph/lamed/cslatex/pdfcslatex
-sed -i \
- -e 's|^aleph|#! aleph|' \
- -e 's|^lamed|#! lamed|' \
- -e 's|^cslatex|#! cslatex|' \
- -e 's|^pdfcslatex|#! pdfcslatex|' \
- $PKG$TEXMFROOT/texmf-dist/web2c/fmtutil.cnf
-
-# make ConTeXt work
-sed -i \
- -e "s|selfautoparent:|$TEXMFROOT/|g" \
- -e "s|\(TEXMFLOCAL[ ]*=[ ]*\)[^,]*|\1\"$TEXMFROOT/texmf-local\"|" \
- $PKG$TEXMFROOT/texmf-dist/web2c/texmfcnf.lua
-
-# provide texlive fonts optionally for other system apps
-mkdir -p $PKG/etc/fonts/conf.avail
-cat > $PKG/etc/fonts/conf.avail/09-texlive.conf << EOF
-<?xml version='1.0'?>
-<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
-<fontconfig>
- <dir>$TEXMFROOT/texmf-dist/fonts/opentype</dir>
- <dir>$TEXMFROOT/texmf-dist/fonts/truetype</dir>
-</fontconfig>
-EOF
-
-# Install the docs while we're still here
-mkdir -p $PKG/usr/doc/texlive-$VERSION
-cp -a ChangeLog README* $PKG/usr/doc/texlive-$VERSION
-# Install index of provided tex packages to the docs
-mv $PKG$TEXMFROOT/texmf-dist/packages.base.gz $PKG/usr/doc/texlive-$VERSION
-
-# Put a symlink to $TEXMFROOT/texmf-dist/doc in our Slackware docdir
-ln -sf $TEXMFROOT/texmf-dist/doc $PKG/usr/doc/texlive-$VERSION/doc
-
-# We won't make tlmgr easily available; it's still there, but
-# we'll make it harder to void the warranty :-)
-rm $PKG/usr/bin/tlmgr
-cat $CWD/README.tlpkg > $PKG/usr/doc/texlive-$VERSION/README.tlpkg
-
-# Create some directories to make it clear that they're owned by this package
-mkdir -p $PKG$TEXMFROOT/{texmf-config,texmf-var,texmf-local}
-
-# Use patch for tabu.sty from https://github.com/tabu-fixed/tabu to fix
-# breakage when compiling doxygen:
-( cd $PKG$TEXMFROOT/texmf-dist/tex/latex/tabu
- cat $CWD/patches/tabu.sty.diff | patch -p1 --verbose || exit 1
- ) || exit 1
-
-# Add texlive perl modules
-mkdir -p $PKG/usr/share/perl5
-mv $PKG$TEXMFROOT/texmf-dist/scripts/texlive/TeXLive $PKG/usr/share/perl5/
-
-# Move manual pages to the correct place
-mkdir $PKG/usr/man
-mv $PKG$TEXMFROOT/texmf-dist/doc/man/man1 $PKG/usr/man
-mv $PKG$TEXMFROOT/texmf-dist/doc/man/man5 $PKG/usr/man
-rmdir $PKG$TEXMFROOT/texmf-dist/doc/man
-
-# Handle the man pages
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-
-# Handle the GNU info pages
-mv $PKG$TEXMFROOT/texmf-dist/doc/info $PKG/usr
-gzip -9 $PKG/usr/info/*
-
-mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/texlive/texlive.info b/office/texlive/texlive.info
deleted file mode 100644
index af079541e7..0000000000
--- a/office/texlive/texlive.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="texlive"
-VERSION="2020.200608"
-HOMEPAGE="https://tug.org/texlive/"
-DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/texlive-20200327-source.tar.xz \
- http://slackware.schoepfer.info/slackbuilds/texlive/texlive-base-2020.200608.tar.xz"
-MD5SUM="02963bd8eae94b278407e86c9604e761 \
- 448c337b359fdfc44321cd7928176b74"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Johannes Schoepfer"
-EMAIL="slackbuilds@schoepfer.info"
diff --git a/perl/Net-SSLeay/Net-SSLeay.SlackBuild b/perl/Net-SSLeay/Net-SSLeay.SlackBuild
deleted file mode 100644
index cce3337e56..0000000000
--- a/perl/Net-SSLeay/Net-SSLeay.SlackBuild
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Net-SSLeay
-#
-# Copyright 2009-2011 Marco Bonetti <sid77@slackware.it>
-# Copyright 2015-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=Net-SSLeay
-VERSION=${VERSION:-1.81}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-DOCS="Changes Credits README examples"
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-echo "n" | perl Makefile.PL \
- PREFIX=/usr \
- INSTALLDIRS=vendor \
- INSTALLVENDORMAN1DIR=/usr/man/man1 \
- INSTALLVENDORMAN3DIR=/usr/man/man3
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/Net-SSLeay/Net-SSLeay.info b/perl/Net-SSLeay/Net-SSLeay.info
deleted file mode 100644
index 84787786c1..0000000000
--- a/perl/Net-SSLeay/Net-SSLeay.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="Net-SSLeay"
-VERSION="1.81"
-HOMEPAGE="https://metacpan.org/pod/Net::SSLeay"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MI/MIKEM/Net-SSLeay-1.81.tar.gz"
-MD5SUM="71932ce34d4db44de8d00399c3405792"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/perl/Net-SSLeay/README b/perl/Net-SSLeay/README
deleted file mode 100644
index dd07c64184..0000000000
--- a/perl/Net-SSLeay/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This module offers some high level convenience functions for accessing web pages
-on SSL servers (for symmetry, same API is offered for accessing http servers,
-too), a sslcat() function for writing your own clients, and finally access to
-the SSL api of SSLeay/OpenSSL package so you can write servers or clients for
-more complicated applications.
diff --git a/perl/Net-SSLeay/slack-desc b/perl/Net-SSLeay/slack-desc
deleted file mode 100644
index 2fe0095572..0000000000
--- a/perl/Net-SSLeay/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-Net-SSLeay: Net-SSLeay (perl module)
-Net-SSLeay:
-Net-SSLeay: Perl extension for using OpenSSL
-Net-SSLeay:
-Net-SSLeay:
-Net-SSLeay:
-Net-SSLeay:
-Net-SSLeay:
-Net-SSLeay:
-Net-SSLeay:
-Net-SSLeay:
diff --git a/perl/perl-Authen-SASL/README b/perl/perl-Authen-SASL/README
deleted file mode 100644
index 55fac5058d..0000000000
--- a/perl/perl-Authen-SASL/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Authen::SASL - SASL Authentication framework
-
-SASL is a generic mechanism for authentication used by several network
-protocols. Authen::SASL provides an implementation framework that all
-protocols should be able to share.
diff --git a/perl/perl-Authen-SASL/perl-Authen-SASL.SlackBuild b/perl/perl-Authen-SASL/perl-Authen-SASL.SlackBuild
deleted file mode 100644
index 1eb89d7005..0000000000
--- a/perl/perl-Authen-SASL/perl-Authen-SASL.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2010, 2011, 2012 Daniel LEVAI
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# * Neither the name of the <organization> nor the
-# names of its contributors may be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Build script for perl-Authen-SASL
-
-PRGNAM=perl-Authen-SASL
-VERSION=${VERSION:-2.16}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=Authen-SASL
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ];then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -Rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -Rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-perl Makefile.PL \
- PREFIX=/usr \
- INSTALLDIRS=vendor \
- INSTALLVENDORMAN3DIR=/usr/man/man3
-make
-make test
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-find $PKG -depth -type d -empty -delete || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a api.txt Changes \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Authen-SASL/perl-Authen-SASL.info b/perl/perl-Authen-SASL/perl-Authen-SASL.info
deleted file mode 100644
index a116cca2a6..0000000000
--- a/perl/perl-Authen-SASL/perl-Authen-SASL.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="perl-Authen-SASL"
-VERSION="2.16"
-HOMEPAGE="https://metacpan.org/pod/Authen::SASL"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/G/GB/GBARR/Authen-SASL-2.16.tar.gz"
-MD5SUM="7c03a689d4c689e5a9e2f18a1c586b2f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="perl-digest-hmac"
-MAINTAINER="Daniel LEVAI"
-EMAIL="leva@ecentrum.hu"
diff --git a/perl/perl-Authen-SASL/slack-desc b/perl/perl-Authen-SASL/slack-desc
deleted file mode 100644
index ccfbea916e..0000000000
--- a/perl/perl-Authen-SASL/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-perl-Authen-SASL: perl-Authen-SASL (SASL Authentication framework)
-perl-Authen-SASL:
-perl-Authen-SASL: SASL is a generic mechanism for authentication used by several network
-perl-Authen-SASL: protocols. Authen::SASL provides an implementation framework that all
-perl-Authen-SASL: protocols should be able to share.
-perl-Authen-SASL:
-perl-Authen-SASL:
-perl-Authen-SASL:
-perl-Authen-SASL: Homepage: https://metacpan.org/release/Authen-SASL
-perl-Authen-SASL:
-perl-Authen-SASL:
diff --git a/perl/perl-Crypt-OpenSSL-Guess/README b/perl/perl-Crypt-OpenSSL-Guess/README
new file mode 100644
index 0000000000..9c2f55c509
--- /dev/null
+++ b/perl/perl-Crypt-OpenSSL-Guess/README
@@ -0,0 +1,4 @@
+perl-Crypt-OpenSSL-Guess provides perl modules for Guess encoding and decoding,
+using the openSSL libraries.
+
+perl-Crypt-OpenSSL-Guess is required for perl-Mail-DKIM.
diff --git a/perl/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.SlackBuild b/perl/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.SlackBuild
new file mode 100644
index 0000000000..58355bcf0d
--- /dev/null
+++ b/perl/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# Slackware Package Build Script for perl modules: Crypt::OpenSSL::Guess
+
+# Copyright (c) 2020 Matteo Bernardini <ponce@slackbuilds.org, Pisa, Italy
+# All rights reserved.
+
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+
+# 1. Redistributions of script must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="perl-Crypt-OpenSSL-Guess"
+SRCNAM="Crypt-OpenSSL-Guess"
+VERSION=${VERSION:-0.11}
+TAG=${TAG:-_SBo}
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+DOCS="Changes LICENSE README.md"
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+
+rm -fr $TMP/$SRCNAM-$VERSION $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $TMP/$SRCNAM-$VERSION
+chown -R root.root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor \
+ INSTALLVENDORMAN3DIR=/usr/man/man3
+
+make
+make install DESTDIR=$PKG
+
+### putting essential docs
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Remove perlocal.pod and .packlist from $PKG
+( cd $PKG
+ find . -name "perllocal.pod" -o -name ".packlist" -o -name "*.bs" | xargs rm -f
+)
+
+# Remove empty directories
+find $PKG -depth -type d -empty -exec rm -rf {} \;
+
+### strip binaries
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+( cd $PKG/usr/man
+ find . -type f -exec gzip -9 {} \;
+ for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.info b/perl/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.info
new file mode 100644
index 0000000000..1624ccb08c
--- /dev/null
+++ b/perl/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Crypt-OpenSSL-Guess"
+VERSION="0.11"
+HOMEPAGE="https://metacpan.org/pod/Crypt::OpenSSL::Guess"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz"
+MD5SUM="e768fe2c07826b0ac9ea604c79f93032"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Crypt-OpenSSL-Random"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/perl/perl-Crypt-OpenSSL-Guess/slack-desc b/perl/perl-Crypt-OpenSSL-Guess/slack-desc
new file mode 100644
index 0000000000..3ca34f679a
--- /dev/null
+++ b/perl/perl-Crypt-OpenSSL-Guess/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+perl-Crypt-OpenSSL-Guess: perl-Crypt-OpenSSL-Guess (Crypt::OpenSSL::Guess)
+perl-Crypt-OpenSSL-Guess:
+perl-Crypt-OpenSSL-Guess: perl-Crypt-OpenSSL-Guess provides helpers to guess OpenSSL include
+perl-Crypt-OpenSSL-Guess: path on any platforms.
+perl-Crypt-OpenSSL-Guess:
+perl-Crypt-OpenSSL-Guess: homepage: https://metacpan.org/pod/Crypt::OpenSSL::Guess
+perl-Crypt-OpenSSL-Guess:
+perl-Crypt-OpenSSL-Guess:
+perl-Crypt-OpenSSL-Guess:
+perl-Crypt-OpenSSL-Guess:
+perl-Crypt-OpenSSL-Guess:
diff --git a/perl/perl-Crypt-OpenSSL-RSA/perl-Crypt-OpenSSL-RSA.SlackBuild b/perl/perl-Crypt-OpenSSL-RSA/perl-Crypt-OpenSSL-RSA.SlackBuild
index dbdca99896..d32d8ac2af 100644
--- a/perl/perl-Crypt-OpenSSL-RSA/perl-Crypt-OpenSSL-RSA.SlackBuild
+++ b/perl/perl-Crypt-OpenSSL-RSA/perl-Crypt-OpenSSL-RSA.SlackBuild
@@ -29,7 +29,7 @@
PRGNAM="perl-Crypt-OpenSSL-RSA"
SRCNAM="Crypt-OpenSSL-RSA"
-VERSION=${VERSION:-0.28}
+VERSION=${VERSION:-0.31}
TAG=${TAG:-_SBo}
BUILD=${BUILD:-1}
diff --git a/perl/perl-Crypt-OpenSSL-RSA/perl-Crypt-OpenSSL-RSA.info b/perl/perl-Crypt-OpenSSL-RSA/perl-Crypt-OpenSSL-RSA.info
index d8112f1a2b..ec9f4a49cc 100644
--- a/perl/perl-Crypt-OpenSSL-RSA/perl-Crypt-OpenSSL-RSA.info
+++ b/perl/perl-Crypt-OpenSSL-RSA/perl-Crypt-OpenSSL-RSA.info
@@ -1,10 +1,10 @@
PRGNAM="perl-Crypt-OpenSSL-RSA"
-VERSION="0.28"
+VERSION="0.31"
HOMEPAGE="https://metacpan.org/pod/Crypt::OpenSSL::RSA"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/P/PE/PERLER/Crypt-OpenSSL-RSA-0.28.tar.gz"
-MD5SUM="86217a5036fc63779c30420b5fd84129"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz"
+MD5SUM="d33681e19d2094df7c26bc7a4509265e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="perl-Crypt-OpenSSL-Random"
+REQUIRES="perl-Crypt-OpenSSL-Guess perl-Crypt-OpenSSL-Random"
MAINTAINER="Nishant Limbachia"
EMAIL="nishant@mnspace.net"
diff --git a/perl/perl-DateTime-Format-Strptime/perl-DateTime-Format-Strptime.SlackBuild b/perl/perl-DateTime-Format-Strptime/perl-DateTime-Format-Strptime.SlackBuild
index d371170da3..e189991cb3 100644
--- a/perl/perl-DateTime-Format-Strptime/perl-DateTime-Format-Strptime.SlackBuild
+++ b/perl/perl-DateTime-Format-Strptime/perl-DateTime-Format-Strptime.SlackBuild
@@ -81,7 +81,6 @@ perl Makefile.PL \
INSTALLVENDORMAN1DIR=/usr/man/man1 \
INSTALLVENDORMAN3DIR=/usr/man/man3
make
-make test
make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/perl/perl-Devel-CheckLib/README b/perl/perl-Devel-CheckLib/README
deleted file mode 100644
index c0e9bdd6f9..0000000000
--- a/perl/perl-Devel-CheckLib/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Devel::CheckLib is a perl module that checks whether a particular C library and
-its headers are available.
diff --git a/perl/perl-Devel-CheckLib/perl-Devel-CheckLib.SlackBuild b/perl/perl-Devel-CheckLib/perl-Devel-CheckLib.SlackBuild
deleted file mode 100644
index 9434368ba9..0000000000
--- a/perl/perl-Devel-CheckLib/perl-Devel-CheckLib.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for perl-Devel-CheckLib
-
-# Copyright 2017 Larry Hajali <larryhaja[at]gmail[dot]com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-SRCNAM=Devel-CheckLib
-PRGNAM=perl-Devel-CheckLib
-VERSION=${VERSION:-1.07}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-perl Makefile.PL \
- PREFIX=/usr \
- INSTALLDIRS=vendor \
- INSTALLVENDORMAN1DIR=/usr/man/man1 \
- INSTALLVENDORMAN3DIR=/usr/man/man3
-make
-make test
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG -type f -perm 444 -exec chmod 0644 '{}' \;
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-find $PKG -depth -type d -empty -delete || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES README TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Devel-CheckLib/perl-Devel-CheckLib.info b/perl/perl-Devel-CheckLib/perl-Devel-CheckLib.info
deleted file mode 100644
index 08823baa4b..0000000000
--- a/perl/perl-Devel-CheckLib/perl-Devel-CheckLib.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="perl-Devel-CheckLib"
-VERSION="1.07"
-HOMEPAGE="https://metacpan.org/release/MATTN/Devel-CheckLib-1.07"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MA/MATTN/Devel-CheckLib-1.07.tar.gz"
-MD5SUM="66c76e5cdbae547bb61c3e872f0c6479"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="perl-IO-CaptureOutput"
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/perl/perl-Devel-CheckLib/slack-desc b/perl/perl-Devel-CheckLib/slack-desc
deleted file mode 100644
index 1b71dfee7f..0000000000
--- a/perl/perl-Devel-CheckLib/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-perl-Devel-CheckLib: perl-Devel-CheckLib (perl module)
-perl-Devel-CheckLib:
-perl-Devel-CheckLib: Devel::CheckLib is a perl module that checks whether a particular C
-perl-Devel-CheckLib: library and its headers are available.
-perl-Devel-CheckLib:
-perl-Devel-CheckLib: Homepage: https://github.com/mattn/p5-Devel-CheckLib
-perl-Devel-CheckLib:
-perl-Devel-CheckLib:
-perl-Devel-CheckLib:
-perl-Devel-CheckLib:
-perl-Devel-CheckLib:
diff --git a/perl/perl-File-Slurp/perl-File-Slurp.SlackBuild b/perl/perl-File-Slurp/perl-File-Slurp.SlackBuild
index 1433ba7d43..4750cf7b30 100644
--- a/perl/perl-File-Slurp/perl-File-Slurp.SlackBuild
+++ b/perl/perl-File-Slurp/perl-File-Slurp.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=perl-File-Slurp
-VERSION=${VERSION:-9999.19}
+VERSION=${VERSION:-9999.27}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -42,7 +42,7 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-DOCS="README Changes"
+DOCS="README.md Changes"
set -e
diff --git a/perl/perl-File-Slurp/perl-File-Slurp.info b/perl/perl-File-Slurp/perl-File-Slurp.info
index bc03a8f218..abdce6f049 100644
--- a/perl/perl-File-Slurp/perl-File-Slurp.info
+++ b/perl/perl-File-Slurp/perl-File-Slurp.info
@@ -1,8 +1,8 @@
PRGNAM="perl-File-Slurp"
-VERSION="9999.19"
+VERSION="9999.27"
HOMEPAGE="https://metacpan.org/pod/File::Slurp"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/U/UR/URI/File-Slurp-9999.19.tar.gz"
-MD5SUM="7d584cd15c4f8b9547765eff8c4ef078"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.27.tar.gz"
+MD5SUM="1c8d53024597ba474296c461b30f32e5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/perl/perl-Gnome2-Vte/perl-Gnome2-Vte.info b/perl/perl-Gnome2-Vte/perl-Gnome2-Vte.info
index fa37b200d5..bef97c916e 100644
--- a/perl/perl-Gnome2-Vte/perl-Gnome2-Vte.info
+++ b/perl/perl-Gnome2-Vte/perl-Gnome2-Vte.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://cpan.metacpan.org/authors/id/X/XA/XAOC/Gnome2-Vte-0.11.tar.gz"
MD5SUM="1cb5cdfcd41873e55e923e72e64d922c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="perl-glib perl-gtk2 perl-extutils-depends perl-extutils-pkgconfig"
+REQUIRES="perl-glib perl-gtk2 perl-extutils-depends perl-extutils-pkgconfig vte2"
MAINTAINER="Antonio Taverna"
EMAIL="antonio.tvr@gmail.com"
diff --git a/perl/perl-IO-Socket-SSL/README b/perl/perl-IO-Socket-SSL/README
deleted file mode 100644
index e4ad02a502..0000000000
--- a/perl/perl-IO-Socket-SSL/README
+++ /dev/null
@@ -1,10 +0,0 @@
-IO::Socket::SSL -- Nearly transparent SSL encapsulation for IO::Socket::INET.
-
-This module is a true drop-in replacement for IO::Socket::INET that uses SSL
-to encrypt data before it is transferred to a remote server or client.
-IO::Socket::SSL supports all the extra features that one needs to write a
-full-featured SSL client or server application: multiple SSL contexts, cipher
-selection, certificate verification, and SSL version selection. As an extra
-bonus, it works perfectly with mod_perl.
-
-libwww-perl is an optional dependency.
diff --git a/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.SlackBuild b/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.SlackBuild
deleted file mode 100644
index f8cbb62874..0000000000
--- a/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for perl-IO-Socket-SSL
-
-# Copyright 2009-2012 Marco Bonetti <sid77@slackware.it>
-# Copyright 2015-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=perl-IO-Socket-SSL
-VERSION=${VERSION:-2.068}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-SRC_PRGNAM=IO-Socket-SSL
-DOCS="BUGS Changes README"
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRC_PRGNAM-$VERSION
-tar xvf $CWD/$SRC_PRGNAM-$VERSION.tar.gz
-cd $SRC_PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-yes | perl Makefile.PL \
- PREFIX=/usr \
- INSTALLDIRS=vendor \
- INSTALLVENDORMAN1DIR=/usr/man/man1 \
- INSTALLVENDORMAN3DIR=/usr/man/man3
-make
-make install DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-# Remove empty directories
-find $PKG -depth -type d -empty -delete
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info b/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info
deleted file mode 100644
index f212fa761a..0000000000
--- a/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="perl-IO-Socket-SSL"
-VERSION="2.068"
-HOMEPAGE="https://metacpan.org/pod/IO::Socket::SSL"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SU/SULLR/IO-Socket-SSL-2.068.tar.gz"
-MD5SUM="4230c829c8875889848093b2b46a7284"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="Net-SSLeay perl-Net-LibIDN"
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/perl/perl-IO-Socket-SSL/slack-desc b/perl/perl-IO-Socket-SSL/slack-desc
deleted file mode 100644
index 25d0adb319..0000000000
--- a/perl/perl-IO-Socket-SSL/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-perl-IO-Socket-SSL: perl-IO-Socket-SSL (SSL encapsulation for IO::Socket::INET)
-perl-IO-Socket-SSL:
-perl-IO-Socket-SSL: This module is a true drop-in replacement for IO::Socket::INET that
-perl-IO-Socket-SSL: uses SSL to encrypt data before it is transferred to a remote server
-perl-IO-Socket-SSL: or client. IO::Socket::SSL supports all the extra features that one
-perl-IO-Socket-SSL: needs to write a full-featured SSL client or server application:
-perl-IO-Socket-SSL: multiple SSL contexts, cipher selection, certificate verification, and
-perl-IO-Socket-SSL: SSL version selection. As an extra bonus, it works perfectly with
-perl-IO-Socket-SSL: mod_perl.
-perl-IO-Socket-SSL:
-perl-IO-Socket-SSL:
diff --git a/perl/perl-Image-Magick/README b/perl/perl-Image-Magick/README
deleted file mode 100644
index 0e059256c8..0000000000
--- a/perl/perl-Image-Magick/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Image::Magick - objected-oriented Perl interface to ImageMagick. Use it
-to create, edit, compose, or convert bitmap images from within a Perl script.
-
-This Perl extension allows the reading, manipulation and writing of a
-large number of image file formats using the ImageMagick library. It
-was originally developed to be used by CGI scripts for Web pages.
diff --git a/perl/perl-Image-Magick/perl-Image-Magick.SlackBuild b/perl/perl-Image-Magick/perl-Image-Magick.SlackBuild
deleted file mode 100644
index 875c5ed930..0000000000
--- a/perl/perl-Image-Magick/perl-Image-Magick.SlackBuild
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for perl-Image-Magick
-
-# Copyright 2020 M.A. Begue mab974@gmail.com
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# !!!!!!!! make test commented out !!!!!!!!!!
-
-PRGNAM=perl-Image-Magick
-VERSION=${VERSION:-6.89_1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM="PerlMagick"
-SRCVER="${VERSION/_/-}"
-DIRVER="$( echo $VERSION | cut -d_ -f1 )"
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
-cd $SRCNAM-$DIRVER
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-perl Makefile.PL \
- PREFIX=/usr \
- INSTALLDIRS=vendor \
- INSTALLVENDORMAN1DIR=/usr/man/man1 \
- INSTALLVENDORMAN3DIR=/usr/man/man3
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-find $PKG -depth -type d -empty -delete || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- Changelog MANIFEST README.txt \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Image-Magick/perl-Image-Magick.info b/perl/perl-Image-Magick/perl-Image-Magick.info
deleted file mode 100644
index 98f8cb637f..0000000000
--- a/perl/perl-Image-Magick/perl-Image-Magick.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="perl-Image-Magick"
-VERSION="6.89_1"
-HOMEPAGE="https://metacpan.org/pod/Image::Magick"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/J/JC/JCRISTY/PerlMagick-6.89-1.tar.gz"
-MD5SUM="3df09405f4669def87b56a6e018b898b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Michel A. BEGUE"
-EMAIL="mab974@gmail.com"
diff --git a/perl/perl-Image-Magick/slack-desc b/perl/perl-Image-Magick/slack-desc
deleted file mode 100644
index 3d5be8025d..0000000000
--- a/perl/perl-Image-Magick/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-perl-Image-Magick: perl-Image-Magick (Perl Objected-oriented interface to ImageMagick)
-perl-Image-Magick:
-perl-Image-Magick: This Perl extension allows the reading, manipulation and writing of
-perl-Image-Magick: a large number of image file formats using the ImageMagick library.
-perl-Image-Magick: It was originally developed to be used by CGI scripts for Web pages.
-perl-Image-Magick:
-perl-Image-Magick: Use it to create, edit, compose, or convert bitmap images from within
-perl-Image-Magick: a Perl script.
-perl-Image-Magick:
-perl-Image-Magick: Find out more at http://www.imagemagick.org/script/perl-magick.php
-perl-Image-Magick:
diff --git a/perl/perl-Module-Runtime/perl-Module-Runtime.SlackBuild b/perl/perl-Module-Runtime/perl-Module-Runtime.SlackBuild
index d2d11f4a18..9fcb072da3 100644
--- a/perl/perl-Module-Runtime/perl-Module-Runtime.SlackBuild
+++ b/perl/perl-Module-Runtime/perl-Module-Runtime.SlackBuild
@@ -26,7 +26,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=perl-Module-Runtime
-VERSION=${VERSION:-0.015}
+VERSION=${VERSION:-0.016}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -34,7 +34,7 @@ SRCNAM=Module-Runtime
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -45,8 +45,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,10 +69,10 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
cd $SRCNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
perl Makefile.PL \
PREFIX=/usr \
diff --git a/perl/perl-Module-Runtime/perl-Module-Runtime.info b/perl/perl-Module-Runtime/perl-Module-Runtime.info
index ec5bdacb61..1807470812 100644
--- a/perl/perl-Module-Runtime/perl-Module-Runtime.info
+++ b/perl/perl-Module-Runtime/perl-Module-Runtime.info
@@ -1,8 +1,8 @@
PRGNAM="perl-Module-Runtime"
-VERSION="0.015"
+VERSION="0.016"
HOMEPAGE="https://metacpan.org/pod/Module::Runtime"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.015.tar.gz"
-MD5SUM="f0f3ef126998189665bc5d496c3548db"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz"
+MD5SUM="d3d47222fa2e3dfcb4526f6cc8437b20"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="perl-Module-Build"
diff --git a/perl/perl-Pod-Coverage/perl-Pod-Coverage.info b/perl/perl-Pod-Coverage/perl-Pod-Coverage.info
index 4408d2c780..ce436d3c94 100644
--- a/perl/perl-Pod-Coverage/perl-Pod-Coverage.info
+++ b/perl/perl-Pod-Coverage/perl-Pod-Coverage.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://cpan.metacpan.org/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.tar.
MD5SUM="12229e553ee7887680ee3db11da5ee52"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="perl-Devel-Symdump"
+REQUIRES="perl-Devel-Symdump perl-Pod-Parser"
MAINTAINER="Willy Sudiarto Raharjo"
EMAIL="willysr@slackbuilds.org"
diff --git a/perl/perl-Pod-Parser/README b/perl/perl-Pod-Parser/README
new file mode 100644
index 0000000000..d42b387360
--- /dev/null
+++ b/perl/perl-Pod-Parser/README
@@ -0,0 +1,7 @@
+Pod::Parser is a base class for creating POD filters and translators.
+It handles most of the effort involved with parsing the POD sections
+from an input stream, leaving subclasses free to be concerned only
+with performing the actual translation of text.
+
+Note: this module is considered legacy and has been removed from the
+standard perl distribution but is still needed for a bunch of things.
diff --git a/perl/perl-Pod-Parser/perl-Pod-Parser.SlackBuild b/perl/perl-Pod-Parser/perl-Pod-Parser.SlackBuild
new file mode 100644
index 0000000000..a68dfd49b5
--- /dev/null
+++ b/perl/perl-Pod-Parser/perl-Pod-Parser.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for perl-Pod-Parser
+
+# Copyright 2020 Matteo Bernardini <ponce@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=perl-Pod-Parser
+VERSION=${VERSION:-1.63}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=Pod-Parser
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+ PREFIX=/usr \
+ INSTALLDIRS=vendor \
+ INSTALLVENDORMAN3DIR=/usr/man/man3
+
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+find $PKG -name "perllocal.pod" -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Pod-Parser/perl-Pod-Parser.info b/perl/perl-Pod-Parser/perl-Pod-Parser.info
new file mode 100644
index 0000000000..a2c25b6e12
--- /dev/null
+++ b/perl/perl-Pod-Parser/perl-Pod-Parser.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Pod-Parser"
+VERSION="1.63"
+HOMEPAGE="https://metacpan.org/pod/Pod::Parser"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MA/MAREKR/Pod-Parser-1.63.tar.gz"
+MD5SUM="d8e0d60e03d77442d354fd567e469ae4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/perl/perl-Pod-Parser/slack-desc b/perl/perl-Pod-Parser/slack-desc
new file mode 100644
index 0000000000..171aa0c018
--- /dev/null
+++ b/perl/perl-Pod-Parser/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+perl-Pod-Parser: perl-Pod-Parser (base class for creating POD filters and translators)
+perl-Pod-Parser:
+perl-Pod-Parser: Pod::Parser is a base class for creating POD filters and translators.
+perl-Pod-Parser: It handles most of the effort involved with parsing the POD sections
+perl-Pod-Parser: from an input stream, leaving subclasses free to be concerned only
+perl-Pod-Parser: with performing the actual translation of text.
+perl-Pod-Parser:
+perl-Pod-Parser:
+perl-Pod-Parser:
+perl-Pod-Parser:
+perl-Pod-Parser:
diff --git a/perl/perl-Razor2-Client-Agent/perl-Razor2-Client-Agent.SlackBuild b/perl/perl-Razor2-Client-Agent/perl-Razor2-Client-Agent.SlackBuild
index e4e173d86d..39972aaf69 100644
--- a/perl/perl-Razor2-Client-Agent/perl-Razor2-Client-Agent.SlackBuild
+++ b/perl/perl-Razor2-Client-Agent/perl-Razor2-Client-Agent.SlackBuild
@@ -69,7 +69,7 @@ perl Makefile.PL \
INSTALLDIRS=vendor \
INSTALLVENDORMAN1DIR=/usr/man/man1 \
INSTALLVENDORMAN3DIR=/usr/man/man3
-make
+make -j1
make test
make install DESTDIR=$PKG INSTALLMAN5DIR=$PKG/usr/man/man5
diff --git a/perl/perl-cairo/perl-cairo.SlackBuild b/perl/perl-cairo/perl-cairo.SlackBuild
index ad42e9740b..b348b3a35a 100644
--- a/perl/perl-cairo/perl-cairo.SlackBuild
+++ b/perl/perl-cairo/perl-cairo.SlackBuild
@@ -81,7 +81,7 @@ perl Makefile.PL \
INSTALLDIRS=vendor \
INSTALLVENDORMAN3DIR=/usr/man/man3
make
-make test
+#make test
make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/perl/perl-libnet/README b/perl/perl-libnet/README
deleted file mode 100644
index 0b66c0e6c3..0000000000
--- a/perl/perl-libnet/README
+++ /dev/null
@@ -1,3 +0,0 @@
-libnet is a collection of Perl modules which provides a simple
-and consistent programming interface (API) to the client side
-of various protocols used in the internet community.
diff --git a/perl/perl-libnet/libnet-3.08-Do-not-create-Net-libnet.cfg.patch b/perl/perl-libnet/libnet-3.08-Do-not-create-Net-libnet.cfg.patch
deleted file mode 100644
index 911bc10fa8..0000000000
--- a/perl/perl-libnet/libnet-3.08-Do-not-create-Net-libnet.cfg.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a40f2774eede8e65dd6128b45525ec88f469e031 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 10 Jul 2015 13:02:00 +0200
-Subject: [PATCH 2/2] Do not create Net/libnet.cfg
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-I will remove the Net/libnet.cfg because:
-
-(1) it's content equals to default configuration hard-coded in the
-code
-(2) it's kind of configuration file we do not mark it as a configuration
-file, so it's overwritten on each update
-(3) it's loaded from directory based on Net::Config module location.
-I.e. core module will search it in core path, vendor module in vendor
-path and site module in site path.
-
-perl.spec does not provide it either.
-
-<https://bugzilla.redhat.com/show_bug.cgi?id=1238689>
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- Makefile.PL | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.PL b/Makefile.PL
-index 64d6959..25fc626 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -235,7 +235,7 @@ MAIN: {
- sub MY::post_initialize {
- my $self = shift;
-
-- return '' if $self->{PERL_CORE};
-+ return '';
-
- if (not -f $CfgFile) {
- my @args = qw(Configure);
---
-2.5.0
-
diff --git a/perl/perl-libnet/perl-libnet.SlackBuild b/perl/perl-libnet/perl-libnet.SlackBuild
deleted file mode 100644
index 5f4feddd26..0000000000
--- a/perl/perl-libnet/perl-libnet.SlackBuild
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for perl-libnet
-
-# Copyright 2016-2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
-# Based on slackbuilds.org perl template.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=perl-libnet
-VERSION=${VERSION:-3.11}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=libnet
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-DOCS="Artistic Changes Copying LICENCE README"
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-patch -p1 < $CWD/libnet-3.08-Do-not-create-Net-libnet.cfg.patch
-
-echo | perl Makefile.PL \
- PREFIX=/usr \
- INSTALLDIRS=vendor \
- INSTALLVENDORMAN3DIR=/usr/man/man3
-make
-make test
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-find $PKG -depth -type d -empty -delete || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-libnet/perl-libnet.info b/perl/perl-libnet/perl-libnet.info
deleted file mode 100644
index b43abac717..0000000000
--- a/perl/perl-libnet/perl-libnet.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="perl-libnet"
-VERSION="3.11"
-HOMEPAGE="https://metacpan.org/release/libnet"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SH/SHAY/libnet-3.11.tar.gz"
-MD5SUM="f4fdfa0906bf2ad5ac3c74c3860eb029"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="perl-IO-Socket-SSL"
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
diff --git a/perl/perl-libnet/slack-desc b/perl/perl-libnet/slack-desc
deleted file mode 100644
index faf8be5984..0000000000
--- a/perl/perl-libnet/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-perl-libnet: perl-libnet (perl net modules)
-perl-libnet:
-perl-libnet: libnet is a collection of Perl modules which provides a simple
-perl-libnet: and consistent programming interface (API) to the client side
-perl-libnet: of various protocols used in the internet community.
-perl-libnet:
-perl-libnet: homepage: https://metacpan.org/release/libnet
-perl-libnet:
-perl-libnet:
-perl-libnet:
-perl-libnet:
diff --git a/python/Mako/Mako.SlackBuild b/python/Mako/Mako.SlackBuild
deleted file mode 100644
index bf7baa10c6..0000000000
--- a/python/Mako/Mako.SlackBuild
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Mako
-
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
-# Copyright 2017, 2019 Hunter Sezen California, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=Mako
-VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-# Python 3 support.
-if python3 -c 'import sys' 2>/dev/null; then
- python3 setup.py install --root=$PKG
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGES LICENSE README.rst doc/*.html \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/Mako/Mako.info b/python/Mako/Mako.info
deleted file mode 100644
index 7aac08c55f..0000000000
--- a/python/Mako/Mako.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="Mako"
-VERSION="1.1.0"
-HOMEPAGE="https://www.makotemplates.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/b0/3c/8dcd6883d009f7cae0f3157fb53e9afb05a0d3d33b3db1268ec2e6f4a56b/Mako-1.1.0.tar.gz"
-MD5SUM="6c3f2da0b74af529a4c4a537d0848bf2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
diff --git a/python/Mako/README b/python/Mako/README
deleted file mode 100644
index b39455cf1d..0000000000
--- a/python/Mako/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Mako is a template library written in Python. It provides a familiar,
-non-XML syntax which compiles into Python modules for maximum
-performance. Mako's syntax and API borrows from the best ideas of many
-others, including Django templates, Cheetah, Myghty, and Genshi.
-Conceptually, Mako is an embedded Python (i.e. Python Server Page)
-language, which refines the familiar ideas of componentized layout and
-inheritance to produce one of the most straightforward and flexible
-models available, while also maintaining close ties to Python calling
-and scoping semantics.
-
-Python3 is an optional dependency.
diff --git a/python/Mako/slack-desc b/python/Mako/slack-desc
deleted file mode 100644
index 3ae4979cac..0000000000
--- a/python/Mako/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-Mako: Mako (A python templating language)
-Mako:
-Mako: Mako is a template library written in Python. It provides a familiar,
-Mako: non-XML syntax which compiles into Python modules for maximum
-Mako: performance. Mako's syntax and API borrows from the best ideas of many
-Mako: others, including Django templates, Cheetah, Myghty, and Genshi.
-Mako: Conceptually, Mako is an embedded Python (i.e. Python Server Page)
-Mako: language, which refines the familiar ideas of componentized layout and
-Mako: inheritance to produce one of the most straightforward and flexible
-Mako: models available, while also maintaining close ties to Python.
-Mako: Homepage: http://www.makotemplates.org/
diff --git a/python/Pygments/Pygments.SlackBuild b/python/Pygments/Pygments.SlackBuild
deleted file mode 100644
index cfeea2b0be..0000000000
--- a/python/Pygments/Pygments.SlackBuild
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Pygments
-
-# Copyright 2009 Grissiom <chaos.proton@gmail.com>
-# Copyright 2009-2015 LukenShiro, Italy
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=Pygments
-VERSION=${VERSION:-2.5.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python2 setup.py install --prefix=/usr --root=$PKG
-python3 setup.py install --prefix=/usr --root=$PKG
-
-mkdir -p $PKG/usr/man/man1
-cp -a doc/pygmentize.1 $PKG/usr/man/man1
-# Adapting to Slackware's directory layout
-sed -i "s|share/doc/python-pygments|doc/${PRGNAM}-${VERSION}|" \
- $PKG/usr/man/man1/pygmentize.1
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS CHANGES LICENSE README.rst \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/Pygments/Pygments.info b/python/Pygments/Pygments.info
deleted file mode 100644
index 8727823497..0000000000
--- a/python/Pygments/Pygments.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="Pygments"
-VERSION="2.5.2"
-HOMEPAGE="https://pygments.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-2.5.2.tar.gz"
-MD5SUM="465a35559863089d959d783a69f79b9f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/Pygments/README b/python/Pygments/README
deleted file mode 100644
index 975ce911d5..0000000000
--- a/python/Pygments/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Pygments is a generic syntax highlighter for general use in all kinds of
-software such as forum systems, wikis or other applications that need to
-prettify source code.
-
-Highlights are:
- * A wide range of common languages and markup formats is supported.
- * Special attention is paid to details, increasing quality by a fair amount.
- * Support for new languages and formats are added easily.
- * A number of output formats, presently HTML, LaTeX, RTF, SVG and ANSI
- sequences.
- * It is usable as a command-line tool and as a library.
diff --git a/python/Pygments/slack-desc b/python/Pygments/slack-desc
deleted file mode 100644
index e648ba594b..0000000000
--- a/python/Pygments/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-Pygments: Pygments (syntax highlighting package written in Python)
-Pygments:
-Pygments: It is a generic syntax highlighter for general use in all kinds of
-Pygments: software such as forum systems, wikis or other applications that need
-Pygments: to prettify source code. A wide range of common languages and markup
-Pygments: formats is supported.
-Pygments:
-Pygments:
-Pygments:
-Pygments:
-Pygments:
diff --git a/python/cryptography/cryptography.SlackBuild b/python/cryptography/cryptography.SlackBuild
index 120640c210..ea66340723 100644
--- a/python/cryptography/cryptography.SlackBuild
+++ b/python/cryptography/cryptography.SlackBuild
@@ -25,7 +25,7 @@
# Markus Reichelt <slackbuilds@mareichelt.de>, 0xCCEEF115
PRGNAM=cryptography
-VERSION=${VERSION:-2.1.4}
+VERSION=${VERSION:-2.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/python/cryptography/cryptography.info b/python/cryptography/cryptography.info
index 492e5edda9..413b50ea50 100644
--- a/python/cryptography/cryptography.info
+++ b/python/cryptography/cryptography.info
@@ -1,10 +1,10 @@
PRGNAM="cryptography"
-VERSION="2.1.4"
+VERSION="2.8"
HOMEPAGE="https://cryptography.io/"
-DOWNLOAD="https://pypi.python.org/packages/78/c5/7188f15a92413096c93053d5304718e1f6ba88b818357d05d19250ebff85/cryptography-2.1.4.tar.gz"
-MD5SUM="9f39d4d8f2b05f295fa0ff52475ec4f2"
+DOWNLOAD="https://files.pythonhosted.org/packages/be/60/da377e1bed002716fb2d5d1d1cab720f298cb33ecff7bf7adea72788e4e4/cryptography-2.8.tar.gz"
+MD5SUM="77730058b556c6d9838679a94c6229ce"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="pyasn1 cffi enum34 ipaddress idna packaging asn1crypto"
+REQUIRES="pyasn1 cffi enum34 ipaddress idna packaging asn1crypto wheel"
MAINTAINER="Markus Reichelt"
EMAIL="slackbuilds@mareichelt.de"
diff --git a/python/css-parser/README b/python/css-parser/README
new file mode 100644
index 0000000000..5cf85ef683
--- /dev/null
+++ b/python/css-parser/README
@@ -0,0 +1,3 @@
+A Python package to parse and build CSS Cascading Style Sheets.
+
+Optional dependencies: python3, python-chardet and gdata.
diff --git a/python/css-parser/css-parser.SlackBuild b/python/css-parser/css-parser.SlackBuild
new file mode 100644
index 0000000000..23c3486b7e
--- /dev/null
+++ b/python/css-parser/css-parser.SlackBuild
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# Slackware build script for css-parser
+
+# Copyright 2009-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=css-parser
+VERSION=${VERSION:-1.0.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Change files from DOS to unix.
+for FILE in $(find . -type f -exec grep -Pl '\r$' {} \;); do
+ sed -e 's/\r//g' $FILE > ${FILE}.new
+ touch -r $FILE ${FILE}.new
+ mv ${FILE}.new $FILE
+done
+
+python setup.py install --root=$PKG
+
+if $(python3 -c 'import sys' 2>/dev/null); then
+ rm -rf build
+ python3 setup.py install --root=$PKG
+fi
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/css-parser/css-parser.info b/python/css-parser/css-parser.info
new file mode 100644
index 0000000000..552f961364
--- /dev/null
+++ b/python/css-parser/css-parser.info
@@ -0,0 +1,10 @@
+PRGNAM="css-parser"
+VERSION="1.0.4"
+HOMEPAGE="https://github.com/ebook-utils/css-parser"
+DOWNLOAD="https://files.pythonhosted.org/packages/38/97/94c9cdb2410d4f89749fa947338970203ef26f2bdb7ac089ab96a87763d2/css-parser-1.0.4.tar.gz"
+MD5SUM="c6caae4db5557a07b7353c97baa13767"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Larry Hajali"
+EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/python/css-parser/slack-desc b/python/css-parser/slack-desc
new file mode 100644
index 0000000000..8babce12b6
--- /dev/null
+++ b/python/css-parser/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+css-parser: css-parser (CSS parser and builder)
+css-parser:
+css-parser: A Python package to parse and build CSS Cascading Style Sheets.
+css-parser:
+css-parser: Homepage: https://github.com/ebook-utils/css-parser
+css-parser:
+css-parser:
+css-parser:
+css-parser:
+css-parser:
+css-parser:
diff --git a/python/curtsies/curtsies.SlackBuild b/python/curtsies/curtsies.SlackBuild
index 8e0f82e29c..3052cccefd 100644
--- a/python/curtsies/curtsies.SlackBuild
+++ b/python/curtsies/curtsies.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=curtsies
-VERSION=${VERSION:-0.3.0}
+VERSION=${VERSION:-0.3.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/python/curtsies/curtsies.info b/python/curtsies/curtsies.info
index 78ba063494..904a72de56 100644
--- a/python/curtsies/curtsies.info
+++ b/python/curtsies/curtsies.info
@@ -1,8 +1,8 @@
PRGNAM="curtsies"
-VERSION="0.3.0"
+VERSION="0.3.1"
HOMEPAGE="https://github.com/thomasballinger/curtsies"
-DOWNLOAD="https://files.pythonhosted.org/packages/78/1e/3b69f26d9e496901e80fc90e39e479c85fb6df595c2e2935a4fd781b3c9b/curtsies-0.3.0.tar.gz"
-MD5SUM="20e7295c9592b4101915131a685725f0"
+DOWNLOAD="https://files.pythonhosted.org/packages/5a/81/acd15a63392c25d78ba94f528f66e86093d72e0fb618b573743aa4efdccc/curtsies-0.3.1.tar.gz"
+MD5SUM="60b63928812df3297856bcd53278071b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="blessings wcwidth"
diff --git a/python/dbus-python3/README b/python/dbus-python3/README
deleted file mode 100644
index f6bf55695d..0000000000
--- a/python/dbus-python3/README
+++ /dev/null
@@ -1,6 +0,0 @@
-dbus-python3 (Python3 bindings for dbus)
-
-dbus-python is a binding for libdbus, the reference implementation of
-D-Bus. For compatibility reasons, its API involves a lot of type-guessing
-(despite "explicit is better than implicit" and "resist the temptation
-to guess").
diff --git a/python/dbus-python3/dbus-python3.SlackBuild b/python/dbus-python3/dbus-python3.SlackBuild
deleted file mode 100644
index 03f9d06fa6..0000000000
--- a/python/dbus-python3/dbus-python3.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dbus-python3
-
-# Copyright 2016 Hunter Sezen California, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=dbus-python3
-SRCNAM=$(echo $PRGNAM | tr -d 3)
-VERSION=${VERSION:-1.2.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-PYTHON=/usr/bin/python3 \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux \
- --host=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Conflicts with Slackware's dbus-python package
-rm -rf $PKG/usr/include
-rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/dbus-python3/dbus-python3.info b/python/dbus-python3/dbus-python3.info
deleted file mode 100644
index 32a06750ba..0000000000
--- a/python/dbus-python3/dbus-python3.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dbus-python3"
-VERSION="1.2.4"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/DBusBindings#Python"
-DOWNLOAD="https://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.4.tar.gz"
-MD5SUM="7372a588c83a7232b4e08159bfd48fe5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
diff --git a/python/dbus-python3/slack-desc b/python/dbus-python3/slack-desc
deleted file mode 100644
index b7b83c2e07..0000000000
--- a/python/dbus-python3/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-dbus-python3: dbus-python3 (Python3 bindings for dbus)
-dbus-python3:
-dbus-python3: dbus-python is a binding for libdbus, the reference implementation
-dbus-python3: of D-Bus.
-dbus-python3:
-dbus-python3:
-dbus-python3:
-dbus-python3:
-dbus-python3:
-dbus-python3:
-dbus-python3:
diff --git a/python/gst-python/gst-python.SlackBuild b/python/gst-python/gst-python.SlackBuild
index 9a6c438da5..4a847d9c56 100644
--- a/python/gst-python/gst-python.SlackBuild
+++ b/python/gst-python/gst-python.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gst-python
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.16.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/python/gst-python/gst-python.info b/python/gst-python/gst-python.info
index bfb027af8c..9e3ae5125e 100644
--- a/python/gst-python/gst-python.info
+++ b/python/gst-python/gst-python.info
@@ -1,8 +1,8 @@
PRGNAM="gst-python"
-VERSION="1.6.2"
+VERSION="1.16.2"
HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-python.html"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.6.2.tar.xz"
-MD5SUM="14b6cfe1a0db5cc01c6a58f7b4af6184"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.16.2.tar.xz"
+MD5SUM="6ac709767334d8d0a71cb4e016f6abeb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/python/gst-python3/fix-builds-with-python-3.8.patch b/python/gst-python3/fix-builds-with-python-3.8.patch
new file mode 100644
index 0000000000..edff445a7a
--- /dev/null
+++ b/python/gst-python3/fix-builds-with-python-3.8.patch
@@ -0,0 +1,43 @@
+From 10707f437f2fc3632067c6a0efa4432f7ebaf362 Mon Sep 17 00:00:00 2001
+From: Sebastian Dröge <sebastian@centricular.com>
+Date: Fri, 13 Dec 2019 10:46:20 +0200
+Subject: [PATCH] backport of "fix build with Python 3.8 by also checking for
+ python-3.X-embed.pc"
+
+Since Python 3.8 the normal checks don't include the Python libraries
+anymore and linking of the gst-python module would fail.
+
+See also https://github.com/mesonbuild/meson/issues/5629
+
+Fixes https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28
+
+Upstream commit: 22f28155d86e27c4134de4ed2861264003fcfd23
+
+Signed-off-by: Sebastian Dröge <sebastian@centricular.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ meson.build | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 744b7ce..492af1a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -25,6 +25,14 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d
+ pymod = import('python')
+ python = pymod.find_installation(get_option('python'))
+ python_dep = python.dependency(required : true)
++pythonver = python.language_version()
++
++# Workaround for https://github.com/mesonbuild/meson/issues/5629
++# https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28
++python_dep = dependency('python-@0@-embed'.format(pythonver), version: '>=3', required: false)
++if not python_dep.found()
++ python_dep = python.dependency(required : true)
++endif
+
+ python_abi_flags = python.get_variable('ABIFLAGS', '')
+ pylib_loc = get_option('libpython-dir')
+--
+2.24.1
+
diff --git a/python/gst-python3/gst-python3.SlackBuild b/python/gst-python3/gst-python3.SlackBuild
index a9c2d7eb42..08ebb64e98 100644
--- a/python/gst-python3/gst-python3.SlackBuild
+++ b/python/gst-python3/gst-python3.SlackBuild
@@ -25,7 +25,7 @@
PRGNAM=gst-python3
SRCNAM=gst-python
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.16.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -71,18 +71,23 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --build=$ARCH-slackware-linux \
- PYTHON=/usr/bin/python3
+patch -p1 < $CWD/fix-builds-with-python-3.8.patch
-make
-make install DESTDIR=$PKG
-
-# Remove the .la file to prevent conflicts with the python2 version of gst-python
-rm $PKG/usr/lib${LIBDIRSUFFIX}/gstreamer-1.0/libgstpythonplugin.la
+mkdir build
+cd build
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ meson .. \
+ --buildtype=release \
+ --infodir=/usr/info \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --prefix=/usr \
+ --sysconfdir=/etc
+ ninja
+ DESTDIR=$PKG ninja install
+cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/python/gst-python3/gst-python3.info b/python/gst-python3/gst-python3.info
index 71b1372970..1837d4e1ea 100644
--- a/python/gst-python3/gst-python3.info
+++ b/python/gst-python3/gst-python3.info
@@ -1,8 +1,8 @@
PRGNAM="gst-python3"
-VERSION="1.6.2"
+VERSION="1.16.2"
HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-python.html"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.6.2.tar.xz"
-MD5SUM="14b6cfe1a0db5cc01c6a58f7b4af6184"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.16.2.tar.xz"
+MD5SUM="6ac709767334d8d0a71cb4e016f6abeb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="python3"
diff --git a/python/halberd/halberd.SlackBuild b/python/halberd/halberd.SlackBuild
index 2081acbd56..8e78173d5d 100644
--- a/python/halberd/halberd.SlackBuild
+++ b/python/halberd/halberd.SlackBuild
@@ -69,9 +69,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Fix path to latex binary for Slackware
-patch -p1 --verbose < $CWD/make-pdf-manual.diff
-
# Generate PDF documentation
( cd doc/
make manual.pdf
diff --git a/python/halberd/make-pdf-manual.diff b/python/halberd/make-pdf-manual.diff
deleted file mode 100644
index 6eae15bdd0..0000000000
--- a/python/halberd/make-pdf-manual.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-
-Corrects the path to the latex binary on Slackware.
-
---- halberd-0.2.4.orig/doc/GNUmakefile 2015-11-17 19:57:03.993466727 -0700
-+++ halberd-0.2.4/doc/GNUmakefile 2015-11-17 19:58:43.780459960 -0700
-@@ -15,7 +15,7 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
--LATEX := /usr/bin/latex
-+LATEX := /usr/share/texmf/bin/latex
- DVIPDF := /usr/bin/dvipdf
- LATEX2HTML := /usr/bin/latex2html
-
diff --git a/python/idna/README b/python/idna/README
deleted file mode 100644
index f9cda8c1b2..0000000000
--- a/python/idna/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Internationalized Domain Names in Applications (IDNA)
-
-Optional dependency: python3
diff --git a/python/idna/idna.SlackBuild b/python/idna/idna.SlackBuild
deleted file mode 100644
index fce3d8cdf5..0000000000
--- a/python/idna/idna.SlackBuild
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for idna
-
-# Copyright 2015-2018 Markus Reichelt, Aachen, DE
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=idna
-VERSION=${VERSION:-2.6}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-if $(python3 -c 'import sys' 2>/dev/null); then
- python3 setup.py install --root=$PKG
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.rst $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/idna/idna.info b/python/idna/idna.info
deleted file mode 100644
index 2fc3b4a57d..0000000000
--- a/python/idna/idna.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="idna"
-VERSION="2.6"
-HOMEPAGE="https://github.com/kjd/idna"
-DOWNLOAD="https://github.com/kjd/idna/archive/v2.6/idna-2.6.tar.gz"
-MD5SUM="a835f2d123511e2a28c8ccda7a2da7fc"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Markus Reichelt"
-EMAIL="slackbuilds@mareichelt.de"
diff --git a/python/idna/slack-desc b/python/idna/slack-desc
deleted file mode 100644
index 5010245075..0000000000
--- a/python/idna/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-idna: idna (Internationalized Domain Names in Applications)
-idna:
-idna: A library to support the IDNA protocol as specified in RFC 5891.
-idna:
-idna:
-idna:
-idna: Homepage: https://github.com/kjd/idna
-idna:
-idna:
-idna:
-idna:
diff --git a/python/packaging/README b/python/packaging/README
deleted file mode 100644
index 2fd2170a02..0000000000
--- a/python/packaging/README
+++ /dev/null
@@ -1 +0,0 @@
-Core utilities for Python packages.
diff --git a/python/packaging/packaging.SlackBuild b/python/packaging/packaging.SlackBuild
deleted file mode 100644
index b977bbb29b..0000000000
--- a/python/packaging/packaging.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for packaging
-#
-# Copyright 2017,2018 Markus Reichelt, Aachen, DE
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=packaging
-VERSION=${VERSION:-17.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE* *.rst docs/ $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/packaging/packaging.info b/python/packaging/packaging.info
deleted file mode 100644
index 247e0c9305..0000000000
--- a/python/packaging/packaging.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="packaging"
-VERSION="17.1"
-HOMEPAGE="https://pypi.python.org/pypi/packaging"
-DOWNLOAD="https://files.pythonhosted.org/packages/77/32/439f47be99809c12ef2da8b60a2c47987786d2c6c9205549dd6ef95df8bd/packaging-17.1.tar.gz"
-MD5SUM="8baf8241d1b6b0a5fae9b00f359976a8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="pyparsing six"
-MAINTAINER="Markus Reichelt"
-EMAIL="slackbuilds@mareichelt.de"
diff --git a/python/packaging/slack-desc b/python/packaging/slack-desc
deleted file mode 100644
index 77dcf7455d..0000000000
--- a/python/packaging/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-packaging: packaging (Core utilities for Python packages)
-packaging:
-packaging: https://pypi.python.org/pypi/packaging
-packaging:
-packaging:
-packaging:
-packaging:
-packaging:
-packaging:
-packaging:
-packaging:
diff --git a/python/pip/README b/python/pip/README
deleted file mode 100644
index 6c75c7eea5..0000000000
--- a/python/pip/README
+++ /dev/null
@@ -1,24 +0,0 @@
-pip is a replacement for easy_install (from python-setuptools). It uses
-mostly the same techniques for finding packages, so packages that were
-made easy_installable should be pip-installable as well.
-
-pip is meant to improve on easy_install. Some of the improvements:
-
-- All packages are downloaded before installation. Partially-completed
- installation doesn't occur as a result.
-- Care is taken to present useful output on the console.
-- The reasons for actions are kept track of. For instance, if a package
- is being installed, pip keeps track of why that package was required.
-- Error messages should be useful.
-- The code is relatively concise and cohesive, making it easier to use
- programmatically.
-- Packages don't have to be installed as egg archives, they can be
- installed flat (while keeping the egg metadata).
-- Native support for other version control systems (Git, Mercurial and
- Bazaar).
-- Uninstallation of packages.
-- Simple to define fixed sets of requirements and reliably reproduce a
- set of packages.
-
-pip is complementary with virtualenv, and it is encouraged that you use
-virtualenv to isolate your installation.
diff --git a/python/pip/pip.SlackBuild b/python/pip/pip.SlackBuild
deleted file mode 100644
index 0f28914773..0000000000
--- a/python/pip/pip.SlackBuild
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for pip
-
-# Copyright 2012-2018 Audrius Kažukauskas <audrius@neutrino.lt>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=pip
-VERSION=${VERSION:-9.0.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-# Add bash completion file.
-install -D -m 644 $CWD/pip.sh $PKG/usr/share/bash-completion/completions/pip
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/pip/pip.info b/python/pip/pip.info
deleted file mode 100644
index ca296f0c81..0000000000
--- a/python/pip/pip.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pip"
-VERSION="9.0.3"
-HOMEPAGE="https://pip.pypa.io/"
-DOWNLOAD="https://pypi.python.org/packages/c4/44/e6b8056b6c8f2bfd1445cc9990f478930d8e3459e9dbf5b8e2d2922d64d3/pip-9.0.3.tar.gz"
-MD5SUM="b15b33f9aad61f88d0f8c866d16c55d8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Audrius Kažukauskas"
-EMAIL="audrius@neutrino.lt"
diff --git a/python/pip/pip.sh b/python/pip/pip.sh
deleted file mode 100644
index b9b1ea1477..0000000000
--- a/python/pip/pip.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# bash completion for pip
-
-_pip_completion()
-{
- COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]}" \
- COMP_CWORD=$COMP_CWORD \
- PIP_AUTO_COMPLETE=1 $1 ) )
-}
-complete -o default -F _pip_completion pip
diff --git a/python/pip/slack-desc b/python/pip/slack-desc
deleted file mode 100644
index 443b5a0291..0000000000
--- a/python/pip/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-pip: pip (a better easy_install replacement)
-pip:
-pip: pip is a replacement for easy_install from python-setuptools.
-pip:
-pip: Homepage: https://pip.pypa.io/
-pip:
-pip:
-pip:
-pip:
-pip:
-pip:
diff --git a/python/ply/README b/python/ply/README
deleted file mode 100644
index 2f2cf04e38..0000000000
--- a/python/ply/README
+++ /dev/null
@@ -1,2 +0,0 @@
-PLY is a 100% Python implementation of the common parsing tools lex
-and yacc.
diff --git a/python/ply/ply.SlackBuild b/python/ply/ply.SlackBuild
deleted file mode 100644
index 179d6b7aae..0000000000
--- a/python/ply/ply.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ply
-
-# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greeece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=ply
-VERSION=${VERSION:-3.11}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
- python3 setup.py install --root=$PKG
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-
-cp -a ANNOUNCE CHANGES PKG-INFO TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/ply/ply.info b/python/ply/ply.info
deleted file mode 100644
index a9b9df8638..0000000000
--- a/python/ply/ply.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ply"
-VERSION="3.11"
-HOMEPAGE="http://www.dabeaz.com/ply/"
-DOWNLOAD="https://pypi.python.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da/ply-3.11.tar.gz"
-MD5SUM="6465f602e656455affcd7c5734c638f8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/ply/slack-desc b/python/ply/slack-desc
deleted file mode 100644
index 62a84d58d8..0000000000
--- a/python/ply/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-ply: ply (Python Lex & Yacc)
-ply:
-ply: PLY is yet another implementation of lex and yacc for Python.
-ply: Some notable features include the fact that its implemented entirely
-ply: n Python and it uses LALR(1) parsing which is efficient and well
-ply: suited for larger grammars.
-ply:
-ply: Homepage: http://www.dabeaz.com/ply/
-ply:
-ply:
-ply:
diff --git a/python/py3cairo/README b/python/py3cairo/README
deleted file mode 100644
index 5e237fabd8..0000000000
--- a/python/py3cairo/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Py3cairo is a Python 3.x binding for the Cairo graphics library.
-The Pycairo bindings are designed to match the cairo C API as closely as
-possible, and to deviate only in cases which are clearly better
-implemented in a more 'Pythonic' way.
-
-This requires python3.
-
-Py3cairo is safe to install beside Slackware's pycairo package (Python 2.7).
diff --git a/python/py3cairo/py3cairo.SlackBuild b/python/py3cairo/py3cairo.SlackBuild
deleted file mode 100644
index 80ddef805f..0000000000
--- a/python/py3cairo/py3cairo.SlackBuild
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for py3cairo
-# Copyright 2014, Bojan Popovic <bocke@slackware-srbija.org>, Belgrade, Serbia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=py3cairo
-SRCNAM=pycairo
-VERSION=${VERSION:-1.10.0}
-BUILD=${BUILD:-3}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-DOCS="COPYING* AUTHORS INSTALL NEWS README doc examples"
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-export PYTHON=python3
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-patch -p1 < $CWD/pycairo-1.10.0-waf_unpack-1.patch
-wafdir=$(./waf unpack)
-pushd $wafdir
-patch -p1 < $CWD/pycairo-1.10.0-waf_python_3_4-1.patch
-popd
-unset wafdir
-
-PYTHON="/usr/bin/python3" \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./waf configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION
-
-./waf build
-DESTDIR=$PKG ./waf install
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/py3cairo/py3cairo.info b/python/py3cairo/py3cairo.info
deleted file mode 100644
index 22bc7cca86..0000000000
--- a/python/py3cairo/py3cairo.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="py3cairo"
-VERSION="1.10.0"
-HOMEPAGE="http://cairographics.org/pycairo/"
-DOWNLOAD="http://cairographics.org/releases/pycairo-1.10.0.tar.bz2"
-MD5SUM="e6fd3f2f1e6a72e0db0868c4985669c5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Bojan Popovic"
-EMAIL="bocke@slackware-srbija.org"
diff --git a/python/py3cairo/pycairo-1.10.0-waf_python_3_4-1.patch b/python/py3cairo/pycairo-1.10.0-waf_python_3_4-1.patch
deleted file mode 100644
index 83f69bdeeb..0000000000
--- a/python/py3cairo/pycairo-1.10.0-waf_python_3_4-1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Submitted by: Wayne Blaszczyk (wblaszcz at bigpond dot net dot au)
-Date: 2014-03-27
-Initial Package Version: 1.10.0
-Upstream Status: unknown
-Origin: Gentoo
-URL: https://bugs.gentoo.org/show_bug.cgi?id=504342
-Description: Fix build with Python-3.4
-
---- a/waflib/Tools/python.py
-+++ b/waflib/Tools/python.py
-@@ -169,7 +169,7 @@
- conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
- includes=[]
- if conf.env.PYTHON_CONFIG:
-- for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
-+ for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
- if(incstr.startswith('-I')or incstr.startswith('/I')):
- incstr=incstr[2:]
- if incstr not in includes:
diff --git a/python/py3cairo/pycairo-1.10.0-waf_unpack-1.patch b/python/py3cairo/pycairo-1.10.0-waf_unpack-1.patch
deleted file mode 100644
index 319dd2c13b..0000000000
--- a/python/py3cairo/pycairo-1.10.0-waf_unpack-1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Submitted by: Wayne Blaszczyk (wblaszcz at bigpond dot net dot au)
-Date: 2014-03-27
-Initial Package Version: 1.10.0
-Upstream Status: unknown
-Origin: Gentoo
-URL: https://bugs.gentoo.org/show_bug.cgi?id=504342
-Description: Fix build with Python-3.4
-
---- a/waf
-+++ b/waf
-@@ -153,6 +153,9 @@
- return dir
-
- wafdir = find_lib()
-+if sys.argv[1:] == ['unpack']:
-+ print(wafdir)
-+ exit()
- sys.path.insert(0, wafdir)
- from waflib.Tools.c_config import MACRO_TO_DESTOS
- MACRO_TO_DESTOS['__POWERPC__'] = 'darwin'
diff --git a/python/py3cairo/slack-desc b/python/py3cairo/slack-desc
deleted file mode 100644
index 5d9388745f..0000000000
--- a/python/py3cairo/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-py3cairo: py3cairo (Python 3.x bindings for cairo)
-py3cairo:
-py3cairo: Pycairo is a Python binding for the cairo graphics library.
-py3cairo: The Pycairo bindings are designed to match the cairo C API as closely
-py3cairo: as possible, and to deviate only in cases which are clearly better
-py3cairo: implemented in a more 'Pythonic' way.
-py3cairo:
-py3cairo:
-py3cairo:
-py3cairo: Home Page: http://cairographics.org/pycairo/
-py3cairo:
diff --git a/python/pygobject3-python3/README b/python/pygobject3-python3/README
deleted file mode 100644
index 76fd055556..0000000000
--- a/python/pygobject3-python3/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This archive contains bindings for the GLib, and GObject, to be used in Python.
-It is a fairly complete set of bindings, it's already rather useful, and is
-usable to write moderately complex programs.
diff --git a/python/pygobject3-python3/pygobject3-python3.SlackBuild b/python/pygobject3-python3/pygobject3-python3.SlackBuild
deleted file mode 100644
index 0f871f9bc4..0000000000
--- a/python/pygobject3-python3/pygobject3-python3.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for pygobject3-python3
-
-# Copyright 2016 Hunter Sezen California, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=pygobject3-python3
-SRCNAM=pygobject
-VERSION=${VERSION:-3.18.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --with-python=python3 \
- --enable-compile-warnings=no \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Conflicts with Slackware's pygobject3 package
-rm -rf $PKG/usr/include
-rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS PKG-INFO README \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/pygobject3-python3/pygobject3-python3.info b/python/pygobject3-python3/pygobject3-python3.info
deleted file mode 100644
index 23fd6a46f1..0000000000
--- a/python/pygobject3-python3/pygobject3-python3.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pygobject3-python3"
-VERSION="3.18.2"
-HOMEPAGE="http://www.pygtk.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.18/pygobject-3.18.2.tar.xz"
-MD5SUM="0a956f3e785e23b0f136832f2e57a862"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="py3cairo"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
diff --git a/python/pygobject3-python3/slack-desc b/python/pygobject3-python3/slack-desc
deleted file mode 100644
index 48b49f9cd8..0000000000
--- a/python/pygobject3-python3/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-pygobject3-python3: pygobject3-python3 (GObject bindings for Python3)
-pygobject3-python3:
-pygobject3-python3: This archive contains bindings for the GLib, and GObject, to be used
-pygobject3-python3: in Python. It is a fairly complete set of bindings, it's already
-pygobject3-python3: rather useful, and is usable to write moderately complex programs.
-pygobject3-python3:
-pygobject3-python3: Home page: http://www.pygtk.org/
-pygobject3-python3:
-pygobject3-python3:
-pygobject3-python3:
-pygobject3-python3:
diff --git a/python/pyicu/pyicu.SlackBuild b/python/pyicu/pyicu.SlackBuild
index d9f91aeb08..bf2bb1d31a 100644
--- a/python/pyicu/pyicu.SlackBuild
+++ b/python/pyicu/pyicu.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=pyicu
-VERSION=${VERSION:-1.9.5}
+VERSION=${VERSION:-2.4.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/python/pyicu/pyicu.info b/python/pyicu/pyicu.info
index 5ec10d4cbc..d7f2315c8b 100644
--- a/python/pyicu/pyicu.info
+++ b/python/pyicu/pyicu.info
@@ -1,8 +1,8 @@
PRGNAM="pyicu"
-VERSION="1.9.5"
+VERSION="2.4.2"
HOMEPAGE="https://github.com/ovalhub/pyicu"
-DOWNLOAD="https://pypi.python.org/packages/a2/9f/1947f288143191b903e58633ee597cb98bc284de28dafb1231b6f8b67b99/PyICU-1.9.5.tar.gz"
-MD5SUM="30f85b7272f15b26c110c9f3e3a9e7a0"
+DOWNLOAD="https://files.pythonhosted.org/packages/95/0c/0fb09019efb65a29789ec5538f8e521b8f548da6935a3a474e19fbf2ea4d/PyICU-2.4.2.tar.gz"
+MD5SUM="bb09676c234849f586094e3fe99c3606"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/python/pyparsing/README b/python/pyparsing/README
deleted file mode 100644
index ac29972273..0000000000
--- a/python/pyparsing/README
+++ /dev/null
@@ -1,5 +0,0 @@
-The pyparsing module is an alternative approach to creating and
-executing simple grammars, vs. the traditional lex/yacc
-approach, or the use of regular expressions. The pyparsing
-module provides a library of classes that client code uses to
-construct the grammar directly in Python code.
diff --git a/python/pyparsing/pyparsing.SlackBuild b/python/pyparsing/pyparsing.SlackBuild
deleted file mode 100644
index 170f8e23b7..0000000000
--- a/python/pyparsing/pyparsing.SlackBuild
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for pyparsing
-
-# Copyright 2008-2012 Heinz Wiesinger, Amsterdam, The Netherlands
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Updated for v2.3.1 Jan 2019
-
-PRGNAM=pyparsing
-VERSION=${VERSION:-2.3.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES LICENSE PKG-INFO README.rst docs/ $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/pyparsing/pyparsing.info b/python/pyparsing/pyparsing.info
deleted file mode 100644
index c649ee71a9..0000000000
--- a/python/pyparsing/pyparsing.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pyparsing"
-VERSION="2.3.1"
-HOMEPAGE="https://github.com/pyparsing/pyparsing"
-DOWNLOAD="https://github.com/pyparsing/pyparsing/releases/download/pyparsing_2.3.1/pyparsing-2.3.1.tar.gz"
-MD5SUM="630e86b719619a251de0ba4a97239cec"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Barry J. Grundy"
-EMAIL="bgrundy<at>linuxleo.com"
diff --git a/python/pyparsing/slack-desc b/python/pyparsing/slack-desc
deleted file mode 100644
index 2d09abba87..0000000000
--- a/python/pyparsing/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-pyparsing: pyparsing (parsing module for python)
-pyparsing:
-pyparsing: The pyparsing module is an alternative approach to creating and
-pyparsing: executing simple grammars, vs. the traditional lex/yacc
-pyparsing: approach, or the use of regular expressions. The pyparsing
-pyparsing: module provides a library of classes that client code uses to
-pyparsing: construct the grammar directly in Python code.
-pyparsing:
-pyparsing: Homepage: http://pyparsing.wikispaces.com/
-pyparsing:
-pyparsing:
diff --git a/python/python-certifi/README b/python/python-certifi/README
deleted file mode 100644
index f2306e1d4c..0000000000
--- a/python/python-certifi/README
+++ /dev/null
@@ -1,10 +0,0 @@
-Certifi is a carefully curated collection of Root Certificates for validating the
-trustworthiness of SSL certificates while verifying the identity of TLS hosts.
-It has been extracted from the Requests project.
-
-The internet is an untrusted place. Every HTTP request you make should have
-verification on by default. This happens every time you access a website with
-your web browser, without any knowledge to the user — there’s no reason your code
-should be any different.
-
-Certifi is here to make this possible.
diff --git a/python/python-certifi/python-certifi.SlackBuild b/python/python-certifi/python-certifi.SlackBuild
deleted file mode 100644
index a5bcecac14..0000000000
--- a/python/python-certifi/python-certifi.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python-certifi
-
-# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python-certifi
-SRCNAM=$(printf $PRGNAM | cut -c8-14)
-VERSION=${VERSION:-2019.9.11}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-certifi/python-certifi.info b/python/python-certifi/python-certifi.info
deleted file mode 100644
index 60c1be47b2..0000000000
--- a/python/python-certifi/python-certifi.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python-certifi"
-VERSION="2019.9.11"
-HOMEPAGE="https://certifi.io/en/latest/"
-DOWNLOAD="https://files.pythonhosted.org/packages/62/85/7585750fd65599e88df0fed59c74f5075d4ea2fe611deceb95dd1c2fb25b/certifi-2019.9.11.tar.gz"
-MD5SUM="cadd4e373fc08f649fa39b82aed9ad96"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python-certifi/slack-desc b/python/python-certifi/slack-desc
deleted file mode 100644
index c08eb095c7..0000000000
--- a/python/python-certifi/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python-certifi: python-certifi (Python SSL Certificates)
-python-certifi:
-python-certifi: Certifi is a carefully curated collection of Root Certificates for
-python-certifi: validating the trustworthiness of SSL certificates while verifying
-python-certifi: the identity of TLS hosts. It has been extracted from the Requests
-python-certifi: project.
-python-certifi:
-python-certifi: Homepage: https://certifi.io/en/latest/
-python-certifi:
-python-certifi:
-python-certifi:
diff --git a/python/python-chardet/README b/python/python-chardet/README
deleted file mode 100644
index fa68e6f22e..0000000000
--- a/python/python-chardet/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Universal encoding detector for Python 2 and 3.
-
-Optional dependency: python3
diff --git a/python/python-chardet/python-chardet.SlackBuild b/python/python-chardet/python-chardet.SlackBuild
deleted file mode 100644
index e8ea4139eb..0000000000
--- a/python/python-chardet/python-chardet.SlackBuild
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python-chardet
-
-# Copyright 2014 Mikko Värri, Finland
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python-chardet
-SRCNAM=chardet
-VERSION=${VERSION:-3.0.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-if $(python3 -c 'import sys' 2>/dev/null); then
- python3 setup.py install --root=$PKG
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-chardet/python-chardet.info b/python/python-chardet/python-chardet.info
deleted file mode 100644
index 867f911a41..0000000000
--- a/python/python-chardet/python-chardet.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python-chardet"
-VERSION="3.0.4"
-HOMEPAGE="https://pypi.python.org/pypi/chardet"
-DOWNLOAD="https://pypi.python.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz"
-MD5SUM="7dd1ba7f9c77e32351b0a0cfacf4055c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
diff --git a/python/python-chardet/slack-desc b/python/python-chardet/slack-desc
deleted file mode 100644
index e742e9d67a..0000000000
--- a/python/python-chardet/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python-chardet: python-chardet (autodetection of character encoding in python)
-python-chardet:
-python-chardet: Universal encoding detector for Python 2 and 3.
-python-chardet:
-python-chardet: Homepage: https://pypi.python.org/pypi/chardet
-python-chardet:
-python-chardet:
-python-chardet:
-python-chardet:
-python-chardet:
-python-chardet:
diff --git a/python/python-distro/README b/python/python-distro/README
deleted file mode 100644
index f7e60d8c18..0000000000
--- a/python/python-distro/README
+++ /dev/null
@@ -1,3 +0,0 @@
-The distro (for: Linux Distribution) package provides information about
-the Linux distribution it runs on, such as a reliable machine-readable ID,
-or version information.
diff --git a/python/python-distro/python-distro.SlackBuild b/python/python-distro/python-distro.SlackBuild
deleted file mode 100644
index d6b4b23504..0000000000
--- a/python/python-distro/python-distro.SlackBuild
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python-distro
-
-# Copyright 2016-2019 Dimitris Zlatanidis Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python-distro
-SRCNAM=$(printf $PRGNAM | cut -c8-13)
-VERSION=${VERSION:-1.4.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
- python3 setup.py install --root=$PKG
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md CONTRIBUT*.md CHANGELOG.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-distro/python-distro.info b/python/python-distro/python-distro.info
deleted file mode 100644
index 9b381121eb..0000000000
--- a/python/python-distro/python-distro.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python-distro"
-VERSION="1.4.0"
-HOMEPAGE="https://github.com/nir0s/distro"
-DOWNLOAD="https://files.pythonhosted.org/packages/ca/e3/78443d739d7efeea86cbbe0216511d29b2f5ca8dbf51a6f2898432738987/distro-1.4.0.tar.gz"
-MD5SUM="f2406d8efdb872c64a79e28967eff71a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python-distro/slack-desc b/python/python-distro/slack-desc
deleted file mode 100644
index 7def214c55..0000000000
--- a/python/python-distro/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python-distro: python-distro (Linux OS platform information API)
-python-distro:
-python-distro: The distro (for: Linux Distribution) package provides information
-python-distro: about the Linux distribution it runs on, such as a reliable
-python-distro: machine-readable ID, or version information.
-python-distro:
-python-distro: Homepage: https://github.com/nir0s/distro
-python-distro:
-python-distro:
-python-distro:
-python-distro:
diff --git a/python/python-future/README b/python/python-future/README
deleted file mode 100644
index 8eef8438bd..0000000000
--- a/python/python-future/README
+++ /dev/null
@@ -1,3 +0,0 @@
-python-future is the missing compatibility layer between Python 2 and
-Python 3. It allows you to use a single, clean Python 3.x-compatible
-codebase to support both Python 2 and Python 3 with minimal overhead.
diff --git a/python/python-future/python-future.SlackBuild b/python/python-future/python-future.SlackBuild
deleted file mode 100644
index c5534c90d6..0000000000
--- a/python/python-future/python-future.SlackBuild
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python-future
-
-# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python-future
-SRCNAM=$(echo $PRGNAM | cut -c8-13)
-VERSION=${VERSION:-0.18.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.rst *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-future/python-future.info b/python/python-future/python-future.info
deleted file mode 100644
index 32a8f29fc1..0000000000
--- a/python/python-future/python-future.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python-future"
-VERSION="0.18.0"
-HOMEPAGE="https://github.com/PythonCharmers/python-future"
-DOWNLOAD="https://files.pythonhosted.org/packages/f6/85/c273089eb6efa5644c0a1382ea553554bc0d40e00a46d989ec67f123f8b5/future-0.18.0.tar.gz"
-MD5SUM="75ff140f2f609c8c0cb32e0c8f4ef78d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python-future/slack-desc b/python/python-future/slack-desc
deleted file mode 100644
index f397961378..0000000000
--- a/python/python-future/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python-future: python-future (Python 2/3 compatibility)
-python-future:
-python-future: python-future is the missing compatibility layer between Python 2 and
-python-future: Python 3. It allows you to use a single, clean Python 3.x-compatible
-python-future: codebase to support both Python 2 and Python 3 with minimal overhead.
-python-future:
-python-future: Homepage: https://github.com/PythonCharmers/python-future
-python-future:
-python-future:
-python-future:
-python-future:
diff --git a/python/python-gattlib/dont_hardcode_python_versions.patch b/python/python-gattlib/dont_hardcode_python_versions.patch
new file mode 100644
index 0000000000..0e11e85d18
--- /dev/null
+++ b/python/python-gattlib/dont_hardcode_python_versions.patch
@@ -0,0 +1,19 @@
+Matteo Bernardini <ponce@slackbuilds.org>
+---
+Don't hardcode python versions
+
+diff -Naur gattlib-0.20150805.orig/setup.py gattlib-0.20150805/setup.py
+--- gattlib-0.20150805.orig/setup.py 2015-08-05 15:16:56.000000000 +0200
++++ gattlib-0.20150805/setup.py 2018-05-02 09:45:04.625893000 +0200
+@@ -19,9 +19,9 @@
+ glib_libs = [x.strip() for x in glib_libs if x]
+
+ if sys.version_info.major == 3:
+- boost_libs = ["boost_python-py34"]
++ boost_libs = ["boost_python3"+str(sys.version_info.minor)]
+ else:
+- boost_libs = ["boost_python"]
++ boost_libs = ["boost_python2"+str(sys.version_info.minor)]
+ extension_modules = [
+ Extension(
+ 'gattlib',
diff --git a/python/python-gattlib/python-gattlib.SlackBuild b/python/python-gattlib/python-gattlib.SlackBuild
index 0264f52fc1..354003e93e 100644
--- a/python/python-gattlib/python-gattlib.SlackBuild
+++ b/python/python-gattlib/python-gattlib.SlackBuild
@@ -57,6 +57,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/dont_hardcode_python_versions.patch
+
python setup.py install --root=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/python/python-notify2/README b/python/python-notify2/README
deleted file mode 100644
index a1c3e66911..0000000000
--- a/python/python-notify2/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a pure-python replacement for notify-python, using
-python-dbus to communicate with the notifications server directly.
-It's compatible with Python 2 and 3, and its callbacks can work
-with Gtk 3 or Qt 4 applications.
diff --git a/python/python-notify2/python-notify2.SlackBuild b/python/python-notify2/python-notify2.SlackBuild
deleted file mode 100644
index 847f3135da..0000000000
--- a/python/python-notify2/python-notify2.SlackBuild
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python-notify2
-
-# Copyright 2015-2020 Dimitris Zlatanidis Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python-notify2
-SRCNAM=$(echo $PRGNAM | cut -c8-14)
-VERSION=${VERSION:-0.3.1}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
- python3 setup.py install --root=$PKG
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a PKG-INFO examples/README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-notify2/python-notify2.info b/python/python-notify2/python-notify2.info
deleted file mode 100644
index 6e1b1b278d..0000000000
--- a/python/python-notify2/python-notify2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python-notify2"
-VERSION="0.3.1"
-HOMEPAGE="https://bitbucket.org/takluyver/pynotify2"
-DOWNLOAD="https://pypi.python.org/packages/aa/e8/d4b335aa739dc299a77766ecc5f1972d1de1993524aa94acef3219bba315/notify2-0.3.1.tar.gz"
-MD5SUM="ffccaed9330787c7442b453f6520a474"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python-notify2/slack-desc b/python/python-notify2/slack-desc
deleted file mode 100644
index f7123aedd8..0000000000
--- a/python/python-notify2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python-notify2: python-notify2 (Python interface to DBus notifications)
-python-notify2:
-python-notify2: This is a pure-python replacement for notify-python, using
-python-notify2: python-dbus to communicate with the notifications server directly.
-python-notify2: It's compatible with Python 2 and 3, and its callbacks can work with
-python-notify2: Gtk 3 or Qt 4 applications.
-python-notify2:
-python-notify2: Homepage: https://bitbucket.org/takluyver/pynotify2
-python-notify2:
-python-notify2:
-python-notify2:
diff --git a/python/python-requests/README b/python/python-requests/README
deleted file mode 100644
index 5f015336cd..0000000000
--- a/python/python-requests/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Requests is an Apache2 Licensed HTTP library, written in Python, for
-human beings.
-
-python3 and python3-certifi are optional dependencies (autodetected).
diff --git a/python/python-requests/python-requests.SlackBuild b/python/python-requests/python-requests.SlackBuild
deleted file mode 100644
index 8ba50ef3d8..0000000000
--- a/python/python-requests/python-requests.SlackBuild
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python-requests
-
-# Copyright 2013-2020 Thibaut Notteboom, Paris, FRANCE
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python-requests
-VERSION=${VERSION:-2.24.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=requests
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
- python3 setup.py install --root=$PKG
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- *.rst *.md LICENSE docs/ \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-requests/python-requests.info b/python/python-requests/python-requests.info
deleted file mode 100644
index 835df66c6d..0000000000
--- a/python/python-requests/python-requests.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python-requests"
-VERSION="2.24.0"
-HOMEPAGE="https://requests.kennethreitz.org/en/master/"
-DOWNLOAD="https://github.com/kennethreitz/requests/archive/v2.24.0/requests-2.24.0.tar.gz"
-MD5SUM="0dccb8677a63d69efe93b3a000b5d41c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python-certifi python-chardet idna python-urllib3"
-MAINTAINER="Thibaut Notteboom"
-EMAIL="thibaut.notteboom@gmail.com"
diff --git a/python/python-requests/slack-desc b/python/python-requests/slack-desc
deleted file mode 100644
index af39269d06..0000000000
--- a/python/python-requests/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python-requests: python-requests (Requests: HTTP for Humans)
-python-requests:
-python-requests: Requests is an Apache2 Licensed HTTP library, written in Python, for
-python-requests: human beings.
-python-requests:
-python-requests:
-python-requests:
-python-requests:
-python-requests:
-python-requests:
-python-requests:
diff --git a/python/python-urllib3/README b/python/python-urllib3/README
deleted file mode 100644
index df9a0f529f..0000000000
--- a/python/python-urllib3/README
+++ /dev/null
@@ -1,12 +0,0 @@
-urllib3 is a powerful, sanity-friendly HTTP client for Python. Much of the Python
-ecosystem already uses urllib3 and you should too. urllib3 brings many critical features
-that are missing from the Python standard libraries:
-
-Thread safety.
-Connection pooling.
-Client-side SSL/TLS verification.
-File uploads with multipart encoding.
-Helpers for retrying requests and dealing with HTTP redirects.
-Support for gzip and deflate encoding.
-Proxy support for HTTP and SOCKS.
-100% test coverage.
diff --git a/python/python-urllib3/python-urllib3.SlackBuild b/python/python-urllib3/python-urllib3.SlackBuild
deleted file mode 100644
index 06311f48e6..0000000000
--- a/python/python-urllib3/python-urllib3.SlackBuild
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python-urllib3
-
-# Copyright 2013 Thibaut Notteboom, Paris, FRANCE
-# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python-urllib3
-SRCNAM=$(echo $PRGNAM | cut -c8-14)
-VERSION=${VERSION:-1.25.7}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
- python3 setup.py install --root=$PKG
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.rst *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-urllib3/python-urllib3.info b/python/python-urllib3/python-urllib3.info
deleted file mode 100644
index 77dbbca4f3..0000000000
--- a/python/python-urllib3/python-urllib3.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python-urllib3"
-VERSION="1.25.7"
-HOMEPAGE="https://urllib3.readthedocs.io/en/latest/"
-DOWNLOAD="https://files.pythonhosted.org/packages/ad/fc/54d62fa4fc6e675678f9519e677dfc29b8964278d75333cf142892caf015/urllib3-1.25.7.tar.gz"
-MD5SUM="85e1e3925f8c1095172bff343f3312ed"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python-urllib3/slack-desc b/python/python-urllib3/slack-desc
deleted file mode 100644
index 90699d4267..0000000000
--- a/python/python-urllib3/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python-urllib3: python-urllib3 (HTTP library)
-python-urllib3:
-python-urllib3: urllib3 is a powerful, sanity-friendly HTTP client for Python. Much
-python-urllib3: of the Python ecosystem already uses urllib3 and you should too.
-python-urllib3:
-python-urllib3: Homepage: https://urllib3.readthedocs.io/en/latest/
-python-urllib3:
-python-urllib3:
-python-urllib3:
-python-urllib3:
-python-urllib3:
diff --git a/python/python-xlib/python-xlib.SlackBuild b/python/python-xlib/python-xlib.SlackBuild
index 52f6b400b8..96330a6f28 100644
--- a/python/python-xlib/python-xlib.SlackBuild
+++ b/python/python-xlib/python-xlib.SlackBuild
@@ -38,14 +38,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Partially revert: fixup metadata
-# Revert: setup: check setuptools is recent enough to support `setup.cfg`
-# https://github.com/python-xlib/python-xlib/commit/22a8e1929ad58b8168bcf5d931e8f6067ebdec0a
-# https://github.com/python-xlib/python-xlib/commit/376b4739cedc4eee32e60e7b158d20ed18dfddc1
-# https://github.com/python-xlib/python-xlib/issues/106
-sed -i 's/\r$//g' setup.py
-patch -p1 < $CWD/setup.patch
-
python setup.py install --root $PKG
# Python 3 support.
diff --git a/python/python-xlib/setup.patch b/python/python-xlib/setup.patch
deleted file mode 100644
index 47be163a34..0000000000
--- a/python/python-xlib/setup.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 71bdb08..b425618 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,17 +1,25 @@
- # Distutils script for python-xlib
-
--from pkg_resources import parse_requirements
--from setuptools import (__version__ as setuptools_version, setup)
-+from setuptools import setup
-
--
--# Check setuptools is recent enough to support `setup.cfg`.
--setuptools_require = next(parse_requirements('setuptools>=30.3.0'))
--assert setuptools_version in setuptools_require, '{} is required'.format(setuptools_require)
-+import Xlib
-
-
- setup(
-+ name='python-xlib',
-+ version=Xlib.__version_string__,
-+
-+ description='Python X Library',
-+ download_url='https://github.com/python-xlib/python-xlib/releases',
-+ url='https://github.com/python-xlib/python-xlib',
-+ license='LGPLv2+',
-+
-+ author='Peter Liljenberg',
-+ author_email='petli@ctrl-c.liu.se',
-+
- install_requires=['six>=1.10.0'],
- setup_requires=['setuptools-scm'],
-+
- packages=[
- 'Xlib',
- 'Xlib.ext',
-@@ -20,4 +28,22 @@ setup(
- 'Xlib.support',
- 'Xlib.xobject'
- ],
-+
-+ keywords='xlib x11 x windows',
-+ classifiers=[
-+ 'Development Status :: 5 - Production/Stable',
-+ 'Environment :: X11 Applications',
-+ 'Intended Audience :: Developers',
-+ 'License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)',
-+ 'Operating System :: OS Independent',
-+ 'Programming Language :: Python :: 2.7',
-+ 'Programming Language :: Python :: 3',
-+ 'Programming Language :: Python :: 3.3',
-+ 'Programming Language :: Python :: 3.4',
-+ 'Programming Language :: Python :: 3.5',
-+ 'Programming Language :: Python :: Implementation :: CPython',
-+ 'Topic :: Software Development :: Libraries :: Python Modules',
-+ 'Topic :: Software Development :: Libraries',
-+ 'Topic :: Software Development :: User Interfaces',
-+ ],
- )
---
-2.22.0
diff --git a/python/python2-pillow/README b/python/python2-pillow/README
new file mode 100644
index 0000000000..f5ff1634c6
--- /dev/null
+++ b/python/python2-pillow/README
@@ -0,0 +1,5 @@
+The Python Imaging Library (PIL) adds image processing capabilities
+to your Python environment. This library provides extensive file
+format support, an efficient internal representation, and powerful
+image processing capabilities.
+This is the latest version available for python-2.x.
diff --git a/python/python2-pillow/python2-pillow.SlackBuild b/python/python2-pillow/python2-pillow.SlackBuild
new file mode 100644
index 0000000000..5ccf7e8cc3
--- /dev/null
+++ b/python/python2-pillow/python2-pillow.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for python2-pillow
+
+# Copyright 2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python2-pillow
+SRCNAM=Pillow
+VERSION=${VERSION:-6.2.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+DOCS="LICENSE *.rst"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python2-pillow/python2-pillow.info b/python/python2-pillow/python2-pillow.info
new file mode 100644
index 0000000000..375915503f
--- /dev/null
+++ b/python/python2-pillow/python2-pillow.info
@@ -0,0 +1,10 @@
+PRGNAM="python2-pillow"
+VERSION="6.2.2"
+HOMEPAGE="https://python-pillow.org"
+DOWNLOAD="https://github.com/python-pillow/Pillow/archive/6.2.2/Pillow-6.2.2.tar.gz"
+MD5SUM="e4e86fcb8732157ea1346d115b5c96e3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/python/python2-pillow/slack-desc b/python/python2-pillow/slack-desc
new file mode 100644
index 0000000000..f62064bd94
--- /dev/null
+++ b/python/python2-pillow/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+python2-pillow: python2-pillow (Python Imaging Library)
+python2-pillow:
+python2-pillow: The Python Imaging Library (PIL) adds image processing capabilities
+python2-pillow: to your Python environment. This library provides extensive file
+python2-pillow: format support, an efficient internal representation, and powerful
+python2-pillow: image processing capabilities.
+python2-pillow: This is the latest version available for python-2.x.
+python2-pillow:
+python2-pillow: homepage: https://python-pillow.org
+python2-pillow:
+python2-pillow:
diff --git a/python/python3-Cython/README b/python/python3-Cython/README
deleted file mode 100644
index 0dd3a3eda4..0000000000
--- a/python/python3-Cython/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Cython is an optimising static compiler for both the Python programming
-language and the extended Cython programming language (based on Pyrex).
-It makes writing C extensions for Python as easy as Python itself.
-
-This SlackBuild may be installed alongside the stock Cython package.
diff --git a/python/python3-Cython/python3-Cython.SlackBuild b/python/python3-Cython/python3-Cython.SlackBuild
deleted file mode 100644
index 173569230e..0000000000
--- a/python/python3-Cython/python3-Cython.SlackBuild
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python3-Cython
-
-# Copyright 2016-2020 Christoph Willing Brisbane, Australia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python3-Cython
-SRCNAM=Cython
-VERSION=${VERSION:-0.29.17}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python3 setup.py install --root=$PKG --prefix=/usr
-
-# Rename executables to avoid clashes with stock Cython versions
-find $PKG/usr/bin/ -type f -executable -exec mv '{}' '{}'3 \;
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.txt docs/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-Cython/python3-Cython.info b/python/python3-Cython/python3-Cython.info
deleted file mode 100644
index 9fb6e094c1..0000000000
--- a/python/python3-Cython/python3-Cython.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-Cython"
-VERSION="0.29.17"
-HOMEPAGE="https://cython.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/99/36/a3dc962cc6d08749aa4b9d85af08b6e354d09c5468a3e0edc610f44c856b/Cython-0.29.17.tar.gz"
-MD5SUM="0936311ccd09f1164ab2f46ca5cd8c3b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@linux.com"
diff --git a/python/python3-Cython/slack-desc b/python/python3-Cython/slack-desc
deleted file mode 100644
index 9c2bdbf818..0000000000
--- a/python/python3-Cython/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python3-Cython: python3-Cython (C-Extensions for Python3)
-python3-Cython:
-python3-Cython: Cython is an optimising static compiler for both the Python
-python3-Cython: programming language and the extended Cython programming language
-python3-Cython: (based on Pyrex). It makes writing C extensions for Python as easy
-python3-Cython: as Python itself.
-python3-Cython:
-python3-Cython: This SlackBuild may be installed alongside the stock Cython package.
-python3-Cython:
-python3-Cython:
-python3-Cython:
diff --git a/python/python3-appdirs/README b/python/python3-appdirs/README
deleted file mode 100644
index 8e3a9e20fa..0000000000
--- a/python/python3-appdirs/README
+++ /dev/null
@@ -1,2 +0,0 @@
-A small Python module for determining appropriate platform-specific
-dirs, e.g. a "user data dir".
diff --git a/python/python3-appdirs/python3-appdirs.SlackBuild b/python/python3-appdirs/python3-appdirs.SlackBuild
deleted file mode 100644
index 2a6e3593f7..0000000000
--- a/python/python3-appdirs/python3-appdirs.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python3-appdirs
-
-# Copyright 2016 Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python3-appdirs
-SRCNAM=appdirs
-VERSION=${VERSION:-1.4.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python3 setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES.rst LICENSE.txt README.rst TODO.md $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-appdirs/python3-appdirs.info b/python/python3-appdirs/python3-appdirs.info
deleted file mode 100644
index c22980e08d..0000000000
--- a/python/python3-appdirs/python3-appdirs.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-appdirs"
-VERSION="1.4.3"
-HOMEPAGE="https://github.com/ActiveState/appdirs/"
-DOWNLOAD="https://github.com/ActiveState/appdirs/archive/1.4.3/appdirs-1.4.3.tar.gz"
-MD5SUM="b0bd73c5dac1bee973e60adcbdcbb5ed"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Jeremy Hansen"
-EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/python/python3-appdirs/slack-desc b/python/python3-appdirs/slack-desc
deleted file mode 100644
index f174600be9..0000000000
--- a/python/python3-appdirs/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python3-appdirs: python3-appdirs (module to determine platform-specific dirs)
-python3-appdirs:
-python3-appdirs: python3-appdirs A small Python module for determining appropriate
-python3-appdirs: platform-specific dirs, e.g. a "user data dir".
-python3-appdirs:
-python3-appdirs:
-python3-appdirs: Homepage: https://github.com/sigmavirus24/appdirs
-python3-appdirs:
-python3-appdirs:
-python3-appdirs:
-python3-appdirs:
diff --git a/python/python3-certifi/README b/python/python3-certifi/README
deleted file mode 100644
index c7257f4714..0000000000
--- a/python/python3-certifi/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This installable Python package contains a CA Bundle that you can reference in
-your Python code.
diff --git a/python/python3-certifi/python3-certifi.SlackBuild b/python/python3-certifi/python3-certifi.SlackBuild
deleted file mode 100644
index 15d16d51cc..0000000000
--- a/python/python3-certifi/python3-certifi.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python3-certifi
-
-# Copyright 2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
-# Based on python-certifi by Dimitris Zlatanidis
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python3-certifi
-VERSION=${VERSION:-2019.6.16}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=certifi
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python3 setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- LICENSE README.rst \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-certifi/python3-certifi.info b/python/python3-certifi/python3-certifi.info
deleted file mode 100644
index 8b1d1ea2dc..0000000000
--- a/python/python3-certifi/python3-certifi.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-certifi"
-VERSION="2019.6.16"
-HOMEPAGE="https://pypi.python.org/pypi/certifi/"
-DOWNLOAD="https://pypi.python.org/packages/source/c/certifi/certifi-2019.6.16.tar.gz"
-MD5SUM="af8fea5f3df6f7f81e9c6cbc6dd7c1e8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/python3-certifi/slack-desc b/python/python3-certifi/slack-desc
deleted file mode 100644
index cc79fa4126..0000000000
--- a/python/python3-certifi/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python3-certifi: python3-certifi (Python SSL Certificates)
-python3-certifi:
-python3-certifi: This installable Python package contains a python3-certifi: CA
-python3-certifi: Bundle that you can reference in your Python code.
-python3-certifi:
-python3-certifi:
-python3-certifi:
-python3-certifi:
-python3-certifi:
-python3-certifi:
-python3-certifi:
diff --git a/python/python3-future/README b/python/python3-future/README
deleted file mode 100644
index 8eef8438bd..0000000000
--- a/python/python3-future/README
+++ /dev/null
@@ -1,3 +0,0 @@
-python-future is the missing compatibility layer between Python 2 and
-Python 3. It allows you to use a single, clean Python 3.x-compatible
-codebase to support both Python 2 and Python 3 with minimal overhead.
diff --git a/python/python3-future/doinst.sh b/python/python3-future/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/python/python3-future/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
diff --git a/python/python3-future/python3-future.SlackBuild b/python/python3-future/python3-future.SlackBuild
deleted file mode 100644
index a1fca9e50c..0000000000
--- a/python/python3-future/python3-future.SlackBuild
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python3-future
-
-# Copyright 2016 Dimitris Zlatanidis Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python3-future
-SRCNAM=$(echo $PRGNAM | cut -c9-14)
-VERSION=${VERSION:-0.15.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python3 setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.rst *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-future/python3-future.info b/python/python3-future/python3-future.info
deleted file mode 100644
index 69f5e4a7bf..0000000000
--- a/python/python3-future/python3-future.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-future"
-VERSION="0.15.2"
-HOMEPAGE="https://github.com/PythonCharmers/python-future"
-DOWNLOAD="https://pypi.python.org/packages/source/f/future/future-0.15.2.tar.gz"
-MD5SUM="a68eb3c90b3b76714c5ceb8c09ea3a06"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python3-future/slack-desc b/python/python3-future/slack-desc
deleted file mode 100644
index 15ddbe5f94..0000000000
--- a/python/python3-future/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python3-future: python3-future (Python 2/3 compatibility)
-python3-future:
-python3-future: python-future is the missing compatibility layer between Python 2 and
-python3-future: Python 3. It allows you to use a single, clean Python 3.x-compatible
-python3-future: codebase to support both Python 2 and Python 3 with minimal overhead.
-python3-future:
-python3-future: Homepage: https://github.com/PythonCharmers/python-future
-python3-future:
-python3-future:
-python3-future:
-python3-future:
diff --git a/python/python3-packaging/README b/python/python3-packaging/README
deleted file mode 100644
index 6c7efffed6..0000000000
--- a/python/python3-packaging/README
+++ /dev/null
@@ -1,2 +0,0 @@
-The Python packaging module contains a set of small, helper utilities for
-dealing with Python packages.
diff --git a/python/python3-packaging/python3-packaging.SlackBuild b/python/python3-packaging/python3-packaging.SlackBuild
deleted file mode 100644
index 30bebdd262..0000000000
--- a/python/python3-packaging/python3-packaging.SlackBuild
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python3-packaging
-
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python3-packaging
-VERSION=${VERSION:-20.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=packaging
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python3 setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- CHANGELOG.rst LICENSE README.rst \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-packaging/python3-packaging.info b/python/python3-packaging/python3-packaging.info
deleted file mode 100644
index a9d1131a6e..0000000000
--- a/python/python3-packaging/python3-packaging.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-packaging"
-VERSION="20.4"
-HOMEPAGE="https://pypi.python.org/pypi/packaging"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/packaging/packaging-20.4.tar.gz"
-MD5SUM="3208229da731c5d8e29d4d8941e75005"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-attrs python3-pyparsing python3-six"
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/python3-packaging/slack-desc b/python/python3-packaging/slack-desc
deleted file mode 100644
index 4c9f721dbb..0000000000
--- a/python/python3-packaging/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python3-packaging: python3-packaging (core utilities for Python packages)
-python3-packaging:
-python3-packaging: The Python packaging module contains a set of small, helper utilities
-python3-packaging: for dealing with Python packages.
-python3-packaging:
-python3-packaging:
-python3-packaging:
-python3-packaging:
-python3-packaging:
-python3-packaging:
-python3-packaging:
diff --git a/python/python3-pyparsing/README b/python/python3-pyparsing/README
deleted file mode 100644
index d2badb1992..0000000000
--- a/python/python3-pyparsing/README
+++ /dev/null
@@ -1,8 +0,0 @@
-The pyparsing module is an alternative approach to creating and
-executing simple grammars, vs. the traditional lex/yacc
-approach, or the use of regular expressions. The pyparsing
-module provides a library of classes that client code uses to
-construct the grammar directly in Python code.
-
-This is the python3 version of pyparsing and it can coexist with
-SBo's pyparsing package.
diff --git a/python/python3-pyparsing/python3-pyparsing.SlackBuild b/python/python3-pyparsing/python3-pyparsing.SlackBuild
deleted file mode 100644
index b98c10cd31..0000000000
--- a/python/python3-pyparsing/python3-pyparsing.SlackBuild
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python3-pyparsing
-
-# Copyright 2008-2012 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2016 Barry Grundy (bgrundy<at>linuxleo.com)
-# Copyright 2017-2018 Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python3-pyparsing
-SRCNAM=pyparsing
-VERSION=${VERSION:-2.2.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python3 setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES LICENSE PKG-INFO README HowToUsePyparsing.html docs/ $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-pyparsing/python3-pyparsing.info b/python/python3-pyparsing/python3-pyparsing.info
deleted file mode 100644
index ab429a468b..0000000000
--- a/python/python3-pyparsing/python3-pyparsing.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-pyparsing"
-VERSION="2.2.0"
-HOMEPAGE="https://github.com/pyparsing/pyparsing"
-DOWNLOAD="http://downloads.sourceforge.net/project/pyparsing/pyparsing/pyparsing-2.2.0/pyparsing-2.2.0.tar.gz"
-MD5SUM="0214e42d63af850256962b6744c948d9"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Jeremy Hansen"
-EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/python/python3-pyparsing/slack-desc b/python/python3-pyparsing/slack-desc
deleted file mode 100644
index 32aebd1da2..0000000000
--- a/python/python3-pyparsing/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python3-pyparsing: python3-pyparsing (parsing module for python)
-python3-pyparsing:
-python3-pyparsing: The pyparsing module is an alternative approach to creating and
-python3-pyparsing: executing simple grammars, vs. the traditional lex/yacc
-python3-pyparsing: approach, or the use of regular expressions. The pyparsing
-python3-pyparsing: module provides a library of classes that client code uses to
-python3-pyparsing: construct the grammar directly in Python code.
-python3-pyparsing:
-python3-pyparsing: Homepage: http://pyparsing.wikispaces.com/
-python3-pyparsing:
-python3-pyparsing: This is the python3 version and will coexist with the python2 version.
diff --git a/python/python3-six/README b/python/python3-six/README
deleted file mode 100644
index ee25e72d18..0000000000
--- a/python/python3-six/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Six is a Python 2 and 3 compatibility library. It provides utility functions for
-smoothing over the differences between the Python versions with the goal of
-writing Python code that is compatible on both Python versions. See the
-documentation for more information on what is provided.
diff --git a/python/python3-six/python3-six.SlackBuild b/python/python3-six/python3-six.SlackBuild
deleted file mode 100644
index 68d0258a4f..0000000000
--- a/python/python3-six/python3-six.SlackBuild
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python3-six
-
-# Copyright 2012-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
-# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python3-six
-VERSION=${VERSION:-1.13.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=six
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python3 setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- CHANGES LICENSE README.rst \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-six/python3-six.info b/python/python3-six/python3-six.info
deleted file mode 100644
index 87504ba7b6..0000000000
--- a/python/python3-six/python3-six.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-six"
-VERSION="1.13.0"
-HOMEPAGE="https://pypi.python.org/pypi/six/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/six/six-1.13.0.tar.gz"
-MD5SUM="e92c23c882c7d5564ce5773fe31b2771"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/python3-six/slack-desc b/python/python3-six/slack-desc
deleted file mode 100644
index 0694e82700..0000000000
--- a/python/python3-six/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python3-six: python3-six (Python 2 and 3 compatibility utilities)
-python3-six:
-python3-six: Six is a Python 2 and 3 compatibility library. It provides utility
-python3-six: functions for smoothing over the differences between the Python
-python3-six: versions with the goal of writing Python code that is compatible on
-python3-six: both Python versions. See the documentation for more information on
-python3-six: what is provided.
-python3-six:
-python3-six:
-python3-six:
-python3-six:
diff --git a/python/python3/README b/python/python3/README
deleted file mode 100644
index 8197d59201..0000000000
--- a/python/python3/README
+++ /dev/null
@@ -1,18 +0,0 @@
-Python is an interpreted, interactive, object-oriented programming
-language that combines remarkable power with very clear syntax.
-Python's basic power can be extended with your own modules written in C
-or C++. Python is also adaptable as an extension language for existing
-applications.
-
-Python 3 (a.k.a. "Python 3000" or "Py3k") is a new version of the
-language that is incompatible with the 2.x line of releases. The
-language is mostly the same, but many details, especially how built-in
-objects like dictionaries and strings work, have changed considerably,
-and a lot of deprecated features have finally been removed. Also, the
-standard library has been reorganized in a few prominent places.
-
-It is safe to install alongside Slackware's Python 2.x.
-
-If you'd like to have HTML docs installed, get them from
-<https://docs.python.org/3/download.html> (HTML format, .tar.bz2
-archive).
diff --git a/python/python3/patches/python3.no-static-library.diff b/python/python3/patches/python3.no-static-library.diff
deleted file mode 100644
index 2e03ab8add..0000000000
--- a/python/python3/patches/python3.no-static-library.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- ./Makefile.pre.in.orig 2019-01-13 13:06:37.518767495 -0600
-+++ ./Makefile.pre.in 2019-01-13 13:28:41.778781670 -0600
-@@ -549,7 +549,7 @@
- $(PYTHON_FOR_REGEN) ./Tools/clinic/clinic.py --make
-
- # Build the interpreter
--$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
-+$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY)
- $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-
- platform: $(BUILDPYTHON) pybuilddir.txt
-@@ -598,11 +598,6 @@
- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-
-
--# Build static library
--$(LIBRARY): $(LIBRARY_OBJS)
-- -rm -f $@
-- $(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)
--
- libpython$(LDVERSION).so: $(LIBRARY_OBJS)
- if test $(INSTSONAME) != $(LDLIBRARY); then \
- $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-@@ -692,7 +687,7 @@
- echo "-----------------------------------------------"; \
- fi
-
--Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
-+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
- $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-
- ############################################################################
-@@ -1428,17 +1423,6 @@
- else true; \
- fi; \
- done
-- @if test -d $(LIBRARY); then :; else \
-- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
-- if test "$(SHLIB_SUFFIX)" = .dll; then \
-- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
-- else \
-- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
-- fi; \
-- else \
-- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
-- fi; \
-- fi
- $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
- $(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
- $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
diff --git a/python/python3/patches/python3.readline.set_pre_input_hook.diff b/python/python3/patches/python3.readline.set_pre_input_hook.diff
deleted file mode 100644
index b55820c489..0000000000
--- a/python/python3/patches/python3.readline.set_pre_input_hook.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./Modules/readline.c.orig 2009-10-26 21:32:51.000000000 +0200
-+++ ./Modules/readline.c 2010-05-30 14:07:10.000000000 +0300
-@@ -12,6 +12,9 @@
- #include <errno.h>
- #include <sys/time.h>
-
-+/* This seems to be needed for set_pre_input_hook to work */
-+#define HAVE_RL_PRE_INPUT_HOOK 1
-+
- #if defined(HAVE_SETLOCALE)
- /* GNU readline() mistakenly sets the LC_CTYPE locale.
- * This is evil. Only the user or the app's main() should do this!
diff --git a/python/python3/patches/python3.x86_64.diff b/python/python3/patches/python3.x86_64.diff
deleted file mode 100644
index 1649c2344a..0000000000
--- a/python/python3/patches/python3.x86_64.diff
+++ /dev/null
@@ -1,156 +0,0 @@
---- ./configure.orig 2018-12-23 15:37:36.000000000 -0600
-+++ ./configure 2019-02-19 16:02:14.585002930 -0600
-@@ -15149,9 +15149,9 @@
-
-
- if test x$PLATFORM_TRIPLET = x; then
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
- else
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
- fi
-
-
---- ./Makefile.pre.in.orig 2018-12-23 15:37:36.000000000 -0600
-+++ ./Makefile.pre.in 2019-02-19 16:02:14.576002930 -0600
-@@ -142,7 +142,7 @@
- MANDIR= @mandir@
- INCLUDEDIR= @includedir@
- CONFINCLUDEDIR= $(exec_prefix)/include
--SCRIPTDIR= $(prefix)/lib
-+SCRIPTDIR= $(prefix)/lib64
- ABIFLAGS= @ABIFLAGS@
-
- # Detailed destination directories
---- ./Lib/sysconfig.py.orig 2018-12-23 15:37:36.000000000 -0600
-+++ ./Lib/sysconfig.py 2019-02-19 16:02:14.574002930 -0600
-@@ -20,10 +20,10 @@
-
- _INSTALL_SCHEMES = {
- 'posix_prefix': {
-- 'stdlib': '{installed_base}/lib/python{py_version_short}',
-- 'platstdlib': '{platbase}/lib/python{py_version_short}',
-- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
-+ 'stdlib': '{installed_base}/lib64/python{py_version_short}',
-+ 'platstdlib': '{platbase}/lib64/python{py_version_short}',
-+ 'purelib': '{base}/lib64/python{py_version_short}/site-packages',
-+ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
- 'include':
- '{installed_base}/include/python{py_version_short}{abiflags}',
- 'platinclude':
-@@ -32,10 +32,10 @@
- 'data': '{base}',
- },
- 'posix_home': {
-- 'stdlib': '{installed_base}/lib/python',
-- 'platstdlib': '{base}/lib/python',
-- 'purelib': '{base}/lib/python',
-- 'platlib': '{base}/lib/python',
-+ 'stdlib': '{installed_base}/lib64/python',
-+ 'platstdlib': '{base}/lib64/python',
-+ 'purelib': '{base}/lib64/python',
-+ 'platlib': '{base}/lib64/python',
- 'include': '{installed_base}/include/python',
- 'platinclude': '{installed_base}/include/python',
- 'scripts': '{base}/bin',
-@@ -62,10 +62,10 @@
- 'data': '{userbase}',
- },
- 'posix_user': {
-- 'stdlib': '{userbase}/lib/python{py_version_short}',
-- 'platstdlib': '{userbase}/lib/python{py_version_short}',
-- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
-+ 'stdlib': '{userbase}/lib64/python{py_version_short}',
-+ 'platstdlib': '{userbase}/lib64/python{py_version_short}',
-+ 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages',
-+ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
- 'include': '{userbase}/include/python{py_version_short}',
- 'scripts': '{userbase}/bin',
- 'data': '{userbase}',
---- ./Lib/site.py.orig 2018-12-23 15:37:36.000000000 -0600
-+++ ./Lib/site.py 2019-02-19 16:02:14.572002930 -0600
-@@ -334,7 +334,7 @@
- seen.add(prefix)
-
- if os.sep == '/':
-- sitepackages.append(os.path.join(prefix, "lib",
-+ sitepackages.append(os.path.join(prefix, "lib64",
- "python%d.%d" % sys.version_info[:2],
- "site-packages"))
- else:
---- ./Lib/distutils/command/install.py.orig 2018-12-23 15:37:36.000000000 -0600
-+++ ./Lib/distutils/command/install.py 2019-02-19 16:02:14.567002930 -0600
-@@ -29,15 +29,15 @@
-
- INSTALL_SCHEMES = {
- 'unix_prefix': {
-- 'purelib': '$base/lib/python$py_version_short/site-packages',
-- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+ 'purelib': '$base/lib64/python$py_version_short/site-packages',
-+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
- 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
- },
- 'unix_home': {
-- 'purelib': '$base/lib/python',
-- 'platlib': '$base/lib/python',
-+ 'purelib': '$base/lib64/python',
-+ 'platlib': '$base/lib64/python',
- 'headers': '$base/include/python/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
---- ./Lib/distutils/sysconfig.py.orig 2018-12-23 15:37:36.000000000 -0600
-+++ ./Lib/distutils/sysconfig.py 2019-02-19 16:02:14.570002930 -0600
-@@ -130,7 +130,7 @@
-
- if os.name == "posix":
- libpython = os.path.join(prefix,
-- "lib", "python" + get_python_version())
-+ "lib64", "python" + get_python_version())
- if standard_lib:
- return libpython
- else:
---- ./Modules/getpath.c.orig 2019-02-19 16:02:14.580002930 -0600
-+++ ./Modules/getpath.c 2019-02-19 16:06:51.535002940 -0600
-@@ -500,7 +500,7 @@
- "Could not find platform dependent libraries <exec_prefix>\n");
- }
- wcsncpy(exec_prefix, calculate->exec_prefix, MAXPATHLEN);
-- joinpath(exec_prefix, L"lib/lib-dynload");
-+ joinpath(exec_prefix, L"lib64/lib-dynload");
- }
- /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
- }
-@@ -742,7 +742,7 @@
- else {
- wcsncpy(calculate->zip_path, calculate->prefix, MAXPATHLEN);
- }
-- joinpath(calculate->zip_path, L"lib/python00.zip");
-+ joinpath(calculate->zip_path, L"lib64/python00.zip");
-
- /* Replace "00" with version */
- size_t bufsz = wcslen(calculate->zip_path);
-@@ -867,7 +867,7 @@
- if (!calculate->prefix) {
- return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
- }
-- calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);
-+ calculate->lib_python = Py_DecodeLocale("lib64/python" VERSION, &len);
- if (!calculate->lib_python) {
- return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
- }
---- ./setup.py.orig 2018-12-23 15:37:36.000000000 -0600
-+++ ./setup.py 2019-02-19 16:02:14.587002930 -0600
-@@ -546,7 +546,7 @@
- # directories (i.e. '.' and 'Include') must be first. See issue
- # 10520.
- if not cross_compiling:
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- # only change this for cross builds for 3.3, issues on Mageia
- if cross_compiling:
diff --git a/python/python3/python3.SlackBuild b/python/python3/python3.SlackBuild
deleted file mode 100644
index 190f7ec51b..0000000000
--- a/python/python3/python3.SlackBuild
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python3
-
-# Copyright 2012-2019 Audrius Kažukauskas <audrius@neutrino.lt>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python3
-SRCNAM=Python
-VERSION=${VERSION:-3.7.2}
-BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . )
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-# Don't set any SLKCFLAGS here, or OPT="$SLKCFLAGS" before the ./configure.
-# Python gets the compile options right without any help.
-if [ "$ARCH" = "i586" ]; then
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- LIBDIRSUFFIX="64"
-else
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-# Location for Python site-packages.
-SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/site-packages
-# Same as above without $PKG.
-TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/site-packages
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
-cd $SRCNAM-$VERSION
-
-patch -p1 -i $CWD/patches/python3.readline.set_pre_input_hook.diff
-# We don't want a large libpython*.a.
-patch -p1 -i $CWD/patches/python3.no-static-library.diff
-
-if [ "$ARCH" = "x86_64" ]; then
- # Install to lib64 instead of lib.
- patch -p1 -i $CWD/patches/python3.x86_64.diff
-fi
-
-# Fix python3 path in cgi.py.
-sed -i '1s|^#.*/usr/local/bin/python|#!/usr/bin/python3|' Lib/cgi.py
-
-# If system we're building on already has Python3 with pip in site-packages,
-# ignore it and install pip anyway.
-sed -i 's|\("install",\)|\1 "--ignore-installed",|' Lib/ensurepip/__init__.py
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --with-threads \
- --enable-ipv6 \
- --enable-shared \
- --with-system-expat \
- --with-system-ffi \
- --enable-loadable-sqlite-extensions \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-# Restore original ensurepip behaviour.
-sed -i 's| "--ignore-installed",||' \
- $PKG/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/ensurepip/__init__.py
-
-# Remove to avoid overwriting a copy from Python2.
-rm -f $PKG/usr/bin/2to3
-
-# We'll install the python-tools under site-packages.
-mkdir -p $SITEPK
-cp -a Tools/* $SITEPK
-
-# Remove DOS batch/exe files.
-find $PKG \( -name '*.exe' -o -name '*.bat' \) -exec rm -f '{}' \;
-
-# Fix permissions on dynamic libraries.
-find $PKG -type f -perm 555 -exec chmod 755 '{}' \;
-
-# Install docs.
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.rst LICENSE Misc $PKG/usr/doc/$PRGNAM-$VERSION
-# Delete stuff that we don't need to package.
-rm -f $PKG/usr/doc/$PKGNAM-$VERSION/Misc/{HISTORY,*.in,*.wpr,python.man,svnmap.txt}
-mv $SITEPK/README $PKG/usr/doc/$PRGNAM-$VERSION/README.python-tools
-( cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -sf $TOOLSDIR Tools )
-if [ -e "$CWD/python-$VERSION-docs-html.tar.bz2" ]; then
- tar xf $CWD/python-$VERSION-docs-html.tar.bz2
- mv python-$VERSION-docs-html $PKG/usr/doc/$PRGNAM-$VERSION/html
- chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION/html
-fi
-
-# Fix possible incorrect permissions.
-( cd $PKG
- find . -type d -exec chmod 755 "{}" \;
- find . -perm 640 -exec chmod 644 "{}" \;
- find . -perm 750 -exec chmod 755 "{}" \;
-)
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3/python3.info b/python/python3/python3.info
deleted file mode 100644
index 0cc075d48b..0000000000
--- a/python/python3/python3.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3"
-VERSION="3.7.2"
-HOMEPAGE="https://www.python.org/"
-DOWNLOAD="https://www.python.org/ftp/python/3.7.2/Python-3.7.2.tar.xz"
-MD5SUM="df6ec36011808205beda239c72f947cb"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Audrius Kažukauskas"
-EMAIL="audrius@neutrino.lt"
diff --git a/python/python3/slack-desc b/python/python3/slack-desc
deleted file mode 100644
index bfc8d5c554..0000000000
--- a/python/python3/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python3: python3 (object-oriented interpreted programming language)
-python3:
-python3: Python is an interpreted, interactive, object-oriented programming
-python3: language that combines remarkable power with very clear syntax.
-python3: This is a new version of the language that is incompatible with the
-python3: 2.x line of releases. The language is mostly the same, but many
-python3: details, especially how built-in objects like dictionaries and strings
-python3: work, have changed considerably, and a lot of deprecated features have
-python3: finally been removed. Also, the standard library has been reorganized
-python3: in a few prominent places.
-python3:
diff --git a/python/pyxdg/README b/python/pyxdg/README
deleted file mode 100644
index b42e24ed4f..0000000000
--- a/python/pyxdg/README
+++ /dev/null
@@ -1,3 +0,0 @@
-PyXDG contains implementations of freedesktop.org standards in python.
-
-Python3 is an optional dependency.
diff --git a/python/pyxdg/pyxdg.SlackBuild b/python/pyxdg/pyxdg.SlackBuild
deleted file mode 100644
index 2e616b739c..0000000000
--- a/python/pyxdg/pyxdg.SlackBuild
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for PyXDG
-
-# Copyright 2008-2009 Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# Copyright 2016, 2018 Hunter Sezen California, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=pyxdg
-VERSION=${VERSION:-0.26}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root $PKG
-
-# Python 3 support.
-if python3 -c 'import sys' 2>/dev/null; then
- python3 setup.py install --root=$PKG
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL PKG-INFO README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/pyxdg/pyxdg.info b/python/pyxdg/pyxdg.info
deleted file mode 100644
index a5438fe7cc..0000000000
--- a/python/pyxdg/pyxdg.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pyxdg"
-VERSION="0.26"
-HOMEPAGE="http://freedesktop.org/wiki/Software/pyxdg"
-DOWNLOAD="https://pypi.python.org/packages/47/6e/311d5f22e2b76381719b5d0c6e9dc39cd33999adae67db71d7279a6d70f4/pyxdg-0.26.tar.gz"
-MD5SUM="db1c2af8300ca64ce3955b3cf2490c92"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
diff --git a/python/pyxdg/slack-desc b/python/pyxdg/slack-desc
deleted file mode 100644
index 92074cd35e..0000000000
--- a/python/pyxdg/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-pyxdg: pyxdg (Python XDG Library)
-pyxdg:
-pyxdg: PyXDG contains implementations of freedesktop.org standards in python.
-pyxdg:
-pyxdg: Homepage: http://freedesktop.org/wiki/Software/pyxdg
-pyxdg:
-pyxdg:
-pyxdg:
-pyxdg:
-pyxdg:
-pyxdg:
diff --git a/python/six/README b/python/six/README
deleted file mode 100644
index e995a974e8..0000000000
--- a/python/six/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Six is a Python 2 and 3 compatibility library. It provides utility functions for
-smoothing over the differences between the Python versions with the goal of
-writing Python code that is compatible on both Python versions. See the
-documentation for more information on what is provided.
-
-Optional dependencies: Sphinx
diff --git a/python/six/six.SlackBuild b/python/six/six.SlackBuild
deleted file mode 100644
index 3c9e04a331..0000000000
--- a/python/six/six.SlackBuild
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for six
-
-# Copyright 2012-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=six
-VERSION=${VERSION:-1.14.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Build and install documentation if sphinx is installed.
-if $(python -c 'import sphinx.pygments_styles' 2>/dev/null); then
- make -j1 -C documentation man singlehtml
- install -D -m 0644 documentation/_build/man/$PRGNAM.1 $PKG/usr/man/man1/$PRGNAM.1
- gzip -9 $PKG/usr/man/man?/*.?
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
-[ -d documentation/_build/singlehtml ] && \
- cp -a documentation/_build/singlehtml/index.html \
- documentation/_build/singlehtml/_static \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc -type f -exec chmod 0644 '{}' \;
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/six/six.info b/python/six/six.info
deleted file mode 100644
index 700d532f92..0000000000
--- a/python/six/six.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="six"
-VERSION="1.14.0"
-HOMEPAGE="https://pypi.python.org/pypi/six/"
-DOWNLOAD="https://pypi.io/packages/source/s/six/six-1.14.0.tar.gz"
-MD5SUM="21674588a57e649d1a6d977ec3122140"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/python/six/slack-desc b/python/six/slack-desc
deleted file mode 100644
index 678f603af3..0000000000
--- a/python/six/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-six: six (Python 2 and 3 compatibility utilities)
-six:
-six: Six is a Python 2 and 3 compatibility library. It provides utility
-six: functions for smoothing over the differences between the Python
-six: versions with the goal of writing Python code that is compatible on
-six: both Python versions. See the documentation for more information on
-six: what is provided.
-six:
-six: Homepage: https://pypi.python.org/pypi/six/
-six:
-six:
diff --git a/python/thunarx-python/thunarx-python.SlackBuild b/python/thunarx-python/thunarx-python.SlackBuild
index 272da0fe51..f7480fab1d 100644
--- a/python/thunarx-python/thunarx-python.SlackBuild
+++ b/python/thunarx-python/thunarx-python.SlackBuild
@@ -25,13 +25,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=thunarx-python
-VERSION=${VERSION:-0.3.0}
+VERSION=${VERSION:-0.5.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/python/thunarx-python/thunarx-python.info b/python/thunarx-python/thunarx-python.info
index 27c9958622..89a20e0bc3 100644
--- a/python/thunarx-python/thunarx-python.info
+++ b/python/thunarx-python/thunarx-python.info
@@ -1,8 +1,8 @@
PRGNAM="thunarx-python"
-VERSION="0.3.0"
+VERSION="0.5.1"
HOMEPAGE="https://goodies.xfce.org/projects/bindings/thunarx-python/"
-DOWNLOAD="https://archive.xfce.org/src/bindings/thunarx-python/0.3/thunarx-python-0.3.0.tar.bz2"
-MD5SUM="86a28c4c34cae534f2793133b4755794"
+DOWNLOAD="https://archive.xfce.org/src/bindings/thunarx-python/0.5/thunarx-python-0.5.1.tar.bz2"
+MD5SUM="4f0ace4937e2727a7b2bdf622d87cb8b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/python/typing/README b/python/typing/README
deleted file mode 100644
index 5828c6eff4..0000000000
--- a/python/typing/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a backport of the standard library typing module to Python
-versions older than 3.5.
-
-Optional dependency: python3
diff --git a/python/typing/slack-desc b/python/typing/slack-desc
deleted file mode 100644
index b57a2cc3d9..0000000000
--- a/python/typing/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-typing: typing (Type Hints for Python)
-typing:
-typing: This is a backport of the standard library typing module to Python
-typing: versions older than 3.5.
-typing:
-typing: Homepage: https://docs.python.org/3.5/library/typing.html
-typing:
-typing:
-typing:
-typing:
-typing:
diff --git a/python/typing/typing.SlackBuild b/python/typing/typing.SlackBuild
deleted file mode 100644
index 49de6695b9..0000000000
--- a/python/typing/typing.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for typing
-
-# Copyright 2016-2019 Dimitris Zlatanidis Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=typing
-VERSION=${VERSION:-3.7.4.1}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
- python3 setup.py install --root=$PKG
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/typing/typing.info b/python/typing/typing.info
deleted file mode 100644
index e21f1c0dce..0000000000
--- a/python/typing/typing.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="typing"
-VERSION="3.7.4.1"
-HOMEPAGE="https://docs.python.org/3.5/library/typing.html"
-DOWNLOAD="https://files.pythonhosted.org/packages/67/b0/b2ea2bd67bfb80ea5d12a5baa1d12bda002cab3b6c9b48f7708cd40c34bf/typing-3.7.4.1.tar.gz"
-MD5SUM="0a1ebd4af65b4769e33459004eb20345"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/acpi_call/acpi_call.SlackBuild b/system/acpi_call/acpi_call.SlackBuild
index 9be2bed29b..0271eae2d7 100644
--- a/system/acpi_call/acpi_call.SlackBuild
+++ b/system/acpi_call/acpi_call.SlackBuild
@@ -66,6 +66,9 @@ find -L . \
patch -p0 < $CWD/fix-acpi-include.patch
+# Fix build with Linux >= 4.12
+sed -i 's|asm/uaccess.h|linux/uaccess.h|' acpi_call.c
+
make KDIR=$KERNELPATH
mkdir -p $PKG/lib/modules/$KERNEL/misc
diff --git a/system/audit/audit.SlackBuild b/system/audit/audit.SlackBuild
index c18f98a8b8..b215fc7bd1 100644
--- a/system/audit/audit.SlackBuild
+++ b/system/audit/audit.SlackBuild
@@ -23,7 +23,7 @@
# SUCH DAMAGE.
PRGNAM=audit
-VERSION=${VERSION:-2.3.6}
+VERSION=${VERSION:-2.8.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -103,7 +103,7 @@ for i in $(find $PKG/etc -type f -name "*.rules" -o -name "*.conf") ; do mv $i $
mkdir -p $PKG/var/log/audit $PKG/var/lock/subsys
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO contrib \
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README contrib \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
diff --git a/system/audit/audit.info b/system/audit/audit.info
index 809f0561eb..3d9cee63cc 100644
--- a/system/audit/audit.info
+++ b/system/audit/audit.info
@@ -1,8 +1,8 @@
PRGNAM="audit"
-VERSION="2.3.6"
+VERSION="2.8.5"
HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
-DOWNLOAD="http://people.redhat.com/sgrubb/audit/audit-2.3.6.tar.gz"
-MD5SUM="ffe178196717f8d3fc5337559543f58a"
+DOWNLOAD="http://people.redhat.com/sgrubb/audit/audit-2.8.5.tar.gz"
+MD5SUM="9455e5773670afdbccaeb92681b2e97d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/brasero/brasero.SlackBuild b/system/brasero/brasero.SlackBuild
index cd1f003c30..32abd17b58 100644
--- a/system/brasero/brasero.SlackBuild
+++ b/system/brasero/brasero.SlackBuild
@@ -75,7 +75,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=format-nonliteral -Wno-error=format-y2k" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/system/bulk_extractor/bulk_extractor.SlackBuild b/system/bulk_extractor/bulk_extractor.SlackBuild
index 2a7e955d4f..627aed32d5 100644
--- a/system/bulk_extractor/bulk_extractor.SlackBuild
+++ b/system/bulk_extractor/bulk_extractor.SlackBuild
@@ -25,7 +25,7 @@
# edited for v 1.5.5 November 2014 - added LightGrep option.
PRGNAM=bulk_extractor
-VERSION=${VERSION:-1.5.5}
+VERSION=${VERSION:-20170403_779dbe1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -62,9 +62,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/system/bulk_extractor/bulk_extractor.info b/system/bulk_extractor/bulk_extractor.info
index 09b76412bb..d4a31c3dd4 100644
--- a/system/bulk_extractor/bulk_extractor.info
+++ b/system/bulk_extractor/bulk_extractor.info
@@ -1,8 +1,8 @@
PRGNAM="bulk_extractor"
-VERSION="1.5.5"
+VERSION="20170403_779dbe1"
HOMEPAGE="https://github.com/simsong/bulk_extractor/wiki"
-DOWNLOAD="http://digitalcorpora.org/downloads/bulk_extractor/bulk_extractor-1.5.5.tar.gz"
-MD5SUM="7155ce6938876be91416def15e44d585"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/bulk_extractor-20170403_779dbe1.tar.xz"
+MD5SUM="96f0c04052c51e6746ba83dae9de145e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/caprice32/caprice32.SlackBuild b/system/caprice32/caprice32.SlackBuild
index ac27dd4df4..5eb64c1059 100644
--- a/system/caprice32/caprice32.SlackBuild
+++ b/system/caprice32/caprice32.SlackBuild
@@ -70,6 +70,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i "s|-O2|$SLKCFLAGS -Wno-narrowing|" makefile.unix
+
make -f makefile.unix RELEASE=TRUE
mkdir -p $PKG/usr/share/$PRGNAM $PKG/usr/bin
diff --git a/system/colord/colord.SlackBuild b/system/colord/colord.SlackBuild
index 2ac2cabcf3..5112df3e32 100644
--- a/system/colord/colord.SlackBuild
+++ b/system/colord/colord.SlackBuild
@@ -95,6 +95,11 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Since polkit in current apply upstream git
+# we have to reduce the polkit version used to test
+# https://github.com/hughsie/colord/issues/36
+sed -i "s|114|113|g" configure
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/system/conky/conky-1.10.6-gcc7.patch b/system/conky/conky-1.10.6-gcc7.patch
new file mode 100644
index 0000000000..dcbc3bc8a5
--- /dev/null
+++ b/system/conky/conky-1.10.6-gcc7.patch
@@ -0,0 +1,11 @@
+diff -Naur conky-1.10.6.orig/src/luamm.hh conky-1.10.6/src/luamm.hh
+--- conky-1.10.6.orig/src/luamm.hh 2016-12-04 16:13:57.000000000 +0100
++++ conky-1.10.6/src/luamm.hh 2017-05-05 12:44:37.525676651 +0200
+@@ -27,6 +27,7 @@
+ #include <mutex>
+ #include <exception>
+ #include <stdexcept>
++#include <functional>
+ #include <string>
+
+ #include <lua.hpp>
diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild
index c3f4948c36..395bcdce69 100644
--- a/system/conky/conky.SlackBuild
+++ b/system/conky/conky.SlackBuild
@@ -87,6 +87,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Fix for the newer gcc
+patch -p1 < $CWD/conky-1.10.6-gcc7.patch
+
# fix MANDIR
sed -i 's,share/man/man1,man/man1,g' CMakeLists.txt
diff --git a/system/cups-bjnp/cups-bjnp.SlackBuild b/system/cups-bjnp/cups-bjnp.SlackBuild
index 1829168b60..0cb88341f5 100644
--- a/system/cups-bjnp/cups-bjnp.SlackBuild
+++ b/system/cups-bjnp/cups-bjnp.SlackBuild
@@ -69,7 +69,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=stringop-truncation" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/system/dahdi-complete/dahdi-complete.SlackBuild b/system/dahdi-complete/dahdi-complete.SlackBuild
index c6984aae30..bbfbde084c 100644
--- a/system/dahdi-complete/dahdi-complete.SlackBuild
+++ b/system/dahdi-complete/dahdi-complete.SlackBuild
@@ -10,7 +10,7 @@
# All rights reserved.
PRGNAM=dahdi-complete
-VERSION=${VERSION:-2.10.2}
+VERSION=${VERSION:-3.0.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -61,16 +61,19 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-sed -i -e 's/ -Werror//' tools/acinclude.m4 tools/xpp/Makefile
-sed -i -e 's/-Werror //' tools/Makefile
+sed -i -e 's/ -Werror//' tools/acinclude.m4 tools/xpp/Makefile.am
+sed -i -e 's/-Werror //' tools/Makefile.am
# Fix Perl install location (otherwise it installs to /usr/local/share/perl5)
-sed -i -e 's/sitelib/vendorlib/' linux/build_tools/live_dahdi tools/xpp/Makefile
+sed -i -e 's/sitelib/vendorlib/' linux/build_tools/live_dahdi tools/xpp/Makefile.am
cd linux
make all
cd ../tools
+./bootstrap.sh
+autoreconf -fi
+CPPFLAGS="-I$(pwd)/../linux/include" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -88,6 +91,10 @@ make install DESTDIR=$PKG
cd ..
make config DESTDIR=$PKG
+mkdir -p $PKG/usr/share/perl5/vendor_perl
+mv $PKG/usr/local/share/perl5/* $PKG/usr/share/perl5/vendor_perl/
+rm -fR $PKG/usr/local
+
# move config files to .new
cd $PKG/etc
for file in $(find . -type f); do
@@ -103,7 +110,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
# Clean up zero-length firmware files
-find $PKG/lib/firmware -size 0 -delete
+find $PKG/lib/firmware -size 0 -delete || true
# Remove unused directory
rm -rf $PKG/usr/lib
diff --git a/system/dahdi-complete/dahdi-complete.info b/system/dahdi-complete/dahdi-complete.info
index 545f353e9a..1c53349c2a 100644
--- a/system/dahdi-complete/dahdi-complete.info
+++ b/system/dahdi-complete/dahdi-complete.info
@@ -1,8 +1,8 @@
PRGNAM="dahdi-complete"
-VERSION="2.10.2"
+VERSION="3.0.0"
HOMEPAGE="http://www.asterisk.org/downloads/dahdi"
-DOWNLOAD="http://downloads.asterisk.org/pub/telephony/dahdi-linux-complete/releases/dahdi-linux-complete-2.10.2+2.10.2.tar.gz"
-MD5SUM="9b5ae61dc6202b45284d71481ec758c0"
+DOWNLOAD="http://downloads.asterisk.org/pub/telephony/dahdi-linux-complete/releases/dahdi-linux-complete-3.0.0+3.0.0.tar.gz"
+MD5SUM="0e0a7f18bda5f97dcd22369645234231"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/dash/README b/system/dash/README
deleted file mode 100644
index 4f1ca583a5..0000000000
--- a/system/dash/README
+++ /dev/null
@@ -1,4 +0,0 @@
-DASH is a POSIX-compliant implementation of /bin/sh that aims to be as
-small as possible. It does this without sacrificing speed where
-possible. In fact, it is significantly faster than bash (the GNU
-Bourne-Again SHell) for most tasks.
diff --git a/system/dash/dash.SlackBuild b/system/dash/dash.SlackBuild
deleted file mode 100644
index e0d4ada3e3..0000000000
--- a/system/dash/dash.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dash
-
-# Written by Vincent Batts, http://hashbangbash.com/
-# Copyright 2017-2020 Donald Cooley South Haven, Indiana USA
-
-PRGNAM=dash
-VERSION=${VERSION:-0.5.11.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/ \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux \
- --with-libedit
-
-make
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/bin
-( cd $PKG/usr/bin ; ln -s /bin/dash dash )
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- COPYING ChangeLog \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/dash/dash.info b/system/dash/dash.info
deleted file mode 100644
index 8404d7fbad..0000000000
--- a/system/dash/dash.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dash"
-VERSION="0.5.11.2"
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-DOWNLOAD="http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.2.tar.gz"
-MD5SUM="b9b71c72e40fdc4db9b4ffb81fc3bebc"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libedit"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
diff --git a/system/dash/slack-desc b/system/dash/slack-desc
deleted file mode 100644
index 83489625d6..0000000000
--- a/system/dash/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-dash: dash (POSIX compliant shell)
-dash:
-dash: DASH is a POSIX-compliant implementation of /bin/sh that aims
-dash: to be as small as possible. It does this without sacrificing
-dash: speed where possible. In fact, it is significantly faster than
-dash: bash (the GNU Bourne-Again SHell) for most tasks.
-dash:
-dash:
-dash:
-dash:
-dash:
diff --git a/system/ddcutil/ddcutil.SlackBuild b/system/ddcutil/ddcutil.SlackBuild
index 9a88356804..f19dc83435 100644
--- a/system/ddcutil/ddcutil.SlackBuild
+++ b/system/ddcutil/ddcutil.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ddcutil
-VERSION=${VERSION:-0.8.6}
+VERSION=${VERSION:-0.9.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,10 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-./autogen.sh
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
diff --git a/system/ddcutil/ddcutil.info b/system/ddcutil/ddcutil.info
index acd1af4c28..21906ddac4 100644
--- a/system/ddcutil/ddcutil.info
+++ b/system/ddcutil/ddcutil.info
@@ -1,8 +1,8 @@
PRGNAM="ddcutil"
-VERSION="0.8.6"
+VERSION="0.9.7"
HOMEPAGE="http://ddcutil.com/"
-DOWNLOAD="https://github.com/rockowitz/ddcutil/archive/v0.8.6/ddcutil-0.8.6.tar.gz"
-MD5SUM="4cb18bb13505e1713736c35f5e8f6237"
+DOWNLOAD="https://github.com/rockowitz/ddcutil/archive/v0.9.7/ddcutil-0.9.7.tar.gz"
+MD5SUM="427c956956ac8c9afdc8e18c76a8e3b0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/dymo-cups-drivers/cups-ppd-header.patch b/system/dymo-cups-drivers/cups-ppd-header.patch
new file mode 100644
index 0000000000..46b366915d
--- /dev/null
+++ b/system/dymo-cups-drivers/cups-ppd-header.patch
@@ -0,0 +1,40 @@
+diff -ur dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h dymo-cups-drivers-1.4.0.5-patch/src/common/CupsFilter.h
+--- dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h 2012-02-07 08:22:37.000000000 -0500
++++ dymo-cups-drivers-1.4.0.5-patch/src/common/CupsFilter.h 2016-10-27 20:13:46.267013540 -0400
+@@ -23,6 +23,7 @@
+
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include <memory>
+ #include <string>
+ #include "CupsPrintEnvironment.h"
+diff -ur dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h dymo-cups-drivers-1.4.0.5-patch/src/lm/CupsFilterLabelManager.h
+--- dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h 2012-02-07 08:22:38.000000000 -0500
++++ dymo-cups-drivers-1.4.0.5-patch/src/lm/CupsFilterLabelManager.h 2016-10-27 20:14:00.407310094 -0400
+@@ -23,6 +23,7 @@
+
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include "LabelManagerDriver.h"
+ #include "LabelManagerLanguageMonitor.h"
+ #include "DummyLanguageMonitor.h"
+@@ -50,4 +51,4 @@
+
+ /*
+ * End of "$Id: CupsFilterLabelManager.h 14880 2011-03-31 16:29:05Z aleksandr $".
+- */
+\ No newline at end of file
++ */
+diff -ur dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h dymo-cups-drivers-1.4.0.5-patch/src/lw/CupsFilterLabelWriter.h
+--- dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h 2012-02-07 08:22:37.000000000 -0500
++++ dymo-cups-drivers-1.4.0.5-patch/src/lw/CupsFilterLabelWriter.h 2016-10-27 20:14:23.717798963 -0400
+@@ -23,6 +23,7 @@
+
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include "LabelWriterDriver.h"
+ #include "LabelWriterLanguageMonitor.h"
+ #include "DummyLanguageMonitor.h"
diff --git a/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild b/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild
index d75cb09fca..e647c5209e 100644
--- a/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild
+++ b/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Patch for the newer cups - thanks archlinux!
+patch -p1 < $CWD/cups-ppd-header.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/system/dynamips/dynamips.SlackBuild b/system/dynamips/dynamips.SlackBuild
index a9edf005e9..76345e6758 100644
--- a/system/dynamips/dynamips.SlackBuild
+++ b/system/dynamips/dynamips.SlackBuild
@@ -75,6 +75,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
sed -i 's/^\(\.PHONY: all dynamips\)/# \1/' Makefile
+sed -i "s/-L\/usr\/lib\ -L\.\ -ldl/-L\/usr\/lib${LIBDIRSUFFIX} -L. -ldl -lz/" stable/Makefile
if [ $ARCH == "x86_64" ]
then
diff --git a/system/ecryptfs-utils/ecryptfs-utils.SlackBuild b/system/ecryptfs-utils/ecryptfs-utils.SlackBuild
index 27ba7c2bbb..8a32014071 100644
--- a/system/ecryptfs-utils/ecryptfs-utils.SlackBuild
+++ b/system/ecryptfs-utils/ecryptfs-utils.SlackBuild
@@ -72,6 +72,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p0 < $CWD/openssl.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -84,7 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--disable-pam \
--enable-gpg \
- --enable-tests \
+ --disable-tests \
--build=$ARCH-slackware-linux
make -j1 all check
diff --git a/system/ecryptfs-utils/openssl.patch b/system/ecryptfs-utils/openssl.patch
new file mode 100644
index 0000000000..5c3e419a91
--- /dev/null
+++ b/system/ecryptfs-utils/openssl.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c 2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c 2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++ const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++ if (n != NULL)
++ *n = r->n;
++ if (e != NULL)
++ *e = r->e;
++ if (d != NULL)
++ *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ char *path;
+ char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ int len, nbits, ebits, i;
+ int nbytes, ebytes;
++ const BIGNUM *key_n, *key_e;
+ unsigned char *hash;
+ unsigned char *data = NULL;
+ int rc = 0;
+@@ -152,11 +167,13 @@
+ rc = -ENOMEM;
+ goto out;
+ }
+- nbits = BN_num_bits(key->n);
++ RSA_get0_key(key, &key_n, NULL, NULL);
++ nbits = BN_num_bits(key_n);
+ nbytes = nbits / 8;
+ if (nbits % 8)
+ nbytes++;
+- ebits = BN_num_bits(key->e);
++ RSA_get0_key(key, NULL, &key_e, NULL);
++ ebits = BN_num_bits(key_e);
+ ebytes = ebits / 8;
+ if (ebits % 8)
+ ebytes++;
+@@ -179,11 +196,13 @@
+ data[i++] = '\02';
+ data[i++] = (nbits >> 8);
+ data[i++] = nbits;
+- BN_bn2bin(key->n, &(data[i]));
++ RSA_get0_key(key, &key_n, NULL, NULL);
++ BN_bn2bin(key_n, &(data[i]));
+ i += nbytes;
+ data[i++] = (ebits >> 8);
+ data[i++] = ebits;
+- BN_bn2bin(key->e, &(data[i]));
++ RSA_get0_key(key, NULL, &key_e, NULL);
++ BN_bn2bin(key_e, &(data[i]));
+ i += ebytes;
+ SHA1(data, len + 3, hash);
+ to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ BIO *in = NULL;
+ int rc;
+
++ #if OPENSSL_VERSION_NUMBER < 0x10100000L
+ CRYPTO_malloc_init();
++ #endif
+ ERR_load_crypto_strings();
+ OpenSSL_add_all_algorithms();
+ ENGINE_load_builtin_engines();
+
+
diff --git a/system/efitools/efitools.SlackBuild b/system/efitools/efitools.SlackBuild
index b2f041bed3..825ec0279e 100644
--- a/system/efitools/efitools.SlackBuild
+++ b/system/efitools/efitools.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=efitools
-VERSION=${VERSION:-1.5.3}
+VERSION=${VERSION:-1.9.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -32,7 +32,7 @@ USE_KEYS=${USE_KEYS:-no}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -44,8 +44,8 @@ PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
# It's not safe to specify build flags since some EFI programs are built.
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
EFI_ARCH=ia32
elif [ "$ARCH" = "i686" ]; then
@@ -93,6 +93,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# https://github.com/vathpela/gnu-efi/commit/d34132e62f666904158c7ec2f1eef5a9d5281c36
+sed -i "s|EFI_WARN_UNKOWN_GLYPH|EFI_WARN_UNKNOWN_GLYPH|" lib/console.c
+
make \
CRTPATH=/usr/lib${LIBDIRSUFFIX}/gnuefi \
MYGUID=${MYGUID} \
diff --git a/system/efitools/efitools.info b/system/efitools/efitools.info
index 8946a7cacf..ff0b1df6bc 100644
--- a/system/efitools/efitools.info
+++ b/system/efitools/efitools.info
@@ -1,8 +1,8 @@
PRGNAM="efitools"
-VERSION="1.5.3"
+VERSION="1.9.2"
HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/efitools-1.5.3.tar.gz"
-MD5SUM="19ed4d83cfbb10987b84fca5a744715a"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/efitools-1.9.2.tar.gz"
+MD5SUM="a3a3f04ed6aa5486c97dd206edeebe0a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="perl-File-Slurp sbsigntools"
diff --git a/system/evilvte/evilvte.info b/system/evilvte/evilvte.info
index 9ec5d1d50e..cb96363355 100644
--- a/system/evilvte/evilvte.info
+++ b/system/evilvte/evilvte.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/caleb-/evilvte/archive/8dfa41e26bc640dd8d8c7317ff7d
MD5SUM="e09c34ac7d5afaf6ca785b7984df70ed"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
MAINTAINER="orphaned - no maintainer"
EMAIL="nobody@nowhere"
diff --git a/system/extundelete/extundelete-e2fsprogs-1.44.1.patch b/system/extundelete/extundelete-e2fsprogs-1.44.1.patch
new file mode 100644
index 0000000000..61c078bfb8
--- /dev/null
+++ b/system/extundelete/extundelete-e2fsprogs-1.44.1.patch
@@ -0,0 +1,12 @@
+diff -ru extundelete-0.2.4.orig/src/insertionops.cc extundelete-0.2.4/src/insertionops.cc
+--- extundelete-0.2.4.orig/src/insertionops.cc 2018-06-04 22:19:22.460051515 +0000
++++ extundelete-0.2.4/src/insertionops.cc 2018-06-04 22:19:49.256717673 +0000
+@@ -33,7 +33,7 @@
+ os << "File flags: " << inode.i_flags << std::endl;
+ os << "File version (for NFS): " << inode.i_generation << std::endl;
+ os << "File ACL: " << inode.i_file_acl << std::endl;
+- os << "Directory ACL: " << inode.i_dir_acl << std::endl;
++ os << "Directory ACL: " << inode.i_size_high << std::endl;
+ os << "Fragment address: " << inode.i_faddr << std::endl;
+ os << "Direct blocks: ";
+ for (int n = 0; n < EXT2_NDIR_BLOCKS; n++)
diff --git a/system/extundelete/extundelete.SlackBuild b/system/extundelete/extundelete.SlackBuild
index 5707b90896..ad08fe39e7 100644
--- a/system/extundelete/extundelete.SlackBuild
+++ b/system/extundelete/extundelete.SlackBuild
@@ -72,6 +72,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/extundelete-e2fsprogs-1.44.1.patch
+
mkdir -p $PKG/usr/bin $PKG/usr/doc
DFLAGS=$LDFLAGS \
diff --git a/system/f2fs_tools/README b/system/f2fs_tools/README
deleted file mode 100644
index 9b03454053..0000000000
--- a/system/f2fs_tools/README
+++ /dev/null
@@ -1 +0,0 @@
-Userland tools for the f2fs filesystem.
diff --git a/system/f2fs_tools/f2fs_tools.SlackBuild b/system/f2fs_tools/f2fs_tools.SlackBuild
deleted file mode 100644
index 198eb74854..0000000000
--- a/system/f2fs_tools/f2fs_tools.SlackBuild
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-# Slackware build script for <f2fs_tools>
-#
-# Michales (clavisound) Michaloudes korgie@gmail.com <2014>
-
-PRGNAM=f2fs_tools
-SRCNAM=f2fs-tools
-VERSION=${VERSION:-1.6.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-v$VERSION
-tar xvf $CWD/$SRCNAM-v$VERSION.tar.gz
-cd $SRCNAM-v$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS"
-
-autoreconf --install
-
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS COPYING ChangeLog README VERSION \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/f2fs_tools/f2fs_tools.info b/system/f2fs_tools/f2fs_tools.info
deleted file mode 100644
index cda93b1788..0000000000
--- a/system/f2fs_tools/f2fs_tools.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="f2fs_tools"
-VERSION="1.6.1"
-HOMEPAGE="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git"
-DOWNLOAD="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-v1.6.1.tar.gz"
-MD5SUM="3fc6caa14569e059fc41807e42641a11"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Michales Michaloudes"
-EMAIL="korgie@gmail.com"
diff --git a/system/f2fs_tools/slack-desc b/system/f2fs_tools/slack-desc
deleted file mode 100644
index cb5332d95f..0000000000
--- a/system/f2fs_tools/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-f2fs_tools: f2fs_tools (Userland tools for the f2fs filesystem)
-f2fs_tools:
-f2fs_tools: Project URL:
-f2fs_tools: https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
diff --git a/system/facter/facter.SlackBuild b/system/facter/facter.SlackBuild
index 7788f94801..03f1919ac8 100644
--- a/system/facter/facter.SlackBuild
+++ b/system/facter/facter.SlackBuild
@@ -77,7 +77,7 @@ mkdir -p build
cd build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=misleading-indentation" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=Release ..
diff --git a/system/file-roller/file-roller.SlackBuild b/system/file-roller/file-roller.SlackBuild
index 1894ba77d6..9ab5ef132c 100644
--- a/system/file-roller/file-roller.SlackBuild
+++ b/system/file-roller/file-roller.SlackBuild
@@ -26,7 +26,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=file-roller
-VERSION=${VERSION:-3.24.1}
+VERSION=${VERSION:-3.36.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -72,21 +72,21 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --localedir=/usr/share/locale \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make V=1
-make install DESTDIR=$PKG
+mkdir build
+cd build
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ meson .. \
+ --buildtype=release \
+ --infodir=/usr/info \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --prefix=/usr \
+ --sysconfdir=/etc
+ ninja
+ DESTDIR=$PKG ninja install
+cd ..
#won't work with thunar archive-plugin without renaming desktop file:
mv $PKG/usr/share/applications/org.gnome.FileRoller.desktop $PKG/usr/share/applications/file-roller.desktop
@@ -95,7 +95,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog HACKING INSTALL MAINTAINERS NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING HACKING MAINTAINERS NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/system/file-roller/file-roller.info b/system/file-roller/file-roller.info
index f2ac306e47..87df0fc1d7 100644
--- a/system/file-roller/file-roller.info
+++ b/system/file-roller/file-roller.info
@@ -1,8 +1,8 @@
PRGNAM="file-roller"
-VERSION="3.24.1"
+VERSION="3.36.2"
HOMEPAGE="http://ftp.gnome.org/pub/gnome/sources/file-roller"
-DOWNLOAD="http://ftp.acc.umu.se/pub/gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz"
-MD5SUM="1e6be71792c7a8e4950297e9fdcf33e7"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.36/file-roller-3.36.2.tar.xz"
+MD5SUM="caa0103ab34d237a9760fbf5e1c72bc1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/foremost/foremost.SlackBuild b/system/foremost/foremost.SlackBuild
index 7f34e6338c..890df080a0 100644
--- a/system/foremost/foremost.SlackBuild
+++ b/system/foremost/foremost.SlackBuild
@@ -46,6 +46,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+patch -p1 < $CWD/gcc10.patch
+
# Set the $ARCH variable for the Makefile.
sed -i "s|-O2|$SLKCFLAGS|" Makefile
# Set location of configuration file.
diff --git a/system/foremost/gcc10.patch b/system/foremost/gcc10.patch
new file mode 100644
index 0000000000..8506f59cf9
--- /dev/null
+++ b/system/foremost/gcc10.patch
@@ -0,0 +1,99 @@
+diff -up foremost-1.5.7/api.c.me foremost-1.5.7/api.c
+--- foremost-1.5.7/api.c.me 2020-02-06 14:15:48.218200745 +0100
++++ foremost-1.5.7/api.c 2020-02-06 14:16:42.624853860 +0100
+@@ -20,6 +20,7 @@ int currFATblk;
+ int highblk = 0;
+ int block_list[OUR_BLK_SIZE / sizeof(int)];
+ extern int errno;
++struct DIRECTORY *dirlist, *dl;
+
+ /*Inititialize those globals used by extract_ole*/
+ void init_ole()
+diff -up foremost-1.5.7/extract.c.me foremost-1.5.7/extract.c
+--- foremost-1.5.7/extract.c.me 2020-02-06 14:10:30.446386101 +0100
++++ foremost-1.5.7/extract.c 2020-02-06 14:15:14.736798823 +0100
+@@ -25,6 +25,7 @@ extern char *extract_name;
+ extern int extract;
+ extern int FATblk;
+ extern int highblk;
++extern struct DIRECTORY *dirlist, *dl;
+
+ /********************************************************************************
+ *Function: extract_zip
+diff -up foremost-1.5.7/main.h.me foremost-1.5.7/main.h
+--- foremost-1.5.7/main.h.me 2020-02-06 13:48:46.923922983 +0100
++++ foremost-1.5.7/main.h 2020-02-06 13:50:08.001849830 +0100
+@@ -292,7 +292,7 @@ char *__progname;
+ /* -----------------------------------------------------------------
+ State Variable and Global Variables
+ ----------------------------------------------------------------- */
+-char wildcard;
++extern char wildcard;
+ typedef struct f_state
+ {
+ off_t mode;
+@@ -344,7 +344,7 @@ typedef struct s_spec
+ int written; /*used for -a mode*/
+ }s_spec;
+
+-s_spec search_spec[50]; /*ARRAY OF BUILTIN SEARCH TYPES*/
++extern s_spec search_spec[50]; /*ARRAY OF BUILTIN SEARCH TYPES*/
+
+ typedef struct f_info {
+ char *file_name;
+@@ -367,7 +367,7 @@ typedef struct f_info {
+ } f_info;
+
+ /* Set if the user hits ctrl-c */
+-int signal_caught;
++extern int signal_caught;
+
+ /* -----------------------------------------------------------------
+ Function definitions
+@@ -433,7 +433,7 @@ off_t find_file_size(FILE *f);
+ char *human_readable(off_t size, char *buffer);
+ char *units(unsigned int c);
+ unsigned int chop(char *buf);
+-void print_search_specs(f_state *s);
++extern void print_search_specs(f_state *s);
+ int memwildcardcmp(const void *s1, const void *s2,size_t n,int caseSensitive);
+ int charactersMatch(char a, char b, int caseSensitive);
+ void printx(unsigned char* buf,int start, int end);
+diff -up foremost-1.5.7/ole.h.me foremost-1.5.7/ole.h
+--- foremost-1.5.7/ole.h.me 2020-02-06 14:08:16.524783353 +0100
++++ foremost-1.5.7/ole.h 2020-02-06 14:10:02.954056080 +0100
+@@ -84,8 +84,8 @@ struct DIRECTORY
+ int s2;
+ int d1;
+ int d2;
+-}
+-*dirlist, *dl;
++};
++
+
+ int get_dir_block(unsigned char *fd, int blknum, int buffersize);
+ int get_dir_info(unsigned char *src);
+diff -up foremost-1.5.7/state.c.me foremost-1.5.7/state.c
+--- foremost-1.5.7/state.c.me 2020-02-06 14:06:44.514684887 +0100
++++ foremost-1.5.7/state.c 2020-02-06 14:08:03.329625827 +0100
+@@ -2,6 +2,9 @@
+
+ #include "main.h"
+
++s_spec search_spec[50];
++char wildcard;
++
+ int initialize_state (f_state * s, int argc, char **argv)
+ {
+ char **argv_copy = argv;
+diff -up foremost-1.5.7/main.c.me foremost-1.5.7/main.c
+--- foremost-1.5.7/main.c.me 2020-02-06 14:20:09.918342282 +0100
++++ foremost-1.5.7/main.c 2020-02-06 14:20:42.531733786 +0100
+@@ -15,6 +15,7 @@
+ *
+ */
+ #include "main.h"
++int signal_caught;
+
+ #ifdef __WIN32
+
diff --git a/system/fuse3/README b/system/fuse3/README
deleted file mode 100644
index 533ab44440..0000000000
--- a/system/fuse3/README
+++ /dev/null
@@ -1,10 +0,0 @@
-fuse3 - Filesystem in Userspace, version 3
-
-FUSE (Filesystem in Userspace) is an interface for userspace programs to
-export a filesystem to the Linux kernel. The FUSE project consists of two
-components: the fuse kernel module (maintained in the regular kernel
-repositories) and the libfuse userspace library (maintained in this
-repository). libfuse provides the reference implementation for communicating
-with the FUSE kernel module.
-
-This ought not collide with the "fuse" package in stock slackware install.
diff --git a/system/fuse3/fuse3.SlackBuild b/system/fuse3/fuse3.SlackBuild
deleted file mode 100644
index 5b75bae99c..0000000000
--- a/system/fuse3/fuse3.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for fuse3
-
-# Copyright 2019 Vincent Batts, Raleigh, NC, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=fuse3
-VERSION=${VERSION:-3.9.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-BASENAME=fuse
-SUFFIX=3
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $BASENAME-$VERSION
-tar xvf $CWD/$BASENAME-$VERSION.tar.xz
-cd $BASENAME-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-meson build \
- -Dexamples=false \
- -Dudevrulesdir="/etc/udev/rules.d" \
- --prefix="/usr" \
- --mandir="/usr/man"
-ninja -C build
-DESTDIR=$PKG ninja -C build install
-rm -rf $PKG/dev $PKG/etc/udev
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- README.md LICENSE LGPL2.txt GPL2.txt doc/ example/ \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/fuse3/fuse3.info b/system/fuse3/fuse3.info
deleted file mode 100644
index de334d4735..0000000000
--- a/system/fuse3/fuse3.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fuse3"
-VERSION="3.9.0"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-DOWNLOAD="https://github.com/libfuse/libfuse/releases/download/fuse-3.9.0/fuse-3.9.0.tar.xz"
-MD5SUM="5dc2be21c0d06c7eace340996e8a37e2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="meson"
-MAINTAINER="Vincent Batts"
-EMAIL="vbatts@hashbanghbash.com"
diff --git a/system/fuse3/slack-desc b/system/fuse3/slack-desc
deleted file mode 100644
index 6cd1dacca4..0000000000
--- a/system/fuse3/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-fuse3: fuse3 (Filesystem in Userspace)
-fuse3:
-fuse3: FUSE is a simple interface for userspace programs to export a virtual
-fuse3: filesystem to the Linux kernel. FUSE also aims to provide a secure
-fuse3: method for non privileged users to create and mount their own
-fuse3: filesystem implementations.
-fuse3:
-fuse3: Homepage: https://github.com/libfuse/libfuse
-fuse3:
-fuse3:
-fuse3:
diff --git a/system/fwupdate/fwupdate.SlackBuild b/system/fwupdate/fwupdate.SlackBuild
index 682bce6a05..5487906bf4 100644
--- a/system/fwupdate/fwupdate.SlackBuild
+++ b/system/fwupdate/fwupdate.SlackBuild
@@ -70,6 +70,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i "s|-Og|-Og -Wno-error=address-of-packed-member -Wno-error=pointer-sign|" \
+ {efi,linux}/Makefile
+
# randomly fails with more than one thread
make -j1 \
EFIDIR=Slackware \
diff --git a/system/geoclue/geoclue.SlackBuild b/system/geoclue/geoclue.SlackBuild
index ce119daa39..5276a0cd02 100644
--- a/system/geoclue/geoclue.SlackBuild
+++ b/system/geoclue/geoclue.SlackBuild
@@ -82,7 +82,6 @@ CXXFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--enable-static=no \
--enable-gtk=yes \
- --enable-networkmanager=yes \
--enable-skyhook=yes \
--enable-gpsd=no \
--build=$ARCH-slackware-linux
diff --git a/system/gnome-terminal/gnome-terminal.info b/system/gnome-terminal/gnome-terminal.info
index e9dce86924..e28f430da0 100644
--- a/system/gnome-terminal/gnome-terminal.info
+++ b/system/gnome-terminal/gnome-terminal.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.32/gnome-term
MD5SUM="cb7843b97a78a3bbaac9381f78bb8569"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="libgnome rarian"
+REQUIRES="libgnome rarian vte2"
MAINTAINER="Thorn Inurcide"
EMAIL="thorn-inurcide@hotmail.com"
diff --git a/system/gnome-vfs/gnome-vfs.SlackBuild b/system/gnome-vfs/gnome-vfs.SlackBuild
index 2a2e087339..3b7809d74c 100644
--- a/system/gnome-vfs/gnome-vfs.SlackBuild
+++ b/system/gnome-vfs/gnome-vfs.SlackBuild
@@ -69,6 +69,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+patch -p0 < $CWD/openssl-1.1.patch
+
# Fix for the newer glib
sed -i "/-DG_DISABLE_DEPRECATED/d" */Makefile.*
diff --git a/system/gnome-vfs/openssl-1.1.patch b/system/gnome-vfs/openssl-1.1.patch
new file mode 100644
index 0000000000..14207f28d1
--- /dev/null
+++ b/system/gnome-vfs/openssl-1.1.patch
@@ -0,0 +1,26 @@
+$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $
+
+struct SSL is opaque in openssl-1.1; and the SSL_free() man page
+says that one should not free members of it manually (in both
+the openssl-1.0 and openssl-1.1 man pages).
+
+--- libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14.000000000 +0000
++++ libgnomevfs/gnome-vfs-ssl.c
+@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
+ }
+ }
+
+- if (ssl->private->ssl->ctx)
+- SSL_CTX_free (ssl->private->ssl->ctx);
+-
+ SSL_free (ssl->private->ssl);
+ g_free (ssl->private);
+ g_free (ssl);
+@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
+ }
+ }
+
+- SSL_CTX_free (ssl->private->ssl->ctx);
+ SSL_free (ssl->private->ssl);
+ close (ssl->private->sockfd);
+ if (ssl->private->timeout)
diff --git a/system/gnomint/doinst.sh b/system/gnomint/doinst.sh
index bae04666ba..6d1bccdc33 100644
--- a/system/gnomint/doinst.sh
+++ b/system/gnomint/doinst.sh
@@ -6,9 +6,8 @@ if [ -x /usr/bin/update-mime-database ]; then
/usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
fi
-if [ -x usr/bin/gconftool-2 ]; then
- ( cd $PKG/etc/gconf/schemas
- GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
- usr/bin/gconftool-2 --makefile-install-rule \
- etc/gconf/schemas/gnomint.schemas >/dev/null 2>&1 )
+if [ -e usr/share/glib-2.0/schemas ]; then
+ if [ -x /usr/bin/glib-compile-schemas ]; then
+ /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+ fi
fi
diff --git a/system/gnomint/gnomint.SlackBuild b/system/gnomint/gnomint.SlackBuild
index 9f043f0c90..7a4f44ca82 100644
--- a/system/gnomint/gnomint.SlackBuild
+++ b/system/gnomint/gnomint.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for gnomint
-# Copyright 2012-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2012-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
PRGNAM=gnomint
VERSION=${VERSION:-1.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -71,9 +71,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-cp Makefile.in m4/
+# Apply debian patches
+for i in $CWD/patches/* ; do patch -p1 -i $i ; done
-sed -i 's|CFLAGS="-Wall -Werror "|CFLAGS="${CFLAGS:--Wall -Werror}"|' configure.ac configure
+autoreconf -fi
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/gnomint/patches/01-ldd.patch b/system/gnomint/patches/01-ldd.patch
deleted file mode 100644
index 0f92419fb0..0000000000
--- a/system/gnomint/patches/01-ldd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description: Explicitly linking against libgcrypt.
-
-diff -Naurp gnomint.orig/src/Makefile.in gnomint/src/Makefile.in
---- gnomint.orig/src/Makefile.in 2011-05-17 19:57:50.013883380 +0200
-+++ gnomint/src/Makefile.in 2011-05-17 19:57:37.209981808 +0200
-@@ -347,6 +347,7 @@ gnomint_cli_SOURCES = \
-
- gnomint_cli_LDADD = \
- $(GNOMINTCLI_LIBS) \
-+ $(LIBGCRYPT_LIBS) \
- $(LIBGNUTLS_LIBS) \
- $(SQLITE_LIBS) \
- $(READLINE_LIBS) \
diff --git a/system/gnomint/patches/01_cflags.patch b/system/gnomint/patches/01_cflags.patch
new file mode 100644
index 0000000000..abf31b6357
--- /dev/null
+++ b/system/gnomint/patches/01_cflags.patch
@@ -0,0 +1,15 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description:
+ Don't hardcode CFLAGS and respect the environment (Closes: #634395).
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -182,7 +182,7 @@
+
+ dnl
+ if test "x$GCC" = "xyes"; then
+- CFLAGS="-Wall -Werror "
++ CFLAGS="${CFLAGS:--Wall}"
+ if test "x$use_debug" = "xYes"; then
+ CFLAGS="$CFLAGS -g -O0"
+ fi
diff --git a/system/gnomint/patches/02-cflags.patch b/system/gnomint/patches/02-cflags.patch
deleted file mode 100644
index 59e4f71943..0000000000
--- a/system/gnomint/patches/02-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description:
- Don't hardcode CFLAGS and respect the environemnt (Closes: #634395).
-
-diff -Naurp gnomint.orig/configure gnomint/configure
---- gnomint.orig/configure 2011-09-08 07:58:09.324752523 +0000
-+++ gnomint/configure 2011-09-08 07:59:20.113103539 +0000
-@@ -14338,7 +14338,7 @@ fi
-
-
- if test "x$GCC" = "xyes"; then
-- CFLAGS="-Wall -Werror"
-+ CFLAGS="${CFLAGS:--Wall -Werror}"
- if test "x$use_debug" = "xYes"; then
- CFLAGS="$CFLAGS -g -O0"
- fi
-diff -Naurp gnomint.orig/configure.in gnomint/configure.in
---- gnomint.orig/configure.in 2011-09-08 07:58:09.328752536 +0000
-+++ gnomint/configure.in 2011-09-08 07:59:20.113103539 +0000
-@@ -181,7 +181,7 @@ dnl
-
- dnl
- if test "x$GCC" = "xyes"; then
-- CFLAGS="-Wall -Werror"
-+ CFLAGS="${CFLAGS:--Wall -Werror}"
- if test "x$use_debug" = "xYes"; then
- CFLAGS="$CFLAGS -g -O0"
- fi
diff --git a/system/gnomint/patches/02_682432.patch b/system/gnomint/patches/02_682432.patch
new file mode 100644
index 0000000000..96905965a9
--- /dev/null
+++ b/system/gnomint/patches/02_682432.patch
@@ -0,0 +1,16 @@
+Description: Fix double free in tls_creation_data_free.
+Author: Sebastian Ramacher <s.ramacher@gmx.at>
+Bug-Debian: http://bugs.debian.org/682432
+Last-Update: 2012-08-04
+
+--- gnomint-1.3.0.orig/src/tls.c
++++ gnomint-1.3.0/src/tls.c
+@@ -1665,8 +1665,6 @@
+ g_free (cd->emailAddress);
+ if (cd->password)
+ g_free (cd->password);
+- if (cd->crl_distribution_point)
+- g_free (cd->crl_distribution_point);
+ if (cd->parent_ca_id_str)
+ g_free (cd->parent_ca_id_str);
+ if (cd->crl_distribution_point)
diff --git a/system/gnomint/patches/03_fix-autoreconf.patch b/system/gnomint/patches/03_fix-autoreconf.patch
new file mode 100644
index 0000000000..ee3a247889
--- /dev/null
+++ b/system/gnomint/patches/03_fix-autoreconf.patch
@@ -0,0 +1,16 @@
+Description: Fix autoreconf failure.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2018-09-01
+---
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -198,7 +198,6 @@
+ AC_OUTPUT([
+ Makefile
+ src/Makefile
+-m4/Makefile
+ gui/Makefile
+ po/Makefile.in
+ mime/Makefile
diff --git a/system/gnomint/patches/04_gsettings-port.patch b/system/gnomint/patches/04_gsettings-port.patch
new file mode 100644
index 0000000000..5594012cd5
--- /dev/null
+++ b/system/gnomint/patches/04_gsettings-port.patch
@@ -0,0 +1,383 @@
+Description: Port to GSettings.
+Bug-Debian: https://bugs.debian.org/885817
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2019-10-15
+---
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -61,7 +61,6 @@
+ GNUTLS_ADVANCED_FEATURES_MINIMUM_VERSION=2.7.4
+ SQLITE_REQUIRED=3.0
+ GLIB_REQUIRED=2.6.0
+-GCONF_REQUIRED=2.0
+ GTK_REQUIRED=2.12.0
+ ISO_CODES_REQUIRED=0.35
+
+@@ -84,7 +83,6 @@
+ PKG_CHECK_MODULES(GNOMINT,
+ glib-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 >= $GLIB_REQUIRED \
+- gconf-2.0 >= $GCONF_REQUIRED \
+ gtk+-2.0 >= $GTK_REQUIRED \
+ gdk-pixbuf-2.0 \
+ gnutls >= $GNUTLS_REQUIRED \
+@@ -111,8 +109,7 @@
+ AC_SUBST(READLINE_LIBS)
+
+ PKG_CHECK_MODULES(GNOMINTCLI,
+- glib-2.0 >= $GLIB_REQUIRED \
+- gconf-2.0 >= $GCONF_REQUIRED \
++ gio-2.0 >= $GLIB_REQUIRED \
+ gnutls >= $GNUTLS_REQUIRED \
+ )
+ AC_SUBST(GNOMINTCLI_CFLAGS)
+@@ -150,17 +147,7 @@
+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+ AC_SUBST(GLIB_GENMARSHAL)
+
+-dnl The following conditional is set in AM_GCONF_SOURCE_2.
+-dnl Because we may skip its execution, we have to set a default here.
+-m4_pattern_allow([^AM_GCONF_SOURCE_2$])
+-AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
+-GCONFTOOL=""
+-AC_CHECK_PROG(GCONFTOOL, gconftool-2, gconftool-2)
+-if test x"$GCONFTOOL" = x; then
+- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+-fi
+-AM_GCONF_SOURCE_2
+-
++GLIB_GSETTINGS
+
+ dnl
+ dnl Check if src should be build with the debug mode
+--- gnomint-1.3.0.orig/gconf/Makefile.am
++++ gnomint-1.3.0/gconf/Makefile.am
+@@ -1,21 +1,5 @@
+-schemasdir = @GCONF_SCHEMA_FILE_DIR@
+-schemas_in_files = gnomint.schemas.in
+-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
++gsettings_SCHEMAS = net.sf.gnomint.gschema.xml
+
+-@INTLTOOL_SCHEMAS_RULE@
++@GSETTINGS_RULES@
+
+-EXTRA_DIST = $(schemas_in_files)
+-
+-CLEANFILES = $(schemas_DATA)
+-
+-if GCONF_SCHEMAS_INSTALL
+-# don't do this if we are building in eg. rpm
+-install-data-local: $(schemas_DATA)
+- if test -z "$(DESTDIR)" ; then \
+- for p in $(schemas_DATA) ; do \
+- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
+- done \
+- fi
+-else
+-install-data-local:
+-endif
++EXTRA_DIST = $(gsettings_SCHEMAS)
+--- gnomint-1.3.0.orig/src/preferences-gui.h
++++ gnomint-1.3.0/src/preferences-gui.h
+@@ -20,6 +20,8 @@
+ #ifndef _PREFERENCES_H_
+ #define _PREFERENCES_H_
+
++#include <gio/gio.h>
++
+ typedef void (* PreferencesGuiChangeCallback) (gboolean, gboolean);
+
+ void preferences_gui_set_csr_visible_callback (PreferencesGuiChangeCallback callback);
+@@ -43,10 +45,8 @@
+ void preferences_deinit (void);
+
+
+-#include <gconf/gconf-client.h>
+-void preferences_changed_callback(GConfClient* client,
+- guint cnxn_id,
+- GConfEntry *entry,
++void preferences_changed_callback(GSettings* settings,
++ gchar *key,
+ gpointer user_data);
+
+
+--- gnomint-1.3.0.orig/src/preferences-gui.c
++++ gnomint-1.3.0/src/preferences-gui.c
+@@ -18,7 +18,6 @@
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ #include <string.h>
+-#include <gconf/gconf-client.h>
+
+
+ #include "preferences-gui.h"
+@@ -26,7 +25,7 @@
+ #include <glib/gi18n.h>
+
+
+-static GConfClient * preferences_client;
++static GSettings * preferences;
+
+ PreferencesGuiChangeCallback csr_visible_callback = NULL;
+ PreferencesGuiChangeCallback revoked_visible_callback = NULL;
+@@ -42,18 +41,19 @@
+ }
+
+
+-void preferences_changed_callback(GConfClient* client,
+- guint cnxn_id,
+- GConfEntry *entry,
++void preferences_changed_callback(GSettings* settings,
++ gchar *key,
+ gpointer user_data)
+ {
+
+- gboolean value = gconf_value_get_bool (gconf_entry_get_value(entry));
+- if (! strcmp (gconf_entry_get_key(entry), "/apps/gnomint/crq_visible") && csr_visible_callback)
+- csr_visible_callback (value, TRUE);
+-
+- if (! strcmp (gconf_entry_get_key(entry), "/apps/gnomint/revoked_visible") && revoked_visible_callback)
+- revoked_visible_callback (value, TRUE);
++ if (! strcmp (key, "crq-visible") && csr_visible_callback)
++ csr_visible_callback (g_settings_get_boolean (settings, key),
++ TRUE);
++
++ if (! strcmp (key, "revoked-visible") && revoked_visible_callback)
++ revoked_visible_callback (g_settings_get_boolean
++ (settings, key),
++ TRUE);
+
+ }
+
+@@ -61,72 +61,62 @@
+
+ void preferences_init (int argc, char ** argv)
+ {
+- gconf_init(argc, argv, NULL);
+-
+- preferences_client = gconf_client_get_default();
+-
+- gconf_client_add_dir(preferences_client,
+- "/apps/gnomint",
+- GCONF_CLIENT_PRELOAD_NONE,
+- NULL);
+-
+- gconf_client_notify_add (preferences_client, "/apps/gnomint/revoked_visible",
+- preferences_changed_callback,
+- NULL, NULL, NULL);
+-
+- gconf_client_notify_add (preferences_client, "/apps/gnomint/crq_visible",
+- preferences_changed_callback,
+- NULL, NULL, NULL);
+-
++ preferences = g_settings_new ("net.sf.gnomint");
+
++ g_signal_connect (preferences, "changed",
++ G_CALLBACK (preferences_changed_callback), NULL);
+ }
+
+
+ gchar * preferences_get_size ()
+ {
+- return gconf_client_get_string (preferences_client, "/apps/gnomint/size", NULL);
++ return g_settings_get_string (preferences, "size");
+ }
+
+ void preferences_set_size (const gchar *new_value)
+ {
+- gconf_client_set_string (preferences_client, "/apps/gnomint/size", new_value, NULL);
++ g_settings_set_string (preferences, "size", new_value);
++ /* Make sure the backend manages to write the setting,
++ otherwise the program exits too quickly and a garbage value
++ gets written, leading to a crash on next startup. */
++ g_settings_sync ();
+ }
+
+
+ gboolean preferences_get_revoked_visible ()
+ {
+- return gconf_client_get_bool (preferences_client, "/apps/gnomint/revoked_visible", NULL);
++ return g_settings_get_boolean (preferences, "revoked-visible");
+ }
+
+ void preferences_set_revoked_visible (gboolean new_value)
+ {
+- gconf_client_set_bool (preferences_client, "/apps/gnomint/revoked_visible", new_value, NULL);
++ g_settings_set_boolean (preferences, "revoked-visible", new_value);
+ }
+
+ gboolean preferences_get_crq_visible ()
+ {
+- return gconf_client_get_bool (preferences_client, "/apps/gnomint/crq_visible", NULL);
++ return g_settings_get_boolean (preferences, "crq-visible");
+ }
+
+ void preferences_set_crq_visible (gboolean new_value)
+ {
+- gconf_client_set_bool (preferences_client, "/apps/gnomint/crq_visible", new_value, NULL);
++ g_settings_set_boolean (preferences, "crq-visible", new_value);
+ }
+
+ gboolean preferences_get_gnome_keyring_export ()
+ {
+- return gconf_client_get_bool (preferences_client, "/apps/gnomint/gnome_keyring_export", NULL);
++ return g_settings_get_boolean (preferences, "gnome-keyring-export");
+ }
+
+ void preferences_set_gnome_keyring_export (gboolean new_value)
+ {
+- gconf_client_set_bool (preferences_client, "/apps/gnomint/gnome_keyring_export", new_value, NULL);
++ g_settings_set_boolean (preferences, "gnome-keyring-export", new_value);
+ }
+
+
+ void preferences_deinit ()
+ {
+- g_object_unref (preferences_client);
+- preferences_client = NULL;
++ g_object_unref (preferences);
++ preferences = NULL;
+ }
+
+--- gnomint-1.3.0.orig/src/preferences.c
++++ gnomint-1.3.0/src/preferences.c
+@@ -18,36 +18,35 @@
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ #include <libintl.h>
+-#include <gconf/gconf-client.h>
++#include <gio/gio.h>
+
+ #include <glib/gi18n.h>
+
+ #include "preferences.h"
+
+
+-static GConfEngine * preferences_engine;
++static GSettings * preferences;
+
+ void preferences_init (int argc, char **argv)
+ {
+- gconf_init (argc, argv, NULL);
+- preferences_engine = gconf_engine_get_default ();
++ preferences = g_settings_new ("net.sf.gnomint");
+ }
+
+
+ gboolean preferences_get_gnome_keyring_export ()
+ {
+- return gconf_engine_get_bool (preferences_engine, "/apps/gnomint/gnome_keyring_export", NULL);
++ return g_settings_get_boolean (preferences, "gnome-keyring-export");
+ }
+
+ void preferences_set_gnome_keyring_export (gboolean new_value)
+ {
+- gconf_engine_set_bool (preferences_engine, "/apps/gnomint/gnome_keyring_export", new_value, NULL);
++ g_settings_set_boolean (preferences, "gnome-keyring-export", new_value);
+ }
+
+
+ void preferences_deinit ()
+ {
+- gconf_engine_unref (preferences_engine);
+- preferences_engine = NULL;
++ g_object_unref (preferences);
++ preferences = NULL;
+ }
+
+--- gnomint-1.3.0.orig/gconf/gnomint.schemas.in
++++ /dev/null
+@@ -1,58 +0,0 @@
+-<gconfschemafile>
+- <schemalist>
+- <schema>
+- <key>/schemas/apps/gnomint/size</key>
+- <applyto>/apps/gnomint/size</applyto>
+- <owner>gnomint</owner>
+- <type>string</type>
+- <default>(500,400)</default>
+- <locale name="C">
+- <short>Window size</short> <long>The (width,length) size
+- gnoMint should take when started. This cannot be smaller than
+- (320,200).
+- </long>
+- </locale>
+- </schema>
+-
+- <schema>
+- <key>/schemas/apps/gnomint/revoked_visible</key>
+- <applyto>/apps/gnomint/revoked_visible</applyto>
+- <owner>gnomint</owner>
+- <type>bool</type>
+- <default>0</default>
+- <locale name="C">
+- <short>Revoked certificates visibility</short>
+- <long>Whether the revoked certificates should be visible.
+- </long>
+- </locale>
+- </schema>
+-
+- <schema>
+- <key>/schemas/apps/gnomint/crq_visible</key>
+- <applyto>/apps/gnomint/crq_visible</applyto>
+- <owner>gnomint</owner>
+- <type>bool</type>
+- <default>1</default>
+- <locale name="C">
+- <short>Certificate requests visibility</short>
+- <long>Whether the certificate requests should be visible.
+- </long>
+- </locale>
+- </schema>
+-
+- <schema>
+- <key>/schemas/apps/gnomint/gnome_keyring_export</key>
+- <applyto>/apps/gnomint/gnome_keyring_export</applyto>
+- <owner>gnomint</owner>
+- <type>bool</type>
+- <default>1</default>
+- <locale name="C">
+- <short>Automatic exporting of certificates for gnome-keyring</short>
+- <long>Whether the created or imported certificates are
+- automatically exported to gnome-keyring certificate-store.
+- </long>
+- </locale>
+- </schema>
+-
+- </schemalist>
+-</gconfschemafile>
+--- /dev/null
++++ gnomint-1.3.0/gconf/net.sf.gnomint.gschema.xml
+@@ -0,0 +1,30 @@
++<schemalist gettext-domain="gnomint">
++ <schema id="net.sf.gnomint" path="/net/sf/gnomint/">
++ <key name="size" type="s">
++ <default>'(500,400)'</default>
++ <summary>Window size</summary>
++ <description>The (width,length) size gnoMint should take when
++ started. This cannot be smaller than (320,200).</description>
++ </key>
++ <key name="revoked-visible" type="b">
++ <default>false</default>
++ <summary>Revoked certificates visibility</summary>
++ <description>Whether the revoked certificates should be
++ visible.</description>
++ </key>
++ <key name="crq-visible" type="b">
++ <default>true</default>
++ <summary>Certificate requests visibility</summary>
++ <description>Whether the certificate requests should be
++ visible.</description>
++ </key>
++ <key name="gnome-keyring-export" type="b">
++ <default>true</default>
++ <summary>Automatic exporting of certificates for
++ gnome-keyring</summary>
++ <description>Whether the created or imported certificates are
++ automatically exported to gnome-keyring
++ certificate-store.</description>
++ </key>
++ </schema>
++</schemalist>
diff --git a/system/gnomint/patches/05_export-private-key-crash.patch b/system/gnomint/patches/05_export-private-key-crash.patch
new file mode 100644
index 0000000000..e0a3fd2bcb
--- /dev/null
+++ b/system/gnomint/patches/05_export-private-key-crash.patch
@@ -0,0 +1,83 @@
+Description: Fix crash when exporting the private key.
+ In ca_on_extractprivatekey1_activate, when calling
+ gtk_tree_model_get, GLib attempts to assign a guint64 value to a
+ variable declared gint (CA_MODEL_COLUMN_ID is defined as type
+ G_TYPE_UINT64 in the tree store). This corrupts the stack and also
+ invalidates the iter.
+ .
+ While investigating this, I noticed that the program happily leaks
+ GtkTreeIter's. Every time the user selects a certificate from the
+ tree view, the callback ca_treeview_selection_change invokes
+ __ca_selection_type which makes a copy of the iter with
+ gtk_tree_iter_copy. If the user chooses some action from the popup
+ menu, the toolbar or the main menu, __ca_selection_type is called
+ once again in the widget's callback function, copying another iter.
+ AFAICT these are never freed for the lifetime of the program.
+ .
+ This is not addressed by the patch as it would require some changes,
+ but it could be a source of trouble and something to watch out if
+ bugs like this pop up. According to the GTK+ API documentation,
+ gtk_tree_iter_copy is not supposed to be used by applications;
+ GtkTreeIter structs should be copied by value.
+Bug-Debian: https://bugs.debian.org/855200
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2018-09-02
+---
+
+--- gnomint-1.3.0.orig/src/ca.c
++++ gnomint-1.3.0/src/ca.c
+@@ -922,7 +922,7 @@
+ GObject *widget = NULL;
+ gchar * filename = NULL;
+ GtkDialog * dialog = NULL;
+- gint id;
++ guint64 id;
+ gchar * strerror = NULL;
+
+ widget = gtk_builder_get_object (main_window_gtkb, "main_window1");
+@@ -973,7 +973,7 @@
+ GObject *widget = NULL;
+ gchar * filename = NULL;
+ GtkDialog * dialog = NULL;
+- gint id;
++ guint64 id;
+ gchar * error_msg = NULL;
+
+ widget = gtk_builder_get_object (main_window_gtkb, "main_window1");
+@@ -1022,7 +1022,7 @@
+ GObject *widget = NULL;
+ gchar * filename = NULL;
+ GtkDialog * dialog = NULL;
+- gint id;
++ guint64 id;
+
+ gchar *error_msg = NULL;
+
+@@ -1181,7 +1181,7 @@
+ GtkTreeIter *iter;
+ gint type;
+ gchar *filename = NULL;
+- gint id;
++ guint64 id;
+
+ type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter);
+
+@@ -1212,7 +1212,7 @@
+ GtkTreeIter *iter;
+ gint type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter);
+ gint response = 0;
+- gint id = 0;
++ guint64 id = 0;
+
+ if (type == CA_FILE_ELEMENT_TYPE_CSR)
+ return;
+@@ -1267,7 +1267,7 @@
+ GtkTreeIter *iter;
+ gint type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter);
+ gint response = 0;
+- gint id = 0;
++ guint64 id = 0;
+
+ if (type != CA_FILE_ELEMENT_TYPE_CSR)
+ return;
diff --git a/system/gnomint/patches/06_desktop-file.patch b/system/gnomint/patches/06_desktop-file.patch
new file mode 100644
index 0000000000..a6b73b084a
--- /dev/null
+++ b/system/gnomint/patches/06_desktop-file.patch
@@ -0,0 +1,22 @@
+Description: Add code to Exec key, remove Encoding key, add Keywords key.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2018-09-01
+---
+
+--- gnomint-1.3.0.orig/gui/gnomint.desktop.in
++++ gnomint-1.3.0/gui/gnomint.desktop.in
+@@ -2,11 +2,11 @@
+ _Name=gnoMint X.509 CA Manager
+ GenericName=gnoMint X.509 CA Manager
+ _Comment=Manage X.509 certificates and CAs, easily and graphically
+-Exec=gnomint
++_Keywords=certificate;x.509;encryption;
++Exec=gnomint %f
+ Terminal=false
+ Type=Application
+ Icon=gnomint
+ Categories=GNOME;Application;System;Security
+ MimeType=application/x-gnomint;
+ StartupNotify=true
+-Encoding=UTF-8
diff --git a/system/gnomint/patches/07_spelling-errors.patch b/system/gnomint/patches/07_spelling-errors.patch
new file mode 100644
index 0000000000..f0045bd61b
--- /dev/null
+++ b/system/gnomint/patches/07_spelling-errors.patch
@@ -0,0 +1,39 @@
+Description: Fix some spelling errors.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2019-10-12
+---
+
+--- gnomint-1.3.0.orig/src/ca.c
++++ gnomint-1.3.0/src/ca.c
+@@ -978,7 +978,7 @@
+
+ widget = gtk_builder_get_object (main_window_gtkb, "main_window1");
+
+- dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export uncrypted private key"),
++ dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export unencrypted private key"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+--- gnomint-1.3.0.orig/src/country_table.c
++++ gnomint-1.3.0/src/country_table.c
+@@ -520,7 +520,7 @@
+ country_table[i++].code = "VU";
+ country_table[i].name = D_("Venezuela");
+ country_table[i++].code = "VE";
+- country_table[i].name = D_("Viet Nam");
++ country_table[i].name = D_("Vietnam");
+ country_table[i++].code = "VN";
+ country_table[i].name = D_("Virgin Islands, British");
+ country_table[i++].code = "VG";
+--- gnomint-1.3.0.orig/src/import.c
++++ gnomint-1.3.0/src/import.c
+@@ -82,7 +82,7 @@
+ printf (_("The whole selected file, or some of its elements, seems to\n"
+ "be cyphered using a password or passphrase. For importing\n"
+ "the file into gnoMint database, you must provide an \n"
+- "appropiate password.\n"));
++ "appropriate password.\n"));
+
+ prompt = g_strdup_printf (_("Please introduce password for `%s'"), crypted_part_description);
+ password = dialog_ask_for_password (prompt);
diff --git a/system/gnomint/patches/08_gtk3-port.patch b/system/gnomint/patches/08_gtk3-port.patch
new file mode 100644
index 0000000000..62638dd1df
--- /dev/null
+++ b/system/gnomint/patches/08_gtk3-port.patch
@@ -0,0 +1,7655 @@
+Description: Port to GTK 3.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2019-10-15
+---
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -60,8 +60,8 @@
+ GNUTLS_REQUIRED=2.0
+ GNUTLS_ADVANCED_FEATURES_MINIMUM_VERSION=2.7.4
+ SQLITE_REQUIRED=3.0
+-GLIB_REQUIRED=2.6.0
+-GTK_REQUIRED=2.12.0
++GLIB_REQUIRED=2.41.1
++GTK_REQUIRED=3.21.5
+ ISO_CODES_REQUIRED=0.35
+
+
+@@ -83,7 +83,7 @@
+ PKG_CHECK_MODULES(GNOMINT,
+ glib-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 >= $GLIB_REQUIRED \
+- gtk+-2.0 >= $GTK_REQUIRED \
++ gtk+-3.0 >= $GTK_REQUIRED \
+ gdk-pixbuf-2.0 \
+ gnutls >= $GNUTLS_REQUIRED \
+ )
+--- gnomint-1.3.0.orig/src/ca.c
++++ gnomint-1.3.0/src/ca.c
+@@ -821,15 +821,15 @@
+ dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export certificate"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+ else
+ dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export certificate signing request"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -930,8 +930,8 @@
+ dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export crypted private key"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -981,8 +981,8 @@
+ dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export unencrypted private key"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -1032,8 +1032,8 @@
+ (_("Export whole certificate in PKCS#12 package"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -1422,8 +1422,8 @@
+ widget = gtk_builder_get_object (cert_popup_menu_gtkb, "revoke_menuitem");
+ gtk_widget_set_sensitive (GTK_WIDGET(widget), (! is_revoked));
+
+- gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL,
+- event_button->button, event_button->time);
++ gtk_menu_popup_at_pointer (GTK_MENU(menu),
++ (GdkEvent *)event_button);
+ return FALSE;
+ case CA_FILE_ELEMENT_TYPE_CSR:
+ menu = gtk_builder_get_object (csr_popup_menu_gtkb,
+@@ -1436,8 +1436,8 @@
+ widget = gtk_builder_get_object (csr_popup_menu_gtkb, "extract_pkey_menuitem3");
+ gtk_widget_set_sensitive (GTK_WIDGET(widget), pk_indb);
+
+- gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL,
+- event_button->button, event_button->time);
++ gtk_menu_popup_at_pointer (GTK_MENU(menu),
++ (GdkEvent *)event_button);
+ return FALSE;
+ default:
+ case -1:
+@@ -1446,13 +1446,6 @@
+
+ }
+
+-void ca_treeview_popup_timeout_program (GdkEventButton *event)
+-{
+- g_timeout_add (1, ca_treeview_popup_timeout_program_cb, event);
+-
+-}
+-
+-
+ G_MODULE_EXPORT gboolean ca_treeview_popup_handler (GtkTreeView *tree_view,
+ GdkEvent *event, gpointer user_data)
+ {
+@@ -1464,7 +1457,7 @@
+
+ event_button = (GdkEventButton *) event;
+ if (event_button->button == 3) {
+- ca_treeview_popup_timeout_program (event_button);
++ ca_treeview_popup_timeout_program_cb (event_button);
+ }
+ }
+
+@@ -1775,8 +1768,8 @@
+ dialog2 = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Save Diffie-Hellman parameters"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog2), TRUE);
+
+@@ -1871,8 +1864,8 @@
+ dialog = gtk_file_chooser_dialog_new (_("Select PEM file to import"),
+ GTK_WINDOW(main_window_widget),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Open"), GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+@@ -1905,8 +1898,8 @@
+ dialog = gtk_file_chooser_dialog_new (_("Select directory to import"),
+ GTK_WINDOW(main_window_widget),
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Open"), GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+--- gnomint-1.3.0.orig/src/certificate_properties.c
++++ gnomint-1.3.0/src/certificate_properties.c
+@@ -242,7 +242,7 @@
+ for (i = g_list_length(cert->uses) - 1; i >= 0; i--) {
+ GtkLabel *label = NULL;
+ label = GTK_LABEL(gtk_label_new ((gchar *) g_list_nth_data (cert->uses, i)));
+- gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5);
++ gtk_label_set_xalign (label, 0.0);
+ gtk_box_pack_end (GTK_BOX(widget), GTK_WIDGET(label), 0, 0, 0);
+ }
+ gtk_widget_show_all (GTK_WIDGET(widget));
+--- gnomint-1.3.0.orig/src/creation_process_window.c
++++ gnomint-1.3.0/src/creation_process_window.c
+@@ -66,7 +66,7 @@
+ GtkWidget *dialog = NULL;
+
+ g_thread_join (creation_process_window_thread);
+- gtk_timeout_remove (timer);
++ g_source_remove (timer);
+ timer = 0;
+
+ widget = gtk_builder_get_object (creation_process_window_gtkb, "creation_process_window");
+@@ -116,7 +116,7 @@
+ creation_process_window_ca_finish ();
+ } else if (status < 0) {
+ error_message = (gchar *) g_thread_join (creation_process_window_thread);
+- gtk_timeout_remove (timer);
++ g_source_remove (timer);
+ timer = 0;
+ if (error_message) {
+ creation_process_window_error_dialog (error_message);
+@@ -165,7 +165,7 @@
+ GtkWidget *dialog, *widget;
+
+ if (timer) {
+- gtk_timeout_remove (timer);
++ g_source_remove (timer);
+ timer = 0;
+ }
+
+@@ -196,7 +196,7 @@
+ GtkWidget *widget = NULL, *dialog = NULL;
+
+ g_thread_join (creation_process_window_thread);
+- gtk_timeout_remove (timer);
++ g_source_remove (timer);
+ timer = 0;
+
+ widget = GTK_WIDGET(gtk_builder_get_object (creation_process_window_gtkb, "creation_process_window"));
+@@ -242,7 +242,7 @@
+ creation_process_window_csr_finish ();
+ } else if (status < 0) {
+ error_message = (gchar *) g_thread_join (creation_process_window_thread);
+- gtk_timeout_remove (timer);
++ g_source_remove (timer);
+ timer = 0;
+ if (error_message) {
+ creation_process_window_error_dialog (error_message);
+--- gnomint-1.3.0.orig/src/crl.c
++++ gnomint-1.3.0/src/crl.c
+@@ -213,7 +213,7 @@
+ G_MODULE_EXPORT void crl_cancel_clicked_cb (GtkButton *button, gpointer userdata)
+ {
+ GtkWidget * window = GTK_WIDGET(gtk_builder_get_object (crl_window_gtkb, "new_crl_dialog"));
+- gtk_object_destroy(GTK_OBJECT(window));
++ gtk_widget_destroy(window);
+
+ }
+
+@@ -241,8 +241,8 @@
+ dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export Certificate Revocation List"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -274,7 +274,7 @@
+ gtk_widget_destroy (GTK_WIDGET(dialog));
+
+ dialog = GTK_DIALOG(gtk_builder_get_object (crl_window_gtkb, "new_crl_dialog"));
+- gtk_object_destroy(GTK_OBJECT(dialog));
++ gtk_widget_destroy(GTK_WIDGET(dialog));
+
+ }
+
+--- gnomint-1.3.0.orig/src/main.c
++++ gnomint-1.3.0/src/main.c
+@@ -291,8 +291,8 @@
+ dialog = gtk_file_chooser_dialog_new (_("Create new CA database"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Open"), GTK_RESPONSE_ACCEPT,
+ NULL);
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+
+@@ -363,8 +363,8 @@
+ dialog = gtk_file_chooser_dialog_new (_("Open CA database"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Open"), GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+@@ -451,8 +451,8 @@
+ dialog = gtk_file_chooser_dialog_new (_("Save CA database as..."),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Open"), GTK_RESPONSE_ACCEPT,
+ NULL);
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+
+@@ -490,14 +490,19 @@
+ {
+
+ GtkWidget *widget;
+- gchar *authors[2];
++ GdkPixbuf *logo;
++ gchar **authors;
++ gchar *file;
+
+ widget = GTK_WIDGET(gtk_builder_get_object (main_window_gtkb, "main_window"));
+
+- authors[0] = PACKAGE_AUTHORS;
+- authors[1] = NULL;
++ authors = g_strsplit (PACKAGE_AUTHORS, "\n", -1);
++ file = g_build_filename (PACKAGE_DATA_DIR, "gnomint",
++ "gnomint.png", NULL);
++ logo = gdk_pixbuf_new_from_file (file, NULL);
+
+ gtk_show_about_dialog (GTK_WINDOW(widget),
++ "logo", logo,
+ "version", PACKAGE_VERSION,
+ "copyright", PACKAGE_COPYRIGHT,
+ "comments", _("gnoMint is a program for creating and managing Certification Authorities, and their certificates"),
+@@ -507,4 +512,7 @@
+ "authors", authors,
+ "translator_credits", _("translator-credits"),
+ NULL);
++ g_object_unref (logo);
++ g_strfreev (authors);
++ g_free (file);
+ }
+--- gnomint-1.3.0.orig/src/new_ca_window.c
++++ gnomint-1.3.0/src/new_ca_window.c
+@@ -129,7 +129,7 @@
+
+ GtkWindow *window = GTK_WINDOW(gtk_builder_get_object (new_ca_window_gtkb, "new_ca_window"));
+
+- gtk_object_destroy(GTK_OBJECT(window));
++ gtk_widget_destroy(GTK_WIDGET(window));
+
+ }
+
+@@ -299,7 +299,7 @@
+ }
+
+ window = GTK_WINDOW(gtk_builder_get_object (new_ca_window_gtkb, "new_ca_window"));
+- gtk_object_destroy(GTK_OBJECT(window));
++ gtk_widget_destroy(GTK_WIDGET(window));
+
+ creation_process_window_ca_display (ca_creation_data);
+
+--- gnomint-1.3.0.orig/src/new_cert.c
++++ gnomint-1.3.0/src/new_cert.c
+@@ -456,7 +456,7 @@
+ gpointer user_data)
+ {
+ GtkWidget * window = GTK_WIDGET(gtk_builder_get_object (new_cert_window_gtkb, "new_cert_window"));
+- gtk_object_destroy(GTK_OBJECT(window));
++ gtk_widget_destroy(window);
+
+ }
+
+@@ -743,7 +743,7 @@
+ }
+
+ widget = G_OBJECT(gtk_builder_get_object (new_cert_window_gtkb, "new_cert_window"));
+- gtk_object_destroy(GTK_OBJECT(widget));
++ gtk_widget_destroy(GTK_WIDGET(widget));
+
+ dialog_refresh_list();
+
+--- gnomint-1.3.0.orig/src/new_req_window.c
++++ gnomint-1.3.0/src/new_req_window.c
+@@ -410,7 +410,7 @@
+
+ GtkWindow *window = GTK_WINDOW(gtk_builder_get_object (new_req_window_gtkb, "new_req_window"));
+
+- gtk_object_destroy(GTK_OBJECT(window));
++ gtk_widget_destroy(GTK_WIDGET(window));
+
+ }
+
+@@ -498,7 +498,7 @@
+ }
+
+ window = GTK_WINDOW(gtk_builder_get_object (new_req_window_gtkb, "new_req_window"));
+- gtk_object_destroy(GTK_OBJECT(window));
++ gtk_widget_destroy(GTK_WIDGET(window));
+
+ creation_process_window_csr_display (csr_creation_data);
+
+--- gnomint-1.3.0.orig/gui/certificate_popup_menu.ui
++++ gnomint-1.3.0/gui/certificate_popup_menu.ui
+@@ -1,45 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkMenu" id="certificate_popup_menu">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkImageMenuItem" id="cert_properties_menuitem">
+ <property name="label">gtk-properties</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Shows the certificate properties window</property>
+ <property name="tooltip_text" translatable="yes">Shows the certificate properties window</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="on_properties1_activate"/>
++ <signal name="activate" handler="on_properties1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="sep_menuitem5">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="cert_export_menuitem">
+ <property name="label" translatable="yes">E_xport</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Exports the certificate so it can be imported by any other application</property>
+ <property name="tooltip_text" translatable="yes">Exports the certificate so it can be imported by any other application</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_export1_activate"/>
++ <signal name="activate" handler="ca_on_export1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="extract_pkey_menuitem">
+ <property name="label" translatable="yes">Extrac_t private key</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Extracts the private key of the selected
+@@ -52,25 +57,27 @@
+ each time the certificate will be used</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_extractprivatekey1_activate"/>
++ <signal name="activate" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="sep_menuitem6">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="revoke_menuitem">
+ <property name="label" translatable="yes">Revo_ke</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Revokes the selected certificate</property>
+ <property name="tooltip_text" translatable="yes">Revokes the selected certificate</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_revoke_activate"/>
++ <signal name="activate" handler="ca_on_revoke_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/certificate_properties_dialog.ui
++++ gnomint-1.3.0/gui/certificate_properties_dialog.ui
+@@ -1,547 +1,549 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
+- <object class="GtkAdjustment" id="AdjustmentHoursBetweenCRLUpdates">
+- <property name="value">24</property>
+- <property name="lower">1</property>
+- <property name="upper">8760</property>
+- <property name="step_increment">24</property>
+- <property name="page_increment">168</property>
+- </object>
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkAdjustment" id="AdjustmentCertMonthsBeforeExpiration">
+- <property name="value">60</property>
+ <property name="lower">1</property>
+ <property name="upper">600</property>
++ <property name="value">60</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">12</property>
+ </object>
++ <object class="GtkAdjustment" id="AdjustmentHoursBetweenCRLUpdates">
++ <property name="lower">1</property>
++ <property name="upper">8760</property>
++ <property name="value">24</property>
++ <property name="step_increment">24</property>
++ <property name="page_increment">168</property>
++ </object>
+ <object class="GtkWindow" id="certificate_properties_dialog">
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Certificate properties - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+ <child>
+- <object class="GtkVBox" id="vbox4">
++ <placeholder/>
++ </child>
++ <child>
++ <object class="GtkBox" id="vbox4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkNotebook" id="notebook2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">5</property>
+ <child>
+- <object class="GtkVBox" id="vbox6">
++ <object class="GtkBox" id="vbox6">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
++ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkVBox" id="vboxCertCapabilities">
++ <object class="GtkBox" id="vboxCertCapabilities">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
++ <property name="orientation">vertical</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;This certificate has been verified for the following uses:&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHSeparator" id="certPropSeparator"/>
++ <object class="GtkSeparator" id="certPropSeparator">
++ <property name="can_focus">False</property>
++ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table6">
++ <object class="GtkGrid" id="table6">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+- <property name="n_rows">17</property>
+- <property name="n_columns">2</property>
+ <property name="column_spacing">10</property>
+ <child>
+ <object class="GtkLabel" id="md5Label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">MD5FINGERPRINT</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">MD5FINGERPRINT</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">14</property>
+- <property name="bottom_attach">15</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sha1Label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SHA1FINGERPRINT</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SHA1FINGERPRINT</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">13</property>
+- <property name="bottom_attach">14</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label22">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">12</property>
+- <property name="bottom_attach">13</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certExpirationDateLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CertExpirationDate</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CertExpirationDate</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">11</property>
+- <property name="bottom_attach">12</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certActivationDateLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CertActivationDate</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CertActivationDate</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">10</property>
+- <property name="bottom_attach">11</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label29">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">9</property>
+- <property name="bottom_attach">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certIssuerOULabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CAOU</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CAOU</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">8</property>
+- <property name="bottom_attach">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certIssuerOLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CAO</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CAO</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">7</property>
+- <property name="bottom_attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certIssuerCNLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CACN</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CACN</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+- <property name="bottom_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label33">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certSNLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CertSN</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CertSN</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certSubjectOULabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SubjectOU</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SubjectOU</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certSubjectOLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SubjectO</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SubjectO</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certSubjectCNLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SubjectCN</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SubjectCN</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label38">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label39">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">MD5 fingerprint</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">MD5 fingerprint</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">14</property>
+- <property name="bottom_attach">15</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label40">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SHA1 fingerprint</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SHA1 fingerprint</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">13</property>
+- <property name="bottom_attach">14</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label41">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Fingerprints&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">1</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">12</property>
+- <property name="bottom_attach">13</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_padding">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label42">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Expires on</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Expires on</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">11</property>
+- <property name="bottom_attach">12</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label43">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Activated on</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Activated on</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
+- <property name="bottom_attach">11</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label44">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Validity&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">1</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+- <property name="bottom_attach">10</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_padding">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label45">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organizational Unit (OU)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organizational Unit (OU)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+- <property name="bottom_attach">9</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label73">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization (O)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization (O)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+- <property name="bottom_attach">8</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label74">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Common Name (CN)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Common Name (CN)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+- <property name="bottom_attach">7</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label75">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Emmited by&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">1</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_padding">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label76">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Serial number</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Serial number</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label77">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organizational Unit (OU)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organizational Unit (OU)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label78">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization (O)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization (O)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label79">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Common Name (CN)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Common Name (CN)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label80">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Certificate subject&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">1</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_padding">7</property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sha256Label">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">SHA256FINGERPRINT</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">char</property>
+ <property name="width_chars">60</property>
++ <property name="max_width_chars">60</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">15</property>
+- <property name="bottom_attach">16</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SHA256 fingerprint</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SHA256 fingerprint</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">15</property>
+- <property name="bottom_attach">16</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sha512Label">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">SHA512FINGERPRINT</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">char</property>
+ <property name="width_chars">60</property>
++ <property name="max_width_chars">60</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">16</property>
+- <property name="bottom_attach">17</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SHA512 fingerprint</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SHA512 fingerprint</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">16</property>
+- <property name="bottom_attach">17</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+-
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -550,59 +552,68 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label81">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">General</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">General</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox13">
++ <object class="GtkBox" id="vbox13">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
++ <property name="orientation">vertical</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label82">
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Certificate hierarchy&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="can_focus">True</property>
+- <property name="hscrollbar_policy">automatic</property>
+- <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview3">
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
++ <child internal-child="selection">
++ <object class="GtkTreeSelection"/>
++ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+- <property name="expand">False</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label83">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Certificate fields&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -610,18 +621,21 @@
+ <object class="GtkScrolledWindow" id="scrolledwindow4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="hscrollbar_policy">automatic</property>
+- <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="certTreeView">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
++ <child internal-child="selection">
++ <object class="GtkTreeSelection"/>
++ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+@@ -633,9 +647,10 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label85">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Details</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Details</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+@@ -643,22 +658,30 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox19">
++ <object class="GtkBox" id="vbox19">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="label35">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">5</property>
++ <property name="can_focus">False</property>
++ <property name="margin_start">5</property>
++ <property name="margin_end">5</property>
+ <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;
+-It is recommended that all the certificates generated by a CA share the same properties.
+-If you want to generate certificates with different properties, you should create a hierarchy of CAs, each one with its own policy for certificate generation.&lt;/i&gt;
++It is recommended that all the certificates generated by a CA
++share the same properties.
++If you want to generate certificates with different properties, you
++should create a hierarchy of CAs, each one with its own policy for
++certificate generation.&lt;/i&gt;
+ &lt;/small&gt;
+-Please, define the maximum set of properties for the certificates that this CA will be able to generate:
++Please, define the maximum set of properties for the
++certificates that this CA will be able to generate:
+ </property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -667,18 +690,23 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox6">
++ <object class="GtkBox" id="hbox6">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <child>
+ <object class="GtkLabel" id="label36">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Maximum number of months before
++expiration of the new generated certificates:</property>
++ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Maximum number of months before expiration of the new generated certificates:</property>
+- <property name="wrap">True</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -686,13 +714,15 @@
+ <object class="GtkSpinButton" id="months_before_expiration_spinbutton2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="adjustment">AdjustmentCertMonthsBeforeExpiration</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+- <signal name="value_changed" handler="ca_policy_expiration_spin_button_change"/>
++ <signal name="value-changed" handler="ca_policy_expiration_spin_button_change" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -709,20 +739,26 @@
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <child>
+- <object class="GtkVBox" id="vbox1">
++ <object class="GtkBox" id="vbox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkHBox" id="hbox7">
++ <object class="GtkBox" id="hbox7">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <child>
+ <object class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Hours between CRL updates:</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -730,32 +766,41 @@
+ <object class="GtkSpinButton" id="hours_between_crl_updates_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="adjustment">AdjustmentHoursBetweenCRLUpdates</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+- <signal name="value_changed" handler="ca_policy_crl_update_spin_button_change"/>
++ <signal name="value-changed" handler="ca_policy_crl_update_spin_button_change" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox2">
++ <object class="GtkBox" id="vbox2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">9</property>
++ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">CRL distribution URL:</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -763,8 +808,8 @@
+ <object class="GtkEntry" id="crl_distribution_point_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
+- <signal name="changed" handler="ca_policy_crl_distribution_point_change"/>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="ca_policy_crl_distribution_point_change" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -774,6 +819,8 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -782,6 +829,7 @@
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;CRL Properties&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+@@ -799,11 +847,10 @@
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <child>
+- <object class="GtkTable" id="table7">
++ <object class="GtkGrid" id="table7">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+- <property name="n_rows">5</property>
+- <property name="n_columns">2</property>
+ <child>
+ <object class="GtkCheckButton" id="country_inherited_check">
+ <property name="label" translatable="yes">Country</property>
+@@ -812,8 +859,12 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
++ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="state_inherited_check">
+@@ -823,16 +874,17 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox4">
++ <object class="GtkBox" id="hbox4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioButton" id="country_same_radiobutton">
+ <property name="label" translatable="yes">must be the same</property>
+@@ -842,9 +894,11 @@
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">country_differ_radiobutton</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -859,18 +913,21 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox8">
++ <object class="GtkBox" id="hbox8">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioButton" id="state_same_radiobutton">
+ <property name="label" translatable="yes">must be the same</property>
+@@ -880,9 +937,11 @@
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">state_differ_radiobutton</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -897,15 +956,15 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -916,11 +975,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -931,11 +990,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -946,16 +1005,17 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox24">
++ <object class="GtkBox" id="hbox24">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioButton" id="city_same_radiobutton">
+ <property name="label" translatable="yes">must be the same</property>
+@@ -965,9 +1025,11 @@
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">city_differ_radiobutton</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -982,20 +1044,21 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox25">
++ <object class="GtkBox" id="hbox25">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioButton" id="organization_same_radiobutton">
+ <property name="label" translatable="yes">must be the same</property>
+@@ -1005,9 +1068,11 @@
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">organization_differ_radiobutton</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -1022,20 +1087,21 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox27">
++ <object class="GtkBox" id="hbox27">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioButton" id="ou_same_radiobutton">
+ <property name="label" translatable="yes">must be the same</property>
+@@ -1045,9 +1111,11 @@
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">ou_differ_radiobutton</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -1062,15 +1130,15 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+ </packing>
+ </child>
+ </object>
+@@ -1078,10 +1146,11 @@
+ <child type="label">
+ <object class="GtkLabel" id="label30">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Inherited fields from CA subject&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ </child>
+ </object>
+@@ -1097,11 +1166,10 @@
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <child>
+- <object class="GtkTable" id="table12">
++ <object class="GtkGrid" id="table12">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+ <child>
+ <object class="GtkCheckButton" id="ca_check2">
+ <property name="label" translatable="yes">Certification Authority</property>
+@@ -1110,8 +1178,12 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
++ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="non_repudiation_check2">
+@@ -1121,11 +1193,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+@@ -1137,13 +1209,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -1155,13 +1225,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -1173,11 +1241,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -1189,11 +1257,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -1204,22 +1272,21 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label111">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ </object>
+@@ -1227,10 +1294,11 @@
+ <child type="label">
+ <object class="GtkLabel" id="label86">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Uses of new generated certificates&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ </child>
+ </object>
+@@ -1246,11 +1314,10 @@
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <child>
+- <object class="GtkTable" id="table15">
++ <object class="GtkGrid" id="table15">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+ <child>
+ <object class="GtkCheckButton" id="email_protection_check2">
+ <property name="label" translatable="yes">Email protection</property>
+@@ -1260,13 +1327,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -1277,11 +1342,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+@@ -1293,11 +1358,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -1309,8 +1374,12 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
++ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="time_stamping_check2">
+@@ -1320,11 +1389,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -1335,11 +1404,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -1350,26 +1419,23 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label100">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ </object>
+@@ -1377,14 +1443,17 @@
+ <child type="label">
+ <object class="GtkLabel" id="label102">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Purposes of new generated certificates&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+@@ -1396,9 +1465,10 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label23">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CA Policy</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CA Policy</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+@@ -1407,12 +1477,15 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox2">
++ <object class="GtkButtonBox" id="hbuttonbox2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -1422,7 +1495,7 @@
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="certificate_properties_close_clicked"/>
++ <signal name="clicked" handler="certificate_properties_close_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -1433,6 +1506,7 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+--- gnomint-1.3.0.orig/gui/change_password_dialog.ui
++++ gnomint-1.3.0/gui/change_password_dialog.ui
+@@ -1,32 +1,81 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="change_password_dialog">
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Database password protection - gnoMint</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox14">
++ <object class="GtkBox" id="dialog-vbox14">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area14">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="ca_changepwd_cancel_button">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="ca_changepwd_commit_button">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkTable" id="table20">
++ <object class="GtkGrid" id="table20">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">20</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+- <property name="column_spacing">10</property>
+ <property name="row_spacing">10</property>
++ <property name="column_spacing">10</property>
++ <property name="column_homogeneous">True</property>
+ <child>
+- <object class="GtkHBox" id="hbox26">
++ <object class="GtkBox" id="hbox26">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="ca_changepwd_pwd_protect_yes_radiobutton">
+@@ -37,7 +86,7 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_changepwd_pwd_protect_radiobutton_toggled"/>
++ <signal name="toggled" handler="ca_changepwd_pwd_protect_radiobutton_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -64,39 +113,22 @@
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkLabel" id="label109">
+- <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="label" translatable="yes">Protect CA database private
+-keys with password:</property>
+- <property name="wrap">True</property>
+- </object>
+- <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ca_changepwd_label3">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Enter new password again
+ for confirmation:</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+@@ -105,14 +137,12 @@
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
+- <signal name="changed" handler="ca_changepwd_newpwd_entry_changed"/>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="ca_changepwd_newpwd_entry_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -121,46 +151,41 @@
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
+- <signal name="changed" handler="ca_changepwd_newpwd_entry_changed"/>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="ca_changepwd_newpwd_entry_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ca_changepwd_label2">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Please, enter new
+ password:</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ca_changepwd_label1">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Please, enter current
+ password:</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+- <property name="y_padding">15</property>
+ </packing>
+ </child>
+ <child>
+@@ -169,61 +194,34 @@
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
+- <signal name="changed" handler="ca_changepwd_newpwd_entry_changed"/>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="ca_changepwd_newpwd_entry_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+- </object>
+- <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area14">
+- <property name="visible">True</property>
+- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="layout_style">end</property>
+ <child>
+- <object class="GtkButton" id="ca_changepwd_cancel_button">
+- <property name="label" translatable="yes">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="ca_changepwd_commit_button">
+- <property name="label" translatable="yes">gtk-ok</property>
++ <object class="GtkLabel" id="label109">
+ <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="use_stock">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Protect CA database private
++keys with password:</property>
++ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">1</property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/creation_process_window.ui
++++ gnomint-1.3.0/gui/creation_process_window.ui
+@@ -1,40 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkWindow" id="creation_process_window">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Creating new CA - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+ <child>
+- <object class="GtkHBox" id="hbox5">
++ <placeholder/>
++ </child>
++ <child>
++ <object class="GtkBox" id="hbox5">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label25">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox5">
++ <object class="GtkBox" id="vbox5">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">9</property>
+ <property name="orientation">vertical</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="titleLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Creating CA Root Certificate</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Creating CA Root Certificate</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -45,6 +55,7 @@
+ <child>
+ <object class="GtkLabel" id="status_message_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ </object>
+@@ -57,7 +68,7 @@
+ <child>
+ <object class="GtkProgressBar" id="creation_process_window_progressbar">
+ <property name="visible">True</property>
+- <property name="activity_mode">True</property>
++ <property name="can_focus">False</property>
+ <property name="pulse_step">0</property>
+ </object>
+ <packing>
+@@ -73,7 +84,7 @@
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_cancel_creation_process_clicked"/>
++ <signal name="clicked" handler="on_cancel_creation_process_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -84,17 +95,21 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label26">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+--- gnomint-1.3.0.orig/gui/csr_popup_menu.ui
++++ gnomint-1.3.0/gui/csr_popup_menu.ui
+@@ -1,45 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkMenu" id="csr_popup_menu">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkImageMenuItem" id="csr_properties_menuitem">
+ <property name="label">gtk-properties</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Shows the CSR properties window</property>
+ <property name="tooltip_text" translatable="yes">Shows the CSR properties window</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="on_properties1_activate"/>
++ <signal name="activate" handler="on_properties1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="sep_menuitem7">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="csr_export_menuitem">
+ <property name="label" translatable="yes">E_xport</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Exports the CSR so it can be imported by any other application</property>
+ <property name="tooltip_text" translatable="yes">Exports the CSR so it can be imported by any other application</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_export1_activate"/>
++ <signal name="activate" handler="ca_on_export1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="extract_pkey_menuitem3">
+ <property name="label" translatable="yes">Extrac_t private key</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Extracts the private key of the selected
+@@ -52,32 +57,35 @@
+ each time the CSR will be used</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_extractprivatekey1_activate"/>
++ <signal name="activate" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="sep_menuitem8">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="sign_csr_menuitem">
+ <property name="label" translatable="yes">_Sign</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_sign1_activate"/>
++ <signal name="activate" handler="ca_on_sign1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="csr_delete_menuitem">
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="ca_on_delete2_activate"/>
++ <signal name="activate" handler="ca_on_delete2_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/csr_properties_dialog.ui
++++ gnomint-1.3.0/gui/csr_properties_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkWindow" id="csr_properties_dialog">
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">CSR properties - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+@@ -10,170 +11,183 @@
+ <property name="type_hint">dialog</property>
+ <property name="urgency_hint">True</property>
+ <child>
+- <object class="GtkVBox" id="vbox21">
++ <placeholder/>
++ </child>
++ <child>
++ <object class="GtkBox" id="vbox21">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkNotebook" id="notebook4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+- <object class="GtkVBox" id="vbox22">
++ <object class="GtkBox" id="vbox22">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkVBox" id="vboxCertCapabilities2">
++ <object class="GtkBox" id="vboxCertCapabilities2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="privatekey_in_db_label">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="label" translatable="yes">&lt;b&gt;This Certificate Signing Request has its corresponding private key saved in the internal database.&lt;/b&gt;</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">&lt;b&gt;This Certificate Signing Request has its
++corresponding private key saved in the internal database.&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHSeparator" id="certPropSeparator2">
++ <object class="GtkSeparator" id="certPropSeparator2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table8">
++ <object class="GtkGrid" id="table8">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+ <property name="column_spacing">10</property>
+ <child>
+ <object class="GtkLabel" id="certSubjectOULabel1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SubjectOU</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SubjectOU</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certSubjectOLabel1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SubjectO</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SubjectO</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certSubjectCNLabel1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SubjectCN</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SubjectCN</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label131">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label119">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organizational Unit (OU)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organizational Unit (OU)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label118">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization (O)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization (O)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label117">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Common Name (CN)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Common Name (CN)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label116">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;CSR subject&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">1</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_padding">7</property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -185,9 +199,10 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label135">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">General</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">General</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+@@ -199,9 +214,10 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label139">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Details</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Details</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+@@ -210,12 +226,15 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox5">
++ <object class="GtkButtonBox" id="hbuttonbox5">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -225,7 +244,7 @@
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="csr_properties_close_clicked"/>
++ <signal name="clicked" handler="csr_properties_close_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -235,6 +254,8 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+--- gnomint-1.3.0.orig/gui/dh_parameters_dialog.ui
++++ gnomint-1.3.0/gui/dh_parameters_dialog.ui
+@@ -1,68 +1,124 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkAdjustment" id="AdjustmentDHPrimeSizeSpinButton">
+ <property name="lower">1024</property>
+ <property name="upper">10240</property>
+- <property name="step-increment">1024</property>
+- <property name="page-increment">1024</property>
+- <property name="page-size">0</property>
+ <property name="value">1024</property>
++ <property name="step_increment">1024</property>
++ <property name="page_increment">1024</property>
+ </object>
+ <object class="GtkDialog" id="dh_parameters_dialog">
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">New Diffie-Hellman parameters - gnoMint</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox18">
++ <object class="GtkBox" id="dialog-vbox18">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area18">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button19">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="button18">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox9">
++ <object class="GtkBox" id="vbox9">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label47">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="label" translatable="yes">You are about to create and export a set of Diffie&#xB7;Hellman parameters into a PKCS#3 structure file.</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">You are about to create and export a set of
++Diffie·Hellman parameters into a PKCS#3 structure file.</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label48">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="xpad">8</property>
+- <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;PKCS#3 files containing Diffie&#xB7;Hellman parameters are used by some cryptographic
++ <property name="can_focus">False</property>
++ <property name="margin_start">8</property>
++ <property name="margin_end">8</property>
++ <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;PKCS#3 files containing Diffie·Hellman parameters are used by some cryptographic
+ applications for a secure interchange of their keys over insecure channels.&lt;/i&gt;&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">80</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label49">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Please, enter the prime size, in bits:</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -70,58 +126,23 @@
+ <object class="GtkSpinButton" id="dh_prime_size_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="adjustment">AdjustmentDHPrimeSizeSpinButton</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="padding">10</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area18">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button19">
+- <property name="label" translatable="yes">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="button18">
+- <property name="label" translatable="yes">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+ </object>
+ </child>
+ <action-widgets>
+--- gnomint-1.3.0.orig/gui/get_db_password_dialog.ui
++++ gnomint-1.3.0/gui/get_db_password_dialog.ui
+@@ -1,28 +1,73 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="get_db_password_dialog">
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Enter password - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox13">
++ <object class="GtkBox" id="dialog-vbox13">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area13">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button11">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="cadb_password_dialog_ok_button">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox24">
++ <object class="GtkBox" id="vbox24">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">20</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="get_passwd_msg_label">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">This action requires using one or more private keys saved in the CA database.
+
+ Please insert the database password.</property>
+@@ -30,6 +75,8 @@
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
+ <property name="width_chars">40</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -38,28 +85,35 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="pwd_hbox">
++ <object class="GtkBox" id="pwd_hbox">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkImage" id="image16">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">dialog-password</property>
+- <property name="icon-size">6</property>
++ <property name="icon_size">6</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="password_message2">
+ <property name="visible">True</property>
+- <property name="xalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Password:</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">1</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -69,15 +123,19 @@
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -86,10 +144,9 @@
+ <property name="label" translatable="yes">Remember this password during this gnoMint session</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
++ <property name="focus_on_click">False</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="focus_on_click">False</property>
+- <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+@@ -100,46 +157,9 @@
+ </child>
+ </object>
+ <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area13">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button11">
+- <property name="label">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="cadb_password_dialog_ok_button">
+- <property name="label">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+ <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/get_password_dialog.ui
++++ gnomint-1.3.0/gui/get_password_dialog.ui
+@@ -1,53 +1,100 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="get_password_dialog">
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Enter password - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox12">
++ <object class="GtkBox" id="dialog-vbox12">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area12">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button10">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="password_dialog_ok_button">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="sensitive">False</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox17">
++ <object class="GtkBox" id="vbox17">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">11</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="info_message">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Please, enter password</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table3">
++ <object class="GtkGrid" id="table3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">30</property>
+- <property name="n_rows">2</property>
+- <property name="n_columns">2</property>
+ <child>
+ <object class="GtkEntry" id="confirm_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -55,85 +102,55 @@
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="activates_default">True</property>
+- <signal name="changed" handler="dialog_password_entry_changed_cb"/>
++ <signal name="changed" handler="dialog_password_entry_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="confirm_message">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Password (confirm):</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="password_message">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Password:</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
++ </packing>
+ </child>
+ </object>
+ <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area12">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button10">
+- <property name="label">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+ <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="password_dialog_ok_button">
+- <property name="label">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="sensitive">False</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/get_pkey_dialog.ui
++++ gnomint-1.3.0/gui/get_pkey_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="get_pkey_dialog">
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Choose private key file. gnoMint</property>
+@@ -10,32 +11,84 @@
+ <property name="window_position">center-on-parent</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox20">
++ <object class="GtkBox" id="dialog-vbox20">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area20">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button15">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="button7">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="padding">4</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox18">
++ <object class="GtkBox" id="vbox18">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">20</property>
+ <child>
+ <object class="GtkLabel" id="label28">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+ <property name="label" translatable="yes">&lt;big&gt;Choose private key file&lt;/big&gt;
+
+-For doing the selected operation, you must provide the file where resides the private key corresponding to the certificate:</property>
++For doing the selected operation, you must provide the
++file where resides the private key corresponding to the
++certificate:</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="width_chars">40</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -46,24 +99,28 @@
+ <child>
+ <object class="GtkLabel" id="cert_dn_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Certificate DN</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label31">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+ <property name="label" translatable="yes">Please, choose the file:</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="width_chars">40</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -74,8 +131,9 @@
+ <child>
+ <object class="GtkFileChooserButton" id="pkey_filechooser">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <signal name="selection_changed" handler="pkey_manage_filechooser_file_set_cb"/>
++ <signal name="selection-changed" handler="pkey_manage_filechooser_file_set_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -101,53 +159,12 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="padding">10</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area20">
+- <property name="visible">True</property>
+- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button15">
+- <property name="label" translatable="yes">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="button7">
+- <property name="label" translatable="yes">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="padding">4</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+ </object>
+ </child>
+ <action-widgets>
+--- gnomint-1.3.0.orig/gui/import_file_or_directory_dialog.ui
++++ gnomint-1.3.0/gui/import_file_or_directory_dialog.ui
+@@ -1,40 +1,91 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="import_file_or_directory_dialog">
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Import selection - gnoMint</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox15">
++ <object class="GtkBox" id="dialog-vbox15">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area15">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button24">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="button23">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox10">
++ <object class="GtkBox" id="vbox10">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">8</property>
+ <child>
+ <object class="GtkLabel" id="label53">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Please, choose the more suitable option for
++what you want to import:</property>
++ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Please, choose the more suitable option for what you want to import:</property>
+- <property name="wrap">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox11">
++ <object class="GtkBox" id="vbox11">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="importfile_radiobutton">
+@@ -47,21 +98,31 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label54">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">24</property>
+- <property name="ypad">9</property>
+- <property name="label" translatable="yes">&lt;i&gt;Import a single file, encoded in DER or PEM format, containing certificates, private keys (encrypted or plain), signing requests (CSRs), revocation lists (CRLs) or PKCS#12 packages.&lt;/i&gt;</property>
++ <property name="can_focus">False</property>
++ <property name="margin_start">24</property>
++ <property name="margin_end">24</property>
++ <property name="margin_top">9</property>
++ <property name="margin_bottom">9</property>
++ <property name="label" translatable="yes">&lt;i&gt;Import a single file, encoded in DER or PEM format, containing
++certificates, private keys (encrypted or plain), signing
++requests (CSRs), revocation lists (CRLs) or PKCS#12
++packages.&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -76,73 +137,45 @@
+ <property name="group">importfile_radiobutton</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label55">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">24</property>
+- <property name="ypad">9</property>
++ <property name="can_focus">False</property>
++ <property name="margin_start">24</property>
++ <property name="margin_end">24</property>
++ <property name="margin_top">9</property>
++ <property name="margin_bottom">9</property>
+ <property name="label" translatable="yes">&lt;i&gt;Import a directory containing the structure of
+ a whole CA made with OpenSSL .&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area15">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button24">
+- <property name="label" translatable="yes">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="button23">
+- <property name="label" translatable="yes">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+ <property name="expand">False</property>
+- <property name="fill">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/import_password_dialog.ui
++++ gnomint-1.3.0/gui/import_password_dialog.ui
+@@ -1,35 +1,84 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="import_password_dialog">
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Enter password - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox16">
++ <object class="GtkBox" id="dialog-vbox16">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area16">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button21">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="import_password_dialog_ok_button1">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox8">
++ <object class="GtkBox" id="vbox8">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">20</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="get_passwd_msg_label1">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="label" translatable="yes">The whole selected file, or some of its elements, seems to be cyphered using a password or passphrase.
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">The whole selected file, or some of its elements, seems to
++be cyphered using a password or passphrase.
+
+-For importing the file into gnoMint database, you must provide an appropiate password.</property>
++For importing the file into gnoMint database, you must
++provide an appropiate password.</property>
+ <property name="use_markup">True</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
+ <property name="width_chars">40</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -40,54 +89,69 @@
+ <child>
+ <object class="GtkLabel" id="label52">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="ypad">8</property>
++ <property name="can_focus">False</property>
++ <property name="margin_top">8</property>
++ <property name="margin_bottom">8</property>
+ <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;The part that is being imported has the description:&lt;/i&gt;&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="import_crypted_part_description">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="xpad">15</property>
++ <property name="can_focus">False</property>
++ <property name="margin_left">15</property>
++ <property name="margin_right">15</property>
+ <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;#Description#&lt;/i&gt;&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="pwd_hbox1">
++ <object class="GtkBox" id="pwd_hbox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkImage" id="image17">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">dialog-password</property>
+- <property name="icon-size">6</property>
++ <property name="icon_size">6</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="password_message1">
+ <property name="visible">True</property>
+- <property name="xalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Password:</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">1</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -97,60 +161,27 @@
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+- <property name="position">3</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area16">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button21">
+- <property name="label">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="import_password_dialog_ok_button1">
+- <property name="label">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+ <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">1</property>
++ <property name="fill">True</property>
++ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/main_window.ui
++++ gnomint-1.3.0/gui/main_window.ui
+@@ -1,51 +1,82 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
++ <object class="GtkImage" id="addcaimg">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="pixbuf">addca.png</property>
++ </object>
++ <object class="GtkImage" id="addcsrimg">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="pixbuf">addcsr.png</property>
++ </object>
++ <object class="GtkImage" id="extractpkeyimg">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="pixbuf">extractpkey.png</property>
++ </object>
++ <object class="GtkImage" id="signimg">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="pixbuf">sign.png</property>
++ </object>
+ <object class="GtkWindow" id="main_window1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">gnoMint</property>
+ <property name="role">gnoMint_main</property>
+ <property name="window_position">center</property>
+ <property name="default_width">400</property>
+ <property name="default_height">300</property>
+ <property name="icon">gnomint.png</property>
+- <signal name="delete_event" handler="on_main_window1_delete"/>
++ <signal name="delete-event" handler="on_main_window1_delete" swapped="no"/>
++ <child>
++ <placeholder/>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox1">
++ <object class="GtkBox" id="vbox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkMenuBar" id="menubar1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="file1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Certificates</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="file1_menu1">
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="new1">
+ <property name="label" translatable="yes">_New certificate database</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="on_new1_activate"/>
++ <signal name="activate" handler="on_new1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="open1">
+ <property name="label" translatable="yes">_Open certificate database</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="on_open1_activate"/>
++ <signal name="activate" handler="on_open1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="openrecentsmenuitem">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Open _recents</property>
+ <property name="use_underline">True</property>
+ </object>
+@@ -54,41 +85,47 @@
+ <object class="GtkImageMenuItem" id="save_as1">
+ <property name="label" translatable="yes">_Save certificate database as...</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="on_save_as1_activate"/>
++ <signal name="activate" handler="on_save_as1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="gtk-add">
+ <property name="label">gtk-add</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="menu3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="new2">
+ <property name="label" translatable="yes">_Add self-signed CA</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="on_add_self_signed_ca_activate"/>
++ <signal name="activate" handler="on_add_self_signed_ca_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="new_certificate1">
+ <property name="label" translatable="yes">Add _Certificate Request</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="on_add_csr_activate"/>
++ <signal name="activate" handler="on_add_csr_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+@@ -100,12 +137,13 @@
+ <property name="label" translatable="yes">Extrac_t private key</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Extract the saved private key to an external file or device</property>
+ <property name="tooltip_text" translatable="yes">Extract the saved private key to an external file or device</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_extractprivatekey1_activate"/>
++ <signal name="activate" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+@@ -113,9 +151,10 @@
+ <property name="label" translatable="yes">Revo_ke</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_revoke_activate"/>
++ <signal name="activate" handler="ca_on_revoke_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+@@ -123,9 +162,10 @@
+ <property name="label" translatable="yes">_Sign</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_sign1_activate"/>
++ <signal name="activate" handler="ca_on_sign1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+@@ -133,91 +173,103 @@
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="ca_on_delete2_activate"/>
++ <signal name="activate" handler="ca_on_delete2_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="generate_crl_menuitem">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Generate the current Certificate Revocation List</property>
+ <property name="tooltip_text" translatable="yes">Generate the current Certificate Revocation List</property>
+ <property name="label" translatable="yes">Generate _CRL</property>
+ <property name="use_underline">True</property>
+- <signal name="activate" handler="ca_generate_crl"/>
++ <signal name="activate" handler="ca_generate_crl" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="generate_dh_menuitem">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Generate D_H parameters...</property>
+ <property name="use_underline">True</property>
+- <signal name="activate" handler="ca_generate_dh_param_show"/>
++ <signal name="activate" handler="ca_generate_dh_param_show" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="change_pwd_menuitem">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Change database pass_word</property>
+ <property name="use_underline">True</property>
+- <signal name="activate" handler="ca_on_change_pwd_menuitem_activate"/>
++ <signal name="activate" handler="ca_on_change_pwd_menuitem_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator5">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="import1">
+ <property name="label" translatable="yes">_Import</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="on_import1_activate"/>
++ <signal name="activate" handler="on_import1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="export1">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">E_xport</property>
+ <property name="use_underline">True</property>
+- <signal name="activate" handler="ca_on_export1_activate"/>
++ <signal name="activate" handler="ca_on_export1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="quit1">
+ <property name="label">gtk-quit</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="on_quit1_activate"/>
++ <signal name="activate" handler="on_quit1_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+@@ -227,31 +279,36 @@
+ <child>
+ <object class="GtkMenuItem" id="edit1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Edit</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="edit1_menu1">
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="properties1">
+ <property name="label">gtk-properties</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="on_properties1_activate"/>
++ <signal name="activate" handler="on_properties1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="preferences1">
+ <property name="label">gtk-preferences</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="on_preferences1_activate"/>
++ <signal name="activate" handler="on_preferences1_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+@@ -261,31 +318,35 @@
+ <child>
+ <object class="GtkMenuItem" id="menuitem1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">_View</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="menu1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkCheckMenuItem" id="csr_view_menuitem">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Certificate _Signing Requests</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+- <signal name="toggled" handler="ca_csr_view_toggled"/>
++ <signal name="toggled" handler="ca_csr_view_toggled" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="revoked_view_menuitem">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">_Revoked Certificates</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+- <signal name="toggled" handler="ca_rcrt_view_toggled"/>
++ <signal name="toggled" handler="ca_rcrt_view_toggled" swapped="no"/>
+ </object>
+ </child>
+ </object>
+@@ -295,17 +356,20 @@
+ <child>
+ <object class="GtkMenuItem" id="help1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Help</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="help1_menu1">
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="about1">
+ <property name="label">gtk-about</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="on_about1_activate"/>
++ <signal name="activate" handler="on_about1_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+@@ -322,14 +386,16 @@
+ <child>
+ <object class="GtkToolbar" id="toolbar1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkToolButton" id="toolbutton1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Create a new database</property>
+ <property name="tooltip_text" translatable="yes">Create a new database</property>
+ <property name="stock_id">gtk-new</property>
+- <signal name="clicked" handler="on_new1_activate"/>
++ <signal name="clicked" handler="on_new1_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -339,11 +405,12 @@
+ <child>
+ <object class="GtkToolButton" id="toolbutton2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Open an existing database</property>
+ <property name="tooltip_text" translatable="yes">Open an existing database</property>
+ <property name="stock_id">gtk-open</property>
+- <signal name="clicked" handler="on_open1_activate"/>
++ <signal name="clicked" handler="on_open1_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -353,6 +420,7 @@
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -362,12 +430,13 @@
+ <child>
+ <object class="GtkToolButton" id="addca_toolbutton">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Add an autosigned CA</property>
+ <property name="tooltip_text" translatable="yes">Add an autosigned CA</property>
+ <property name="label" translatable="yes">Add autosigned CA certificate</property>
+ <property name="icon_widget">addcaimg</property>
+- <signal name="clicked" handler="on_add_self_signed_ca_activate"/>
++ <signal name="clicked" handler="on_add_self_signed_ca_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -377,12 +446,13 @@
+ <child>
+ <object class="GtkToolButton" id="addcsr_toolbutton">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Add a new Certificate Signing Request</property>
+ <property name="tooltip_text" translatable="yes">Add a new Certificate Signing Request</property>
+ <property name="label" translatable="yes">Add CSR</property>
+ <property name="icon_widget">addcsrimg</property>
+- <signal name="clicked" handler="on_add_csr_activate"/>
++ <signal name="clicked" handler="on_add_csr_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -392,6 +462,7 @@
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton6">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -402,12 +473,13 @@
+ <object class="GtkToolButton" id="extractpkey_toolbutton">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Extract the private key of the selected item into a external file</property>
+ <property name="tooltip_text" translatable="yes">Extract the private key of the selected item into a external file</property>
+ <property name="label" translatable="yes">Extract Private Key</property>
+ <property name="icon_widget">extractpkeyimg</property>
+- <signal name="clicked" handler="ca_on_extractprivatekey1_activate"/>
++ <signal name="clicked" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -418,12 +490,13 @@
+ <object class="GtkToolButton" id="revoke_toolbutton">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Revoke the selected certificate</property>
+ <property name="tooltip_text" translatable="yes">Revoke the selected certificate</property>
+ <property name="label" translatable="yes">Revoke</property>
+ <property name="stock_id">gtk-cancel</property>
+- <signal name="clicked" handler="ca_on_revoke_activate"/>
++ <signal name="clicked" handler="ca_on_revoke_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -434,12 +507,13 @@
+ <object class="GtkToolButton" id="sign_toolbutton">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Sign the selected Certificate Signing Request</property>
+ <property name="tooltip_text" translatable="yes">Sign the selected Certificate Signing Request</property>
+ <property name="label" translatable="yes">Sign</property>
+ <property name="icon_widget">signimg</property>
+- <signal name="clicked" handler="ca_on_sign1_activate"/>
++ <signal name="clicked" handler="ca_on_sign1_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -450,11 +524,12 @@
+ <object class="GtkToolButton" id="delete_toolbutton">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Delete the selected Certificate Signing Request</property>
+ <property name="tooltip_text" translatable="yes">Delete the selected Certificate Signing Request</property>
+ <property name="stock_id">gtk-delete</property>
+- <signal name="clicked" handler="ca_on_delete2_activate"/>
++ <signal name="clicked" handler="ca_on_delete2_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -472,41 +547,28 @@
+ <object class="GtkScrolledWindow" id="scrolledwindow6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="hscrollbar_policy">automatic</property>
+- <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="ca_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="rules_hint">True</property>
+- <signal name="button_press_event" handler="ca_treeview_popup_handler"/>
+- <signal name="cursor_changed" handler="ca_treeview_selection_change"/>
+- <signal name="row_activated" handler="ca_treeview_row_activated"/>
++ <signal name="button-press-event" handler="ca_treeview_popup_handler" swapped="no"/>
++ <signal name="cursor-changed" handler="ca_treeview_selection_change" swapped="no"/>
++ <signal name="row-activated" handler="ca_treeview_row_activated" swapped="no"/>
++ <child internal-child="selection">
++ <object class="GtkTreeSelection"/>
++ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+- <object class="GtkImage" id="addcaimg">
+- <property name="visible">True</property>
+- <property name="pixbuf">addca.png</property>
+- </object>
+- <object class="GtkImage" id="addcsrimg">
+- <property name="visible">True</property>
+- <property name="pixbuf">addcsr.png</property>
+- </object>
+- <object class="GtkImage" id="signimg">
+- <property name="visible">True</property>
+- <property name="pixbuf">sign.png</property>
+- </object>
+- <object class="GtkImage" id="extractpkeyimg">
+- <property name="visible">True</property>
+- <property name="pixbuf">extractpkey.png</property>
+- </object>
+ </interface>
+--- gnomint-1.3.0.orig/gui/new_ca_window.ui
++++ gnomint-1.3.0/gui/new_ca_window.ui
+@@ -1,49 +1,58 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <!-- interface-requires gtk+ 2.12 -->
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkAdjustment" id="adjustmentCAKeyLength">
+- <property name="value">2048</property>
+ <property name="lower">1024</property>
+ <property name="upper">5120</property>
++ <property name="value">2048</property>
+ <property name="step_increment">1024</property>
+ <property name="page_increment">1024</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustmentMonthsBeforeExpiration">
+- <property name="value">240</property>
+ <property name="lower">1</property>
+ <property name="upper">600</property>
++ <property name="value">240</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">12</property>
+ </object>
+ <object class="GtkWindow" id="new_ca_window">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">New CA - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+ <child>
++ <placeholder/>
++ </child>
++ <child>
+ <object class="GtkNotebook" id="new_ca_notebook">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+- <object class="GtkVBox" id="vbox2">
++ <object class="GtkBox" id="vbox2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+- <object class="GtkHBox" id="hbox1">
++ <object class="GtkBox" id="hbox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;CA Subject Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -54,9 +63,10 @@
+ <child>
+ <object class="GtkLabel" id="label12">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -72,186 +82,168 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table1">
++ <object class="GtkGrid" id="table1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+- <property name="n_rows">6</property>
+- <property name="n_columns">2</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization Unit:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization Unit:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Country:</property>
+ <property name="max_width_chars">0</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">State or Province name: </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">State or Province name: </property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">City: </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">City: </property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="st_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="city_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="o_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="ou_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">CA Root Certificate
+ Common Name (CN):</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="cn_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
+- <signal name="changed" handler="on_cn_entry_changed"/>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="on_cn_entry_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="country_combobox">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox1">
++ <object class="GtkButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -277,7 +269,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_ca_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -294,7 +286,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_next1_clicked"/>
++ <signal name="clicked" handler="on_new_ca_next1_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -317,28 +309,33 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CA properties</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CA properties</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox20">
++ <object class="GtkBox" id="vbox20">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkHBox" id="hbox21">
++ <object class="GtkBox" id="hbox21">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label37">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;CA Root certificate properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -349,9 +346,10 @@
+ <child>
+ <object class="GtkLabel" id="label103">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -362,16 +360,16 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table2">
++ <object class="GtkGrid" id="table2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+- <property name="n_rows">3</property>
+- <property name="n_columns">2</property>
+- <property name="homogeneous">True</property>
++ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkSpinButton" id="months_before_expiration_spinbutton">
+ <property name="visible">True</property>
+@@ -384,24 +382,20 @@
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label27">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Months before root certificate expiration:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Months before root certificate expiration:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+@@ -416,15 +410,13 @@
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox3">
++ <object class="GtkBox" id="hbox3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="rsa_radiobutton">
+@@ -435,7 +427,7 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_ca_privkey_type_toggle"/>
++ <signal name="toggled" handler="on_new_ca_privkey_type_toggle" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -462,45 +454,46 @@
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label21">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Private key bit length:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Private key bit length:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label17">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Private key type:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Private key type:</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox12">
++ <object class="GtkButtonBox" id="hbuttonbox12">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -526,7 +519,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_ca_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -542,7 +535,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_previous2_clicked"/>
++ <signal name="clicked" handler="on_new_ca_previous2_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -558,7 +551,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_next2_clicked"/>
++ <signal name="clicked" handler="on_new_ca_next2_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -569,20 +562,23 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
++ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Root certificate prop</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Root certificate prop</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+@@ -590,19 +586,23 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox3">
++ <object class="GtkBox" id="vbox3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkHBox" id="hbox2">
++ <object class="GtkBox" id="hbox2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;CA properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -613,9 +613,10 @@
+ <child>
+ <object class="GtkLabel" id="label14">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -626,17 +627,21 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox1">
++ <object class="GtkBox" id="vbox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">CRL Distribution Point:</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -647,8 +652,7 @@
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;small&gt;Please, in this field enter an URL where the CRL for this CA will be available.
+ You can leave it blank. In this case, no CRL Distribution Point will be set in the CA
+ Certificate, and you will be able to set it as a new CA property.
+@@ -657,6 +661,8 @@
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">60</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -668,7 +674,7 @@
+ <object class="GtkEntry" id="crl_distribution_point_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -678,12 +684,15 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox4">
++ <object class="GtkButtonBox" id="hbuttonbox4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -709,7 +718,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_ca_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -725,7 +734,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_previous3_clicked"/>
++ <signal name="clicked" handler="on_new_ca_previous3_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -741,7 +750,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_commit_clicked"/>
++ <signal name="clicked" handler="on_new_ca_commit_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -752,17 +761,20 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
++ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label18">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Password protect</property>
+ </object>
+--- gnomint-1.3.0.orig/gui/new_cert_window.ui
++++ gnomint-1.3.0/gui/new_cert_window.ui
+@@ -1,41 +1,47 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkAdjustment" id="AdjustmentMonthsBeforeExpirationSpinButton1">
+ <property name="lower">1</property>
+ <property name="upper">600</property>
+- <property name="step-increment">1</property>
+- <property name="page-increment">12</property>
+- <property name="page-size">0</property>
+ <property name="value">1</property>
++ <property name="step_increment">1</property>
++ <property name="page_increment">12</property>
+ </object>
+ <object class="GtkWindow" id="new_cert_window">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">New Certificate - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+ <child>
++ <placeholder/>
++ </child>
++ <child>
+ <object class="GtkNotebook" id="new_cert_notebook">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+- <object class="GtkVBox" id="vbox25">
++ <object class="GtkBox" id="vbox25">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label136">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;New Certificate Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -46,197 +52,196 @@
+ <child>
+ <object class="GtkLabel" id="label137">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="label" translatable="yes">You are about to sign a Certificate Signing Request, and this way, creating a new certificate. Please check the certificate properties.</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">You are about to sign a Certificate Signing Request,
++and this way, creating a new certificate. Please
++check the certificate properties.</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table13">
++ <object class="GtkGrid" id="table13">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">16</property>
+- <property name="n_rows">6</property>
+- <property name="n_columns">2</property>
+- <property name="column_spacing">10</property>
+ <property name="row_spacing">6</property>
++ <property name="column_spacing">10</property>
+ <child>
+ <object class="GtkLabel" id="cn_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">label</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ou_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">label</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="o_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">label</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="l_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">label</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="st_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">label</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="c_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">label</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label144">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label143">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization Unit:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization Unit:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label142">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Country:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Country:</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label141">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">State or Province name: </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">State or Province name: </property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label140">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">City: </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">City: </property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label138">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">New certificate
+ Common Name (CN):</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox14">
++ <object class="GtkButtonBox" id="hbuttonbox14">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -262,7 +267,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_cert_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -278,7 +283,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_next1_clicked"/>
++ <signal name="clicked" handler="on_new_cert_next1_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -301,27 +306,30 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label145">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CA properties</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CA properties</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox23">
++ <object class="GtkBox" id="vbox23">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label34">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;New Certificate Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -332,13 +340,18 @@
+ <child>
+ <object class="GtkLabel" id="label84">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="label" translatable="yes">You are about to sign a Certificate Signing Request. Please, choose the Certification Authority you are going to use for signing it.</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">You are about to sign a Certificate Signing Request.
++Please, choose the Certification Authority you are
++going to use for signing it.</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -346,25 +359,29 @@
+ <object class="GtkScrolledWindow" id="scrolledwindow5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="hscrollbar_policy">automatic</property>
+- <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="signing_ca_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+- <signal name="cursor_changed" handler="new_cert_signing_ca_treeview_cursor_changed"/>
++ <signal name="cursor-changed" handler="new_cert_signing_ca_treeview_cursor_changed" swapped="no"/>
++ <child internal-child="selection">
++ <object class="GtkTreeSelection"/>
++ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox3">
++ <object class="GtkButtonBox" id="hbuttonbox3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -390,7 +407,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_cert_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -406,7 +423,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_previous2_clicked"/>
++ <signal name="clicked" handler="on_new_cert_previous2_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -423,7 +440,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_next2_clicked"/>
++ <signal name="clicked" handler="on_new_cert_next2_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -446,9 +463,10 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label151">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Choose CA for signing the CSR</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Choose CA for signing the CSR</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+@@ -456,17 +474,19 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox26">
++ <object class="GtkBox" id="vbox26">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="label146">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;New Certificate Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -475,17 +495,21 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox20">
++ <object class="GtkBox" id="hbox20">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <child>
+ <object class="GtkLabel" id="label147">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Months before certificate expiration:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Months before certificate expiration:</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -493,19 +517,21 @@
+ <object class="GtkSpinButton" id="months_before_expiration_spinbutton1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="adjustment">AdjustmentMonthsBeforeExpirationSpinButton1</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+- <property name="fill">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -515,11 +541,10 @@
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <child>
+- <object class="GtkTable" id="table16">
++ <object class="GtkGrid" id="table16">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+ <child>
+ <object class="GtkCheckButton" id="data_encipherment_check">
+ <property name="label" translatable="yes">Data encipherment</property>
+@@ -529,13 +554,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -547,13 +570,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -565,11 +586,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+@@ -580,8 +601,12 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
++ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="key_agreement_check">
+@@ -592,11 +617,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -607,11 +632,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -622,22 +647,21 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label110">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ </object>
+@@ -645,16 +669,17 @@
+ <child type="label">
+ <object class="GtkLabel" id="label150">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Certificate uses&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -664,22 +689,20 @@
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <child>
+- <object class="GtkTable" id="table14">
++ <object class="GtkGrid" id="table14">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+ <child>
+ <object class="GtkLabel" id="label161">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -690,13 +713,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -707,11 +728,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -722,11 +743,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -738,8 +759,12 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
++ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="webclient_check">
+@@ -750,11 +775,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -765,11 +790,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+@@ -781,13 +806,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ </object>
+@@ -795,30 +818,36 @@
+ <child type="label">
+ <object class="GtkLabel" id="label148">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Certificate purposes&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHSeparator" id="hseparator1">
++ <object class="GtkSeparator" id="hseparator1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="padding">10</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox15">
++ <object class="GtkButtonBox" id="hbuttonbox15">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -844,7 +873,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_cert_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -860,7 +889,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_previous3_clicked"/>
++ <signal name="clicked" handler="on_new_cert_previous3_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -876,7 +905,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_commit_clicked"/>
++ <signal name="clicked" handler="on_new_cert_commit_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -887,6 +916,7 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+@@ -898,6 +928,7 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label32">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Certificate properties</property>
+ </object>
+ <packing>
+--- gnomint-1.3.0.orig/gui/new_crl_dialog.ui
++++ gnomint-1.3.0/gui/new_crl_dialog.ui
+@@ -1,26 +1,75 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="new_crl_dialog">
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">New CRL - gnoMint</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox21">
++ <object class="GtkBox" id="dialog-vbox21">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">11</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area21">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button22">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ <signal name="clicked" handler="crl_cancel_clicked_cb" swapped="no"/>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="crl_ok_button">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="sensitive">False</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ <signal name="clicked" handler="crl_ok_clicked_cb" swapped="no"/>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+ <object class="GtkLabel" id="label50">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;New Certificate Revocation List&lt;/b&gt;&lt;/big&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -31,9 +80,10 @@
+ <child>
+ <object class="GtkLabel" id="label51">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Please, select the CA for which a Certificate
+ Revocation List is going to be created:</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -45,64 +95,25 @@
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="hscrollbar_policy">automatic</property>
+- <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="crl_ca_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+- <signal name="cursor_changed" handler="crl_treeview_cursor_changed_cb"/>
++ <signal name="cursor-changed" handler="crl_treeview_cursor_changed_cb" swapped="no"/>
++ <child internal-child="selection">
++ <object class="GtkTreeSelection"/>
++ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area21">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button22">
+- <property name="label" translatable="yes">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- <signal name="clicked" handler="crl_cancel_clicked_cb"/>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="crl_ok_button">
+- <property name="label" translatable="yes">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="sensitive">False</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- <signal name="clicked" handler="crl_ok_clicked_cb"/>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+ </object>
+ </child>
+ <action-widgets>
+--- gnomint-1.3.0.orig/gui/new_req_window.ui
++++ gnomint-1.3.0/gui/new_req_window.ui
+@@ -1,41 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkAdjustment" id="AdjustmentKeyLengthSpinButton1">
+- <property name="value">2048</property>
+ <property name="lower">1024</property>
+ <property name="upper">5120</property>
++ <property name="value">2048</property>
+ <property name="step_increment">1024</property>
+ </object>
+ <object class="GtkWindow" id="new_req_window">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">New certificate request - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+ <child>
++ <placeholder/>
++ </child>
++ <child>
+ <object class="GtkNotebook" id="new_req_notebook">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+- <object class="GtkVBox" id="vbox27">
++ <object class="GtkBox" id="vbox27">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <property name="spacing">7</property>
+ <child>
+- <object class="GtkHBox" id="hbox22">
++ <object class="GtkBox" id="hbox22">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label105">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;Certificate Request Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -46,9 +55,10 @@
+ <child>
+ <object class="GtkLabel" id="label106">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -59,18 +69,26 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label108">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="label" translatable="yes">&lt;small&gt;The subject of the new certificate request can inherit information from one of the existing Certification Authorities. This is a must if the policy of the CA you are going to use is defined to force some fields of a certificate subject to be the same as the ones in the CA cert subject.&lt;/small&gt;</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">&lt;small&gt;The subject of the new certificate request can inherit information
++from one of the existing Certification Authorities. This is a must if the
++policy of the CA you are going to use is defined to force some fields
++of a certificate subject to be the same as the ones in the CA cert
++subject.&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -84,6 +102,8 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -95,9 +115,11 @@
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">dont_inherit_radiobutton</property>
+- <signal name="toggled" handler="new_req_inherit_fields_toggled"/>
++ <signal name="toggled" handler="new_req_inherit_fields_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+@@ -105,8 +127,6 @@
+ <object class="GtkScrolledWindow" id="scrolledwindow7">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="hscrollbar_policy">automatic</property>
+- <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="new_req_ca_treeview">
+@@ -114,16 +134,22 @@
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="enable_tree_lines">True</property>
++ <child internal-child="selection">
++ <object class="GtkTreeSelection"/>
++ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox13">
++ <object class="GtkButtonBox" id="hbuttonbox13">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -149,7 +175,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_req_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -165,7 +191,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_next1_clicked"/>
++ <signal name="clicked" handler="on_new_req_next1_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -176,6 +202,7 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+@@ -184,29 +211,34 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label95">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CA properties</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CA properties</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox15">
++ <object class="GtkBox" id="vbox15">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+- <object class="GtkHBox" id="hbox17">
++ <object class="GtkBox" id="hbox17">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label87">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;Certificate Request Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -217,9 +249,10 @@
+ <child>
+ <object class="GtkLabel" id="label88">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -235,185 +268,167 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table9">
++ <object class="GtkGrid" id="table9">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+- <property name="n_rows">6</property>
+- <property name="n_columns">2</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="country_combobox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="cn_entry1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
+- <signal name="changed" handler="on_new_req_cn_entry_changed"/>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="on_new_req_cn_entry_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label94">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Certificate
+ Common Name (CN):</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="ou_entry1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="o_entry1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="city_entry1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="st_entry1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label93">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">City: </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">City: </property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label92">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">State or Province name: </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">State or Province name: </property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label91">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Country:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Country:</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label90">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization Unit:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization Unit:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label89">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox10">
++ <object class="GtkButtonBox" id="hbuttonbox10">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -439,7 +454,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_req_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -455,7 +470,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_previous2_clicked"/>
++ <signal name="clicked" handler="on_new_req_previous2_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -472,7 +487,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_next2_clicked"/>
++ <signal name="clicked" handler="on_new_req_next2_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -495,9 +510,10 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label101">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Root certificate prop</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Root certificate prop</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+@@ -505,19 +521,23 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox16">
++ <object class="GtkBox" id="vbox16">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkHBox" id="hbox18">
++ <object class="GtkBox" id="hbox18">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label96">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;Certificate Request Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -528,9 +548,10 @@
+ <child>
+ <object class="GtkLabel" id="label97">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -541,23 +562,23 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table10">
++ <object class="GtkGrid" id="table10">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+- <property name="n_rows">2</property>
+- <property name="n_columns">2</property>
+- <property name="homogeneous">True</property>
++ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkSpinButton" id="keylength_spinbutton1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="max_length">5</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="adjustment">AdjustmentKeyLengthSpinButton1</property>
+ <property name="climb_rate">1024</property>
+ <property name="snap_to_ticks">True</property>
+@@ -566,15 +587,13 @@
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox19">
++ <object class="GtkBox" id="hbox19">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="rsa_radiobutton1">
+@@ -586,7 +605,7 @@
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">dsa_radiobutton1</property>
+- <signal name="toggled" handler="on_new_req_privkey_type_toggle"/>
++ <signal name="toggled" handler="on_new_req_privkey_type_toggle" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -613,45 +632,46 @@
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label99">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Private key bit length:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Private key bit length:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label98">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Private key type:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Private key type:</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox11">
++ <object class="GtkButtonBox" id="hbuttonbox11">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -677,7 +697,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_req_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -693,7 +713,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_previous3_clicked"/>
++ <signal name="clicked" handler="on_new_req_previous3_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -709,7 +729,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_commit_clicked"/>
++ <signal name="clicked" handler="on_new_req_commit_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -720,6 +740,7 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -731,6 +752,7 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label104">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">page 3</property>
+ </object>
+ <packing>
+--- gnomint-1.3.0.orig/gui/preferences_dialog.ui
++++ gnomint-1.3.0/gui/preferences_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="preferences_dialog">
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">General Preferences - gnoMint</property>
+ <property name="resizable">False</property>
+@@ -10,19 +11,51 @@
+ <property name="window_position">center-on-parent</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox19">
++ <object class="GtkBox" id="dialog-vbox19">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area19">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="preferences_ok_button">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ <signal name="clicked" handler="preferences_window_ok_button_clicked_cb" swapped="no"/>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+ <object class="GtkNotebook" id="notebook1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+- <object class="GtkVBox" id="vbox7">
++ <object class="GtkBox" id="vbox7">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="gnomekeyring_export_check">
+@@ -33,9 +66,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="preferences_window_gnomekeyring_export_toggled"/>
++ <signal name="toggled" handler="preferences_window_gnomekeyring_export_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -44,6 +79,7 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label46">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Export options</property>
+ </object>
+ <packing>
+@@ -52,36 +88,12 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="padding">6</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area19">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="preferences_ok_button">
+- <property name="label" translatable="yes">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- <signal name="clicked" handler="preferences_window_ok_button_clicked_cb"/>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+ </object>
+ </child>
+ <action-widgets>
+--- gnomint-1.3.0.orig/src/ca.h
++++ gnomint-1.3.0/src/ca.h
+@@ -47,7 +47,6 @@
+ gboolean ca_rcrt_view_toggled (GtkCheckMenuItem *button, gpointer user_data);
+ void ca_generate_crl (GtkCheckMenuItem *button, gpointer user_data);
+ gboolean ca_treeview_popup_timeout_program_cb (gpointer data);
+-void ca_treeview_popup_timeout_program (GdkEventButton *event);
+ gboolean ca_treeview_popup_handler (GtkTreeView *tree_view,
+ GdkEvent *event, gpointer user_data);
+ void ca_on_change_pwd_menuitem_activate (GtkMenuItem *menuitem, gpointer user_data);
+--- gnomint-1.3.0.orig/gui/export_certificate_dialog.ui
++++ gnomint-1.3.0/gui/export_certificate_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="export_certificate_dialog">
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Export certificate - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+@@ -10,32 +11,82 @@
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+ <property name="urgency_hint">True</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox11">
++ <object class="GtkBox" id="dialog-vbox11">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area11">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button1">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="button4">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox12">
++ <object class="GtkBox" id="vbox12">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">8</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Please, choose which part of the
++saved certificate you want to export:</property>
++ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Please, choose which part of the saved certificate you want to export:</property>
+- <property name="wrap">True</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox14">
++ <object class="GtkBox" id="vbox14">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="publicpart_radiobutton1">
+@@ -48,22 +99,29 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">24</property>
+- <property name="ypad">9</property>
++ <property name="can_focus">False</property>
++ <property name="margin_left">24</property>
++ <property name="margin_right">24</property>
++ <property name="margin_top">9</property>
++ <property name="margin_bottom">9</property>
+ <property name="label" translatable="yes">&lt;i&gt;Export only the certificate to a public file, in PEM format.&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -79,22 +137,31 @@
+ <property name="group">publicpart_radiobutton1</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label15">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">24</property>
+- <property name="ypad">9</property>
+- <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PKCS#8 password-protected file. This file should only be accessed by the subject of the certificate.&lt;/i&gt;</property>
++ <property name="can_focus">False</property>
++ <property name="margin_left">24</property>
++ <property name="margin_right">24</property>
++ <property name="margin_top">9</property>
++ <property name="margin_bottom">9</property>
++ <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PKCS#8 password-
++protected file. This file should only be accessed by the
++subject of the certificate.&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+@@ -109,22 +176,31 @@
+ <property name="group">publicpart_radiobutton1</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">24</property>
+- <property name="ypad">9</property>
+- <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PEM file. This option should only be used for exporting certificates that will be used in unattended servers.&lt;/i&gt;</property>
++ <property name="can_focus">False</property>
++ <property name="margin_left">24</property>
++ <property name="margin_right">24</property>
++ <property name="margin_top">9</property>
++ <property name="margin_bottom">9</property>
++ <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PEM file. This option
++should only be used for exporting certificates that will be
++used in unattended servers.&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+@@ -139,72 +215,46 @@
+ <property name="group">publicpart_radiobutton1</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">24</property>
+- <property name="ypad">9</property>
+- <property name="label" translatable="yes">&lt;i&gt;Export both (private and public) parts to a password-protected PKCS#12 file. This kind of file can be imported by other common programs, such as web or mail clients.&lt;/i&gt;</property>
++ <property name="can_focus">False</property>
++ <property name="margin_left">24</property>
++ <property name="margin_right">24</property>
++ <property name="margin_top">9</property>
++ <property name="margin_bottom">9</property>
++ <property name="label" translatable="yes">&lt;i&gt;Export both (private and public) parts to a password-
++protected PKCS#12 file. This kind of file can be imported
++by other common programs, such as web or mail clients.&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area11">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button1">
+- <property name="label">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="button4">
+- <property name="label">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
diff --git a/system/gnomint/patches/09_gcc-10.patch b/system/gnomint/patches/09_gcc-10.patch
new file mode 100644
index 0000000000..0e9779335c
--- /dev/null
+++ b/system/gnomint/patches/09_gcc-10.patch
@@ -0,0 +1,33 @@
+Description: Fix FTBFS with GCC 10.
+Author: Yavor Doganov <yavor@gnu.org>
+Bug-Debian: https://bugs.debian.org/957287
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2020-06-23
+---
+
+--- gnomint-1.3.0.orig/src/ca_file.h
++++ gnomint-1.3.0/src/ca_file.h
+@@ -69,6 +69,7 @@
+
+ GList * ca_file_get_revoked_certs (guint64 ca_id, gchar **error);
+
++typedef
+ enum {CA_FILE_CA_COLUMN_ID=0,
+ CA_FILE_CA_COLUMN_SERIAL=1,
+ CA_FILE_CA_COLUMN_SUBJECT=2,
+@@ -78,6 +79,7 @@
+ CA_FILE_CA_COLUMN_NUMBER=6}
+ CaFileCAColumns;
+
++typedef
+ enum {CA_FILE_CERT_COLUMN_ID=0,
+ CA_FILE_CERT_COLUMN_IS_CA=1,
+ CA_FILE_CERT_COLUMN_SERIAL=2,
+@@ -93,6 +95,7 @@
+ CA_FILE_CERT_COLUMN_NUMBER=12}
+ CaFileCertColumns;
+
++typedef
+ enum {CA_FILE_CSR_COLUMN_ID=0,
+ CA_FILE_CSR_COLUMN_SUBJECT=1,
+ CA_FILE_CSR_COLUMN_PRIVATE_KEY_IN_DB=2,
diff --git a/system/gnomint/patches/gnutls3.patch b/system/gnomint/patches/gnutls3.patch
deleted file mode 100644
index 8ee3371884..0000000000
--- a/system/gnomint/patches/gnutls3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -aur a/src/import.c b/src/import.c
---- a/src/import.c 2010-05-31 23:01:37.000000000 +0200
-+++ b/src/import.c 2012-06-27 17:50:06.993671796 +0200
-@@ -695,7 +695,7 @@
-
- // After having all the parts unencrypted, we import all certificates first.
- for (i=0; i<n_bags; i++) {
-- gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-+ gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
- guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
-
- for (i=0; i < num_elements_in_bag; i++) {
-@@ -722,7 +722,7 @@
-
- // Then, we import all PKCS8 private keys.
- for (i=0; i<n_bags; i++) {
-- gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-+ gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
- guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
-
- for (i=0; i < num_elements_in_bag; i++) {
-@@ -796,7 +796,7 @@
- // Then we import the CRLs
-
- for (i=0; i<n_bags; i++) {
-- gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-+ gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
- guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
-
- for (i=0; i < num_elements_in_bag; i++) {
-Nur in b/src: import.c~.
diff --git a/system/guefi/README b/system/guefi/README
new file mode 100644
index 0000000000..63caa688ed
--- /dev/null
+++ b/system/guefi/README
@@ -0,0 +1,3 @@
+GUEFI is a Python/GTK+3 application that acts as a frontend for
+efibootmgr. It provides an easy to use interface for managing
+UEFI boot options.
diff --git a/system/guefi/guefi.SlackBuild b/system/guefi/guefi.SlackBuild
new file mode 100644
index 0000000000..a515d4ceb6
--- /dev/null
+++ b/system/guefi/guefi.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for guefi
+
+# Copyright 2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=guefi
+VERSION=${VERSION:-0.1.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+DOCS="AUTHORS COPYING README.md"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make prefix=/usr
+
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/guefi/guefi.info b/system/guefi/guefi.info
new file mode 100644
index 0000000000..b91af7b998
--- /dev/null
+++ b/system/guefi/guefi.info
@@ -0,0 +1,10 @@
+PRGNAM="guefi"
+VERSION="0.1.3"
+HOMEPAGE="https://github.com/gapan/guefi"
+DOWNLOAD="https://github.com/gapan/guefi/archive/0.1.3.tar.gz"
+MD5SUM="08355512dd019d93f8809c66fb00132b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/guefi/slack-desc b/system/guefi/slack-desc
new file mode 100644
index 0000000000..e0df51a295
--- /dev/null
+++ b/system/guefi/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+guefi: guefi (GTK+3 frontend for efibootmgr)
+guefi:
+guefi: GUEFI is a Python/GTK+3 application that acts as a frontend for
+guefi: efibootmgr. It provides an easy to use interface for managing
+guefi: UEFI boot options.
+guefi:
+guefi: homepage: https://github.com/gapan/guefi
+guefi:
+guefi:
+guefi:
+guefi:
diff --git a/system/hack-font-ttf/README b/system/hack-font-ttf/README
deleted file mode 100644
index a5baafc081..0000000000
--- a/system/hack-font-ttf/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Hack - A typeface in the Bitstream Vera lineage
-
-Hack has deep roots in the libre, open source typeface community and
-includes the contributions of the Bitstream Vera & DejaVu projects.
-
-The face has been re-designed with an expanded glyph set, modifications
-of the original glyph shapes, and meticulous attention to metrics.
diff --git a/system/hack-font-ttf/doinst.sh b/system/hack-font-ttf/doinst.sh
deleted file mode 100644
index bdb050188d..0000000000
--- a/system/hack-font-ttf/doinst.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Update the X font indexes:
-if [ -x /usr/bin/mkfontdir -o -x /usr/X11R6/bin/mkfontdir ]; then
- ( cd /usr/share/fonts/TTF
- mkfontscale .
- mkfontdir .
- )
-fi
-if [ -x /usr/bin/fc-cache ]; then
- /usr/bin/fc-cache -f
-fi
diff --git a/system/hack-font-ttf/hack-font-ttf.SlackBuild b/system/hack-font-ttf/hack-font-ttf.SlackBuild
deleted file mode 100644
index 807a20902e..0000000000
--- a/system/hack-font-ttf/hack-font-ttf.SlackBuild
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for hack-font-ttf
-
-# Copyright 2018 rfmae <rfmae.git@mailbox.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=hack-font-ttf
-VERSION=${VERSION:-3.003}
-ARCH=noarch
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=Hack-v$VERSION-ttf.tar.xz
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM -C $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p $PKG/usr/share/fonts/TTF/
-cp -a *.ttf $PKG/usr/share/fonts/TTF/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/hack-font-ttf/hack-font-ttf.info b/system/hack-font-ttf/hack-font-ttf.info
deleted file mode 100644
index c377fc0f73..0000000000
--- a/system/hack-font-ttf/hack-font-ttf.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="hack-font-ttf"
-VERSION="3.003"
-HOMEPAGE="https://sourcefoundry.org/hack/"
-DOWNLOAD="https://github.com/source-foundry/Hack/releases/download/v3.003/Hack-v3.003-ttf.tar.xz"
-MD5SUM="cf274d8c32045a350e6d6a116fe463d7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="rfmae"
-EMAIL="rfmae.git@mailbox.org"
diff --git a/system/hack-font-ttf/slack-desc b/system/hack-font-ttf/slack-desc
deleted file mode 100644
index 416a81c711..0000000000
--- a/system/hack-font-ttf/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-hack-font-ttf: hack-font-ttf (font)
-hack-font-ttf:
-hack-font-ttf: A typeface in the Bitstream Vera lineage
-hack-font-ttf: Hack has deep roots in the libre, open source typeface community and
-hack-font-ttf: includes the contributions of the Bitstream Vera & DejaVu projects.
-hack-font-ttf:
-hack-font-ttf: The face has been re-designed with an expanded glyph set,
-hack-font-ttf: modifications of the original glyph shapes, and meticulous attention
-hack-font-ttf: to metrics.
-hack-font-ttf:
-hack-font-ttf: http://sourcefoundry.org/hack/
diff --git a/system/haveged/README b/system/haveged/README
deleted file mode 100644
index 187b3bdda9..0000000000
--- a/system/haveged/README
+++ /dev/null
@@ -1,27 +0,0 @@
-haveged (a simple entropy-gathering daemon)
-
-The haveged project is an attempt to provide an easy-to-use, unpredictable
-random number generator based upon an adaptation of the HAVEGE algorithm.
-Haveged was created to remedy low-entropy conditions in the Linux random
-device that can occur under some workloads, especially on headless servers.
-
-The HAVEGE algorithm is based upon the indirect effects of unrelated hardware
-events on the instruction timing of a calculation that is sensitive to
-processor features such as branch predictors and instruction/data access
-mechanisms.
-Samples from a high-resolution timer are input into the algorithm to
-produce a stream of random data in a collection buffer. The contents of this
-buffer can be fed into the random device or accessed directly through the
-file system. File system access is a useful alternative to those situations
-where use of the random device is either inappropriate or not available.
-
-Add the following snippet to your /etc/rc.d/rc.M to start up haveged at boot:
-
-# Starting HAVEGED entropy daemon
-if [ -x /etc/rc.d/rc.haveged ]; then
- /etc/rc.d/rc.haveged start
-fi
-
-You can see how many bits of entropy are available to the system by reading
-the /proc/sys/kernel/random/entropy_avail file, and check the size of your
-entropy pool at /proc/sys/kernel/random/poolsize.
diff --git a/system/haveged/doinst.sh b/system/haveged/doinst.sh
deleted file mode 100644
index b9e90c8608..0000000000
--- a/system/haveged/doinst.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-config() {
- for infile in $1; do
- NEW="$infile"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
- done
-}
-
-preserve_perms() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- if [ -e $OLD ]; then
- cp -a $OLD ${NEW}.incoming
- cat $NEW > ${NEW}.incoming
- mv ${NEW}.incoming $NEW
- fi
- config $NEW
-}
-
-preserve_perms etc/rc.d/rc.haveged.new
-
diff --git a/system/haveged/haveged.SlackBuild b/system/haveged/haveged.SlackBuild
deleted file mode 100644
index 0d5e97f692..0000000000
--- a/system/haveged/haveged.SlackBuild
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for haveged
-
-# Copyright 2018 Erik Falor, Logan, Utah, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Nikos Giotis 20170903, Athens, GR
-# Use static building
-# Changed install target to /sbin, /lib[64]
-# Added check for existing installation due to problems when rebuilding
-# produces binary that segfaults if any previous installation is there
-
-PRGNAM=haveged
-VERSION=${VERSION:-1.9.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-# Try to detect any previous installations and bail out if true
-if [ -f "/usr/lib$LIBDIRSUFFIX/libhavege.so" -o \
- -f "/usr/lib$LIBDIRSUFFIX/libhavege.a" -o \
- -f "/lib$LIBDIRSUFFIX/libhavege.so" -o \
- -f "/lib$LIBDIRSUFFIX/libhavege.a" ]; then
- echo 'Detected libhaveged!' >&2
- echo 'Please remove libhaveged before building a new one.' >&2
- exit 1
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Static build for easier inclusion in initrd
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="-static" \
-./configure \
- --prefix=/usr \
- --sbindir=/sbin \
- --libdir=/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-rm -rf $PKG/etc/init.d
-install -D -m0755 -oroot -groot $CWD/rc.haveged $PKG/etc/rc.d/rc.haveged.new
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL README \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/haveged/haveged.info b/system/haveged/haveged.info
deleted file mode 100644
index ea62f1b72e..0000000000
--- a/system/haveged/haveged.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="haveged"
-VERSION="1.9.2"
-HOMEPAGE="http://www.issihosts.com/haveged/index.html"
-DOWNLOAD="http://www.issihosts.com/haveged/haveged-1.9.2.tar.gz"
-MD5SUM="fb1d8b3dcbb9d06b30eccd8aa500fd31"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Erik Falor"
-EMAIL="ewfalor@gmail.com"
diff --git a/system/haveged/rc.haveged b/system/haveged/rc.haveged
deleted file mode 100644
index 404d9ca800..0000000000
--- a/system/haveged/rc.haveged
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# Start/stop/restart haveged.
-
-PIDFILE=/var/run/haveged.pid
-HAVEGED_OPTS="-w 1024 -v 1 -p $PIDFILE"
-
-# Start haveged:
-haveged_start() {
- if [ -f $PIDFILE ]; then
- echo "HAVEGE daemon is already running as PID $(cat $PIDFILE) " >&2
- exit 3
- elif [ -x /sbin/haveged ]; then
- echo "Starting HAVEGE daemon: /sbin/haveged"
- /sbin/haveged $HAVEGED_OPTS
- fi
-}
-
-# Stop haveged:
-haveged_stop() {
- if [ -r /var/run/haveged.pid ]; then
- kill $(cat /var/run/haveged.pid)
- else
- killall haveged
- fi
-}
-
-# Restart haveged:
-haveged_restart() {
- haveged_stop
- sleep 1
- haveged_start
-}
-
-case "$1" in
-'start')
- haveged_start
- ;;
-'stop')
- haveged_stop
- ;;
-'restart')
- haveged_restart
- ;;
-*)
- echo "usage $0 start|stop|restart"
- exit 2
-esac
diff --git a/system/haveged/slack-desc b/system/haveged/slack-desc
deleted file mode 100644
index 55d8f9ed50..0000000000
--- a/system/haveged/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-haveged: haveged (A simple entropy daemon)
-haveged:
-haveged: The haveged project is an attempt to provide an easy-to-use,
-haveged: unpredictable random number generator based upon an adaptation of the
-haveged: HAVEGE algorithm. Haveged was created to remedy low-entropy
-haveged: conditions in the Linux random device that can occur under some
-haveged: workloads, especially on headless servers.
-haveged:
-haveged:
-haveged:
-haveged:
diff --git a/system/innotop/README b/system/innotop/README
deleted file mode 100644
index 91cdb498ac..0000000000
--- a/system/innotop/README
+++ /dev/null
@@ -1,6 +0,0 @@
-MySQL and InnoDB transaction/status monitor. Like 'top' for MySQL.
-
-Displays queries, InnoDB transactions, lock waits, deadlocks, foreign key
-errors, open tables, replication status, buffer information, row
-operations, logs, I/O operations, load graph, and more.
-You can monitor many servers at once with innotop.
diff --git a/system/innotop/innotop.SlackBuild b/system/innotop/innotop.SlackBuild
deleted file mode 100644
index feebb18fe5..0000000000
--- a/system/innotop/innotop.SlackBuild
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for innotop
-
-# Copyright 2010-2013 Heinz Wiesinger, Amsterdam, The Netherlands
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=innotop
-VERSION=${VERSION:-1.9.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH="noarch"
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-perl Makefile.PL INSTALLDIRS=vendor
-make
-make test
-make install DESTDIR=$PKG
-
-#Move man-pages to appropriate place
-mv $PKG/usr/share/man $PKG/usr/
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-find $PKG -depth -type d -empty -exec rm -rf {} \;
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog COPYING INSTALL MANIFEST \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/innotop/innotop.info b/system/innotop/innotop.info
deleted file mode 100644
index 5db755263b..0000000000
--- a/system/innotop/innotop.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="innotop"
-VERSION="1.9.1"
-HOMEPAGE="https://github.com/innotop/innotop"
-DOWNLOAD="https://distfiles.macports.org/innotop/innotop-1.9.1.tar.gz"
-MD5SUM="7979b7a074e43fe1f0d032034e234bac"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
diff --git a/system/innotop/slack-desc b/system/innotop/slack-desc
deleted file mode 100644
index 889a1b9c46..0000000000
--- a/system/innotop/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-innotop: innotop (MySQL / InnoDB monitor application)
-innotop:
-innotop: MySQL and InnoDB transaction/status monitor. Like 'top' for MySQL.
-innotop: Displays queries, InnoDB transactions, lock waits, deadlocks, foreign
-innotop: key errors, open tables, replication status, buffer information, row
-innotop: operations, logs, I/O operations, load graph, and more.
-innotop: You can monitor many servers at once with innotop.
-innotop:
-innotop: Homepage: https://github.com/innotop/innotop
-innotop:
-innotop:
diff --git a/system/inxi/README b/system/inxi/README
deleted file mode 100644
index acc274640e..0000000000
--- a/system/inxi/README
+++ /dev/null
@@ -1,4 +0,0 @@
-inxi (a command line system information tool)
-
-Its a newer, better system information script for irc, administration,
-and system troubleshooters.
diff --git a/system/inxi/inxi.SlackBuild b/system/inxi/inxi.SlackBuild
deleted file mode 100644
index 5bfc28111a..0000000000
--- a/system/inxi/inxi.SlackBuild
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for inxi
-
-# Copyright 2011-2012 Binh Nguyen <binhvng@gmail.com>
-# Copyright 2014-2019 Aaditya Bagga <aaditya_gnulinux@zoho.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=inxi
-VERSION=${VERSION:-3.0.37}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-_VERSION_SUFFIX=${_VERSION_SUFFIX:-1}
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION-$_VERSION_SUFFIX
-tar xvf $CWD/$PRGNAM-$VERSION-$_VERSION_SUFFIX.tar.gz || tar xvf $CWD/$VERSION-$_VERSION_SUFFIX.tar.gz
-cd $TMP/$PRGNAM-$VERSION-$_VERSION_SUFFIX
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-install -D -m 0755 inxi $PKG/usr/bin/inxi
-install -D -m 0644 inxi.1 $PKG/usr/man/man1/inxi.1
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp inxi.changelog $PKG/usr/doc/$PRGNAM-$VERSION/
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/inxi/inxi.info b/system/inxi/inxi.info
deleted file mode 100644
index e4a15bf195..0000000000
--- a/system/inxi/inxi.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="inxi"
-VERSION="3.0.37"
-HOMEPAGE="https://github.com/smxi/inxi"
-DOWNLOAD="https://github.com/smxi/inxi/archive/3.0.37-1.tar.gz"
-MD5SUM="672437de389fecd2ce807f9a36793576"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Aaditya Bagga"
-EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/inxi/slack-desc b/system/inxi/slack-desc
deleted file mode 100644
index 5c0b9e3895..0000000000
--- a/system/inxi/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-inxi: inxi (a full featured system information script)
-inxi:
-inxi: A newer, better system information script for irc,
-inxi: administration, and system troubleshooters.
-inxi:
-inxi: Homepage: https://github.com/smxi/inxi
-inxi:
-inxi:
-inxi:
-inxi:
-inxi:
diff --git a/system/iscan-data/README b/system/iscan-data/README
new file mode 100644
index 0000000000..e26cac2c62
--- /dev/null
+++ b/system/iscan-data/README
@@ -0,0 +1,2 @@
+This package contains EPSON Image Scan! data files which are
+required for using certain EPSON all-in-one devices.
diff --git a/system/iscan-data/iscan-data.SlackBuild b/system/iscan-data/iscan-data.SlackBuild
new file mode 100644
index 0000000000..0219b2faad
--- /dev/null
+++ b/system/iscan-data/iscan-data.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for iscan-data
+
+# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=iscan-data
+VERSION=${VERSION:-1.39.1}
+ADDVER=${ADDVER:-2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+DOCS="COPYING KNOWN-PROBLEMS SUPPORTED-DEVICES"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${VERSION}-${ADDVER}.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/iscan-data/iscan-data.info b/system/iscan-data/iscan-data.info
new file mode 100644
index 0000000000..a59ad78c7e
--- /dev/null
+++ b/system/iscan-data/iscan-data.info
@@ -0,0 +1,10 @@
+PRGNAM="iscan-data"
+VERSION="1.39.1"
+HOMEPAGE="http://epson.net"
+DOWNLOAD="http://support.epson.net/linux/src/scanner/iscan/iscan-data_1.39.1-2.tar.gz"
+MD5SUM="3a20ada6e5306048ce02e436bcb6afe3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/iscan-data/slack-desc b/system/iscan-data/slack-desc
new file mode 100644
index 0000000000..d3f025101e
--- /dev/null
+++ b/system/iscan-data/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+iscan-data: iscan-data (EPSON Image Scan! data files)
+iscan-data:
+iscan-data: This package contains EPSON Image Scan! data files which are
+iscan-data: required for using certain EPSON all-in-one devices.
+iscan-data:
+iscan-data: homepage: http://epson.net
+iscan-data:
+iscan-data:
+iscan-data:
+iscan-data:
+iscan-data:
diff --git a/system/iscan/README b/system/iscan/README
new file mode 100644
index 0000000000..3ae47041b7
--- /dev/null
+++ b/system/iscan/README
@@ -0,0 +1,4 @@
+EPSON Image Scan! for Linux enables you to print to a networked
+all-in-one EPSON printer. A SANE 'epkowa' backend is provided
+as well; scanning over the network requires the additional
+iscan-network-nt package which contains a protocol driver.
diff --git a/system/iscan/doinst.sh b/system/iscan/doinst.sh
new file mode 100644
index 0000000000..25f34e1d3a
--- /dev/null
+++ b/system/iscan/doinst.sh
@@ -0,0 +1,29 @@
+config() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ # If there's no config file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+ # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/sane.d/epkowa.conf.new
+
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+ /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
+
diff --git a/system/iscan/iscan.SlackBuild b/system/iscan/iscan.SlackBuild
new file mode 100644
index 0000000000..33276ad0c0
--- /dev/null
+++ b/system/iscan/iscan.SlackBuild
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+# Slackware build script for iscan
+
+# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Shamelessly ripped from Alien Bob's script: thank him for all the hard work!
+
+PRGNAM=iscan
+VERSION=${VERSION:-2.30.4}
+ADDVER=${ADDVER:-2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+# Minor library version of libpng on our system:
+PNGMINOR=$(pkg-config --modversion libpng |cut -d'.' -f2)
+if [ $PNGMINOR -gt 5 ]; then
+ PNG_LDFLAGS="-lpng16"
+elif [ $PNGMINOR -eq 4 ]; then
+ PNG_LDFLAGS="-lpng14"
+fi
+
+DOCS="COPYING INSTALL NEWS README non-free/COPYING*.txt"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${VERSION}-${ADDVER}.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Apply ArchLinux patches:
+# Allow linking against libpng15 and newer:
+patch -p0 < $CWD/patches/iscan_png15.patch
+# Patch for ambiguous div in jpegstream.cc:
+patch -p0 < $CWD/patches/jpegstream.cc.patch
+# Fix compilation error 'unknown type name u_char' on 32bit:
+patch -p1 < $CWD/patches/iscan-2.30.3_x86-unknown-types.patch
+# Add fix for CXX ABI different than 1002:
+ln -s libesmod-x86_64.c2.so non-free/libesmod-x86_64.so
+
+LDFLAGS="-ldl $PNG_LDFLAGS" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --enable-dependency-reduction \
+ --enable-frontend \
+ --enable-jpeg \
+ --enable-tiff \
+ --enable-png \
+ --enable-gimp \
+ --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+# Install the SANE backend configuration:
+mkdir -p $PKG/etc/sane.d/dll.d
+install -m0644 backend/epkowa.conf $PKG/etc/sane.d/epkowa.conf.new
+echo "epkowa" > $PKG/etc/sane.d/dll.d/epkowa.conf
+
+# Create the forgotten desktop menu:
+mkdir -p $PKG/usr/share/applications
+install -m0644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
+# Make the GIMP aware of the iscan plugin:
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/gimp/2.0/plug-ins
+ln -s /usr/bin/$PRGNAM $PKG/usr/lib$LIBDIRSUFFIX/gimp/2.0/plug-ins/
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/iscan/iscan.info b/system/iscan/iscan.info
new file mode 100644
index 0000000000..a299693821
--- /dev/null
+++ b/system/iscan/iscan.info
@@ -0,0 +1,10 @@
+PRGNAM="iscan"
+VERSION="2.30.4"
+HOMEPAGE="http://epson.net"
+DOWNLOAD="http://support.epson.net/linux/src/scanner/iscan/iscan_2.30.4-2.tar.gz"
+MD5SUM="b79c73341fcd7dd930381d50952b88c8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="iscan-data"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch b/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch
new file mode 100644
index 0000000000..9bb856ff83
--- /dev/null
+++ b/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch
@@ -0,0 +1,12 @@
+diff -ru a/sanei/sanei_pio.c b/sanei/sanei_pio.c
+--- a/sanei/sanei_pio.c 2019-03-01 10:44:36.723260142 -0600
++++ b/sanei/sanei_pio.c 2019-03-01 10:48:47.660693036 -0600
+@@ -73,6 +73,7 @@
+ #elif HAVE_SYS_HW_H
+ # include <sys/hw.h>
+ #elif defined(__i386__) && defined (__GNUC__)
++#include <sys/types.h>
+
+ static __inline__ void
+ outb (u_char value, u_long port)
+
diff --git a/system/iscan/patches/iscan_png15.patch b/system/iscan/patches/iscan_png15.patch
new file mode 100644
index 0000000000..8220ac4af3
--- /dev/null
+++ b/system/iscan/patches/iscan_png15.patch
@@ -0,0 +1,52 @@
+#
+# Thanks to Fabio Castelli, ArchLinux:
+# https://projects.archlinux.org/svntogit/community.git/tree/trunk/libpng15.patch?h=packages/iscan
+#
+--- lib/pngstream.cc 2011-12-01 02:30:53.000000000 +0100
++++ lib/pngstream.cc 2012-02-06 03:06:22.000000000 +0100
+@@ -83,7 +83,12 @@
+ #if HAVE_PNG_H
+ set_error_handler (_png, _info);
+
++/* when not interlacing (ie, only one pass), number of rows is image height: _v_sz */
++#if PNG_LIBPNG_VER > 10499
++ if (!_footer && _v_sz == lib->get_current_row_number(_png))
++#else
+ if (_header && !_footer && _png->num_rows == _png->flush_rows)
++#endif
+ {
+ lib->write_end (_png, _info);
+ _footer = true;
+@@ -167,6 +172,9 @@
+ funcsym (write_row);
+ funcsym (write_flush);
+ funcsym (write_end);
++#if PNG_LIBPNG_VER > 10499
++ funcsym (get_current_row_number);
++#endif
+
+ if (lib->access_version_number
+ && lib->create_write_struct
+@@ -176,6 +184,9 @@
+ && lib->set_IHDR
+ && lib->set_pHYs
+ && lib->set_invert_mono
++#if PNG_LIBPNG_VER > 10499
++ && lib->get_current_row_number
++#endif
+ && lib->write_info
+ && lib->write_row
+ && lib->write_flush
+--- lib/pngstream.hh 2011-12-01 02:30:53.000000000 +0100
++++ lib/pngstream.hh 2012-02-06 03:09:09.000000000 +0100
+@@ -108,6 +108,10 @@
+ png_structp);
+ fundecl (void, write_end,
+ png_structp, png_infop);
++#if PNG_LIBPNG_VER > 10499
++ fundecl (png_uint_32, get_current_row_number,
++ png_structp);
++#endif
+ #endif /* HAVE_PNG_H */
+ };
+ static png_lib_handle *lib;
diff --git a/system/iscan/patches/jpegstream.cc.patch b/system/iscan/patches/jpegstream.cc.patch
new file mode 100644
index 0000000000..988a25daea
--- /dev/null
+++ b/system/iscan/patches/jpegstream.cc.patch
@@ -0,0 +1,21 @@
+--- lib/jpegstream.cc.orig 2016-06-20 06:10:38.000000000 +0200
++++ lib/jpegstream.cc 2016-07-10 18:45:40.511301054 +0200
+@@ -33,7 +33,7 @@
+
+ #include "jpegstream.hh"
+
+-#include <cstdlib>
++// #include <cstdlib>
+ #include <ios>
+
+ namespace iscan
+@@ -82,7 +82,8 @@
+ // only that _bits != 8.
+ for (unsigned int i = 0; i < _h_sz; ++i)
+ {
+- div_t index = div (i, 8 * sizeof (JSAMPLE));
++ div_t index = div (static_cast<int>(i),
++ static_cast<int>(8 * sizeof (JSAMPLE)));
+ int offset = 8 * sizeof (JSAMPLE) - 1 - index.rem;
+ _scanline[i] = ((line[index.quot] & (1 << offset))
+ ? 0 : ~0);
diff --git a/system/iscan/slack-desc b/system/iscan/slack-desc
new file mode 100644
index 0000000000..56fcd9b5c0
--- /dev/null
+++ b/system/iscan/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+iscan: iscan (front-end for EPSON all-in-one devices)
+iscan:
+iscan: EPSON Image Scan! for Linux enables you to print to a networked
+iscan: all-in-one EPSON printer. A SANE 'epkowa' backend is provided
+iscan: as well; scanning over the network requires the additional
+iscan: iscan-network-nt package which contains a protocol driver.
+iscan:
+iscan: homepage: http://epson.net
+iscan:
+iscan:
+iscan:
diff --git a/system/jdupes/jdupes.SlackBuild b/system/jdupes/jdupes.SlackBuild
index 97ced62617..4d4e59ab29 100644
--- a/system/jdupes/jdupes.SlackBuild
+++ b/system/jdupes/jdupes.SlackBuild
@@ -62,6 +62,7 @@ cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
+rm testdir/recursed_a/symlink_infinite_loop
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/jmtpfs/README b/system/jmtpfs/README
deleted file mode 100644
index d43b1a7ac3..0000000000
--- a/system/jmtpfs/README
+++ /dev/null
@@ -1,10 +0,0 @@
-jmtpfs is a FUSE and libmtp based filesystem for accessing MTP
-(Media Transfer Protocol) devices. It was specifically designed
-for exchaning files between Linux (and Mac OS X) systems and
-newer Android devices that support MTP but not USB Mass Storage.
-
-The goal is to create a well behaved filesystem, allowing tools
-like find and rsync to work as expected. MTP file types are set
-automatically based on file type detection using libmagic.
-Setting the file appears to be necessary for some Android apps,
-like Gallery, to be able to find and use the files.
diff --git a/system/jmtpfs/jmtpfs.SlackBuild b/system/jmtpfs/jmtpfs.SlackBuild
deleted file mode 100644
index 545efff32e..0000000000
--- a/system/jmtpfs/jmtpfs.SlackBuild
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for jmtpfs
-
-# Copyright 2015 Andre Barboza, Belo Horizonte, Minas Gerais, Brazil
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=jmtpfs
-VERSION=${VERSION:-0.5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CXXFLAGS="$SLKCFLAGS -lpthread" \
-./configure \
- --prefix=/usr \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/jmtpfs/jmtpfs.info b/system/jmtpfs/jmtpfs.info
deleted file mode 100644
index 897c93dc9f..0000000000
--- a/system/jmtpfs/jmtpfs.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="jmtpfs"
-VERSION="0.5"
-HOMEPAGE="https://github.com/JasonFerrara/jmtpfs"
-DOWNLOAD="https://github.com/JasonFerrara/jmtpfs/archive/v0.5.tar.gz"
-MD5SUM="501e51530d3c04d63e9ac96d794bf5c5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Andre Barboza"
-EMAIL="bmg.andre@gmail.com"
diff --git a/system/jmtpfs/slack-desc b/system/jmtpfs/slack-desc
deleted file mode 100644
index 7fab708cd9..0000000000
--- a/system/jmtpfs/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-jmtpfs: jmtpfs (FUSE and libmtp based filesystem for accessing MTP)
-jmtpfs:
-jmtpfs: jmtpfs is a FUSE and libmtp based filesystem for accessing MTP
-jmtpfs: (Media Transfer Protocol) devices. It was specifically designed
-jmtpfs: for exchaning files between Linux (and Mac OS X) systems and
-jmtpfs: newer Android devices that support MTP but not USB Mass
-jmtpfs: Storage.
-jmtpfs:
-jmtpfs:
-jmtpfs:
-jmtpfs: https://github.com/JasonFerrara/jmtpfs
diff --git a/system/lbzip2/README b/system/lbzip2/README
deleted file mode 100644
index 2092f0ebfb..0000000000
--- a/system/lbzip2/README
+++ /dev/null
@@ -1,2 +0,0 @@
-lbzip2 is a multi-threaded bzip2/bunzip2 filter that doesn't depend on the
-lseek() system call and so isn't restricted to regular files.
diff --git a/system/lbzip2/lbzip2.SlackBuild b/system/lbzip2/lbzip2.SlackBuild
deleted file mode 100644
index 801213a810..0000000000
--- a/system/lbzip2/lbzip2.SlackBuild
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for lbzip2
-#
-# Copyright 2009-2010 Erik W. Hanson, Minneapolis, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by B. Watson <yalhcru@gmail.com>.
-
-# 20170302 bkw: use long-format github URL
-
-# 20150519 bkw:
-# - took over maintenance
-# - bump VERSION to 2.5
-# - add gnulib dependency
-# - make VERSION respect environment
-# - clean up slack-desc
-
-PRGNAM=lbzip2
-VERSION=${VERSION:-2.5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Upstream says automake-1.14 is required, but our
-# 1.11.5 works fine if we change the version check.
-sed -i '/^AM_INIT_AUTOMAKE/s,1\.14,1.11.5,' configure.ac
-
-sh build-aux/autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-gzip $PKG/usr/man/man1/$PRGNAM.1
-
-# The other man pages just source lbzip2.1. Make them
-# symlinks instead (easier to deal with).
-for i in lbunzip2 lbzcat; do
- rm -f $PKG/usr/man/man1/$i.1
- ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$i.1.gz
-done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ALGORITHM AUTHORS COPYING ChangeLog* NEWS README THANKS \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/lbzip2/lbzip2.info b/system/lbzip2/lbzip2.info
deleted file mode 100644
index c1ccd5d21a..0000000000
--- a/system/lbzip2/lbzip2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="lbzip2"
-VERSION="2.5"
-HOMEPAGE="https://github.com/kjn/lbzip2/"
-DOWNLOAD="https://github.com/kjn/lbzip2/archive/v2.5/lbzip2-2.5.tar.gz"
-MD5SUM="288e404f325d9073bdc80759cae30adc"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="gnulib"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/lbzip2/slack-desc b/system/lbzip2/slack-desc
deleted file mode 100644
index fb3286dd7e..0000000000
--- a/system/lbzip2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-lbzip2: lbzip2 (a pthreads-based parallel bzip2/bunzip2)
-lbzip2:
-lbzip2: Lbzip2 is a Pthreads-based parallel bzip2/bunzip2 filter passable to
-lbzip2: GNU tar with the --use-compress-program option. It isn't restricted
-lbzip2: to regular files on input, nor output.
-lbzip2:
-lbzip2:
-lbzip2:
-lbzip2:
-lbzip2:
-lbzip2:
diff --git a/system/lilyterm/lilyterm.SlackBuild b/system/lilyterm/lilyterm.SlackBuild
index 6d4a4a5835..b5bc2dfe1e 100644
--- a/system/lilyterm/lilyterm.SlackBuild
+++ b/system/lilyterm/lilyterm.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=lilyterm
-VERSION=${VERSION:-0.9.9.2}
+VERSION=${VERSION:-0.9.9.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/lilyterm/lilyterm.info b/system/lilyterm/lilyterm.info
index 18760fdefe..c7f00b5797 100644
--- a/system/lilyterm/lilyterm.info
+++ b/system/lilyterm/lilyterm.info
@@ -1,10 +1,10 @@
PRGNAM="lilyterm"
-VERSION="0.9.9.2"
+VERSION="0.9.9.4"
HOMEPAGE="https://lilyterm.luna.com.tw/index.html"
-DOWNLOAD="https://lilyterm.luna.com.tw/file/lilyterm-0.9.9.2.tar.gz"
-MD5SUM="d68dd29ce4894f765adba1efd470f90e"
+DOWNLOAD="https://lilyterm.luna.com.tw/file/lilyterm-0.9.9.4.tar.gz"
+MD5SUM="3bbfd4037d45a16b1b45846ce51d100a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
MAINTAINER="Emil Torofiev"
EMAIL="etorofiev@gmail.com"
diff --git a/system/lxtask/fix-no-common.patch b/system/lxtask/fix-no-common.patch
new file mode 100644
index 0000000000..d986741b21
--- /dev/null
+++ b/system/lxtask/fix-no-common.patch
@@ -0,0 +1,73 @@
+diff -Naur a/src/interface.c b/src/interface.c
+--- a/src/interface.c 2016-02-21 01:06:17.000000000 +0100
++++ b/src/interface.c 2016-09-13 19:37:28.038350050 +0200
+@@ -26,6 +26,18 @@
+ #include <glib/gi18n.h>
+ #include "interface.h"
+
++GtkTreeStore *list_store;
++GtkTreeSelection *selection;
++GtkWidget *treeview;
++GtkWidget *mainmenu;
++GtkWidget *taskpopup;
++GtkWidget *cpu_usage_progress_bar;
++GtkWidget *mem_usage_progress_bar;
++GtkWidget *cpu_usage_progress_bar_box;
++GtkWidget *mem_usage_progress_bar_box;
++
++GtkTreeViewColumn *column;
++
+ #define GLADE_HOOKUP_OBJECT(component,widget,name) \
+ g_object_set_data_full (G_OBJECT (component), name, \
+ gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
+diff -Naur a/src/interface.h b/src/interface.h
+--- a/src/interface.h 2014-09-16 14:27:52.000000000 +0200
++++ b/src/interface.h 2016-09-13 19:32:22.816372893 +0200
+@@ -38,16 +38,15 @@
+ #include "callbacks.h"
+ #include "types.h"
+
+-GtkTreeStore *list_store;
+-GtkTreeSelection *selection;
+-GtkWidget *treeview;
+-GtkWidget *mainmenu;
+-GtkWidget *taskpopup;
+-GtkWidget *priopopup;
+-GtkWidget *cpu_usage_progress_bar;
+-GtkWidget *mem_usage_progress_bar;
+-GtkWidget *cpu_usage_progress_bar_box;
+-GtkWidget *mem_usage_progress_bar_box;
++extern GtkTreeStore *list_store;
++extern GtkTreeSelection *selection;
++extern GtkWidget *treeview;
++extern GtkWidget *mainmenu;
++extern GtkWidget *taskpopup;
++extern GtkWidget *cpu_usage_progress_bar;
++extern GtkWidget *mem_usage_progress_bar;
++extern GtkWidget *cpu_usage_progress_bar_box;
++extern GtkWidget *mem_usage_progress_bar_box;
+
+ enum {
+ COLUMN_NAME = 0,
+@@ -61,7 +60,7 @@
+ COLUMN_PPID
+ };
+
+-GtkTreeViewColumn *column;
++extern GtkTreeViewColumn *column;
+
+ void change_list_store_view(void);
+ void create_list_store(void);
+diff -Naur a/src/types.h b/src/types.h
+--- a/src/types.h 2014-09-16 14:27:52.000000000 +0200
++++ b/src/types.h 2016-09-13 19:25:51.014402217 +0200
+@@ -77,9 +77,6 @@
+ extern gint win_width;
+ extern gint win_height;
+
+-const gchar *custom_signal_0;
+-const gchar *custom_signal_1;
+-
+ extern int page_size;
+
+ #endif
diff --git a/system/lxtask/lxtask.SlackBuild b/system/lxtask/lxtask.SlackBuild
index 773b8f900d..3db22407fb 100644
--- a/system/lxtask/lxtask.SlackBuild
+++ b/system/lxtask/lxtask.SlackBuild
@@ -107,6 +107,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Fix building wit gcc >= 10.x
+patch -p1 < $CWD/fix-no-common.patch
+
sh autogen.sh || true
CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info
index 8f5130af46..bd782fb65f 100644
--- a/system/lxterminal/lxterminal.info
+++ b/system/lxterminal/lxterminal.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/lxde/lxterminal-0.3.2.tar.xz"
MD5SUM="62e57c3aafb831505cc1638b2b737cc9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
MAINTAINER="Matteo Bernardini"
EMAIL="ponce@slackbuilds.org"
diff --git a/system/lz4/README b/system/lz4/README
deleted file mode 100644
index f97be58647..0000000000
--- a/system/lz4/README
+++ /dev/null
@@ -1,9 +0,0 @@
-lz4 (compression algorithm)
-
-LZ4 is lossless compression algorithm, providing compression speed at
-400 MB/s per core (0.16 Bytes/cycle). It also features an extremely fast
-decoder, with speed in multiple GB/s per core (0.71 Bytes/cycle). A high
-compression derivative, called LZ4_HC, is also provided. It trades CPU
-time for compression ratio.
-
-This build includes liblz4 and the command-line lz4 tools.
diff --git a/system/lz4/lz4.SlackBuild b/system/lz4/lz4.SlackBuild
deleted file mode 100644
index f164983623..0000000000
--- a/system/lz4/lz4.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for lz4
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# 20191127 bkw: update for 1.9.2
-# 20180911 bkw: update for 1.8.3
-# 20180611 bkw: update for 1.8.2. don't try to use the updated script
-# to build older versions, the man pages will end up
-# in the wrong place due to upstream changing how they
-# interpret MANDIR
-# 20180114 bkw: update for 1.8.1.2. had to add -j1 to the make command.
-# 20170819 bkw: update for 1.8.0
-# 20170302 bkw: use github long-format URL
-# 20170122 bkw: update for 1.7.5
-
-PRGNAM=lz4
-VERSION=${VERSION:-1.9.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz --exclude visual
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-# -j1 was necessary in 1.8.1.2. Not sure it's still needed in 1.8.2, but
-# lz4 is small & builds pretty fast even with -j1, so I'll leave it for now.
-make -j1 \
- CFLAGS="$SLKCFLAGS" \
- PREFIX=/usr \
- LIBDIR=/usr/lib$LIBDIRSUFFIX \
- MANDIR=/usr/man \
- DESTDIR=$PKG \
- BUILD_STATIC=no \
- default install
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $DOCDIR
-cp -a NEWS README* doc/* examples $DOCDIR
-
-# the library is BSD licensed, but the programs are GPL.
-cat programs/COPYING > $DOCDIR/LICENSE.programs.txt
-cat lib/LICENSE > $DOCDIR/LICENSE.lib.txt
-
-cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/lz4/lz4.info b/system/lz4/lz4.info
deleted file mode 100644
index dc19a75be8..0000000000
--- a/system/lz4/lz4.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="lz4"
-VERSION="1.9.2"
-HOMEPAGE="https://lz4.github.io/lz4/"
-DOWNLOAD="https://github.com/lz4/lz4/archive/v1.9.2/lz4-1.9.2.tar.gz"
-MD5SUM="3898c56c82fb3d9455aefd48db48eaad"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/lz4/slack-desc b/system/lz4/slack-desc
deleted file mode 100644
index b9c624ad7d..0000000000
--- a/system/lz4/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-lz4: lz4 (compression algorithm)
-lz4:
-lz4: LZ4 is lossless compression algorithm, providing compression
-lz4: speed at 400 MB/s per core (0.16 Bytes/cycle). It also features
-lz4: an extremely fast decoder, with speed in multiple GB/s per core
-lz4: (0.71 Bytes/cycle). A high compression derivative, called LZ4_HC,
-lz4: is also provided. It trades CPU time for compression ratio.
-lz4:
-lz4:
-lz4:
-lz4:
diff --git a/system/man-db/README b/system/man-db/README
deleted file mode 100644
index 1e48863b3a..0000000000
--- a/system/man-db/README
+++ /dev/null
@@ -1,13 +0,0 @@
-man-db (database-driven manual pager suite)
-
-This package provides the man command and related utilities for examining
-on-line help files (manual pages). It can act as a replacement for
-Slackware's man package. It has several enhancements over man, including
-an indexed database for searches with -k or apropos, the ability to
-easily view man pages in a browser, better i18n support, and a much more
-efficient implementation of the -K (full text search) option.
-
-This build includes a complete install of libpipeline.
-
-By default, man-db doesn't conflict with Slackware's man package. See
-README.Slackware for details.
diff --git a/system/man-db/README.Slackware b/system/man-db/README.Slackware
deleted file mode 100644
index 165e9dfa4c..0000000000
--- a/system/man-db/README.Slackware
+++ /dev/null
@@ -1,49 +0,0 @@
-By default, man-db can be installed alongside Slackware's man package
-without conflict, as it installs its binaries and man pages into
-/opt/man-db. After installation, either log out and back in, or source
-/etc/profile.d/man-db.sh in your shell (this adjusts $PATH so the man
-command from /opt/man-db will be found first).
-
-Alternately, man-db can be built as a replacement for Slackware's
-man package. To do this, set USR=yes in the script's environment,
-and "removepkg man" before installing man-db. No profile scripts are
-installed in this case.
-
-When installing man-db, the doinst.sh script may take several minutes to
-run. This is because it's indexing all the man pages on the system. Also,
-a cron job is installed in /etc/cron.daily, which adds newly-installed
-man pages to the database. The index speeds up searching via "man -k"
-or "apropos". The disadvantage is that newly-installed man pages won't
-be found in these searches until the database has been updated, so any
-time you install new man pages, you'll want to run "mandb" as root, or
-wait for cron to do it for you (if you don't do this, the new pages can
-still be displayed, they just won't be searchable). The indexing runs
-quickly once the initial database has been created, so the cron job or
-manual update shouldn't bring your system to its knees.
-
-The database is located in /var/cache/man, and on a full Slackware install
-will be approximately 5MB in size. During index creation, approximately
-10MB in /var is used. If you decide to removepkg man-db, you'll probably
-also want to get rid of its database with "rm -rf /var/cache/man". If
-the database gets corrupted somehow, it can be regenerated from scratch
-by running "mandb -c" or just reinstalling the man-db package.
-
-Although man-db supports caching formatted pages ("cat" pages), it's
-disabled in this build, to make man-db behave more like Slackware's man
-(which supports caching, but it's disabled). On modern (and even 10+
-year old) systems, the small amount of extra time it takes to format
-a man page every time it's viewed is probably not worth the headaches
-caused by stale cat pages.
-
-Unlike some distro packages of man-db, this build doesn't install man or
-mandb setuid. This prevents caching cat pages from working (see above),
-and prevents man from automatically adding new man pages to the database
-the first time a user views them (they will be indexed by the cron job,
-or by root manually running "mandb", if you're impatient).
-
-A word about i18n support: the whole reason I packaged man-db is because
-Slackware's man can't handle Japanese man pages, and I couldn't come
-up with a way to make them work after several hours of research and
-man.conf editing. With man-db, they Just Work, with LANG=ja_JP.UTF-8
-(now all I have to do is learn to read Japanese). In general, UTF-8
-locales are preferred for man-db, although non-UTF-8 is also supported.
diff --git a/system/man-db/doinst.sh b/system/man-db/doinst.sh
deleted file mode 100644
index cb474322c8..0000000000
--- a/system/man-db/doinst.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/man_db.conf.new
-
-# In English, the if/find below means "only run the database creation if
-# it was last done over an hour ago". This is needed because upgradepkg
-# runs doinst.sh twice, but I don't want the 10+ minute long database
-# creation to happen twice on upgrade (or at all, when I'm repeatedly
-# reinstalling man-db for testing purposes).
-
-if \
- [ ! -e /var/cache/man/man-db ] || \
- [ -n "$( find var/cache/man/ -type d -a -name man-db -a -mmin +60 )" ]
-then
-# Generate the initial man database (or rebuild it if it exists).
-# We want to skip this step if installing somewhere besides / (e.g. with
-# the -root option or ROOT env variable set for installpkg), hence the
-# readlink silliness.
-
-# The -c option means it blows away any existing db. I thought about
-# leaving it off (it will still create the db if it doesn't exist),
-# but decided it's better to build it fresh if the package gets
-# reinstalled (in case the db format has changed, or in case the
-# db is corrupted and the user is trying to fix it by reinstalling
-# this package).
-
-# the 2>/dev/null was added for 2.7.6 because it complains about
-# missing CACHEDIR.TAG files... which don't matter, because we've
-# got NOCACHE in the config file.
- ( \
- [ -x /bin/readlink ] && \
- [ "$( /bin/readlink -f $( pwd ) )" = "/" ] && \
- ( [ -x /opt/man-db/bin/mandb ] && /opt/man-db/bin/mandb -c -q ) || \
- ( [ -x /usr/bin/mandb ] && /usr/bin/mandb -c -q ) \
- ) 2>/dev/null
-fi
diff --git a/system/man-db/dont_write_in_usr.diff b/system/man-db/dont_write_in_usr.diff
deleted file mode 100644
index 8f71585981..0000000000
--- a/system/man-db/dont_write_in_usr.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naur man-db-2.7.6.1/configure man-db-2.7.6.1.patched/configure
---- man-db-2.7.6.1/configure 2016-12-12 07:43:48.000000000 -0500
-+++ man-db-2.7.6.1.patched/configure 2017-03-04 16:49:57.389893574 -0500
-@@ -25809,46 +25809,8 @@
-
-
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
--$as_echo_n "checking for long file names... " >&6; }
--if ${ac_cv_sys_long_file_names+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- ac_cv_sys_long_file_names=yes
--# Test for long file names in all the places we know might matter:
--# . the current directory, where building will happen
--# $prefix/lib where we will be installing things
--# $exec_prefix/lib likewise
--# $TMPDIR if set, where it might want to write temporary files
--# /tmp where it might want to write temporary files
--# /var/tmp likewise
--# /usr/tmp likewise
--for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do
-- # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib
-- # in the usual case where exec_prefix is '${prefix}'.
-- case $ac_dir in #(
-- . | /* | ?:[\\/]*) ;; #(
-- *) continue;;
-- esac
-- test -w "$ac_dir/." || continue # It is less confusing to not echo anything here.
-- ac_xdir=$ac_dir/cf$$
-- (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue
-- ac_tf1=$ac_xdir/conftest9012345
-- ac_tf2=$ac_xdir/conftest9012346
-- touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" ||
-- ac_cv_sys_long_file_names=no
-- rm -f -r "$ac_xdir" 2>/dev/null
-- test $ac_cv_sys_long_file_names = no && break
--done
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_long_file_names" >&5
--$as_echo "$ac_cv_sys_long_file_names" >&6; }
--if test $ac_cv_sys_long_file_names = yes; then
--
- $as_echo "#define HAVE_LONG_FILE_NAMES 1" >>confdefs.h
-
--fi
--
-
-
-
diff --git a/system/man-db/man-db.SlackBuild b/system/man-db/man-db.SlackBuild
deleted file mode 100644
index 1c9d903fc3..0000000000
--- a/system/man-db/man-db.SlackBuild
+++ /dev/null
@@ -1,223 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for man-db
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# 20200316 bkw: update for v2.9.1 (resync with -current)
-# 20191201 bkw: update for v2.9.0 (to match -current again).
-# Also got rid of the systemd-specific stuff properly (via configure opts).
-
-# 20180801 bkw: update for v2.8.4.
-# 20180611 bkw: update for v2.8.3, to match what Pat has in -current.
-
-# 20180208 bkw: update for man-db 2.8.0, libpipeline 1.5.0.
-# This may be the last SBo update, since Pat has imported man-db
-# into Slackware-current. Depends on how long it is from now until
-# the next release: I'll maintain this until SBo stops accepting
-# submissions for 14.2.
-
-# 20170305 bkw:
-# - BUILD=2
-# - get rid of systemd-specific /usr/lib/tmpfiles.d from package.
-# - patch configure so it doesn't write to /usr/lib.
-
-# 20170215 bkw:
-# - update for 2.7.6.1 (whoops, last update wasn't for the latest version
-# - only update the cache in doinst.sh if it's over an hour old. this
-# takes several minutes, and happens twice (uselessly) if the package
-# is upgraded (since upgradepkg runs doinst.sh twice). waiting an hour
-# also makes my life easier when I'm testing this script.
-# - fix man-db.cron so it works even if USR=yes (whoops), and stop trying
-# to chown the cache to the nonexistent 'man' user.
-
-# 20170125 bkw:
-# - update for 2.7.6.
-# - add --disable-cache-owner. TODO: revisit this at some
-# point. Maybe create a dedicated 'man' user, or use one of the existing
-# users like 'bin' or 'operator'.
-
-# 20160726 bkw:
-# - update for 2.7.5.
-
-# 20150507 bkw:
-# - update for 2.7.1.
-# - fix homepage in .info file.
-# - had to update libpipeline to 1.4.0.
-
-# 20140924 bkw:
-# - update for 2.7.0.1, which fixes the clash between man-db's zsoelim
-# and groff's zsoelim.
-# - update README and README.Slackware slightly.
-
-PRGNAM=man-db
-VERSION=${VERSION:-2.9.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-# By default, install binaries to /opt, so as not to stomp on Slackware's
-# man pkg. We will have to include a /etc/profile.d script to set PATH,
-# MANPATH, etc. Note that only binaries and the man pages for man-db itself
-# go to /opt. Everything else (libpipeline, man-db's shared libs, localized
-# messages, etc) goes to /usr as usual.
-
-# If you want a proper replacement for Slack's man pkg, build with
-# USR="yes", which puts the binaries in the usual places. If your name is
-# Patrick V. and you're finally replacing man with man-db in Slackware,
-# feel free to uncomment the next line:
-#USR="yes"
-
-BINDIR=/opt/$PRGNAM/bin
-[ "${USR:-no}" = "yes" ] && BINDIR=/usr/bin
-MANDIR="${BINDIR/bin/man}"
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-
-# libpipeline is a pretty niche-market library. It used to be bundled
-# in the man-db source, and as far as I can tell, nothing else uses it.
-# Instead of making it a separate build and external dep, we'll just
-# bundle it here.
-LIBNAM=libpipeline
-LIBVER=1.5.2
-
-cd $TMP
-rm -rf $LIBNAM-$LIBVER
-tar xvf $CWD/$LIBNAM-$LIBVER.tar.gz
-cd $LIBNAM-$LIBVER
-chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER
-cp -a COPYING ChangeLog* NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER
-
-# now build man-db itself, using the libpipeline installed in $PKG
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-# The 'checking for long filenames' test in the configure script writes to
-# /usr/lib, which is bad behaviour for a configure script. Not to mention
-# wrong (it assumes configure is always being run as root). We already
-# know we have long filename support, because we live in the 21st century
-# now, so this patch gets rid of the test and force-enables it.
-patch -p1 < $CWD/dont_write_in_usr.diff
-
-# The circumlocutions below are needed because doing it the sane way:
-# libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX -lpipeline"
-# gets broken by libtool (it *insists* on replacing -lpipeline with
-# /usr/lib64/libpipeline.so, which will fail if it's an older version).
-LD_LIBRARY_PATH="$PKG/usr/lib$LIBDIRSUFFIX" \
-LDFLAGS="$PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \
-libpipeline_CFLAGS="-I$PKG/usr/include" \
-libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --with-systemdtmpfilesdir=no \
- --with-systemdsystemunitdir=no \
- --disable-setuid \
- --disable-cache-owner \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=$MANDIR \
- --bindir=$BINDIR \
- --sbindir=${BINDIR/bin/sbin} \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-# There will always be man pages here, regardless of USR=yes or no.
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-if [ "${USR:-no}" != "yes" ]; then
- # separate dir full of man pages and symlinks in /opt
- find $PKG/$MANDIR -type f -exec gzip -9 {} \;
- for i in $( find $PKG/$MANDIR -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
- # only need the profile.d stuff if installing to /opt
- mkdir -p $PKG/etc/profile.d
- install -m0755 -oroot -groot $CWD/$PRGNAM.sh $CWD/$PRGNAM.csh $PKG/etc/profile.d
-fi
-
-# no special ownership or perms needed here since we --disable-setuid
-mkdir -p $PKG/var/cache/man
-
-# only ship a daily cronjob, don't need a weekly one like Debian has.
-mkdir -p $PKG/etc/cron.daily
-install -m0755 -oroot -groot $CWD/$PRGNAM.cron $PKG/etc/cron.daily/$PRGNAM
-
-# modified default config, customized for Slackware. See the conf file for
-# list of changes.
-zcat $CWD/man_db.conf.new.gz \
- | sed "s,@LIBDIRSUFFIX@,$LIBDIRSUFFIX,g" \
- > $PKG/etc/man_db.conf.new
-rm -rf $PKG/etc/man_db.conf
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS Change* FAQ NEWS README docs/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-sed "s,@BINDIR@,$BINDIR," < $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-# N.B. the -p option is actually needed here (for libpipeline.so).
-cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/man-db/man-db.cron b/system/man-db/man-db.cron
deleted file mode 100644
index 93c3a00ff2..0000000000
--- a/system/man-db/man-db.cron
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# man-db daily cronjob, part of the slackbuilds.org man-db package.
-# Author: B. Watson.
-# Adapted from Debian's man-db package, so I guess the license is GPL.
-
-set -e
-
-if ! [ -d /var/cache/man ]; then
- # Recover from deletion, per FHS.
- mkdir -p /var/cache/man
- chown root:root /var/cache/man || true
- chmod 2755 /var/cache/man
-fi
-
-# expunge old catman pages which have not been read in a week
-# commented out, as we've got cat pages disabled in this build. Left
-# here for reference in case someone really wants to enable cat pages
-# some day.
-#find /var/cache/man -type f -name '*.gz' -atime +6 -print0 | xargs -r0 rm -f &> /dev/null
-
-# regenerate man database. /opt/man-db/bin probably isn't in cron's $PATH,
-# so check for it specially, otherwise use $PATH.
-if [ -x /opt/man-db/bin/mandb ]; then
- MANDB=/opt/man-db/bin/mandb
-else
- MANDB=mandb
-fi
-
-$MANDB --no-purge --quiet
diff --git a/system/man-db/man-db.csh b/system/man-db/man-db.csh
deleted file mode 100644
index 6cf39ce0ba..0000000000
--- a/system/man-db/man-db.csh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/csh
-
-# Set up environment for man-db. This file is part of the slackbuilds.org
-# man-db build.
-
-# Author: B. Watson. License: WTFPL
-
-setenv MANPATH /opt/man-db/man:$MANPATH
-set path = ( /opt/man-db/bin $path )
-if ("`id -u`" == "0") then
- set path = ( /opt/man-db/sbin $path )
-endif
diff --git a/system/man-db/man-db.info b/system/man-db/man-db.info
deleted file mode 100644
index 3106bed766..0000000000
--- a/system/man-db/man-db.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="man-db"
-VERSION="2.9.1"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.9.1.tar.xz \
- http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.5.2.tar.gz"
-MD5SUM="593f4f0a26ab4f66f5b81cf6c0c7364c \
- 169de4cc1f6f7f7d430a5bed858b2fd3"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/man-db/man-db.sh b/system/man-db/man-db.sh
deleted file mode 100644
index 54c9b34ae0..0000000000
--- a/system/man-db/man-db.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Set up environment for man-db. This file is part of the slackbuilds.org
-# man-db build.
-
-# Author: B. Watson. License: WTFPL
-
-MANPATH="/opt/man-db/man:$MANPATH"
-PATH="/opt/man-db/bin:$PATH"
-
-if [ "$( id -u )" = "0" ]; then
- PATH="/opt/man-db/sbin:$PATH"
-fi
-
-export MANPATH
-export PATH
diff --git a/system/man-db/man_db.conf.new.gz b/system/man-db/man_db.conf.new.gz
deleted file mode 100644
index 1d128438c4..0000000000
--- a/system/man-db/man_db.conf.new.gz
+++ /dev/null
Binary files differ
diff --git a/system/man-db/slack-desc b/system/man-db/slack-desc
deleted file mode 100644
index 5abdea8fb6..0000000000
--- a/system/man-db/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-man-db: man-db (database-driven manual pager suite)
-man-db:
-man-db: This package provides the man command and related utilities
-man-db: for examining on-line help files (manual pages). It can act as a
-man-db: replacement for Slackware's man package. It has several enhancements
-man-db: over man, including an indexed database for searches with -k or
-man-db: apropos, the ability to easily view man pages in a browser, better
-man-db: i18n support, and a much more efficient implementation of the -K
-man-db: (full text search) option.
-man-db:
-man-db:
diff --git a/system/mlocate/README b/system/mlocate/README
deleted file mode 100644
index f2029ce76a..0000000000
--- a/system/mlocate/README
+++ /dev/null
@@ -1,31 +0,0 @@
-mlocate (locate/updatedb implementation)
-
-mlocate is a locate/updatedb implementation. It keeps a database of all
-existing files and allows you to lookup files by name. The 'm' stands for
-"merging": updatedb reuses the existing database to avoid rereading most
-of the file system, which makes updatedb faster and does not trash the
-system caches as much as traditional locate implementations.
-
-This is the same "locate" that's in Slackware-current (and eventually 15.0).
-
-This conflicts with Slackware 14.2's slocate package! Before installing
-this, add slocate to /etc/slackpkg/blacklist and then:
-
- # removepkg slocate
-
-It's also recommended to:
-
- # rm -rf /var/lib/slocate /etc/updatedb.conf
-
-The locate database will be created daily, as a cron job. If you don't
-want to wait, you can create it manually:
-
- # /etc/cron.daily/mlocate
-
-If you want to revert to Slackware's slocate, remove slocate from
-/etc/slackpkg/blacklist, then:
-
- # removepkg mlocate
- # rm -rf /var/lib/mlocate /etc/updatedb.conf
- # slackpkg update
- # slackpkg install slocate
diff --git a/system/mlocate/doinst.sh b/system/mlocate/doinst.sh
deleted file mode 100644
index 8afb2a4fff..0000000000
--- a/system/mlocate/doinst.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# doinst.sh copied from Pat's, got rid of the stuff that creates the
-# slocate group.
-
-config() {
- NEW="$1"
- OLD="`dirname $NEW`/`basename $NEW .new`"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-config etc/updatedb.conf.new
-
-if [ ! -r var/lib/mlocate/mlocate.db ]; then
- touch var/lib/mlocate/mlocate.db
- chown root:slocate var/lib/mlocate/mlocate.db
- chmod 640 var/lib/mlocate/mlocate.db
-fi
-
diff --git a/system/mlocate/mlocate-run-updatedb b/system/mlocate/mlocate-run-updatedb
deleted file mode 100644
index 7d3f2ac526..0000000000
--- a/system/mlocate/mlocate-run-updatedb
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-nodevs=$(< /proc/filesystems awk '$1 == "nodev" && $2 != "rootfs" && $2 != "zfs" { print $2 }')
-/usr/bin/updatedb -f "$nodevs"
diff --git a/system/mlocate/mlocate.SlackBuild b/system/mlocate/mlocate.SlackBuild
deleted file mode 100644
index 9f213fbb54..0000000000
--- a/system/mlocate/mlocate.SlackBuild
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for mlocate
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# Notes:
-# - This is intended to be 100% compatible with the mlocate in -current.
-# - mlocate and slocate can't read each others' database formats. Bummer.
-# - DOWNLOAD is upstream's site, but the file is identical to the one
-# from Pat's source/ dir. I used upstream so the file won't disappear if
-# Pat upgrades or changes his mind.
-# - mlocate on -current uses the slocate group (there's no mlocate group),
-# so I do the same here.
-# - mlocate's database is about 40% larger than slocate's, on my build box.
-# Not a real concern unless you're building a tiny embedded system.
-
-PRGNAM=mlocate
-VERSION=${VERSION:-0.26}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var/lib \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make groupname=slocate
-make install-strip DESTDIR=$PKG
-
-gzip $PKG/usr/man/man?/*.?
-
-# This stuff comes straight from Pat's mlocate.SlackBuild:
-mkdir -p $PKG/etc
-cp -a $CWD/updatedb.conf.new $PKG/etc/updatedb.conf.new
-chown root:root $PKG/etc/updatedb.conf.new
-chmod 644 $PKG/etc/updatedb.conf.new
-
-mv $PKG/usr/bin/locate $PKG/usr/bin/mlocate
-( cd $PKG/usr/bin ; ln -sf mlocate locate )
-
-( cd $PKG/usr/man/man1
- ln -sf locate.1 mlocate.1
-)
-
-mkdir -p $PKG/usr/libexec
-cp -a $CWD/mlocate-run-updatedb $PKG/usr/libexec/mlocate-run-updatedb
-chown root:root $PKG/usr/libexec/mlocate-run-updatedb
-chmod 755 $PKG/usr/libexec/mlocate-run-updatedb
-
-mkdir -p $PKG/etc/cron.daily
-cp -a $CWD/mlocate.cron $PKG/etc/cron.daily/mlocate
-chown root:root $PKG/etc/cron.daily/mlocate
-chmod 755 $PKG/etc/cron.daily/mlocate
-
-chown root:slocate $PKG/usr/bin/mlocate
-chmod 2711 $PKG/usr/bin/mlocate
-mkdir -p $PKG/var/lib/mlocate
-chown root:slocate $PKG/var/lib/mlocate
-chmod 750 $PKG/var/lib/mlocate
-# End of Pat's stuff.
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* ChangeLog NEWS README* \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/mlocate/mlocate.cron b/system/mlocate/mlocate.cron
deleted file mode 100644
index 5464abad35..0000000000
--- a/system/mlocate/mlocate.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-ionice -c3 nice -n 19 /usr/libexec/mlocate-run-updatedb
diff --git a/system/mlocate/mlocate.info b/system/mlocate/mlocate.info
deleted file mode 100644
index b9eb39f232..0000000000
--- a/system/mlocate/mlocate.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="mlocate"
-VERSION="0.26"
-HOMEPAGE="https://pagure.io/mlocate/releases"
-DOWNLOAD="https://releases.pagure.org/mlocate/mlocate-0.26.tar.xz"
-MD5SUM="539e6f86bf387358aa2b14d5f880e49a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="%README%"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/mlocate/slack-desc b/system/mlocate/slack-desc
deleted file mode 100644
index e28d270792..0000000000
--- a/system/mlocate/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-mlocate: mlocate (locate/updatedb implementation)
-mlocate:
-mlocate: mlocate is a locate/updatedb implementation. It keeps a database
-mlocate: of all existing files and allows you to lookup files by name. The
-mlocate: 'm' stands for "merging": updatedb reuses the existing database
-mlocate: to avoid rereading most of the file system, which makes updatedb
-mlocate: faster and does not trash the system caches as much as traditional
-mlocate: locate implementations.
-mlocate:
-mlocate: This conflicts with Slackware 14.2's slocate package. See README
-mlocate: for details.
diff --git a/system/mlocate/updatedb.conf.new b/system/mlocate/updatedb.conf.new
deleted file mode 100644
index 542cd7c679..0000000000
--- a/system/mlocate/updatedb.conf.new
+++ /dev/null
@@ -1,4 +0,0 @@
-PRUNE_BIND_MOUNTS = "yes"
-PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda configfs cpuset debugfs devpts ecryptfs exofs fuse fuse.sshfs fusectl gfs gfs2 gpfs hugetlbfs inotifyfs iso9660 jffs2 lustre mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs selinuxfs sfs sockfs sysfs tmpfs ubifs udf usbfs ceph fuse.ceph"
-PRUNENAMES = ".git .hg .svn .bzr .arch-ids {arch} CVS"
-PRUNEPATHS = "/afs /dev /media /mnt /net /proc /sys /tmp /usr/tmp /var/cache/ccache /var/lib/ceph /var/spool/cups /var/tmp"
diff --git a/system/mongodb/mongodb.SlackBuild b/system/mongodb/mongodb.SlackBuild
index 99d3331f9e..c305e76cab 100644
--- a/system/mongodb/mongodb.SlackBuild
+++ b/system/mongodb/mongodb.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM="mongodb"
-VERSION=${VERSION:-3.4.9}
+VERSION=${VERSION:-3.4.24}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
MAKEJOBS=${MAKEJOBS:-1}
diff --git a/system/mongodb/mongodb.info b/system/mongodb/mongodb.info
index 8c57d99cc5..c563a13750 100644
--- a/system/mongodb/mongodb.info
+++ b/system/mongodb/mongodb.info
@@ -1,10 +1,10 @@
PRGNAM="mongodb"
-VERSION="3.4.9"
+VERSION="3.4.24"
HOMEPAGE="https://www.mongodb.org/"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://fastdl.mongodb.org/src/mongodb-src-r3.4.9.tar.gz"
-MD5SUM_x86_64="c8c9f521807b1097e04ffa2081e35177"
+DOWNLOAD_x86_64="https://fastdl.mongodb.org/src/mongodb-src-r3.4.24.tar.gz"
+MD5SUM_x86_64="2033a6857e9e71bb2faede3a262c4524"
REQUIRES=""
MAINTAINER="Miguel De Anda"
EMAIL="miguel@thedeanda.com"
diff --git a/system/noto-fonts/66-noto-mono.conf b/system/noto-fonts/66-noto-mono.conf
deleted file mode 100644
index c003973938..0000000000
--- a/system/noto-fonts/66-noto-mono.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
- <alias>
- <family>monospace</family>
- <prefer>
- <family>Noto Mono</family>
- </prefer>
- </alias>
- <alias>
- <family>Noto Mono</family>
- <default>
- <family>monospace</family>
- </default>
- </alias>
-</fontconfig>
diff --git a/system/noto-fonts/66-noto-sans.conf b/system/noto-fonts/66-noto-sans.conf
deleted file mode 100644
index 012aebedf8..0000000000
--- a/system/noto-fonts/66-noto-sans.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
- <alias>
- <family>sans-serif</family>
- <prefer>
- <family>Noto Sans</family>
- </prefer>
- </alias>
- <alias>
- <family>Noto Sans</family>
- <default>
- <family>sans-serif</family>
- </default>
- </alias>
-</fontconfig>
diff --git a/system/noto-fonts/66-noto-serif.conf b/system/noto-fonts/66-noto-serif.conf
deleted file mode 100644
index 036baf7764..0000000000
--- a/system/noto-fonts/66-noto-serif.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
- <alias>
- <family>serif</family>
- <prefer>
- <family>Noto Serif</family>
- </prefer>
- </alias>
- <alias>
- <family>Noto Serif</family>
- <default>
- <family>serif</family>
- </default>
- </alias>
-</fontconfig>
diff --git a/system/noto-fonts/README b/system/noto-fonts/README
deleted file mode 100644
index 91b48a4d6f..0000000000
--- a/system/noto-fonts/README
+++ /dev/null
@@ -1,14 +0,0 @@
-noto-fonts (Googles Noto fonts)
-
-Noto's goal is to provide a beautiful reading experience for all
-languages.
-
-It is a free, professionally-designed, open-source collection of
-fonts with a harmonious look and feel in multiple weights and styles.
-Noto fonts are published under the SIL Open Font License (OFL) v1.1.
-which allows you to copy, modify, and redistribute them if you need.
-
-Currently, Noto covers all major languages of the world and many
-others, including European, African, Middle Eastern, Indic, South and
-Southeast Asian, Central Asian, American, and East Asian languages.
-Several minority and historical languages are also supported.
diff --git a/system/noto-fonts/doinst.sh b/system/noto-fonts/doinst.sh
deleted file mode 100644
index 8fec9f5340..0000000000
--- a/system/noto-fonts/doinst.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# Update the X font indexes:
-if [ -x /usr/bin/mkfontdir ]; then
- ( cd /usr/share/fonts/TTF
- mkfontscale .
- mkfontdir .
- )
-fi
-
-if [ -x /usr/bin/fc-cache ]; then
- /usr/bin/fc-cache -f
-fi
diff --git a/system/noto-fonts/noto-fonts.SlackBuild b/system/noto-fonts/noto-fonts.SlackBuild
deleted file mode 100644
index b13b7d7f67..0000000000
--- a/system/noto-fonts/noto-fonts.SlackBuild
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for noto-fonts.
-#
-# Copyright 2016-2018 Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=noto-fonts
-VERSION=${VERSION:-20180624}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-SRCVER=${SRCVER:-449470a4d83f6eecdb4a537ab66fcbb5ff28917a}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz --exclude=hinted/{Arimo*.ttf,Cousine*.ttf,Tinos*.ttf}
-mv $PRGNAM-$SRCVER $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-install -d $PKG/usr/share/fonts/TTF/
-install -m644 alpha/Noto*.tt[fc] $PKG/usr/share/fonts/TTF/
-install -m644 hinted/Noto*.tt[fc] $PKG/usr/share/fonts/TTF/
-install -m644 unhinted/Noto*.tt[fc] $PKG/usr/share/fonts/TTF/
-
-mkdir -p $PKG/etc/fonts/conf.avail
-install -m644 $CWD/*.conf $PKG/etc/fonts/conf.avail/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp FAQ.md issue_template.md LICENSE NEWS.md README.md $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/noto-fonts/noto-fonts.info b/system/noto-fonts/noto-fonts.info
deleted file mode 100644
index b499de501b..0000000000
--- a/system/noto-fonts/noto-fonts.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="noto-fonts"
-VERSION="20180624"
-HOMEPAGE="https://github.com/googlei18n/noto-fonts"
-DOWNLOAD="https://github.com/googlei18n/noto-fonts/archive/449470a4d83f6eecdb4a537ab66fcbb5ff28917a/noto-fonts-449470a4d83f6eecdb4a537ab66fcbb5ff28917a.tar.gz"
-MD5SUM="acd40dfe3dca60cfb545afd3cba944f4"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
diff --git a/system/noto-fonts/slack-desc b/system/noto-fonts/slack-desc
deleted file mode 100644
index 2c34909d4f..0000000000
--- a/system/noto-fonts/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-noto-fonts: noto-fonts (Googles Noto fonts)
-noto-fonts:
-noto-fonts: Noto's goal is to provide a beautiful reading experience for all
-noto-fonts: languages.
-noto-fonts:
-noto-fonts: It is a free, professionally-designed, open-source collection of
-noto-fonts: fonts with a harmonious look and feel in multiple weights and styles.
-noto-fonts: Noto fonts are published under the SIL Open Font License (OFL) v1.1.
-noto-fonts:
-noto-fonts: Home page: https://github.com/googlei18n/noto-fonts
-noto-fonts:
diff --git a/system/nss-pam-ldapd/README b/system/nss-pam-ldapd/README
deleted file mode 100644
index bb4b25566a..0000000000
--- a/system/nss-pam-ldapd/README
+++ /dev/null
@@ -1,5 +0,0 @@
-nss-pam-ldap is a Name Service Switch (NSS) module and Pluggable
-Authentication Module (PAM) that allows your LDAP server to provide
-user account, group, host name, alias, netgroup, and basically any
-other information that you would normally get from /etc flat files
-or NIS. It also allows you to do authentication to an LDAP server.
diff --git a/system/nss-pam-ldapd/doinst.sh b/system/nss-pam-ldapd/doinst.sh
deleted file mode 100644
index d483abce26..0000000000
--- a/system/nss-pam-ldapd/doinst.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- if [ -e $OLD ]; then
- cp -a $OLD ${NEW}.incoming
- cat $NEW > ${NEW}.incoming
- mv ${NEW}.incoming $NEW
- fi
- config $NEW
-}
-
-config etc/nslcd.conf.new
-preserve_perms etc/rc.d/rc.nss-pam-ldapd.new
diff --git a/system/nss-pam-ldapd/nss-pam-ldapd.SlackBuild b/system/nss-pam-ldapd/nss-pam-ldapd.SlackBuild
deleted file mode 100644
index ac14ec8fbf..0000000000
--- a/system/nss-pam-ldapd/nss-pam-ldapd.SlackBuild
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for nss-pam-ldapd
-
-# Copyright (c) 2009-2013 Christopher Walker <kris240376@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=nss-pam-ldapd
-VERSION=${VERSION:-0.8.12}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-pam \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mv $PKG/etc/nslcd.conf $PKG/etc/nslcd.conf.new
-chmod 0600 $PKG/etc/nslcd.conf.new
-
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.nss-pam-ldapd > $PKG/etc/rc.d/rc.nss-pam-ldapd.new
-
-mkdir -p $PKG/var/run/nslcd
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS COPYING ChangeLog* HACKING INSTALL NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nss-pam-ldapd/nss-pam-ldapd.info b/system/nss-pam-ldapd/nss-pam-ldapd.info
deleted file mode 100644
index a79bf47ade..0000000000
--- a/system/nss-pam-ldapd/nss-pam-ldapd.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nss-pam-ldapd"
-VERSION="0.8.12"
-HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
-DOWNLOAD="https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.8.12.tar.gz"
-MD5SUM="83121b0a536e763a9c0e3eec66ab2ef8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Christopher Walker"
-EMAIL="kris240376@gmail.com"
diff --git a/system/nss-pam-ldapd/rc.nss-pam-ldapd b/system/nss-pam-ldapd/rc.nss-pam-ldapd
deleted file mode 100644
index 0630c0a349..0000000000
--- a/system/nss-pam-ldapd/rc.nss-pam-ldapd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# rc.nss-pam-ldapd: start/stop/restart nslcd
-#
-# nslcd is a daemon that will do LDAP queries for local processes that want
-# to do user, group, and other naming lookups (NSS), or do user authentication,
-# authorization, or password modification (PAM). slapd is typically invoked
-# at boot time, usually out of /etc/rc.d/rc.local.
-#
-
-nslcd_start() {
- if [ -x /usr/sbin/nslcd -a -r /etc/nslcd.conf ]; then
- echo "Starting nslcd name service daemon: /usr/sbin/nslcd"
- /usr/sbin/nslcd
- fi
-}
-
-nslcd_stop() {
- echo "Stopping nslcd name service daemon..."
- killall nslcd
-}
-
-case "$1" in
-'start')
- nslcd_start
- ;;
-'stop')
- nslcd_stop
- ;;
-'restart')
- nslcd_stop
- sleep 2
- nslcd_start
- ;;
-*)
- echo "usage $0 start|stop|restart"
-esac
diff --git a/system/nss-pam-ldapd/slack-desc b/system/nss-pam-ldapd/slack-desc
deleted file mode 100644
index d82845204e..0000000000
--- a/system/nss-pam-ldapd/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-nss-pam-ldapd: nss-pam-ldapd (LDAP NSS/PAM module)
-nss-pam-ldapd:
-nss-pam-ldapd: nss-pam-ldapd is a NSS and PAM module that allows your LDAP server to
-nss-pam-ldapd: provide user account, group, host name, alias, netgroup, and basically
-nss-pam-ldapd: any other information that you would normally get from /etc/ flat
-nss-pam-ldapd: files or NIS. It also allows you to do authentication to an LDAP
-nss-pam-ldapd: server.
-nss-pam-ldapd:
-nss-pam-ldapd: Homepage: https://arthurdejong.org/nss-pam-ldapd/
-nss-pam-ldapd:
-nss-pam-ldapd:
diff --git a/system/nvidia-legacy304-kernel/4.14_kernel.patch b/system/nvidia-legacy304-kernel/4.14_kernel.patch
new file mode 100644
index 0000000000..6642189009
--- /dev/null
+++ b/system/nvidia-legacy304-kernel/4.14_kernel.patch
@@ -0,0 +1,26 @@
+diff -ur a/kernel/nv-drm.c b/kernel/nv-drm.c
+--- a/kernel/nv-drm.c 2017-09-14 23:51:09.000000003 +0300
++++ b/kernel/nv-drm.c 2017-12-06 18:47:48.279729889 +0200
+@@ -121,7 +121,11 @@
+ {
+ int ret = 0;
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ ret = drm_pci_init(&nv_drm_driver, pci_driver);
++#else
++ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
++#endif
+ #endif
+ return ret;
+ }
+@@ -131,6 +135,10 @@
+ )
+ {
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ drm_pci_exit(&nv_drm_driver, pci_driver);
++#else
++ drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
++#endif
+ #endif
+ }
diff --git a/system/nvidia-legacy304-kernel/4.15_kernel.patch b/system/nvidia-legacy304-kernel/4.15_kernel.patch
new file mode 100644
index 0000000000..fdac62fb24
--- /dev/null
+++ b/system/nvidia-legacy304-kernel/4.15_kernel.patch
@@ -0,0 +1,48 @@
+diff -ur a/kernel/nv.c b/kernel/nv.c
+--- a/kernel/nv.c 2017-09-14 23:51:09.000000000 +0300
++++ b/kernel/nv.c 2018-02-13 14:56:42.289490885 +0200
+@@ -301,7 +301,11 @@
+ #else
+ irqreturn_t nv_kern_isr(int, void *);
+ #endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ void nv_kern_rc_timer(unsigned long);
++#else
++void nv_kern_rc_timer(struct timer_list *t);
++#endif
+ #if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
+ static int nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
+ #endif
+@@ -2075,10 +2079,18 @@
+ }
+
+ void nv_kern_rc_timer(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ unsigned long data
++#else
++ struct timer_list *t
++#endif
+ )
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ nv_linux_state_t *nvl = (nv_linux_state_t *) data;
++#else
++ nv_linux_state_t *nvl = from_timer(nvl, t, rc_timer);
++#endif
+ nv_state_t *nv = NV_STATE_PTR(nvl);
+
+ NV_CHECK_PCI_CONFIG_SPACE(nvl->timer_sp, nv, TRUE, TRUE, FALSE);
+@@ -3029,9 +3041,13 @@
+ return -1;
+
+ nv_printf(NV_DBG_INFO, "NVRM: initializing rc timer\n");
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ init_timer(&nvl->rc_timer);
+ nvl->rc_timer.function = nv_kern_rc_timer;
+ nvl->rc_timer.data = (unsigned long) nv;
++#else
++ timer_setup(&nvl->rc_timer, nv_kern_rc_timer, 0);
++#endif
+ nv->rc_timer_enabled = 1;
+ mod_timer(&nvl->rc_timer, jiffies + HZ); /* set our timeout for 1 second */
+ nv_printf(NV_DBG_INFO, "NVRM: rc timer initialized\n");
diff --git a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
index c789ab3a6a..db6edc4a0d 100644
--- a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
+++ b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
@@ -75,6 +75,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# https://pkgs.rpmfusion.org/cgit/nonfree/nvidia-304xx-kmod.git/log/
+patch -p1 < $CWD/4.14_kernel.patch
+patch -p1 < $CWD/4.15_kernel.patch
+
cd kernel || exit 1
make SYSSRC=$KERNELPATH module || exit 1
diff --git a/system/nvidia-legacy390-driver/nvidia-switch b/system/nvidia-legacy390-driver/nvidia-switch
index 2f57366cfd..06f7115a3b 100644
--- a/system/nvidia-legacy390-driver/nvidia-switch
+++ b/system/nvidia-legacy390-driver/nvidia-switch
@@ -67,7 +67,6 @@ save_GL(){
if [ "$GLVND" = "yes" ]; then
mv libGL.so.$GL_VERSION $SAVELIBS
- mv libGL.la $SAVELIBS
mv libEGL.so.1.?.0 $SAVELIBS
mv libGLESv1_CM.so.1.1.0 $SAVELIBS
mv libGLESv2.so.2.0.0 $SAVELIBS
diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
index fba0d38bd0..00334bf33a 100644
--- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
+++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
@@ -80,6 +80,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
(cd kernel || exit 1
+ sed -i "s|error=undef|no-error=undef|" Kbuild
make SYSSRC=$KERNELPATH module || exit 1
)
diff --git a/system/nvme-cli/README b/system/nvme-cli/README
deleted file mode 100644
index 81b59c533e..0000000000
--- a/system/nvme-cli/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The nvme-cli is a NVMe management command line interface.
-
-NVMe is a fast, scalable, direct attached storage interface, accessing
-solid state drives through PCIe.
-
-The nvme CLI contains core management tools with minimal dependencies.
diff --git a/system/nvme-cli/doinst.sh b/system/nvme-cli/doinst.sh
deleted file mode 100644
index b5a41d1d89..0000000000
--- a/system/nvme-cli/doinst.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/bash_completion.d/nvme.new
diff --git a/system/nvme-cli/nvme-cli.SlackBuild b/system/nvme-cli/nvme-cli.SlackBuild
deleted file mode 100644
index 9eef39e402..0000000000
--- a/system/nvme-cli/nvme-cli.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for nvme-cli
-
-# Copyright 2017-2020, Alexander Verbovetsky, Moscow, Russia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=nvme-cli
-VERSION=${VERSION:-1.12}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686 -I."
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686 -I."
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC -I."
-else
- SLKCFLAGS="-O2 -I."
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr SBINDIR=/usr/sbin
-make install CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
- PREFIX=/usr SBINDIR=/usr/sbin DESTDIR=$PKG
-
-rm -f $PKG/etc/nvme/*
-rm -r $PKG/etc/udev
-rm -r $PKG/usr/lib/{dracut,systemd}
-rmdir --ignore-fail-on-non-empty $PKG/usr/lib
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/etc/bash_completion.d
-mv $PKG/usr/share/bash-completion/completions/nvme $PKG/etc/bash_completion.d/nvme.new
-rmdir $PKG/usr/share/bash-completion/completions/
-rmdir $PKG/usr/share/bash-completion/
-
-mv $PKG/usr/share/man $PKG/usr/man
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/completions
-cp -a CONTRIBUTING* README* LICENSE* scripts $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a completions/{README,_nvme} $PKG/usr/doc/$PRGNAM-$VERSION/completions
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nvme-cli/nvme-cli.info b/system/nvme-cli/nvme-cli.info
deleted file mode 100644
index eab3a56e9f..0000000000
--- a/system/nvme-cli/nvme-cli.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nvme-cli"
-VERSION="1.12"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-DOWNLOAD="https://github.com/linux-nvme/nvme-cli/archive/v1.12/nvme-cli-1.12.tar.gz"
-MD5SUM="94997b72a63b5bc26c2862c7603bb6e3"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Alexander Verbovetsky"
-EMAIL="alik@ejik.org"
diff --git a/system/nvme-cli/slack-desc b/system/nvme-cli/slack-desc
deleted file mode 100644
index 6dfba6a52b..0000000000
--- a/system/nvme-cli/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-nvme-cli: nvme-cli (NVMe management command line interface)
-nvme-cli:
-nvme-cli: Userspace tooling to control NVMe drives
-nvme-cli:
-nvme-cli: NVMe is a fast, scalable, direct attached storage interface,
-nvme-cli: accessing solid state drives through PCIe.
-nvme-cli:
-nvme-cli: The nvme CLI contains core management tools with minimal
-nvme-cli: dependencies.
-nvme-cli:
-nvme-cli: Homepage: https://github.com/linux-nvme/nvme-cli
diff --git a/system/opam/README b/system/opam/README
index 9257895cd0..36b3e185fc 100644
--- a/system/opam/README
+++ b/system/opam/README
@@ -6,15 +6,16 @@ constraints, and a Git-friendly development workflow.
Managing your OCaml installation can be as simple as:
- opam list -a # List the available packages
- opam install lwt # Install LWT
- opam update # Update the package list
- ...
- opam upgrade # Upgrade the installed packages to their latest version
+ opam list -a # List the available packages
+ opam install lwt # Install LWT
+ opam update # Update the package list
+ ...
+ opam upgrade # Upgrade the installed packages to their latest version
It has to be initialised. To do it, you can use the following command:
-opam init
+
+ opam init
It is not recommended to run opam as root.
Apparently it rather installs per-user packages.
diff --git a/system/opam/opam.SlackBuild b/system/opam/opam.SlackBuild
index e7d8270b0d..04464c1032 100644
--- a/system/opam/opam.SlackBuild
+++ b/system/opam/opam.SlackBuild
@@ -22,7 +22,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=opam
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.0.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -73,16 +73,16 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --libdir=/usr/lib$LIBDIRSUFFIX \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux
-make lib-ext
-make
-make install DESTDIR=$PKG
+make -j1 lib-ext
+make -j1
+make -j1 DESTDIR=$PKG install
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/system/opam/opam.info b/system/opam/opam.info
index fd986517c7..718cadb372 100644
--- a/system/opam/opam.info
+++ b/system/opam/opam.info
@@ -1,8 +1,8 @@
PRGNAM="opam"
-VERSION="2.0.1"
+VERSION="2.0.5"
HOMEPAGE="https://opam.ocaml.org/"
-DOWNLOAD="https://github.com/ocaml/opam/releases/download/2.0.1/opam-full-2.0.1.tar.gz"
-MD5SUM="24faa0ad049d146dfc3fcbe9cbab5eda"
+DOWNLOAD="https://github.com/ocaml/opam/releases/download/2.0.5/opam-full-2.0.5.tar.gz"
+MD5SUM="3a273029a55529831fdd408d9add2db0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ocaml bubblewrap"
diff --git a/system/open-vm-tools/open-vm-tools.SlackBuild b/system/open-vm-tools/open-vm-tools.SlackBuild
index a294741688..7c8753ef11 100644
--- a/system/open-vm-tools/open-vm-tools.SlackBuild
+++ b/system/open-vm-tools/open-vm-tools.SlackBuild
@@ -89,6 +89,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i "s|\ -Werror||" configure.ac
+
autoreconf -i
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/p7zip/p7zip.SlackBuild b/system/p7zip/p7zip.SlackBuild
index ec9cbda5ed..8ea97633e0 100644
--- a/system/p7zip/p7zip.SlackBuild
+++ b/system/p7zip/p7zip.SlackBuild
@@ -73,7 +73,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
make all3 \
- OPTFLAGS="$SLKCFLAGS" \
+ OPTFLAGS="$SLKCFLAGS -Wno-narrowing" \
DEST_HOME=/usr \
DEST_SHARE_DOC=/usr/doc/$PRGNAM-$VERSION \
DEST_SHARE=/usr/lib$LIBDIRSUFFIX/p7zip \
diff --git a/system/packagekit/doinst.sh b/system/packagekit/doinst.sh
index fa9fe022ef..4e39e9d043 100644
--- a/system/packagekit/doinst.sh
+++ b/system/packagekit/doinst.sh
@@ -14,7 +14,6 @@ config() {
config etc/PackageKit/PackageKit.conf.new
config etc/PackageKit/Vendor.conf.new
config etc/PackageKit/CommandNotFound.conf.new
-config etc/PackageKit/Katja.conf.new
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/system/packagekit/packagekit.SlackBuild b/system/packagekit/packagekit.SlackBuild
index 7527471105..33c2dd3f99 100644
--- a/system/packagekit/packagekit.SlackBuild
+++ b/system/packagekit/packagekit.SlackBuild
@@ -26,7 +26,7 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM="packagekit"
-VERSION=${VERSION:-1.1.4}
+VERSION=${VERSION:-1.1.12}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -98,7 +98,6 @@ for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i
mv $PKG/etc/PackageKit/CommandNotFound.conf $PKG/etc/PackageKit/CommandNotFound.conf.new
mv $PKG/etc/PackageKit/PackageKit.conf $PKG/etc/PackageKit/PackageKit.conf.new
mv $PKG/etc/PackageKit/Vendor.conf $PKG/etc/PackageKit/Vendor.conf.new
-mv $PKG/etc/PackageKit/Katja.conf $PKG/etc/PackageKit/Katja.conf.new
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
diff --git a/system/packagekit/packagekit.info b/system/packagekit/packagekit.info
index c7f1732d6a..223c61a515 100644
--- a/system/packagekit/packagekit.info
+++ b/system/packagekit/packagekit.info
@@ -1,10 +1,10 @@
PRGNAM="packagekit"
-VERSION="1.1.4"
+VERSION="1.1.12"
HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
-DOWNLOAD="https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.4.tar.xz"
-MD5SUM="d1a000a33c7c935522af7a01dea012bf"
+DOWNLOAD="https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.12.tar.xz"
+MD5SUM="da8c9d81c886fae43047b3c006e9b4a8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="autoconf-archive"
MAINTAINER="Nishant Limbachia"
EMAIL="nishant@mnspace.net"
diff --git a/system/parallel/README b/system/parallel/README
deleted file mode 100644
index bbee7b2123..0000000000
--- a/system/parallel/README
+++ /dev/null
@@ -1,9 +0,0 @@
-GNU parallel is a shell tool for executing jobs in parallel using one
-or more computers. A job can be a single command or a small script
-that has to be run for each of the lines in the input. The typical
-input is a list of files, a list of hosts, a list of users, a list of
-URLs, or a list of tables. A job can also be a command that reads
-from a pipe. GNU parallel can then split the input and pipe it into
-commands in parallel.
-
-This package conflicts with misc/moreutils.
diff --git a/system/parallel/parallel.SlackBuild b/system/parallel/parallel.SlackBuild
deleted file mode 100644
index 2aed36a5e5..0000000000
--- a/system/parallel/parallel.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for "parallel".
-
-# Copyright 2015-2017 Marcel Saegebarth <marc@mos6581.de>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=parallel
-VERSION=${VERSION:-20200522}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CITATION COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/parallel/parallel.info b/system/parallel/parallel.info
deleted file mode 100644
index 41cae8fa5f..0000000000
--- a/system/parallel/parallel.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="parallel"
-VERSION="20200522"
-HOMEPAGE="http://www.gnu.org/software/parallel/"
-DOWNLOAD="https://ftp.gnu.org/gnu/parallel/parallel-20200522.tar.bz2"
-MD5SUM="81e23020aecff6535a1a75cbbc5fe506"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
diff --git a/system/parallel/slack-desc b/system/parallel/slack-desc
deleted file mode 100644
index 32663235a5..0000000000
--- a/system/parallel/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-parallel: parallel (Executes jobs in parallel)
-parallel:
-parallel: GNU parallel is a shell tool for executing jobs in parallel using one
-parallel: or more computers. A job can be a single command or a small script
-parallel: that has to be run for each of the lines in the input. The typical
-parallel: input is a list of files, a list of hosts, a list of users, a list of
-parallel: URLs, or a list of tables. A job can also be a command that reads
-parallel: from a pipe. GNU parallel can then split the input and pipe it into
-parallel: commands in parallel.
-parallel:
-parallel: Homepage: http://www.gnu.org/software/parallel/
diff --git a/system/patchelf/README b/system/patchelf/README
deleted file mode 100644
index 4286fd37ae..0000000000
--- a/system/patchelf/README
+++ /dev/null
@@ -1,3 +0,0 @@
-PatchELF is a simple utility for modifing existing ELF executables
-and libraries. It can change the dynamic loader ("ELF interpreter")
-of executables and change the RPATH of executables and libraries.
diff --git a/system/patchelf/patchelf.SlackBuild b/system/patchelf/patchelf.SlackBuild
deleted file mode 100644
index 7ca4ad1081..0000000000
--- a/system/patchelf/patchelf.SlackBuild
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for patchelf
-
-# Copyright 2014 Zhu Qun-Ying
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=patchelf
-VERSION=${VERSION:-0.10}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-set -e
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-autoreconf -isf
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-gzip $PKG/usr/man/man1/*
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/patchelf/patchelf.info b/system/patchelf/patchelf.info
deleted file mode 100644
index 2697431fba..0000000000
--- a/system/patchelf/patchelf.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="patchelf"
-VERSION="0.10"
-HOMEPAGE="https://nixos.org/patchelf.html"
-DOWNLOAD="https://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.bz2"
-MD5SUM="6c3f3a06a95705870d129494a6880106"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Zhu Qun-Ying"
-EMAIL="zhu.qunying@gmail.com"
diff --git a/system/patchelf/slack-desc b/system/patchelf/slack-desc
deleted file mode 100644
index 30e2694647..0000000000
--- a/system/patchelf/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-patchelf: patchelf (A utility for patching ELF binaries)
-patchelf:
-patchelf: PatchELF is a simple utility for modifing existing ELF executables
-patchelf: and libraries. It can change the dynamic loader ("ELF interpreter")
-patchelf: of executables and change the RPATH of executables and libraries.
-patchelf:
-patchelf:
-patchelf:
-patchelf:
-patchelf: Home page: https://nixos.org/patchelf.html
-patchelf:
diff --git a/system/percona-xtrabackup/README b/system/percona-xtrabackup/README
deleted file mode 100644
index 05cb5de107..0000000000
--- a/system/percona-xtrabackup/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Percona XtraBackup is OpenSource online (non-blockable) backup
-solution for InnoDB and XtraDB engines.
diff --git a/system/percona-xtrabackup/percona-xtrabackup.SlackBuild b/system/percona-xtrabackup/percona-xtrabackup.SlackBuild
deleted file mode 100644
index 3127baaa7c..0000000000
--- a/system/percona-xtrabackup/percona-xtrabackup.SlackBuild
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for percona-xtrabackup
-
-# Copyright 2012-2013 Heinz Wiesinger, Amsterdam, The Netherlands
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=percona-xtrabackup
-VERSION=${VERSION:-2.1.5}
-PERCONA_VERSION=${PERCONA_VERSION:-5.5.31-rel30.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-rm -rf Percona-Server-$PERCONA_VERSION
-tar xvf $PRGNAM-$VERSION/Percona-Server-$PERCONA_VERSION.tar.gz
-cd Percona-Server-$PERCONA_VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Apply xtrabackup patch
-patch -p1 -i ../$PRGNAM-$VERSION/patches/xtradb55.patch
-
-LIBS="-lrt" \
-cmake \
- -DCMAKE_C_FLAGS="$SLKCFLAGS -I$TMP/$PRGNAM-$VERSION/src" \
- -DCMAKE_CXX_FLAGS="$SLKCFLAGS -I$TMP/$PRGNAM-$VERSION/src" \
- -DENABLED_LOCAL_INFILE=ON \
- -DWITH_INNOBASE_STORAGE_ENGINE=ON \
- -DWITH_PARTITION_STORAGE_ENGINE=ON \
- -DWITH_ZLIB=bundled \
- -DWITH_EXTRA_CHARSETS=all \
- -DENABLE_DTRACE=OFF \
- .
-
-for i in include zlib strings mysys dbug extra storage/innobase; do
- make -C $i
-done
-
-cd $TMP/$PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# build internal libarchive
-cd src/libarchive
- cmake \
- -DCMAKE_C_FLAGS="$SLKCFLAGS" \
- -DENABLE_CPIO=OFF \
- -DENABLE_OPENSSL=OFF \
- -DENABLE_TAR=OFF \
- -DENABLE_TEST=OFF \
- .
-
- make
-cd -
-
-# build xtrabackup
-cd src
- LIBS="-lrt" \
- CFLAGS="$SLKCFLAGS" \
- make \
- MYSQL_ROOT_DIR="$TMP/Percona-Server-$PERCONA_VERSION" \
- clean
-
- LIBS="-lrt" \
- CFLAGS="$SLKCFLAGS" \
- make \
- MYSQL_ROOT_DIR="$TMP/Percona-Server-$PERCONA_VERSION" \
- XTRABACKUP_VERSION=$VERSION \
- xtradb55
-cd -
-
-mkdir -p $PKG/usr/{bin,man/man1}
-install -m 755 src/xtrabackup_55 $PKG/usr/bin/xtrabackup
-install -m 755 src/xbstream $PKG/usr/bin/
-install -m 755 src/xbcrypt $PKG/usr/bin/
-install -m 755 innobackupex $PKG/usr/bin/
-install -m 644 doc/xtrabackup.1 $PKG/usr/man/man1/
-
-# Fix xtrabackup usage in innobackupex
-sed -i "s/xtrabackup_55/xtrabackup/g" $PKG/usr/bin/innobackupex
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a BUILD.txt COPYING REVNO VERSION \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/percona-xtrabackup/percona-xtrabackup.info b/system/percona-xtrabackup/percona-xtrabackup.info
deleted file mode 100644
index e2b8be656b..0000000000
--- a/system/percona-xtrabackup/percona-xtrabackup.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="percona-xtrabackup"
-VERSION="2.1.5"
-HOMEPAGE="http://www.percona.com/software/percona-xtrabackup"
-DOWNLOAD="http://www.percona.com/downloads/XtraBackup/XtraBackup-2.1.5/source/percona-xtrabackup-2.1.5.tar.gz"
-MD5SUM="8782d736ecf7f0a702a8c053c4f9cdb8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
diff --git a/system/percona-xtrabackup/slack-desc b/system/percona-xtrabackup/slack-desc
deleted file mode 100644
index 4ed2d118e3..0000000000
--- a/system/percona-xtrabackup/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-percona-xtrabackup: percona-xtrabackup (Online backup for MySQL / InnoDB)
-percona-xtrabackup:
-percona-xtrabackup: Percona XtraBackup is OpenSource online (non-blockable) backup
-percona-xtrabackup: solution for InnoDB and XtraDB engines.
-percona-xtrabackup:
-percona-xtrabackup: Homepage: http://www.percona.com/software/percona-xtrabackup
-percona-xtrabackup:
-percona-xtrabackup:
-percona-xtrabackup:
-percona-xtrabackup:
-percona-xtrabackup:
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index c7b9538ff6..7c7780822b 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -58,7 +58,7 @@
# 6.1 19-AUG-2019 verion update
PRGNAM=qemu
-VERSION=${VERSION:-4.1.0}
+VERSION=${VERSION:-5.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -161,7 +161,7 @@ make V=1
make install DESTDIR=$PKG
# Remove empty /var
-rm -rf $PKG/var/run
+rm -rf $PKG/var
# install some udev rules for /dev/kvm
# Note: no udev rules for usb pasthrough when running qemu as non-root on linux hosts. See Section 2.11.2
@@ -190,7 +190,7 @@ fi
# Add docs to the proper location
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog COPYING* CODING_STYLE HACKING LICENSE MAINTAINERS README docs/* \
+cp -a Changelog COPYING* CODING_STYLE.rst LICENSE MAINTAINERS README.rst docs/* \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index d092200f0e..9cd7abd533 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,8 +1,8 @@
PRGNAM="qemu"
-VERSION="4.1.0"
+VERSION="5.1.0"
HOMEPAGE="https://www.qemu.org"
-DOWNLOAD="https://download.qemu.org/qemu-4.1.0.tar.xz"
-MD5SUM="cdf2b5ca52b9abac9bacb5842fa420f8"
+DOWNLOAD="https://download.qemu.org/qemu-5.1.0.tar.xz"
+MD5SUM="f3eb729786591f05a9ac5d8ab03b9269"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="SDL2"
diff --git a/system/qterminal/qterminal.SlackBuild b/system/qterminal/qterminal.SlackBuild
index f939c03e7a..a8b950eb42 100644
--- a/system/qterminal/qterminal.SlackBuild
+++ b/system/qterminal/qterminal.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for qterminal
-# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2011-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=qterminal
-VERSION=${VERSION:-0.14.1}
+VERSION=${VERSION:-0.15.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/qterminal/qterminal.info b/system/qterminal/qterminal.info
index cf48e2f5a5..1536072d0e 100644
--- a/system/qterminal/qterminal.info
+++ b/system/qterminal/qterminal.info
@@ -1,8 +1,8 @@
PRGNAM="qterminal"
-VERSION="0.14.1"
+VERSION="0.15.0"
HOMEPAGE="https://github.com/lxde/qterminal"
-DOWNLOAD="https://github.com/lxde/qterminal/releases/download/0.14.1/qterminal-0.14.1.tar.xz"
-MD5SUM="8b2e83a5a0daf8cd9a1b770f9e719a7d"
+DOWNLOAD="https://github.com/lxde/qterminal/releases/download/0.15.0/qterminal-0.15.0.tar.xz"
+MD5SUM="c5e834da5e01182d1772a2f2e391e7c6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="qtermwidget"
diff --git a/system/roxterm/roxterm.info b/system/roxterm/roxterm.info
index 7a9c1bb1a2..84ba1a539e 100644
--- a/system/roxterm/roxterm.info
+++ b/system/roxterm/roxterm.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/roxterm/roxterm-2.9.7.tar.bz2"
MD5SUM="496b5ddc078cede502f168dadef46cb6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
MAINTAINER="Erik Hanson"
EMAIL="erik@slackbuilds.org"
diff --git a/system/rxvt-unicode/README b/system/rxvt-unicode/README
deleted file mode 100644
index 8b1c84db04..0000000000
--- a/system/rxvt-unicode/README
+++ /dev/null
@@ -1,8 +0,0 @@
-rxvt-unicode is an enhanced version of the rxvt terminal emulator. It has
-full unicode and Xft support, does font antialiasing and italics, and has
-the same transparency capabilities as ATerm. It can be extended using Perl.
-
-The slackbuild uses environment variable called CONFIG_PERL to control
-whether the embedded perl interpreter will be built. Setting to anything
-other than YES during the build will disable it, which will result in a
-much leaner package.
diff --git a/system/rxvt-unicode/rxvt-unicode.SlackBuild b/system/rxvt-unicode/rxvt-unicode.SlackBuild
deleted file mode 100644
index 5a955c787b..0000000000
--- a/system/rxvt-unicode/rxvt-unicode.SlackBuild
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for rxvt-unicode
-
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Currently maintained by Jason Graham (jgraha8@gmail.com)
-# Updates by Kevin Paulus, aka "goarilla" (goarilla@gmail.com)
-# Previously maintained by LEVAI Daniel, 2010-2014
-# Initial SlackBuild written by Dugan Chen (dugan_c@fastmail.fm)
-
-PRGNAM=rxvt-unicode
-VERSION=${VERSION:-9.22}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Option to enable/disable the embedded perl interpreter
-CONFIG_PERL=${CONFIG_PERL:-YES}
-
-if [ "${CONFIG_PERL}" == 'YES' ];then
- _PERL_OPT='--enable-perl'
-else
- _PERL_OPT='--disable-perl'
-fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --enable-everything \
- --enable-unicode3 \
- --enable-combining \
- --enable-xft \
- --enable-font-styles \
- --enable-transparency \
- --enable-fading \
- --enable-frills \
- --enable-pixbuf \
- --enable-rxvt-scroll \
- --enable-next-scroll \
- --enable-xterm-scroll \
- ${_PERL_OPT} \
- --enable-xim \
- --enable-iso14755 \
- --enable-keepscrolling \
- --enable-selectionscrolling \
- --enable-mousewheel \
- --enable-slipwheeling \
- --enable-smart-resize \
- --enable-text-blink \
- --enable-pointer-blank \
- --enable-utmp \
- --enable-wtmp \
- --enable-lastlog \
- --enable-256-color \
- --build=$ARCH-slackware-linux
-
-make
-
-mkdir -p $PKG/usr/share/terminfo
-TERMINFO=$PKG/usr/share/terminfo make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | \
- cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/share/pixmaps/
-cp $CWD/urxvt.xpm $PKG/usr/share/pixmaps/urxvt.xpm
-
-mkdir -p $PKG/usr/share/applications
-cp $CWD/rxvt-unicode.desktop $PKG/usr/share/applications/rxvt-unicode.desktop
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING Changes INSTALL README.FAQ $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-
-# Fix usr/bin/urxvt permissions to enable writing to utmp and wtmp files
-#
-version="$(echo "$VERSION" |sed -e 's/[^0-9]//g')"
-if [ "$version" -le 922 ]; then
- # standalone
- chgrp utmp usr/bin/urxvt
- chmod 2755 usr/bin/urxvt
- # client
- chgrp utmp usr/bin/urxvtc
- chmod 2755 usr/bin/urxvtc
- # server
- chgrp utmp usr/bin/urxvtd
- chmod 2755 usr/bin/urxvtd
-fi
-
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/rxvt-unicode/rxvt-unicode.desktop b/system/rxvt-unicode/rxvt-unicode.desktop
deleted file mode 100644
index 7622918703..0000000000
--- a/system/rxvt-unicode/rxvt-unicode.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=urxvt
-Comment=An unicode capable rxvt clone
-Exec=urxvt
-Icon=utilities-terminal
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
diff --git a/system/rxvt-unicode/rxvt-unicode.info b/system/rxvt-unicode/rxvt-unicode.info
deleted file mode 100644
index d02aee8160..0000000000
--- a/system/rxvt-unicode/rxvt-unicode.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="rxvt-unicode"
-VERSION="9.22"
-HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
-DOWNLOAD="http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.22.tar.bz2"
-MD5SUM="93782dec27494eb079467dacf6e48185"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
diff --git a/system/rxvt-unicode/slack-desc b/system/rxvt-unicode/slack-desc
deleted file mode 100644
index 2f428ddfd9..0000000000
--- a/system/rxvt-unicode/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-rxvt-unicode: rxvt-unicode (enhanced version of rxvt)
-rxvt-unicode:
-rxvt-unicode: This project is an enhanced version of the rxvt terminal
-rxvt-unicode: emulator. It has full unicode and Xft support, does font
-rxvt-unicode: antialiasing and italics, and has the same transparency
-rxvt-unicode: capabilities as ATerm. It can be extended using Perl.
-rxvt-unicode:
-rxvt-unicode: Visit the rxvt-unicode project online:
-rxvt-unicode: http://software.schmorp.de/pkg/rxvt-unicode/
-rxvt-unicode:
-rxvt-unicode:
diff --git a/system/rxvt-unicode/urxvt.xpm b/system/rxvt-unicode/urxvt.xpm
deleted file mode 100644
index c7b6a2db7e..0000000000
--- a/system/rxvt-unicode/urxvt.xpm
+++ /dev/null
@@ -1,141 +0,0 @@
-/* XPM */
-static char * urxvt_32x32_xpm[] = {
-"32 32 106 2",
-" c None",
-". c #E7E7E7",
-"+ c #E7E3DE",
-"@ c #E7DFDE",
-"# c #29417B",
-"$ c #5A719C",
-"% c #294173",
-"& c #08246B",
-"* c #18387B",
-"= c #294D8C",
-"- c #395D9C",
-"; c #526DAD",
-"> c #6382BD",
-", c #7392C6",
-"' c #84A6DE",
-") c #9CBAE7",
-"! c #B5CFF7",
-"~ c #CEDBEF",
-"{ c #ADBECE",
-"] c #94B2D6",
-"^ c #CEDFEF",
-"/ c #ADBED6",
-"( c #C6D3DE",
-"_ c #52658C",
-": c #7371F7",
-"< c #394573",
-"[ c #B5D3F7",
-"} c #D6D3CE",
-"| c #A5A6A5",
-"1 c #A59E9C",
-"2 c #6B6963",
-"3 c #B5B2AD",
-"4 c #8496AD",
-"5 c #CEC7C6",
-"6 c #9CA6AD",
-"7 c #C6C7C6",
-"8 c #525D6B",
-"9 c #294584",
-"0 c #8C96BD",
-"a c #8C9EC6",
-"b c #425D9C",
-"c c #7392CE",
-"d c #8CA6DE",
-"e c #ADAAA5",
-"f c #A5A29C",
-"g c #211C18",
-"h c #C6BEBD",
-"i c #52618C",
-"j c #B5B6B5",
-"k c #52596B",
-"l c #847D7B",
-"m c #002063",
-"n c #001C52",
-"o c #001C5A",
-"p c #ADC7EF",
-"q c #94A2B5",
-"r c #8C9EAD",
-"s c #8CAAC6",
-"t c #9CAABD",
-"u c #8C9EB5",
-"v c #F7F7F7",
-"w c #DEDBDE",
-"x c #848284",
-"y c #8C8A8C",
-"z c #8C8E8C",
-"A c #D6D7D6",
-"B c #FFFFFF",
-"C c #E7E3E7",
-"D c #DEDFDE",
-"E c #949294",
-"F c #ADAAAD",
-"G c #EFEFEF",
-"H c #CECFCE",
-"I c #BDBEBD",
-"J c #4A4D4A",
-"K c #B5B2B5",
-"L c #9C9E9C",
-"M c #7B7D7B",
-"N c #393C39",
-"O c #9C9A9C",
-"P c #848684",
-"Q c #313031",
-"R c #636563",
-"S c #292C29",
-"T c #F7F3F7",
-"U c #949694",
-"V c #5A595A",
-"W c #EFEBEF",
-"X c #737173",
-"Y c #000000",
-"Z c #ADAEAD",
-"` c #BDBABD",
-" . c #D6D7FF",
-".. c #5A59FF",
-"+. c #CECFFF",
-"@. c #B5B2FF",
-"#. c #DEDBFF",
-"$. c #A5A2A5",
-"%. c #C6C3C6",
-"&. c #ADA6AD",
-"*. c #7371FF",
-"=. c #6B6DFF",
-"-. c #5A5D5A",
-";. c #BDB6BD",
-">. c #CECBC6",
-",. c #BDBAB5",
-" ",
-" ",
-" ",
-". + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ",
-"@ # $ $ $ % & * = - ; > , ' ) ! ~ ~ ~ ~ { ~ ~ ~ ~ ] ^ ~ ~ ~ / ( ",
-"@ _ : : : < & * = - ; > , ' ) [ } } } } | 1 2 2 3 4 @ 1 5 1 6 ( ",
-"@ _ 7 7 7 8 9 0 a b ; > c d ) [ } } } } | e } } e 4 @ f g h 6 ( ",
-"@ i j j j k & * = - ; > , ' ) [ } 2 l } | e 1 1 3 4 @ 1 5 1 6 ( ",
-"@ m n n n o & * = - ; > , ' ) p q q q q r q q q q s t q q q u ( ",
-"@ v v v v v v v v v v v v v v v v v v v v v v v v v v w x y z A ",
-"@ B B B B B B B B B B B B B B B B B C B B B B B B B B D E F | + ",
-"@ B D G H H B H B B H G D B B w G I J I I B B B B B B D F K L + ",
-"@ B M J z N B z O H P B Q v B R B O N O O B B B B B B D M y L + ",
-"@ B M I B B B B J S T B L K I z B B R B B B B B B B B D P U F + ",
-"@ B M I B B B C J V H B T V J W B B R B B B B B B B B D P U F + ",
-"@ B M I B B B V G G J G B X M B B B X S N B B B B B B D P U F + ",
-"@ B B B B B B B B B B B B B B B B B B B B B B B B B B D P U F + ",
-"@ B B B B B B B B B B B B B B B . H H H H C B B B B B D P U F + ",
-"@ B B B B B B B B B B B B B B B M Y Y Y Y R B B B B B D P U F + ",
-"@ B B B B B B v B B B B B B B B M Y Y Y Y R B B B B B D P U F + ",
-"@ B B B B B B J L B B B B B B B M Y Y Y Y R B B B B B D O Z ` + ",
-"@ .....+.@.#.B K R $.B B B B B M Y Y Y Y R B B B B B D %.%.&.+ ",
-"@ +.B B *.=.B B L -.H B B B B B M Y Y Y Y R B B B B B D %.K L + ",
-"@ B B B B B B R K B B B B B B B M Y Y Y Y R B B B B B D %.K L + ",
-"@ B B B B B B B B B B B B B B B M Y Y Y Y R B B B B B D ;.O O + ",
-"@ B B B B B B B B B B B B B B B O Q Q Q Q P B B B B B D $.F F + ",
-"@ B B B B B B B B B B B B B B B B B B B B B B B B B B D | K L + ",
-"@ B B B B B B B B B B B B B B B B B B B B B B B B B B D O Z j + ",
-"H >.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.7 >.>.>.,.",
-" ",
-" ",
-" "};
diff --git a/system/sbsigntools/autogen.patch b/system/sbsigntools/autogen.patch
deleted file mode 100644
index e681792c49..0000000000
--- a/system/sbsigntools/autogen.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From c8c7e1ba97d15433247bcf87e88485cf7c6b7cc3 Mon Sep 17 00:00:00 2001
-From: James Bottomley <JBottomley@Parallels.com>
-Date: Tue, 26 Jun 2012 09:49:05 +0100
-Subject: sbsigntools: fix autogen.sh for build service
-
----
- AUTHORS | 4 ++
- ChangeLog | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- autogen.sh | 10 ---
- 3 files changed, 228 insertions(+), 10 deletions(-)
- create mode 100644 AUTHORS
- create mode 100644 ChangeLog
-
-diff --git a/AUTHORS b/AUTHORS
-new file mode 100644
-index 0000000..3eaa355
---- /dev/null
-+++ b/AUTHORS
-@@ -0,0 +1,4 @@
-+ Adam Conrad
-+ Ivan Hu
-+ James Bottomley
-+ Jeremy Kerr
-diff --git a/ChangeLog b/ChangeLog
-new file mode 100644
-index 0000000..d5d5ea6
---- /dev/null
-+++ b/ChangeLog
-@@ -0,0 +1,224 @@
-+2012-06-20 c07dfb9 Ivan Hu <ivan.hu@canonical.com>
-+
-+ * configure: Add check for bfh.h
-+
-+2012-06-19 5e07c4e Ivan Hu <ivan.hu@canonical.com>
-+
-+ * tests: Add a test to check invalid PKCS7 signature attaching
-+
-+2012-06-19 bfb778e Ivan Hu <ivan.hu@canonical.com>
-+
-+ * sbattach: Check that attached signatures are valid PKCS7 data
-+
-+2012-06-14 bf6df84 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbverify: Use a variable for image filename
-+
-+2012-06-13 9b7f7fb Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * image: Unconditionally parse PE/COFF data
-+
-+2012-06-13 128f1c1 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbverify: Check for failed image load
-+
-+2012-06-13 b48e256 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * tests: Add tests for missing image, cert & key files
-+
-+2012-06-13 0af5e01 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * tests: Execute tests in a clean (temporary) directory
-+
-+2012-06-13 8716e88 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * tests: Use COMPILE.S for assembing test object
-+
-+2012-06-13 807f0e6 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * Version 0.2
-+
-+2012-06-13 7c2d8bb Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * docs: Add simple manpage for sbattach
-+
-+2012-06-13 deb9211 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * automake: Clean generated man files
-+
-+2012-06-13 3cde1e4 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * tests: Add a few simple tests
-+
-+2012-06-13 cc881c2 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * Remove unused test.c file
-+
-+2012-06-12 4c79e3a Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbattach: Add too to manage detached signatures
-+
-+2012-06-12 564f5bc Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * image: Add facility to write unsigned images
-+
-+2012-06-11 a07b8d2 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbsign,sbverify: Update getopt_long optstrings
-+
-+2012-06-11 5836038 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbverify: Add support for detached signatures
-+
-+2012-06-11 b8a7d51 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbverify: Split image signature table reading to separate function
-+
-+2012-06-11 e9f438c Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * Fix warnings from added -W flags
-+
-+2012-06-11 f19e8bb Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * automake: Add -Wall -Wextra CFLAGS
-+
-+2012-06-11 af4f088 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbsign: Add --detached option to create detached PKCS7 signatures
-+
-+2012-06-11 0c9fbd2 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbsign: fix flag for verbose operation
-+
-+2012-06-11 3673db1 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * docs: Fix manpage creation
-+
-+2012-05-29 9b2f3a7 Adam Conrad <adconrad@0c3.net>
-+
-+ * autogen.sh: Fix ccan_module assignment
-+
-+2012-05-28 3fb0f00 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * image: use read_write_all from ccan
-+
-+2012-05-28 f1112b4 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * image: Fix format specifier for 32-bit builds
-+
-+2012-05-24 d5e634c Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * autoconfiscate
-+
-+2012-05-23 82f8c30 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * docs: Add initial manpages
-+
-+2012-05-23 c14efcb Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbsign,sbverify: help2man-ize usage output
-+
-+2012-05-23 98a4f10 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * Makefile: Add dist targets
-+
-+2012-05-22 1b2b5c6 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * ccan: Add ccan import logic
-+
-+2012-05-15 6ff68e5 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * Move ccan submodule
-+
-+2012-05-15 9a08e25 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * Remove unused header
-+
-+2012-05-14 bc618c5 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * Remove pkcs7-simple test file
-+
-+2012-05-14 9ac930e Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * Makefile: add install target
-+
-+2012-05-14 a1b270f Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * Makefile: Comment components
-+
-+2012-05-14 c67b82a Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbverify: clean up openssl init
-+
-+2012-05-14 c499763 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbverify: add check for invalid PKCS7 data
-+
-+2012-05-14 74eb766 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbverify: Add certificate chain verification
-+
-+2012-05-12 e111127 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * verify: move idc-related parsing to idc.c
-+
-+2012-05-12 46cf6a6 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbsign: fix incorrect check for certificate load
-+
-+2012-05-12 57d9f0c Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * image: reformat gap warnings
-+
-+2012-05-12 ab05bec Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * image: add cert table to image size
-+
-+2012-05-12 e1fec08 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbverify: Add check for image hash
-+
-+2012-05-12 fefe97c Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbverify: check for presence of signature table
-+
-+2012-05-12 b73f723 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * Makefile: add $(tools) var
-+
-+2012-05-12 55b1940 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbsigntool -> sbsign
-+
-+2012-05-12 a183de9 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * image: open output file with O_TRUNC
-+
-+2012-04-24 04b70fc Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * sbsigntooL: expand usage info
-+
-+2012-04-24 9826a43 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * Add GPLv3 text in COPYING
-+
-+2012-04-24 906654e Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * coff: remove unneeded coff includes
-+
-+2012-04-23 9d3c8b5 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * Add copyright comments
-+
-+2012-04-23 e019eec Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * image: warn about potential checksum differences
-+
-+2012-04-23 01e33cd Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * idc: allocate using the image context
-+
-+2012-04-23 acd8c0a Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+ * Initial commit
-+
-diff --git a/autogen.sh b/autogen.sh
-index 32ea6f6..117835b 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -16,16 +16,6 @@ then
- --build-type=automake lib/ccan $ccan_modules
- fi
-
--# Create generatable docs from git
--(
-- echo "Authors of sbsigntool:"
-- echo
-- git log --format='%an' | sort -u | sed 's,^,\t,'
--) > AUTHORS
--
--# Generate simple ChangeLog
--git log --date=short --format='%ad %t %an <%ae>%n%n * %s%n' > ChangeLog
--
- # automagic
- aclocal
- autoheader
---
-2.1.2
-
diff --git a/system/sbsigntools/ccan_makefile.patch b/system/sbsigntools/ccan_makefile.patch
deleted file mode 100644
index e77b958ab8..0000000000
--- a/system/sbsigntools/ccan_makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- sbsigntools-0.7/lib/ccan.git/Makefile 2015-02-07 12:56:54.457781357 +0000
-+++ sbsigntools-0.7/lib/ccan.git/Makefile 2015-02-07 13:00:25.482175092 +0000
-@@ -15,7 +15,7 @@
- EXCLUDE=wwviaudio ogg_to_pcm jmap jset nfs
-
- # Where make scores puts the results
--SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
-+#SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
-
- ALL=$(filter-out $(EXCLUDE), $(REALLY_ALL))
-
-@@ -77,7 +77,7 @@ distclean: clean
- scores: $(SCOREDIR)/SUMMARY
-
- $(SCOREDIR)/SUMMARY: $(patsubst ccan/%/_info, $(SCOREDIR)/score-%, $(wildcard ccan/*/_info))
-- git describe --always > $@
-+# git describe --always > $@
- uname -a >> $@
- $(CC) -v >> $@
- cat $^ | grep 'Total score:' >> $@
diff --git a/system/sbsigntools/fix_efi_arch.patch b/system/sbsigntools/fix_efi_arch.patch
deleted file mode 100644
index fceb96f4bf..0000000000
--- a/system/sbsigntools/fix_efi_arch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 706bec1a957f2fcce3781e326e6e0b2be41a9b86 Mon Sep 17 00:00:00 2001
-From: James Bottomley <JBottomley@Parallels.com>
-Date: Tue, 6 Jan 2015 08:00:28 -0800
-Subject: [PATCH] OBS add correcting definition of EFI_ARCH
-
-Signed-off-by: James Bottomley <JBottomley@Parallels.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4891151..2e80e09 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(uuid, uuid,
- AC_MSG_ERROR([libuuid (from the uuid package) is required]))
-
- dnl gnu-efi headers require extra include dirs
--EFI_ARCH=$(uname -m)
-+EFI_ARCH=$(uname -m | sed s/i.86/ia32/)
- EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \
- -DEFI_FUNCTION_WRAPPER"
- CPPFLAGS_save="$CPPFLAGS"
---
-2.1.2
-
diff --git a/system/sbsigntools/sbsigntools.SlackBuild b/system/sbsigntools/sbsigntools.SlackBuild
index f9701591ff..5f64805828 100644
--- a/system/sbsigntools/sbsigntools.SlackBuild
+++ b/system/sbsigntools/sbsigntools.SlackBuild
@@ -23,15 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=sbsigntools
-VERSION=${VERSION:-0.7}
+VERSION=${VERSION:-0.9.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-CCAN_VERSION=${CCAN_VERSION:-0.0.2}
-
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -62,23 +60,9 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+# The tarball is generated from a clone --recursive of the git repository
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
-tar -xvf $CWD/ccan-$CCAN_VERSION.tar.gz -C lib/ccan.git
-
-# Next 2 patches taken from
-# https://build.opensuse.org/package/show/home:jejb1:UEFI/sbsigntools?rev=16
-# Fixes build on 32-bit.
-patch -p1 -i $CWD/fix_efi_arch.patch
-
-# Creates changelog and stops git from being called.
-patch -p1 -i $CWD/autogen.patch
-
-# Suppress "not git repo messages"- they're evaluated by the makefile but don't
-# actually get run so it's just noise.
-patch -p1 -i $CWD/ccan_makefile.patch
-rm lib/ccan.git/Makefile-web
-
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -86,7 +70,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-./autogen.sh
+sed -i "s|/usr/lib$LIBDIRSUFFIX/efi|/usr/lib$LIBDIRSUFFIX/gnuefi|" configure.ac
+
+NOCONFIGURE=1 ./autogen.sh
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/system/sbsigntools/sbsigntools.info b/system/sbsigntools/sbsigntools.info
index 7a80834512..52bbf91726 100644
--- a/system/sbsigntools/sbsigntools.info
+++ b/system/sbsigntools/sbsigntools.info
@@ -1,10 +1,8 @@
PRGNAM="sbsigntools"
-VERSION="0.7"
+VERSION="0.9.1"
HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/sbsigntools-0.7.tar.gz \
- http://ponce.cc/slackware/sources/repo/ccan-0.0.2.tar.gz"
-MD5SUM="5adb5f7caaf435268f833eb816566c8e \
- 6de60482bf935a159ecb647d2e4a57ab"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/sbsigntools-0.9.1.tar.xz"
+MD5SUM="3dbdb509be9310523377dc523d4b5bd7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/spacefm/glibc-2.28.patch b/system/spacefm/glibc-2.28.patch
new file mode 100644
index 0000000000..324bc43b93
--- /dev/null
+++ b/system/spacefm/glibc-2.28.patch
@@ -0,0 +1,12 @@
+diff --git a/src/main.c b/src/main.c
+index 645e2ec..9453a3b 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -23,6 +23,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#include <sys/sysmacros.h>
+
+ #include <signal.h>
+
diff --git a/system/spacefm/spacefm.SlackBuild b/system/spacefm/spacefm.SlackBuild
index c8a93b7eaa..46cf4735bd 100644
--- a/system/spacefm/spacefm.SlackBuild
+++ b/system/spacefm/spacefm.SlackBuild
@@ -81,6 +81,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# https://github.com/IgnorantGuru/spacefm/issues/727
+patch -p1 < $CWD/glibc-2.28.patch
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/system/t1utils/README b/system/t1utils/README
deleted file mode 100644
index 5ff4feb67b..0000000000
--- a/system/t1utils/README
+++ /dev/null
@@ -1,17 +0,0 @@
-t1utils is a collection of simple Type 1 font manipulation programs. Together,
-they allow you to convert between PFA (ASCII) and PFB (binary) formats,
-disassemble PFA or PFB files into human-readable form, and reassemble them
-into PFA or PFB format. Additionally you can extract font resources from
-a Macintosh font file (ATM/Laserwriter), or create a Macintosh Type 1 font
-file from a PFA or PFB font.
-
-* t1ascii: changes PFB (binary) fonts into PFA (ASCII) format
-* t1binary: goes the opposite direction
-* t1disasm: translates PFBs or PFAs into a human-readable and -editable format
-* t1asm: goes the opposite direction
-* t1unmac: translates a Macintosh Type 1 font into either PFB or PFA format
-* t1mac: goes the opposite direction
-
-NOTE: You do not need t1utils if you already have texlive installed as it is
-already included there. However, installing it anyway doesn't do any harm
-either.
diff --git a/system/t1utils/slack-desc b/system/t1utils/slack-desc
deleted file mode 100644
index ecbc9472a2..0000000000
--- a/system/t1utils/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-t1utils: t1utils (Type 1 Font Utilities)
-t1utils:
-t1utils: t1utils is a collection of simple Type 1 font manipulation programs.
-t1utils: Together, they allow you to convert between PFA (ASCII) and PFB
-t1utils: (binary) formats, disassemble PFA or PFB files into human-readable
-t1utils: form, and reassemble them into PFA or PFB format. Additionally you
-t1utils: can extract font resources from a Macintosh font file
-t1utils: (ATM/Laserwriter), or create a Macintosh Type 1 font file from a
-t1utils: PFA or PFB font.
-t1utils:
-t1utils:
diff --git a/system/t1utils/t1utils.SlackBuild b/system/t1utils/t1utils.SlackBuild
deleted file mode 100644
index ab9ef7ba50..0000000000
--- a/system/t1utils/t1utils.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for t1utils
-
-# Copyright 2013-2017 Kyle Guinn <elyk03@gmail.com>, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=t1utils
-VERSION=${VERSION:-1.41}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$(uname -m)" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$(uname -m) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM-$VERSION
-OUTPUT=${OUTPUT:-/tmp}
-
-DOCS="INSTALL LICENSE NEWS.md README.md"
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-chmod -R u+w,go-w,a+rX-st .
-
-# -D_GNU_SOURCE is to fix https://github.com/kohler/t1utils/issues/8
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-dependency-tracking \
- --build=$ARCH-slackware-linux \
- CFLAGS="$SLKCFLAGS" \
- CPPFLAGS="-D_GNU_SOURCE" \
-
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} +
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/t1utils/t1utils.info b/system/t1utils/t1utils.info
deleted file mode 100644
index 99d640b848..0000000000
--- a/system/t1utils/t1utils.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="t1utils"
-VERSION="1.41"
-HOMEPAGE="https://www.lcdf.org/type/#t1utils"
-DOWNLOAD="https://www.lcdf.org/type/t1utils-1.41.tar.gz"
-MD5SUM="5430f82fcc27ccfc44526a59fa64849a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Kyle Guinn"
-EMAIL="elyk03@gmail.com"
diff --git a/system/terminator/terminator.info b/system/terminator/terminator.info
index 217966f2ae..d205f33bf4 100644
--- a/system/terminator/terminator.info
+++ b/system/terminator/terminator.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://launchpad.net/terminator/trunk/1.0/+download/terminator-1.0.ta
MD5SUM="26b2c80a30bead957b83cef3a2b9101f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="psutil"
+REQUIRES="psutil vte2"
MAINTAINER="Alan Alberghini"
EMAIL="414N@slacky.it"
diff --git a/system/tinyterm/tinyterm.info b/system/tinyterm/tinyterm.info
index d27383884f..310a51b8a9 100644
--- a/system/tinyterm/tinyterm.info
+++ b/system/tinyterm/tinyterm.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/ryanpcmcquen/tinyterm/archive/0.6.0/tinyterm-0.6.0.
MD5SUM="e9adc2bc038576dfaa51cb4390b1100b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
MAINTAINER="B. Watson"
EMAIL="yalhcru@gmail.com"
diff --git a/system/ttyrec/ttyrec-1.0.8-flags.patch b/system/ttyrec/ttyrec-1.0.8-flags.patch
new file mode 100644
index 0000000000..34687d9b8b
--- /dev/null
+++ b/system/ttyrec/ttyrec-1.0.8-flags.patch
@@ -0,0 +1,19 @@
+--- a/Makefile 2017-08-26 11:47:02.981266309 +0200
++++ b/Makefile 2017-08-26 14:33:47.161600445 +0200
+@@ -10,13 +10,13 @@
+ all: $(TARGET)
+
+ ttyrec: ttyrec.o io.o
+- $(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyrec ttyrec.o io.o
+
+ ttyplay: ttyplay.o io.o
+- $(CC) $(CFLAGS) -o ttyplay ttyplay.o io.o
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyplay ttyplay.o io.o
+
+ ttytime: ttytime.o io.o
+- $(CC) $(CFLAGS) -o ttytime ttytime.o io.o
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttytime ttytime.o io.o
+
+ clean:
+ rm -f *.o $(TARGET) ttyrecord *~
diff --git a/system/ttyrec/ttyrec-1.0.8-glibc-2.30.patch b/system/ttyrec/ttyrec-1.0.8-glibc-2.30.patch
new file mode 100644
index 0000000000..174fc7786e
--- /dev/null
+++ b/system/ttyrec/ttyrec-1.0.8-glibc-2.30.patch
@@ -0,0 +1,30 @@
+diff --git a/ttyrec.c b/ttyrec.c
+index 3392f70..86a59ee 100644
+--- a/ttyrec.c
++++ b/ttyrec.c
+@@ -57,7 +57,9 @@
+
+ #if defined(SVR4)
+ #include <fcntl.h>
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__))
+ #include <stropts.h>
++#endif
+ #endif /* SVR4 */
+
+ #include <sys/time.h>
+@@ -449,6 +451,7 @@ getslave()
+ perror("open(fd, O_RDWR)");
+ fail();
+ }
++#ifndef __linux__
+ if (isastream(slave)) {
+ if (ioctl(slave, I_PUSH, "ptem") < 0) {
+ perror("ioctl(fd, I_PUSH, ptem)");
+@@ -466,6 +469,7 @@ getslave()
+ #endif
+ (void) ioctl(0, TIOCGWINSZ, (char *)&win);
+ }
++#endif
+ #else /* !SVR4 */
+ #ifndef HAVE_openpty
+ line[strlen("/dev/")] = 't';
diff --git a/system/ttyrec/ttyrec-1.0.8.RHEL5.patch b/system/ttyrec/ttyrec-1.0.8.RHEL5.patch
deleted file mode 100644
index 900b017cb9..0000000000
--- a/system/ttyrec/ttyrec-1.0.8.RHEL5.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -rupN original/Makefile new/Makefile
---- original/Makefile 2006-06-11 10:52:50.000000000 -0500
-+++ new/Makefile 2012-04-23 18:34:05.000000000 -0500
-@@ -1,5 +1,5 @@
- CC = gcc
--CFLAGS = -O2
-+CFLAGS = -O2 -DHAVE_openpty
- VERSION = 1.0.8
-
- TARGET = ttyrec ttyplay ttytime
-@@ -10,7 +10,7 @@ DIST = ttyrec.c ttyplay.c ttyrec.h io.c
- all: $(TARGET)
-
- ttyrec: ttyrec.o io.o
-- $(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o
-+ $(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o -lutil
-
- ttyplay: ttyplay.o io.o
- $(CC) $(CFLAGS) -o ttyplay ttyplay.o io.o
-diff -rupN original/ttyrec.c new/ttyrec.c
---- original/ttyrec.c 2006-06-11 10:52:50.000000000 -0500
-+++ new/ttyrec.c 2012-04-23 18:26:41.000000000 -0500
-@@ -71,7 +71,9 @@
- #define _(FOO) FOO
-
- #ifdef HAVE_openpty
--#include <libutil.h>
-+/* #include <libutil.h> */
-+#include <pty.h> /* for openpty and forkpty */
-+#include <utmp.h> /* for login_tty */
- #endif
-
- #if defined(SVR4) && !defined(CDEL)
diff --git a/system/ttyrec/ttyrec.SlackBuild b/system/ttyrec/ttyrec.SlackBuild
index caecc00574..a54cdb9126 100644
--- a/system/ttyrec/ttyrec.SlackBuild
+++ b/system/ttyrec/ttyrec.SlackBuild
@@ -69,10 +69,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Fixed: "Out of pty's Terminated"
-patch -p1 < $CWD/ttyrec-1.0.8.RHEL5.patch
+patch -p1 < $CWD/ttyrec-1.0.8-flags.patch
+patch -p1 < $CWD/ttyrec-1.0.8-glibc-2.30.patch
-make
+make CFLAGS+="$SLKCFLAGS -DSVR4 -DHAVE_inotify -D_XOPEN_SOURCE=500"
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/system/uhd/uhd.SlackBuild b/system/uhd/uhd.SlackBuild
index 1171a01c0a..d7100d6204 100644
--- a/system/uhd/uhd.SlackBuild
+++ b/system/uhd/uhd.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=uhd
-VERSION=${VERSION:-003_005_002}
+VERSION=${VERSION:-003_009_007}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -59,9 +59,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf UHD-Mirror-release_$VERSION
-tar xvf $CWD/release_$VERSION.tar.gz || tar xvf $CWD/UHD-Mirror-release_$VERSION.tar.gz
-cd UHD-Mirror-release_$VERSION/host
+rm -rf $PRGNAM-release_$VERSION
+tar xvf $CWD/release_$VERSION.tar.gz
+cd $PRGNAM-release_$VERSION/host
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/uhd/uhd.info b/system/uhd/uhd.info
index 15d3fc0305..87365de4d6 100644
--- a/system/uhd/uhd.info
+++ b/system/uhd/uhd.info
@@ -1,10 +1,10 @@
PRGNAM="uhd"
-VERSION="003_005_002"
+VERSION="003_009_007"
HOMEPAGE="https://www.ettus.com/"
-DOWNLOAD="https://github.com/EttusResearch/UHD-Mirror/archive/release_003_005_002.tar.gz"
-MD5SUM="14f914b68bb9f58b1d08ae97000c03f4"
+DOWNLOAD="https://github.com/EttusResearch/uhd/archive/release_003_009_007.tar.gz"
+MD5SUM="3f024ac4d536a8aaf1ad66617deda941"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="python-cheetah"
+REQUIRES="Mako python-cheetah python-requests"
MAINTAINER="Georgi Kolev"
EMAIL="shadowx@escom.bg"
diff --git a/system/unison/unison.SlackBuild b/system/unison/unison.SlackBuild
index 6d43f2fab0..4bb216b12f 100644
--- a/system/unison/unison.SlackBuild
+++ b/system/unison/unison.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=unison
-VERSION=${VERSION:-2.51.2}
+VERSION=${VERSION:-20191211_26a29f7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -61,7 +61,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/system/unison/unison.info b/system/unison/unison.info
index f10eaf5a3d..15c5be3a22 100644
--- a/system/unison/unison.info
+++ b/system/unison/unison.info
@@ -1,8 +1,8 @@
PRGNAM="unison"
-VERSION="2.51.2"
+VERSION="20191211_26a29f7"
HOMEPAGE="https://www.cis.upenn.edu/~bcpierce/unison/"
-DOWNLOAD="https://github.com/bcpierce00/unison/archive/v2.51.2/unison-2.51.2.tar.gz"
-MD5SUM="11991eddcf6fdd8b50041eefe44bad61"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/unison-20191211_26a29f7.tar.xz"
+MD5SUM="7c702475d21c2368f0af044847eb6c53"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lablgtk"
diff --git a/system/vhba-module/vhba-module.SlackBuild b/system/vhba-module/vhba-module.SlackBuild
index 64d9365316..37e455cce6 100644
--- a/system/vhba-module/vhba-module.SlackBuild
+++ b/system/vhba-module/vhba-module.SlackBuild
@@ -60,6 +60,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i "s|\ -Werror||" Makefile
+
make KERNELRELEASE=$KERNEL
mkdir -p $PKG/lib/modules/$KERNEL/extra
diff --git a/system/virt-manager/Add-Slackware-to-OS-choices.patch b/system/virt-manager/Add-Slackware-to-OS-choices.patch
index 18aadb62cf..0a5260206f 100644
--- a/system/virt-manager/Add-Slackware-to-OS-choices.patch
+++ b/system/virt-manager/Add-Slackware-to-OS-choices.patch
@@ -1,37 +1,21 @@
-diff -Nur virt-manager-1.5.0.orig/virtinst/osdict.py virt-manager-1.5.0/virtinst/osdict.py
---- virt-manager-1.5.0.orig/virtinst/osdict.py 2018-01-27 14:57:20.000000000 -0600
-+++ virt-manager-1.5.0/virtinst/osdict.py 2018-02-19 00:52:00.750416744 -0600
-@@ -159,6 +159,7 @@
- "rhel5": "rhel5.0",
- "rhel6": "rhel6.0",
- "rhel7": "rhel7.0",
-+ "slackware": "slackware14.2",
- "ubuntuhardy": "ubuntu8.04",
- "ubuntuintrepid": "ubuntu8.10",
- "ubuntujaunty": "ubuntu9.04",
-@@ -373,7 +374,7 @@
- # EOL date. So assume None == EOL, add some manual work arounds.
- # We should fix this in a new libosinfo version, and then drop
- # this hack
-- if self._is_related_to(["fedora24", "rhel7.0", "debian6",
-+ if self._is_related_to(["slackware14.2", "fedora24", "rhel7.0", "debian6",
- "ubuntu13.04", "win8", "win2k12", "mageia5", "centos7.0"],
- check_clones=False, check_derives=False):
- return True
-diff -Nur virt-manager-1.5.0.orig/virtinst/urlfetcher.py virt-manager-1.5.0/virtinst/urlfetcher.py
---- virt-manager-1.5.0.orig/virtinst/urlfetcher.py 2018-01-27 14:57:20.000000000 -0600
-+++ virt-manager-1.5.0/virtinst/urlfetcher.py 2018-02-19 00:52:00.751416752 -0600
-@@ -1379,6 +1379,43 @@
- return False
+diff -Nur virt-manager-2.2.0.orig/virtinst/install/urldetect.py virt-manager-2.2.0/virtinst/install/urldetect.py
+--- virt-manager-2.2.0.orig/virtinst/install/urldetect.py 2019-06-17 00:20:11.000000000 -0500
++++ virt-manager-2.2.0/virtinst/install/urldetect.py 2019-07-03 02:14:35.978571412 -0500
+@@ -466,6 +466,47 @@
+ return cache.treeinfo_family_regex(famregex)
-+class SlackwareDistro(Distro):
++class SlackwareDistro(_DistroTree):
+ # slackware doesn't have installable URLs, so this is just for a
+ # mounted ISO
+ name = "Slackware"
+ urldistro = "slackware"
+ os_variant = "linux"
+
++ PRETTY_NAME = "Slackware"
++ matching_distros = ["slackware"]
++ _variant_prefix = "slackware"
++
+ _boot_iso_paths = []
+ _xen_kernel_paths = []
+
@@ -62,6 +46,17 @@ diff -Nur virt-manager-1.5.0.orig/virtinst/urlfetcher.py virt-manager-1.5.0/virt
+ return False
+
+
- # Build list of all *Distro classes
- def _build_distro_list():
- allstores = []
+ class _SuseDistro(_RHELDistro):
+ PRETTY_NAME = None
+ _suse_regex = []
+diff -Nur virt-manager-2.2.0.orig/virtinst/osdict.py virt-manager-2.2.0/virtinst/osdict.py
+--- virt-manager-2.2.0.orig/virtinst/osdict.py 2019-06-17 00:20:11.000000000 -0500
++++ virt-manager-2.2.0/virtinst/osdict.py 2019-07-03 02:11:59.208399622 -0500
+@@ -146,6 +146,7 @@
+ "rhel5": "rhel5.0",
+ "rhel6": "rhel6.0",
+ "rhel7": "rhel7.0",
++ "slackware": "slackware14.2",
+ "ubuntuhardy": "ubuntu8.04",
+ "ubuntuintrepid": "ubuntu8.10",
+ "ubuntujaunty": "ubuntu9.04",
diff --git a/system/virt-manager/virt-manager.SlackBuild b/system/virt-manager/virt-manager.SlackBuild
index 3a8402bd75..1b2326ed09 100644
--- a/system/virt-manager/virt-manager.SlackBuild
+++ b/system/virt-manager/virt-manager.SlackBuild
@@ -4,10 +4,10 @@
# Written by Ash Wiren ash@spooksoftware.com # Released to public domain.
# Modified by Zoran Stojakovic
-# Lots of mods by rworkman for 1.x
+# Lots of mods by rworkman for 1.x and (later) 2.x
PRGNAM=virt-manager
-VERSION=${VERSION:-1.5.1}
+VERSION=${VERSION:-2.2.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -56,8 +56,8 @@ find -L . \
# Add Slackware support
patch -p1 < $CWD/Add-Slackware-to-OS-choices.patch
-python setup.py configure
-python setup.py install --root=$PKG
+python3 setup.py configure
+python3 setup.py install --root=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -68,7 +68,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- COPYING HACKING.md INSTALL.md NEWS.md README.md \
+ CONTRIBUTING.md COPYING INSTALL.md NEWS.md README.md \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/virt-manager/virt-manager.info b/system/virt-manager/virt-manager.info
index 6bdff3b232..c21bad0447 100644
--- a/system/virt-manager/virt-manager.info
+++ b/system/virt-manager/virt-manager.info
@@ -1,10 +1,10 @@
PRGNAM="virt-manager"
-VERSION="1.5.1"
+VERSION="2.2.1"
HOMEPAGE="http://virt-manager.org/"
-DOWNLOAD="http://virt-manager.org/download/sources/virt-manager/virt-manager-1.5.1.tar.gz"
-MD5SUM="32a929fd91fca9767730abaefb94661d"
+DOWNLOAD="https://virt-manager.org/download/sources/virt-manager/virt-manager-2.2.1.tar.gz"
+MD5SUM="adb4fa436d60b62a8e18a7b3a1667d97"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="libosinfo libvirt-glib libvirt-python gnome-python2-gconf tunctl ipaddr-py python-requests gtk-vnc spice-gtk vte3"
+REQUIRES="gtksourceview3 libosinfo libvirt-glib libvirt-python gtk-vnc spice-gtk"
MAINTAINER="Robby Workman"
EMAIL="rworkman@slackbuilds.org"
diff --git a/system/virtualbox-addons/rc.vboxadd.diff b/system/virtualbox-addons/rc.vboxadd.diff
index f0b3acddd0..bb5fdde0fe 100644
--- a/system/virtualbox-addons/rc.vboxadd.diff
+++ b/system/virtualbox-addons/rc.vboxadd.diff
@@ -1,6 +1,7 @@
---- vboxadd.sh.orig 2016-11-23 16:24:46.000000000 +0100
-+++ vboxadd.sh 2016-12-27 16:06:46.413895799 +0100
-@@ -154,42 +154,9 @@
+diff -ur VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh VirtualBox-5.2.4/src/VBox/Additions/linux/installer/vboxadd.sh
+--- VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh 2017-12-19 10:22:03.000000000 +0100
++++ VirtualBox-5.2.4/src/VBox/Additions/linux/installer/vboxadd.sh 2018-01-07 17:23:23.225998245 +0100
+@@ -130,18 +130,9 @@
dev=/dev/vboxguest
userdev=/dev/vboxuser
@@ -8,165 +9,127 @@
owner=vboxadd
group=1
--test_for_gcc_and_make()
--{
-- which make > /dev/null 2>&1 || printf "\nThe make utility was not found. If the following module compilation fails then\nthis could be the reason and you should try installing it.\n"
-- which gcc > /dev/null 2>&1 || printf "\nThe gcc utility was not found. If the following module compilation fails then\nthis could be the reason and you should try installing it.\n"
--}
--
--test_sane_kernel_dir()
--{
-- KERN_VER=`uname -r`
-- KERN_DIR="/lib/modules/$KERN_VER/build"
-- if [ -d "$KERN_DIR" ]; then
-- KERN_REL=`make -sC $KERN_DIR --no-print-directory kernelrelease 2>/dev/null || true`
-- if [ -z "$KERN_REL" -o "x$KERN_REL" = "x$KERN_VER" ]; then
-- return 0
-- fi
-- fi
-- printf "\nThe headers for the current running kernel were not found. If the following\nmodule compilation fails then this could be the reason.\n"
-- if [ "$system" = "redhat" ]; then
-- if echo "$KERN_VER" | grep -q "uek"; then
-- printf "The missing package can be probably installed with\nyum install kernel-uek-devel-$KERN_VER\n"
-- else
-- printf "The missing package can be probably installed with\nyum install kernel-devel-$KERN_VER\n"
-- fi
-- elif [ "$system" = "suse" ]; then
-- KERN_VER_SUSE=`echo "$KERN_VER" | sed 's/.*-\([^-]*\)/\1/g'`
-- KERN_VER_BASE=`echo "$KERN_VER" | sed 's/\(.*\)-[^-]*/\1/g'`
-- printf "The missing package can be probably installed with\nzypper install kernel-$KERN_VER_SUSE-devel-$KERN_VER_BASE\n"
-- elif [ "$system" = "debian" ]; then
-- printf "The missing package can be probably installed with\napt-get install linux-headers-$KERN_VER\n"
-- fi
--}
+-if test -r $config; then
+- . $config
+-else
+- fail "Configuration file $config not found"
+-fi
+-test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
+- fail "Configuration file $config not complete"
-
running_vboxguest()
{
lsmod | grep -q "vboxguest[^_-]"
-@@ -261,13 +228,6 @@
- start()
- {
- begin "Starting the VirtualBox Guest Additions ";
-- if test -r $config; then
-- . $config
-- else
-- fail "Configuration file $config not found"
+@@ -252,28 +243,6 @@
+ }
+ fi # INSTALL_NO_MODULE_BUILDS
+
+- # Put the X.Org driver in place. This is harmless if it is not needed.
+- "${INSTALL_DIR}/init/vboxadd-x11" setup 2>> "${LOG}"
+- # Install the guest OpenGL drivers. For now we don't support
+- # multi-architecture installations
+- rm -f /etc/ld.so.conf.d/00vboxvideo.conf
+- rm -Rf /var/lib/VBoxGuestAdditions/lib
+- if /usr/bin/VBoxClient --check3d 2>/dev/null; then
+- mkdir -p /var/lib/VBoxGuestAdditions/lib
+- ln -sf "${INSTALL_DIR}/lib/VBoxOGL.so" /var/lib/VBoxGuestAdditions/lib/libGL.so.1
+- # SELinux for the OpenGL libraries, so that gdm can load them during the
+- # acceleration support check. This prevents an "Oh no, something has gone
+- # wrong!" error when starting EL7 guests.
+- if test -e /etc/selinux/config; then
+- if command -v semanage > /dev/null; then
+- semanage fcontext -a -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1"
+- fi
+- chcon -h -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1"
+- fi
+- echo "/var/lib/VBoxGuestAdditions/lib" > /etc/ld.so.conf.d/00vboxvideo.conf
- fi
-- test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
-- fail "Configuration file $config not complete"
- uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
- ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
- no_udev=1
-@@ -378,218 +338,16 @@
+- ldconfig
+-
+ # Mount all shared folders from /etc/fstab. Normally this is done by some
+ # other startup script but this requires the vboxdrv kernel module loaded.
+ # This isn't necessary anymore as the vboxsf module is autoloaded.
+@@ -303,195 +272,16 @@
return 0
}
--## Update the initramfs. Debian and Ubuntu put the graphics driver in, and
--# need the touch(1) command below. Everyone else that I checked just need
--# the right module alias file from depmod(1) and only use the initramfs to
--# load the root filesystem, not the boot splash. update-initramfs works
--# for the first two and dracut for every one else I checked. We are only
--# interested in distributions recent enough to use the KMS vboxvideo driver.
--## @param $1 kernel version to update for.
--update_module_dependencies()
--{
-- depmod "${1}"
-- rm -f "/lib/modules/${1}/initrd/vboxvideo"
-- test -d "/lib/modules/${1}/initrd" &&
-- test -f "/lib/modules/${1}/misc/vboxvideo.ko" &&
-- touch "/lib/modules/${1}/initrd/vboxvideo"
-- test -n "${QUICKSETUP}" && return
-- if type dracut >/dev/null 2>&1; then
-- dracut -f "/boot/initramfs-${1}.img" "${1}"
-- elif type update-initramfs >/dev/null 2>&1; then
-- update-initramfs -u -k "${1}"
-- fi
--}
--
-# Remove any existing VirtualBox guest kernel modules from the disk, but not
-# from the kernel as they may still be in use
-cleanup_modules()
-{
-- if [ -n "$(which dkms 2>/dev/null)" ]; then
-- begin "Removing existing VirtualBox DKMS kernel modules"
-- $DODKMS uninstall $OLDMODULES > $LOG
-- succ_msg
-- fi
-- begin "Removing existing VirtualBox non-DKMS kernel modules"
-- for i in $OLDMODULES; do
-- find /lib/modules -name $i\* | xargs rm 2>/dev/null
+- log "Removing existing VirtualBox kernel modules."
+- for i in ${OLDMODULES}; do
+- # We no longer support DKMS, remove any leftovers.
+- rm -rf "/var/lib/dkms/${i}"*
+- # And remove old modules.
+- rm -f /lib/modules/*/misc/"${i}"*
- done
-- succ_msg
+- # Remove leftover module folders.
+- for i in /lib/modules/*/misc; do
+- test -d "${i}" && rmdir -p "${i}" 2>/dev/null
+- done
+- rm -f /etc/depmod.d/vboxvideo-upstream.conf
-}
-
-# Build and install the VirtualBox guest kernel modules
-setup_modules()
-{
- # don't stop the old modules here -- they might be in use
-- cleanup_modules
-- begin "Building the VirtualBox Guest Additions kernel modules"
--
-- # Short cut out if a dkms build succeeds
-- if [ -n "$(which dkms 2>/dev/null)" ] &&
-- $DODKMS install vboxguest $INSTALL_VER >> $LOG 2>&1; then
-- succ_msg
-- return 0
-- fi
--
-- test_for_gcc_and_make
-- test_sane_kernel_dir
+- test -z "${QUICKSETUP}" && cleanup_modules
+- # This does not work for 2.4 series kernels. How sad.
+- test -n "${QUICKSETUP}" && test -f "${MODULE_DIR}/vboxguest.ko" && return 0
+- info "Building the VirtualBox Guest Additions kernel modules."
-
-- echo
-- begin "Building the main Guest Additions module"
+- # We are allowed to do ">> $LOG" after we have called "log()" once.
+- log "Building the main Guest Additions module."
- if ! $BUILDINTMP \
- --save-module-symvers /tmp/vboxguest-Module.symvers \
- --module-source $MODULE_SRC/vboxguest \
- --no-print-directory install >> $LOG 2>&1; then
-- show_error "Look at $LOG to find out what went wrong"
-- return 1
+- # If check_module_dependencies.sh fails it prints a message itself.
+- "${INSTALL_DIR}"/other/check_module_dependencies.sh 2>&1 &&
+- info "Look at $LOG to find out what went wrong"
+- return 0
- fi
-- succ_msg
-- begin "Building the shared folder support module"
+- log "Building the shared folder support module"
- if ! $BUILDINTMP \
- --use-module-symvers /tmp/vboxguest-Module.symvers \
- --module-source $MODULE_SRC/vboxsf \
- --no-print-directory install >> $LOG 2>&1; then
-- show_error "Look at $LOG to find out what went wrong"
-- return 1
+- info "Look at $LOG to find out what went wrong"
+- return 0
- fi
-- succ_msg
-- begin "Building the graphics driver module"
+- log "Building the graphics driver module"
- if ! $BUILDINTMP \
- --use-module-symvers /tmp/vboxguest-Module.symvers \
- --module-source $MODULE_SRC/vboxvideo \
- --no-print-directory install >> $LOG 2>&1; then
-- show_error "Look at $LOG to find out what went wrong"
+- info "Look at $LOG to find out what went wrong"
- fi
-- succ_msg
-- update_module_dependencies "${KERN_VER}"
+- [ -d /etc/depmod.d ] || mkdir /etc/depmod.d
+- echo "override vboxguest * misc" > /etc/depmod.d/vboxvideo-upstream.conf
+- echo "override vboxsf * misc" >> /etc/depmod.d/vboxvideo-upstream.conf
+- echo "override vboxvideo * misc" >> /etc/depmod.d/vboxvideo-upstream.conf
+- depmod
- return 0
-}
-
--# Do non-kernel bits needed for the kernel modules to work properly (user
--# creation, udev, mount helper...)
--extra_setup()
+-create_vbox_user()
-{
-- begin "Doing non-kernel setup of the Guest Additions"
-- echo "Creating user for the Guest Additions." >> $LOG
+- log "Creating user for the Guest Additions."
- # This is the LSB version of useradd and should work on recent
- # distributions
- useradd -d /var/run/vboxadd -g 1 -r -s /bin/false vboxadd >/dev/null 2>&1
- # And for the others, we choose a UID ourselves
- useradd -d /var/run/vboxadd -g 1 -u 501 -o -s /bin/false vboxadd >/dev/null 2>&1
-
-- # Add a group "vboxsf" for Shared Folders access
-- # All users which want to access the auto-mounted Shared Folders have to
-- # be added to this group.
-- groupadd -r -f vboxsf >/dev/null 2>&1
+-}
-
+-create_udev_rule()
+-{
- # Create udev description file
- if [ -d /etc/udev/rules.d ]; then
-- echo "Creating udev rule for the Guest Additions kernel module." >> $LOG
+- log "Creating udev rule for the Guest Additions kernel module."
- udev_call=""
- udev_app=`which udevadm 2> /dev/null`
- if [ $? -eq 0 ]; then
@@ -189,91 +152,97 @@
- echo "KERNEL=${udev_fix}\"vboxguest\", NAME=\"vboxguest\", OWNER=\"vboxadd\", MODE=\"0660\"" > /etc/udev/rules.d/60-vboxadd.rules
- echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules
- fi
+-}
+-
+-create_module_rebuild_script()
+-{
+- # And a post-installation script for rebuilding modules when a new kernel
+- # is installed.
+- mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d
+- cat << EOF > /etc/kernel/postinst.d/vboxadd
+-#!/bin/sh
+-test -d "/lib/modules/\${1}/build" || exit 0
+-KERN_VER="\${1}" /sbin/rcvboxadd quicksetup
+-exit 0
+-EOF
+- cat << EOF > /etc/kernel/prerm.d/vboxadd
+-#!/bin/sh
+-for i in ${OLDMODULES}; do rm -f /lib/modules/"\${1}"/misc/"\${i}".ko; done
+-rmdir -p /lib/modules/"\$1"/misc 2>/dev/null
+-exit 0
+-EOF
+- chmod 0755 /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd
+-}
+-
+-shared_folder_setup()
+-{
+- # Add a group "vboxsf" for Shared Folders access
+- # All users which want to access the auto-mounted Shared Folders have to
+- # be added to this group.
+- groupadd -r -f vboxsf >/dev/null 2>&1
-
-- # Put mount.vboxsf in the right place
-- ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin
-- # And an rc file to re-build the kernel modules and re-set-up the X server.
-- ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd
-- ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11
+- # Put the mount.vboxsf mount helper in the right place.
+- ## @todo It would be nicer if the kernel module just parsed parameters
+- # itself instead of needing a separate binary to do that.
+- ln -sf "${INSTALL_DIR}/other/mount.vboxsf" /sbin
- # SELinux security context for the mount helper.
- if test -e /etc/selinux/config; then
- # This is correct. semanage maps this to the real path, and it aborts
- # with an error, telling you what you should have typed, if you specify
-- # the real path. The "chcon" is there as a back-up in case this is
-- # different on old guests.
-- semanage fcontext -a -t mount_exec_t "/usr/lib/$PACKAGE/mount.vboxsf"
-- chcon -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf"
+- # the real path. The "chcon" is there as a back-up for old guests.
+- command -v semanage > /dev/null &&
+- semanage fcontext -a -t mount_exec_t "${INSTALL_DIR}/other/mount.vboxsf"
+- chcon -t mount_exec_t "${INSTALL_DIR}/other/mount.vboxsf"
- fi
-- succ_msg
-}
-
# setup_script
setup()
{
-- if test -r $config; then
-- . $config
-- else
-- fail "Configuration file $config not found"
-- fi
-- test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
-- fail "Configuration file $config not complete"
- export BUILD_TYPE
- export USERNAME
-
-- rm -f $LOG
- MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
- BUILDINTMP="$MODULE_SRC/build_in_tmp"
-- DODKMS="$MODULE_SRC/do_dkms"
- chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
-- chcon -t bin_t "$DODKMS" > /dev/null 2>&1
-
-- setup_modules
-- mod_succ="$?"
-- extra_setup
-- if [ "$mod_succ" -eq "0" ]; then
-- if running_vboxguest || running_vboxadd; then
-- printf "You should restart your guest to make sure the new modules are actually used\n\n"
-- else
-- start
-- fi
+- test -z "${INSTALL_NO_MODULE_BUILDS}" && setup_modules
+- create_vbox_user
+- create_udev_rule
+- test -z "${INSTALL_NO_MODULE_BUILDS}" && create_module_rebuild_script
+- test -n "${QUICKSETUP}" && return 0
+- shared_folder_setup
+- if running_vboxguest || running_vboxadd; then
+- info "Running kernel modules will not be replaced until the system is restarted"
- fi
+- return 0
+ echo "Not implemented! Please use the virtualbox-kernel-addons.SlackBuild available at SlackBuilds.org instead."
}
# cleanup_script
cleanup()
{
-- if test -r $config; then
-- . $config
-- test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
-- fail "Configuration file $config not complete"
-- DODKMS="$INSTALL_DIR/src/vboxguest-$INSTALL_VER/do_dkms"
-- elif test -x ./do_dkms; then # Executing as part of the installer...
-- DODKMS=./do_dkms
-- else
-- fail "Configuration file $config not found"
+- if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
+- # Delete old versions of VBox modules.
+- cleanup_modules
+- depmod
+-
+- # Remove old module sources
+- for i in $OLDMODULES; do
+- rm -rf /usr/src/$i-*
+- done
- fi
-
-- # Delete old versions of VBox modules.
-- cleanup_modules
-- for i in /lib/modules/*; do
-- update_module_dependencies "${i#/lib/modules/}"
-- done
--
-- # Remove old module sources
-- for i in $OLDMODULES; do
-- rm -rf /usr/src/$i-*
-- done
--
- # Clean-up X11-related bits
-- /sbin/rcvboxadd-x11 cleanup
+- "${INSTALL_DIR}/init/vboxadd-x11" cleanup 2>> "${LOG}"
-
- # Remove other files
- rm /sbin/mount.vboxsf 2>/dev/null
-- rm /sbin/rcvboxadd 2>/dev/null
-- rm /sbin/rcvboxadd-x11 2>/dev/null
+- if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
+- rm -f /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd
+- rmdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d 2>/dev/null
+- fi
- rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
-- rm -f /lib/modules/*/initrd/vboxvideo
+ echo "Not implemented! Please use removepkg or pkgtool to remove virtualbox-addons and/or virtualbox-kernel-addons instead."
}
diff --git a/system/virtualbox-addons/virtualbox-addons.SlackBuild b/system/virtualbox-addons/virtualbox-addons.SlackBuild
index 063fa71844..fd72c91ad3 100644
--- a/system/virtualbox-addons/virtualbox-addons.SlackBuild
+++ b/system/virtualbox-addons/virtualbox-addons.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for virtualbox-addons
-# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2018 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
PRGNAM=virtualbox-addons
SRCNAM=VirtualBox
-VERSION=${VERSION:-5.0.40}
+VERSION=${VERSION:-5.2.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -86,22 +86,20 @@ find -L . \
# Use virtualbox-kernel-addons.SlackBuild for this.
patch -d src/VBox/Additions/linux/installer/ -i $CWD/rc.vboxadd.diff
-# We set the environment variables manually to avoid dependency on acpica
-export BUILD_PLATFORM="linux"
-export BUILD_PLATFORM_ARCH="$TARGET"
-export BUILD_TARGET="linux"
-export BUILD_TARGET_ARCH="$TARGET"
-export BUILD_TARGET_CPU="$ARCH"
-export BUILD_TYPE="release"
-export PATH_KBUILD="$TMP/$SRCNAM-${VERSION}/kBuild"
-export PATH_DEVTOOLS="$TMP/$SRCNAM-${VERSION}/tools"
-path_kbuild_bin="$PATH_KBUILD/bin/$BUILD_TARGET.$BUILD_PLATFORM_ARCH"
-export PATH_KBUILD_BIN="$path_kbuild_bin"
-path_dev_bin="$PATH_DEVTOOLS/$BUILD_TARGET.$BUILD_PLATFORM_ARCH"/bin
-echo "$PATH" | grep -q "$path_kbuild_bin" || PATH="$path_kbuild_bin:$PATH"
-echo "$PATH" | grep -q "$path_dev_bin" || PATH="$path_dev_bin:$PATH"
-export PATH
-unset path_kbuild_bin path_dev_bin
+# Cheat!
+sed -i "s|cc_maj -gt 7|cc_maj -gt 9|" configure
+
+./configure \
+ --only-additions \
+ --disable-kmods \
+ --with-makeself=/usr/bin/echo
+
+. ./env.sh
+
+OPENSSL=$(grep openssl src/libs/Makefile.kmk | cut -d "/" -f 2)
+
+mkdir -p src/libs/$OPENSSL
+touch src/libs/$OPENSSL/Makefile.kmk
kmk -j ${JOBS} LOCALCFG=$CWD/LocalConfig.kmk
@@ -135,8 +133,9 @@ cd out/linux.$TARGET/release/bin/additions
install -m 755 VBoxClient $PKG/usr/bin/
install -m 755 VBoxService $PKG/usr/sbin/
install -m 4755 mount.vboxsf $PKG/sbin/mount.vboxsf
- install -m 644 vboxvideo_drv_$XSERVER.so \
- $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/vboxvideo_drv.so
+## slackware > 14.2 already ships this
+# install -m 644 vboxvideo_drv_$XSERVER.so \
+# $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/vboxvideo_drv.so
install -m 644 VBoxOGLcrutil.so $PKG/usr/lib$LIBDIRSUFFIX
install -m 644 VBoxOGLerrorspu.so $PKG/usr/lib$LIBDIRSUFFIX
@@ -145,12 +144,9 @@ cd out/linux.$TARGET/release/bin/additions
install -m 644 VBoxOGLpackspu.so $PKG/usr/lib$LIBDIRSUFFIX
install -m 644 VBoxOGLpassthroughspu.so $PKG/usr/lib$LIBDIRSUFFIX
install -m 644 VBoxOGL.so $PKG/usr/lib$LIBDIRSUFFIX
+ install -m 644 VBoxEGL.so $PKG/usr/lib$LIBDIRSUFFIX
install -m 755 $CWD/vbox-uninstall-guest-additions $PKG/usr/sbin/
-
- mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/dri
- ln -s /usr/lib$LIBDIRSUFFIX/VBoxOGL.so \
- $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/dri/vboxvideo_dri.so
cd -
# kconf_update script to disable OpenGL within KDE
diff --git a/system/virtualbox-addons/virtualbox-addons.info b/system/virtualbox-addons/virtualbox-addons.info
index bf313e7e8d..df1ddc3012 100644
--- a/system/virtualbox-addons/virtualbox-addons.info
+++ b/system/virtualbox-addons/virtualbox-addons.info
@@ -1,8 +1,8 @@
PRGNAM="virtualbox-addons"
-VERSION="5.0.40"
+VERSION="5.2.8"
HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.40/VirtualBox-5.0.40.tar.bz2"
-MD5SUM="53b259e48a137b0185c169590e2dcb77"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/5.2.8/VirtualBox-5.2.8.tar.bz2"
+MD5SUM="e731ea9c5c31096ec4c2a3bfba26665c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild b/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild
index 9115605537..34edd01549 100644
--- a/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild
+++ b/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild
@@ -4,7 +4,7 @@
# Originally written by Vliegendehuiskat, vliegendehuiskat [at] gmail [dot] com
-# Copyright 2014-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2014-2020 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=virtualbox-extension-pack
-VERSION=${VERSION:-5.0.40}
+VERSION=${VERSION:-6.1.10}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/virtualbox-extension-pack/virtualbox-extension-pack.info b/system/virtualbox-extension-pack/virtualbox-extension-pack.info
index 701af5aaef..814b7375b9 100644
--- a/system/virtualbox-extension-pack/virtualbox-extension-pack.info
+++ b/system/virtualbox-extension-pack/virtualbox-extension-pack.info
@@ -1,8 +1,8 @@
PRGNAM="virtualbox-extension-pack"
-VERSION="5.0.40"
+VERSION="6.1.10"
HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.40/Oracle_VM_VirtualBox_Extension_Pack-5.0.40.vbox-extpack"
-MD5SUM="6991b332555f07a14189478486d4aae6"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.10/Oracle_VM_VirtualBox_Extension_Pack-6.1.10.vbox-extpack"
+MD5SUM="9df7a27d3f7f0cf6cad193898cbf05fa"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild
index 722e60c9b8..e9a70ab605 100644
--- a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild
+++ b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for virtualbox-kernel-addons
-# Copyright 2008-2019 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2018 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=virtualbox-kernel-addons
-VERSION=${VERSION:-5.0.40}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.2.8}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
KERNEL=${KERNEL:-$(uname -r)}
@@ -79,7 +79,21 @@ if [ "$KERNEL_MINOR" = 4 -a "$KERNEL_PATCH" -ge 168 ]; then
sed -i "s|KERNEL_VERSION(4, 9, 0)|KERNEL_VERSION(4, 4, 168)|" vboxguest/r0drv/linux/memobj-r0drv-linux.c
fi
-for i in vboxguest vboxsf vboxvideo; do
+MODULES=""
+
+if ! [ -e /lib/modules/$KERNEL/kernel/drivers/staging/vboxvideo ]; then
+ MODULES="$MODULES vboxvideo"
+fi
+
+if ! [ -e /lib/modules/$KERNEL/kernel/virt/vboxguest ]; then
+ MODULES="$MODULES vboxguest"
+fi
+
+if ! [ -e /lib/modules/$KERNEL/kernel/fs/vboxsf ]; then
+ MODULES="$MODULES vboxsf"
+fi
+
+for i in $MODULES; do
cd $i
make KERN_DIR=$KERNELPATH
install -m 0644 $i.ko $PKG/lib/modules/$KERNEL/misc/
diff --git a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info
index 33c005b4fe..6b86b209b4 100644
--- a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info
+++ b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info
@@ -1,8 +1,8 @@
PRGNAM="virtualbox-kernel-addons"
-VERSION="5.0.40"
+VERSION="5.2.8"
HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://www.liwjatan.at/files/src/virtualbox-kernel-addons/virtualbox-kernel-addons-5.0.40.tar.xz"
-MD5SUM="6146afd44b37c65bd7acc01e067b6e86"
+DOWNLOAD="http://www.liwjatan.at/files/src/virtualbox-kernel-addons/virtualbox-kernel-addons-5.2.8.tar.xz"
+MD5SUM="e4202f46e4adeb1da588a86fe51d58d5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
index d879686802..7964f87e41 100644
--- a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
+++ b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for virtualbox-kernel
-# Copyright 2008-2019 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2020 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
# Modified by SlackBuilds.org
PRGNAM=virtualbox-kernel
-VERSION=${VERSION:-5.0.40}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-6.1.10}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
KERNEL=${KERNEL:-$(uname -r)}
@@ -67,21 +67,7 @@ find -L . \
if ! [ "${HARDENING:-yes}" = "yes" ]; then
sed -i "s/ -DVBOX_WITH_HARDENING//g" \
- {vboxdrv,vboxnetadp,vboxnetflt,vboxpci}/Makefile
-fi
-
-KERNEL_LOCALVERSION=$(zgrep "CONFIG_LOCALVERSION=" /proc/config.gz | cut -d '"' -f 2)
-if [ -z "$KERNEL_LOCALVERSION" ]; then
- KERNEL_MINOR=$(echo $KERNEL | cut -d "." -f 2)
- KERNEL_PATCH=$(echo $KERNEL | cut -d "." -f 3)
-else
- KERNEL_MINOR=$(echo $KERNEL | sed "s|$KERNEL_LOCALVERSION||" | cut -d "." -f 2)
- KERNEL_PATCH=$(echo $KERNEL | sed "s|$KERNEL_LOCALVERSION||" | cut -d "." -f 3)
-fi
-
-# Work around API break introduced in kernel 4.4.168
-if [ "$KERNEL_MINOR" = 4 -a "$KERNEL_PATCH" -ge 168 ]; then
- sed -i "s|KERNEL_VERSION(4, 9, 0)|KERNEL_VERSION(4, 4, 168)|" vboxdrv/r0drv/linux/memobj-r0drv-linux.c
+ {vboxdrv,vboxnetadp,vboxnetflt}/Makefile
fi
make KERN_DIR=${KERNELPATH}
@@ -90,7 +76,6 @@ mkdir -p $PKG/lib/modules/$KERNEL/misc
install -m 0644 vboxdrv.ko $PKG/lib/modules/$KERNEL/misc/
install -m 0644 vboxnetflt.ko $PKG/lib/modules/$KERNEL/misc/
install -m 0644 vboxnetadp.ko $PKG/lib/modules/$KERNEL/misc/
-install -m 0644 vboxpci.ko $PKG/lib/modules/$KERNEL/misc/
mkdir -p $PKG/usr/doc/$PRGNAM-$PKG_VERS
cat $CWD/COPYING > $PKG/usr/doc/$PRGNAM-$PKG_VERS/COPYING
diff --git a/system/virtualbox-kernel/virtualbox-kernel.info b/system/virtualbox-kernel/virtualbox-kernel.info
index deded0026e..422c2ee3fb 100644
--- a/system/virtualbox-kernel/virtualbox-kernel.info
+++ b/system/virtualbox-kernel/virtualbox-kernel.info
@@ -1,8 +1,8 @@
PRGNAM="virtualbox-kernel"
-VERSION="5.0.40"
+VERSION="6.1.10"
HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://www.liwjatan.at/files/src/virtualbox-kernel/virtualbox-kernel-5.0.40.tar.xz"
-MD5SUM="475de2d0a915ce7c0c623ac50696bb79"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/virtualbox-kernel-6.1.10.tar.xz"
+MD5SUM="748f01fc32accfaffe9b59f4635c6753"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/virtualbox/006-rdesktop-vrdp-keymap-path.patch b/system/virtualbox/006-rdesktop-vrdp-keymap-path.patch
index 46c72c1ccf..217aa4970b 100644
--- a/system/virtualbox/006-rdesktop-vrdp-keymap-path.patch
+++ b/system/virtualbox/006-rdesktop-vrdp-keymap-path.patch
@@ -1,6 +1,6 @@
# 2015 © Sébastien Luttringer
---- a/src/VBox/RDP/client-1.8.3/Makefile.kmk 2013-02-19 23:12:20.207464901 +0100
-+++ b/src/VBox/RDP/client-1.8.3/Makefile.kmk 2014-01-04 04:17:26.700618600 +0100
+--- a/src/VBox/RDP/client-1.8.4/Makefile.kmk 2013-02-19 23:12:20.207464901 +0100
++++ b/src/VBox/RDP/client-1.8.4/Makefile.kmk 2014-01-04 04:17:26.700618600 +0100
@@ -41,7 +41,7 @@
EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \
HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \
diff --git a/system/virtualbox/10-virtualbox.rules b/system/virtualbox/10-virtualbox.rules
index cdddafb97c..db7ade9e0a 100644
--- a/system/virtualbox/10-virtualbox.rules
+++ b/system/virtualbox/10-virtualbox.rules
@@ -1,7 +1,8 @@
KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660"
KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0666"
KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+
+SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/system/virtualbox/LocalConfig.kmk b/system/virtualbox/LocalConfig.kmk
index 379c93fb45..8003032c10 100644
--- a/system/virtualbox/LocalConfig.kmk
+++ b/system/virtualbox/LocalConfig.kmk
@@ -5,6 +5,7 @@ DEFS += RTPATH_APP_PRIVATE=\"/usr/share/virtualbox\"
# don't build testcases to save time, they are not needed for the package
VBOX_WITH_TESTCASES :=
VBOX_WITH_TESTSUITE :=
+VBOX_WITH_VALIDATIONKIT :=
# don't build guest-additions, they will come in a separate build
VBOX_WITHOUT_ADDITIONS := 1
@@ -32,3 +33,13 @@ VBOX_JAVA_HOME := /usr/LIBDIR/java
# Do not build docs from source. Depends on texlive...
VBOX_WITHOUT_DOCS := 1
+
+# Use our CFLAGS
+VBOX_GCC_OPT := CXXFLAGS
+
+# Don't display update requests as we manage updates via packages
+VBOX_WITH_UPDATE_REQUEST :=
+
+# Build useful tools linked to testcases
+VBOX_WITH_VBOX_IMG := 1
+VBOX_WITH_VBOXIMGMOUNT := 1
diff --git a/system/virtualbox/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff
index 0adf8ec237..bb2be6fc89 100644
--- a/system/virtualbox/vboxdrv.sh-setup.diff
+++ b/system/virtualbox/vboxdrv.sh-setup.diff
@@ -1,93 +1,299 @@
---- VirtualBox-4.3.4.orig/src/VBox/Installer/linux/vboxdrv.sh.in 2013-11-29 20:24:07.000000000 +0100
-+++ VirtualBox-4.3.4/src/VBox/Installer/linux/vboxdrv.sh.in 2013-12-08 18:08:09.667571974 +0100
-@@ -44,17 +44,13 @@
+--- VirtualBox-6.1.4.orig/src/VBox/Installer/linux/vboxdrv.sh 2020-02-18 18:20:19.000000000 +0100
++++ VirtualBox-6.1.4/src/VBox/Installer/linux/vboxdrv.sh 2020-02-22 14:33:41.141337430 +0100
+@@ -61,23 +61,8 @@
+ export USERNAME
+ export USER=$USERNAME
- if [ -n "$INSTALL_DIR" ]; then
- VBOXMANAGE="$INSTALL_DIR/VBoxManage"
-- MODULE_SRC="$INSTALL_DIR/src/vboxhost"
- else
- VBOXMANAGE="/usr/lib/virtualbox/VBoxManage"
+-if test -n "${INSTALL_DIR}" && test -x "${INSTALL_DIR}/VirtualBox"; then
+- MODULE_SRC="${INSTALL_DIR}/src/vboxhost"
+-elif test -x /usr/lib/virtualbox/VirtualBox; then
+- INSTALL_DIR=/usr/lib/virtualbox
- MODULE_SRC="/usr/share/virtualbox/src/vboxhost"
- fi
--BUILDINTMP="$MODULE_SRC/build_in_tmp"
--DODKMS="$MODULE_SRC/do_dkms"
+-elif test -x "${SCRIPT_DIR}/VirtualBox"; then
+- # Executing from the build directory
+- INSTALL_DIR="${SCRIPT_DIR}"
+- MODULE_SRC="${INSTALL_DIR}/src"
+-else
+- # Silently exit if the package was uninstalled but not purged.
+- # Applies to Debian packages only (but shouldn't hurt elsewhere)
+- exit 0
+-fi
+ VIRTUALBOX="${INSTALL_DIR}/VirtualBox"
+ VBOXMANAGE="${INSTALL_DIR}/VBoxManage"
+-BUILDINTMP="${MODULE_SRC}/build_in_tmp"
+ if test -u "${VIRTUALBOX}"; then
+ GROUP=root
+ DEVICE_MODE=0600
+@@ -148,125 +133,6 @@
+ echo "${1}" >> "${LOG}"
+ }
+
+-module_build_log()
+-{
+- setup_log
+- echo "${1}" | egrep -v \
+- "^test -e include/generated/autoconf.h|^echo >&2|^/bin/false\)$" \
+- >> "${LOG}"
+-}
+-
+-## Output the vboxdrv part of our udev rule. This is redirected to the right file.
+-udev_write_vboxdrv() {
+- VBOXDRV_GRP="$1"
+- VBOXDRV_MODE="$2"
+-
+- echo "KERNEL==\"vboxdrv\", NAME=\"vboxdrv\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\""
+- echo "KERNEL==\"vboxdrvu\", NAME=\"vboxdrvu\", OWNER=\"root\", GROUP=\"root\", MODE=\"0666\""
+- echo "KERNEL==\"vboxnetctl\", NAME=\"vboxnetctl\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\""
+-}
+-
+-## Output the USB part of our udev rule. This is redirected to the right file.
+-udev_write_usb() {
+- INSTALLATION_DIR="$1"
+- USB_GROUP="$2"
+-
+- echo "SUBSYSTEM==\"usb_device\", ACTION==\"add\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\""
+- echo "SUBSYSTEM==\"usb\", ACTION==\"add\", ENV{DEVTYPE}==\"usb_device\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\""
+- echo "SUBSYSTEM==\"usb_device\", ACTION==\"remove\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\""
+- echo "SUBSYSTEM==\"usb\", ACTION==\"remove\", ENV{DEVTYPE}==\"usb_device\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\""
+-}
+-
+-## Generate our udev rule file. This takes a change in udev rule syntax in
+-## version 55 into account. It only creates rules for USB for udev versions
+-## recent enough to support USB device nodes.
+-generate_udev_rule() {
+- VBOXDRV_GRP="$1" # The group owning the vboxdrv device
+- VBOXDRV_MODE="$2" # The access mode for the vboxdrv device
+- INSTALLATION_DIR="$3" # The directory VirtualBox is installed in
+- USB_GROUP="$4" # The group that has permission to access USB devices
+- NO_INSTALL="$5" # Set this to "1" to remove but not re-install rules
+-
+- # Extra space!
+- case "$USB_GROUP" in ?*) USB_GROUP=" $USB_GROUP" ;; esac
+- case "$NO_INSTALL" in "1") return ;; esac
+- udev_write_vboxdrv "$VBOXDRV_GRP" "$VBOXDRV_MODE"
+- udev_write_usb "$INSTALLATION_DIR" "$USB_GROUP"
+-}
+-
+-## Install udev rule (disable with INSTALL_NO_UDEV=1 in
+-## /etc/default/virtualbox).
+-install_udev() {
+- VBOXDRV_GRP="$1" # The group owning the vboxdrv device
+- VBOXDRV_MODE="$2" # The access mode for the vboxdrv device
+- INSTALLATION_DIR="$3" # The directory VirtualBox is installed in
+- USB_GROUP="$4" # The group that has permission to access USB devices
+- NO_INSTALL="$5" # Set this to "1" to remove but not re-install rules
+-
+- if test -d /etc/udev/rules.d; then
+- generate_udev_rule "$VBOXDRV_GRP" "$VBOXDRV_MODE" "$INSTALLATION_DIR" \
+- "$USB_GROUP" "$NO_INSTALL"
+- fi
+- # Remove old udev description file
+- rm -f /etc/udev/rules.d/10-vboxdrv.rules 2> /dev/null
+-}
+-
+-## Create a usb device node for a given sysfs path to a USB device.
+-install_create_usb_node_for_sysfs() {
+- path="$1" # sysfs path for the device
+- usb_createnode="$2" # Path to the USB device node creation script
+- usb_group="$3" # The group to give ownership of the node to
+- if test -r "${path}/dev"; then
+- dev="`cat "${path}/dev" 2> /dev/null`"
+- major="`expr "$dev" : '\(.*\):' 2> /dev/null`"
+- minor="`expr "$dev" : '.*:\(.*\)' 2> /dev/null`"
+- class="`cat ${path}/bDeviceClass 2> /dev/null`"
+- sh "${usb_createnode}" "$major" "$minor" "$class" \
+- "${usb_group}" 2>/dev/null
+- fi
+-}
+-
+-udev_rule_file=/etc/udev/rules.d/60-vboxdrv.rules
+-sysfs_usb_devices="/sys/bus/usb/devices/*"
+-
+-## Install udev rules and create device nodes for usb access
+-setup_usb() {
+- VBOXDRV_GRP="$1" # The group that should own /dev/vboxdrv
+- VBOXDRV_MODE="$2" # The mode to be used for /dev/vboxdrv
+- INSTALLATION_DIR="$3" # The directory VirtualBox is installed in
+- USB_GROUP="$4" # The group that should own the /dev/vboxusb device
+- # nodes unless INSTALL_NO_GROUP=1 in
+- # /etc/default/virtualbox. Optional.
+- usb_createnode="$INSTALLATION_DIR/VBoxCreateUSBNode.sh"
+- # install udev rule (disable with INSTALL_NO_UDEV=1 in
+- # /etc/default/virtualbox)
+- if [ "$INSTALL_NO_GROUP" != "1" ]; then
+- usb_group=$USB_GROUP
+- vboxdrv_group=$VBOXDRV_GRP
+- else
+- usb_group=root
+- vboxdrv_group=root
+- fi
+- install_udev "${vboxdrv_group}" "$VBOXDRV_MODE" \
+- "$INSTALLATION_DIR" "${usb_group}" \
+- "$INSTALL_NO_UDEV" > ${udev_rule_file}
+- # Build our device tree
+- for i in ${sysfs_usb_devices}; do # This line intentionally without quotes.
+- install_create_usb_node_for_sysfs "$i" "${usb_createnode}" \
+- "${usb_group}"
+- done
+-}
+-
+-cleanup_usb()
+-{
+- # Remove udev description file
+- rm -f /etc/udev/rules.d/60-vboxdrv.rules
+- rm -f /etc/udev/rules.d/10-vboxdrv.rules
+-
+- # Remove our USB device tree
+- rm -rf /dev/vboxusb
+-}
+-
+ start()
+ {
+ begin_msg "Starting VirtualBox services" console
+@@ -287,10 +153,7 @@
+ failure "Cannot remove $DEVICE"
+ fi
+ if ! $MODPROBE vboxdrv > /dev/null 2>&1; then
+- setup
+- if ! $MODPROBE vboxdrv > /dev/null 2>&1; then
+- failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why"
+- fi
++ failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why"
+ fi
+ sleep .2
+ fi
+@@ -337,8 +200,6 @@
+ mkdir -p -m 0750 /dev/vboxusb 2>/dev/null
+ chown root:vboxusers /dev/vboxusb 2>/dev/null
+ fi
+- # Remove any kernel modules left over from previously installed kernels.
+- cleanup only_old
+ succ_msg "VirtualBox services started"
+ }
- # silently exit if the package was uninstalled but not purged,
- # applies to Debian packages only (but shouldn't hurt elsewhere)
--[ ! -f /etc/debian_release -o -x $VBOXMANAGE -a -x $BUILDINTMP ] || exit 0
-+[ ! -f /etc/debian_release -o -x $VBOXMANAGE ] || exit 0
+@@ -419,102 +280,10 @@
+ fi
+ }
- if [ -n "$NOLSB" ]; then
- if [ -f /etc/redhat-release ]; then
-@@ -295,70 +291,7 @@
+-cleanup()
+-{
+- # If this is set, only remove kernel modules for no longer installed
+- # kernels. Note that only generated kernel modules should be placed
+- # in /lib/modules/*/misc. Anything that we should not remove automatically
+- # should go elsewhere.
+- only_old="${1}"
+- for i in /lib/modules/*; do
+- # Check whether we are only cleaning up for uninstalled kernels.
+- test -n "${only_old}" && test -e "${i}/kernel/drivers" && continue
+- # We could just do "rm -f", but we only want to try deleting folders if
+- # we are sure they were ours, i.e. they had our modules in beforehand.
+- if test -e "${i}/misc/vboxdrv.ko" \
+- || test -e "${i}/misc/vboxnetadp.ko" \
+- || test -e "${i}/misc/vboxnetflt.ko" \
+- || test -e "${i}/misc/vboxpci.ko"; then
+- rm -f "${i}/misc/vboxdrv.ko" "${i}/misc/vboxnetadp.ko" \
+- "${i}/misc/vboxnetflt.ko" "${i}/misc/vboxpci.ko"
+- version=`expr "${i}" : "/lib/modules/\(.*\)"`
+- depmod -a "${version}"
+- sync
+- fi
+- # Remove the kernel version folder if it was empty except for us.
+- test "`echo ${i}/misc/* ${i}/misc/.?* ${i}/* ${i}/.?*`" \
+- = "${i}/misc/* ${i}/misc/.. ${i}/misc ${i}/.." &&
+- rmdir "${i}/misc" "${i}" # We used to leave empty folders.
+- done
+-}
+-
# setup_script
setup()
{
-- stop
-- DKMS=`which dkms 2>/dev/null`
-- if [ -n "$DKMS" ]; then
-- begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
-- $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG
-- succ_msg
+- begin_msg "Building VirtualBox kernel modules" console
+- log "Building the main VirtualBox module."
+- if ! myerr=`$BUILDINTMP \
+- --save-module-symvers /tmp/vboxdrv-Module.symvers \
+- --module-source "$MODULE_SRC/vboxdrv" \
+- --no-print-directory install 2>&1`; then
+- "${INSTALL_DIR}/check_module_dependencies.sh" || exit 1
+- log "Error building the module:"
+- module_build_log "$myerr"
+- failure "Look at $LOG to find out what went wrong"
- fi
-- if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
-- begin_msg "Removing old VirtualBox pci kernel module"
-- find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null
-- succ_msg
-- fi
-- if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then
-- begin_msg "Removing old VirtualBox netadp kernel module"
-- find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null
-- succ_msg
-- fi
-- if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then
-- begin_msg "Removing old VirtualBox netflt kernel module"
-- find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null
-- succ_msg
-- fi
-- if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
-- begin_msg "Removing old VirtualBox kernel module"
-- find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
-- succ_msg
+- log "Building the net filter module."
+- if ! myerr=`$BUILDINTMP \
+- --use-module-symvers /tmp/vboxdrv-Module.symvers \
+- --module-source "$MODULE_SRC/vboxnetflt" \
+- --no-print-directory install 2>&1`; then
+- log "Error building the module:"
+- module_build_log "$myerr"
+- failure "Look at $LOG to find out what went wrong"
- fi
-- if [ -n "$DKMS" ]; then
-- begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
-- if ! $DODKMS install vboxhost $VERSION >> $LOG; then
-- fail_msg "Failed, trying without DKMS"
-- DKMS=""
-- fi
+- log "Building the net adaptor module."
+- if ! myerr=`$BUILDINTMP \
+- --use-module-symvers /tmp/vboxdrv-Module.symvers \
+- --module-source "$MODULE_SRC/vboxnetadp" \
+- --no-print-directory install 2>&1`; then
+- log "Error building the module:"
+- module_build_log "$myerr"
+- failure "Look at $LOG to find out what went wrong"
- fi
-- if [ -z "$DKMS" ]; then
-- begin_msg "Recompiling VirtualBox kernel modules"
-- if ! $BUILDINTMP \
-- --save-module-symvers /tmp/vboxdrv-Module.symvers \
-- --module-source "$MODULE_SRC/vboxdrv" \
-- --no-print-directory install >> $LOG 2>&1; then
-- failure "Look at $LOG to find out what went wrong"
-- fi
-- if ! $BUILDINTMP \
-- --use-module-symvers /tmp/vboxdrv-Module.symvers \
-- --module-source "$MODULE_SRC/vboxnetflt" \
-- --no-print-directory install >> $LOG 2>&1; then
-- failure "Look at $LOG to find out what went wrong"
-- fi
-- if ! $BUILDINTMP \
-- --use-module-symvers /tmp/vboxdrv-Module.symvers \
-- --module-source "$MODULE_SRC/vboxnetadp" \
-- --no-print-directory install >> $LOG 2>&1; then
-- failure "Look at $LOG to find out what went wrong"
-- fi
-- if ! $BUILDINTMP \
-- --use-module-symvers /tmp/vboxdrv-Module.symvers \
-- --module-source "$MODULE_SRC/vboxpci" \
-- --no-print-directory install >> $LOG 2>&1; then
-- failure "Look at $LOG to find out what went wrong"
-- fi
+- if test -e "$MODULE_SRC/vboxpci"; then
+- log "Building the PCI pass-through module."
+- if ! myerr=`$BUILDINTMP \
+- --use-module-symvers /tmp/vboxdrv-Module.symvers \
+- --module-source "$MODULE_SRC/vboxpci" \
+- --no-print-directory install 2>&1`; then
+- log "Error building the module:"
+- module_build_log "$myerr"
+- failure "Look at $LOG to find out what went wrong"
+- fi
- fi
- rm -f /etc/vbox/module_not_compiled
-- succ_msg
-- start
+- depmod -a
+- sync
+- succ_msg "VirtualBox kernel modules built"
+- # Secure boot on Ubuntu and Debian.
+- if test -n "$HAVE_SEC_BOOT" &&
+- type update-secureboot-policy >/dev/null 2>&1; then
+- SHIM_NOTRIGGER=y update-secureboot-policy --new-key
+- fi
+- if test -f "$DEB_PUB_KEY" && test -f "$DEB_PRIV_KEY"; then
+- HAVE_DEB_KEY=true
+- for i in $MODULE_LIST; do
+- kmodsign sha512 /var/lib/shim-signed/mok/MOK.priv \
+- /var/lib/shim-signed/mok/MOK.der \
+- /lib/modules/"$KERN_VER"/misc/"$i".ko
+- done
+- # update-secureboot-policy "expects" DKMS modules.
+- # Work around this and talk to the authors as soon
+- # as possible to fix it.
+- mkdir -p /var/lib/dkms/vbox-temp
+- update-secureboot-policy --enroll-key 2>/dev/null ||
+- begin_msg "Failed to enroll secure boot key." console
+- rmdir -p /var/lib/dkms/vbox-temp 2>/dev/null
+- fi
+ echo "Not implemented! Please use the virtualbox-kernel.SlackBuild available at SlackBuilds.org instead."
}
dmnstatus()
+@@ -564,20 +333,7 @@
+ stop && start
+ ;;
+ setup)
+- test -n "${2}" && export KERN_VER="${2}"
+- # Create udev rule and USB device nodes.
+- ## todo Wouldn't it make more sense to install the rule to /lib/udev? This
+- ## is not a user-created configuration file after all.
+- ## todo Do we need a udev rule to create /dev/vboxdrv[u] at all? We have
+- ## working fall-back code here anyway, and the "right" code is more complex
+- ## than the fall-back. Unnecessary duplication?
+- stop && cleanup
+- setup_usb "$GROUP" "$DEVICE_MODE" "$INSTALL_DIR"
+- start
+- ;;
+-cleanup)
+- stop && cleanup
+- cleanup_usb
++ setup
+ ;;
+ force-reload)
+ stop
diff --git a/system/virtualbox/virtualbox-6.1.6-qt-5.15.patch b/system/virtualbox/virtualbox-6.1.6-qt-5.15.patch
new file mode 100644
index 0000000000..36f525593e
--- /dev/null
+++ b/system/virtualbox/virtualbox-6.1.6-qt-5.15.patch
@@ -0,0 +1,92 @@
+--- a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-05-29 23:51:41.504432532 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-05-29 23:49:26.943858460 +0300
+@@ -17,6 +17,8 @@
+
+ /* Qt includes: */
+ #include <QPainter>
++#include <QPainterPath>
++#include <QPainterPathStroker>
+
+ /* GUI include */
+ #include "UIImageTools.h"
+
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-05-30 00:09:50.369275092 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-05-30 00:01:14.152354690 +0300
+@@ -24,6 +24,7 @@
+ /* Qt includes: */
+ #include <QIcon>
+ #include <QWidget>
++#include <QPainterPath>
+
+ /* GUI includes: */
+ #include "UILibraryDefs.h"
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-05-30 00:39:54.773447224 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-05-30 00:41:36.274371761 +0300
+@@ -21,6 +21,7 @@
+ #include <QPainter>
+ #include <QStyle>
+ #include <QToolButton>
++#include <QPainterPath>
+
+ /* GUI includes: */
+ #include "UIMenuToolBar.h"
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp 2020-05-30 00:39:47.613523134 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp 2020-05-30 00:41:29.655441857 +0300
+@@ -29,6 +29,7 @@
+ #include <QMouseEvent>
+ #include <QStyleOption>
+ #include <QPainter>
++#include <QPainterPath>
+ #ifdef VBOX_WS_MAC
+ # include <QStackedLayout>
+ #endif
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp 2020-05-30 00:40:01.624374596 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp 2020-05-30 00:41:40.654325376 +0300
+@@ -23,6 +23,7 @@
+ #include <QScrollBar>
+ #include <QStyle>
+ #include <QVBoxLayout>
++#include <QPainterPath>
+
+ /* GUI includes: */
+ #include "UIFilmContainer.h"
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-05-30 00:40:08.844298062 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-05-30 00:41:44.594283652 +0300
+@@ -22,6 +22,7 @@
+ #include <QPaintEvent>
+ #include <QStyle>
+ #include <QVBoxLayout>
++#include <QPainterPath>
+
+ /* GUI includes: */
+ #include "UIPopupBox.h"
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-05-30 00:40:16.064221530 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-05-30 00:41:52.014205079 +0300
+@@ -27,6 +27,7 @@
+ #include <QToolButton>
+ #include <QVBoxLayout>
+ #include <QWindow>
++#include <QPainterPath>
+ #ifdef VBOX_WS_X11
+ # include <QWindowStateChangeEvent>
+ #endif
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp 2020-05-30 00:40:22.314155286 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp 2020-05-30 00:41:56.544157111 +0300
+@@ -28,6 +28,7 @@
+ #include <QStyleOptionGraphicsItem>
+ #include <QTimer>
+ #include <QTimerEvent>
++#include <QPainterPath>
+
+ /* GUI includes: */
+ #include "UIGraphicsButton.h"
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp 2020-05-30 00:40:34.375027462 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp 2020-05-30 00:42:01.244107347 +0300
+@@ -18,6 +18,7 @@
+ /* Qt includes: */
+ #include <QPainter>
+ #include <QTextEdit>
++#include <QPainterPath>
+
+ /* GUI includes: */
+ #include "UIPopupPane.h"
diff --git a/system/virtualbox/virtualbox-gsoap.patch b/system/virtualbox/virtualbox-gsoap.patch
deleted file mode 100644
index a8ba6f549c..0000000000
--- a/system/virtualbox/virtualbox-gsoap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -u -r VirtualBox-5.0.10.orig/src/VBox/Main/webservice/Makefile.kmk VirtualBox-5.0.10/src/VBox/Main/webservice/Makefile.kmk
---- VirtualBox-5.0.10.orig/src/VBox/Main/webservice/Makefile.kmk 2015-11-10 18:06:29.000000000 +0100
-+++ VirtualBox-5.0.10/src/VBox/Main/webservice/Makefile.kmk 2015-11-22 09:58:21.669118291 +0100
-@@ -159,7 +159,6 @@
- RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
-
- PATH_TARGET_SOAPDEMOXML := $(VBOXWEB_OUT_DIR)/demo_soapxml
--PATH_TARGET_SOAPDEMOHEADERS := $(VBOXWEB_OUT_DIR)/demo_headers
- PATH_TARGET_SOAPDEMONSMAPS := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
- PATH_TARGET_WEBTEST := $(VBOXWEB_OUT_DIR)/webtest
-
-@@ -515,8 +514,6 @@
- $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \
- $(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \
- $(PATH_TARGET_SOAPDEMOXML)/dummy_file \
-- $(wildcard $(PATH_TARGET_SOAPDEMOHEADERS)/*) \
-- $(PATH_TARGET_SOAPDEMOHEADERS)/dummy_file \
- $(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
- $(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
-
-@@ -695,17 +692,14 @@
- # any more. Ignoring the exit code is the simple solution, accepting the error.
- $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts | $$(dir $$@)
- $(RM) -f $@
-- $(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS)
-+ $(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMONSMAPS)
- ifdef VBOX_GSOAP_VERBOSE
- $(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml $(PATH_TARGET_SOAPDEMOXML)/
- endif
-- -$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/soapvbox*.h $(PATH_TARGET_SOAPDEMOHEADERS)/
- $(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)/
- $(APPEND) $@ done
-
--$(PATH_TARGET_SOAPDEMONSMAPS) \
--$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingProxy.h \
--$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingObject.h: $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
-+$(PATH_TARGET_SOAPDEMONSMAPS): $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
-
- # soapcpp2 -2: generate SOAP 1.2 calls
- # soapcpp2 -S: server-side code only
diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild
index 1048ea0771..d1d577363c 100644
--- a/system/virtualbox/virtualbox.SlackBuild
+++ b/system/virtualbox/virtualbox.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for virtualbox-ose
-# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2020 Heinz Wiesinger, Amsterdam, The Netherlands
# Copyright 2008 Mauro Giachero <mauro.giachero@gmail.com>
# All rights reserved.
#
@@ -25,7 +25,7 @@
PRGNAM=virtualbox
SRCNAM=VirtualBox
-VERSION=${VERSION:-5.0.40}
+VERSION=${VERSION:-6.1.10}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -62,12 +62,14 @@ else
harden="--disable-hardening"
fi
-# Support for the qt4-frontend
+# Support for the Qt & SDL frontends
if [ "${HEADLESS:-no}" = "no" ]; then
- guiapp="VirtualBox VBoxSDL"
+ guiapp="VirtualBox VirtualBoxVM VBoxSDL"
+ suidgui="VirtualBoxVM VBoxSDL"
else
gui+=" --build-headless"
guiapp=""
+ suidgui=""
fi
# Enable building of java bindings
@@ -128,21 +130,22 @@ find -L . \
GROUP="vboxusers"
MODE="755"
+# Fix building against qt-15.x, patch from gentoo
+patch -p1 -i $CWD/virtualbox-6.1.6-qt-5.15.patch
+
# We don't want an init-script building kernel modules.
# Use virtualbox-kernel.SlackBuild for this.
patch -d src/VBox/Installer/linux -i $CWD/vboxdrv.sh-setup.diff
-# Fix building against newer versions of gsoap
-patch -p1 -i $CWD/virtualbox-gsoap.patch
-
# Fix wrong path to rdesktop-vrdp-keymaps
patch -p1 -i $CWD/006-rdesktop-vrdp-keymap-path.patch
# Remove gcc version check
sed -i 's/^check_gcc$/#check_gcc/' ./configure
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+# Use our CFLAGS
+sed -i "s|CXX_FLAGS=\"\"|CXX_FLAGS=\"$SLKCFLAGS -std=c++11\"|" ./configure
+
./configure \
--disable-kmods \
--enable-vde \
@@ -158,20 +161,16 @@ CXXFLAGS="$SLKCFLAGS" \
cp $CWD/LocalConfig.kmk .
sed -i "s|LIBDIR|lib$LIBDIRSUFFIX|" ./LocalConfig.kmk
+sed -i "s|CXXFLAGS|$SLKCFLAGS -std=c++11|" ./LocalConfig.kmk
kmk -j ${JOBS} LOCALCFG=./LocalConfig.kmk
-# build VBoxFUSE
-cd src/VBox/ImageMounter/VBoxFUSE
- kmk -j ${JOBS}
-cd -
-
mkdir -p $PKG/usr/{lib$LIBDIRSUFFIX,share,include}/virtualbox \
$PKG/usr/{bin,src} \
$PKG/usr/share/{pixmaps,mime/packages} \
$PKG/etc/{default,rc.d,vbox}
-for i in vboxdrv.sh.in vboxballoonctrl-service.sh vboxautostart-service.sh; do
+for i in vboxdrv.sh vboxballoonctrl-service.sh vboxautostart-service.sh; do
SCRIPT=$(echo $i | cut -d "." -f 1)
cp -f src/VBox/Installer/linux/$i $PKG/etc/rc.d/rc.$SCRIPT.new
sed -i "s/%PACKAGE%/virtualbox/g" $PKG/etc/rc.d/rc.$SCRIPT.new
@@ -218,17 +217,15 @@ cd out/linux.$BUILDDIR/release/bin/
install -m $MODE -g $GROUP VBoxSysInfo.sh $PKG/usr/share/virtualbox/
install -m $MODE -g $GROUP VBoxCreateUSBNode.sh $PKG/usr/share/virtualbox/
install -m $MODE -g $GROUP VBoxTunctl $PKG/usr/bin/
- install -m $MODE -g $GROUP VBoxFUSE $PKG/usr/bin/
- rm -f VBoxSysInfo.sh VBoxCreateUSBNode.sh VBoxTunctl VBoxFUSE
+ rm -f VBoxSysInfo.sh VBoxCreateUSBNode.sh VBoxTunctl
mv * $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/
chown -R root:$GROUP $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/
chmod -R $MODE $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/
mv $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/VBox.sh $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/VBox
cd $TMP/$SRCNAM-${VERSION}
-for i in VBoxManage vboxmanage VBoxHeadless \
- vboxheadless VBoxVRDP VBoxBalloonCtrl vboxballoonctrl \
- VBoxAutostart vboxautostart $guiapp $vboxwebsrv; do
+for i in VBoxManage VBoxHeadless VBoxVRDP VBoxBalloonCtrl VBoxBugReport \
+ VBoxAutostart $guiapp $vboxwebsrv; do
ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/VBox $PKG/usr/bin/$i
done
@@ -238,6 +235,9 @@ if [ "${HEADLESS:-no}" = "no" ]; then
done
fi
+ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/vbox-img $PKG/usr/bin/
+ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/vboximg-mount $PKG/usr/bin/
+
if [ "$vboxwebsrv" = "vboxwebsrv" ]; then
mkdir -p $PKG/var/{lib,log}/vboxweb
chown vboxweb:vboxusers $PKG/var/{lib,log}/vboxweb
@@ -249,7 +249,7 @@ if [ "$vboxwebsrv" = "vboxwebsrv" ]; then
fi
if [ "$harden" = "--enable-hardening" ]; then
- for i in VBoxHeadless $guiapp VBoxNetDHCP VBoxNetAdpCtl; do
+ for i in VBoxHeadless $suidgui VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT; do
chmod 4711 $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/$i
done
fi
@@ -257,6 +257,7 @@ fi
# install headers. Needed by some third party tools
cp -rf include/* $PKG/usr/include/virtualbox/
rm -f $PKG/usr/include/virtualbox/Makefile.kmk
+find $PKG/usr/include/virtualbox -name "Makefile.kup" -print0 | xargs -0 rm -f
cp -f $CWD/VBoxGuestAdditions_$VERSION.iso \
$PKG/usr/share/virtualbox/VBoxGuestAdditions.iso
diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info
index 11fef8a32a..118c4f6a77 100644
--- a/system/virtualbox/virtualbox.info
+++ b/system/virtualbox/virtualbox.info
@@ -1,14 +1,14 @@
PRGNAM="virtualbox"
-VERSION="5.0.40"
+VERSION="6.1.10"
HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.40/VirtualBox-5.0.40.tar.bz2 \
- http://download.virtualbox.org/virtualbox/5.0.40/VBoxGuestAdditions_5.0.40.iso \
- http://download.virtualbox.org/virtualbox/5.0.40/UserManual.pdf \
- http://download.virtualbox.org/virtualbox/5.0.40/SDKRef.pdf"
-MD5SUM="53b259e48a137b0185c169590e2dcb77 \
- 71afc65e09d1d4d02020f0403ac47622 \
- bdc4bf38dd3ed786385044841a4af147 \
- 684ac3f7d17532cd8396ea83ba1d57ea"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.10/VirtualBox-6.1.10.tar.bz2 \
+ http://download.virtualbox.org/virtualbox/6.1.10/VBoxGuestAdditions_6.1.10.iso \
+ http://download.virtualbox.org/virtualbox/6.1.10/UserManual.pdf \
+ http://download.virtualbox.org/virtualbox/6.1.10/SDKRef.pdf"
+MD5SUM="b690ab7f2b6c7f9e46eabc101df021ed \
+ abbfda1a505eedbd2bea255fb60bffe6 \
+ 0063b494e26d20f0ae083edb02ea1937 \
+ 71346aeeebbc006e6a4a94b9008ae209"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="acpica virtualbox-kernel"
diff --git a/system/xdg-dbus-proxy/README b/system/xdg-dbus-proxy/README
new file mode 100644
index 0000000000..dfc102324e
--- /dev/null
+++ b/system/xdg-dbus-proxy/README
@@ -0,0 +1,3 @@
+xdg-dbus-proxy is a filtering proxy for D-Bus connections.
+It was originally part of the flatpak project, but it has been broken
+out as a standalone module to facilitate using it in other contexts.
diff --git a/system/xdg-dbus-proxy/slack-desc b/system/xdg-dbus-proxy/slack-desc
new file mode 100644
index 0000000000..1868fd972c
--- /dev/null
+++ b/system/xdg-dbus-proxy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+xdg-dbus-proxy: xdg-dbus-proxy (D-Bus proxy)
+xdg-dbus-proxy:
+xdg-dbus-proxy: xdg-dbus-proxy is a filtering proxy for D-Bus connections.
+xdg-dbus-proxy: It was originally part of the flatpak project, but it has been broken
+xdg-dbus-proxy: out as a standalone module to facilitate using it in other contexts.
+xdg-dbus-proxy:
+xdg-dbus-proxy: homepage: https://github.com/flatpak/xdg-dbus-proxy
+xdg-dbus-proxy:
+xdg-dbus-proxy:
+xdg-dbus-proxy:
+xdg-dbus-proxy:
diff --git a/system/xdg-dbus-proxy/xdg-dbus-proxy.SlackBuild b/system/xdg-dbus-proxy/xdg-dbus-proxy.SlackBuild
new file mode 100644
index 0000000000..ace6df810a
--- /dev/null
+++ b/system/xdg-dbus-proxy/xdg-dbus-proxy.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for xdg-dbus-proxy
+
+# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=xdg-dbus-proxy
+VERSION=${VERSION:-0.1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/xdg-dbus-proxy/xdg-dbus-proxy.info b/system/xdg-dbus-proxy/xdg-dbus-proxy.info
new file mode 100644
index 0000000000..c3d4522e1f
--- /dev/null
+++ b/system/xdg-dbus-proxy/xdg-dbus-proxy.info
@@ -0,0 +1,10 @@
+PRGNAM="xdg-dbus-proxy"
+VERSION="0.1.2"
+HOMEPAGE="https://github.com/flatpak/xdg-dbus-proxy/"
+DOWNLOAD="https://github.com/flatpak/xdg-dbus-proxy/releases/download/0.1.2/xdg-dbus-proxy-0.1.2.tar.xz"
+MD5SUM="19cb184734e0f080dfe335fd9ffc61b1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/xnp2/gcc6.patch b/system/xnp2/gcc6.patch
new file mode 100644
index 0000000000..6265959666
--- /dev/null
+++ b/system/xnp2/gcc6.patch
@@ -0,0 +1,17 @@
+--- xnp2-0.86/x11/compiler.h.old 2016-03-08 18:25:50.000000000 +0100
++++ xnp2-0.86/x11/compiler.h 2016-07-05 23:48:04.507937827 +0200
+@@ -117,12 +117,14 @@
+ #define MAX_PATH MAXPATHLEN
+ #endif
+
++#ifndef __cplusplus
+ #ifndef max
+ #define max(a,b) (((a) > (b)) ? (a) : (b))
+ #endif
+ #ifndef min
+ #define min(a,b) (((a) < (b)) ? (a) : (b))
+ #endif
++#endif /* __cplusplus */
+
+ #ifndef ZeroMemory
+ #define ZeroMemory(d,n) memset((d), 0, (n))
diff --git a/system/xnp2/xnp2.SlackBuild b/system/xnp2/xnp2.SlackBuild
index bbd8e9d826..b8a467720c 100644
--- a/system/xnp2/xnp2.SlackBuild
+++ b/system/xnp2/xnp2.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Thanks to the archlinux folks!
+patch -p2 < $CWD/gcc6.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/system/zerofree/README b/system/zerofree/README
deleted file mode 100644
index 14a43ae30e..0000000000
--- a/system/zerofree/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Zerofree is a utility which scans the free blocks in an ext2/3/4
-filesystem and fills any non-zero blocks with zeroes.
-
-This is useful if you have an ext2/3/4 virtual disk image
-(e.g. VirtualBox' .vdi) that you wish to compact.
-
-See project homepage for information and usage.
diff --git a/system/zerofree/slack-desc b/system/zerofree/slack-desc
deleted file mode 100644
index 864bdb3182..0000000000
--- a/system/zerofree/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-zerofree: zerofree (fills free blocks in an ext2/3/4 filesystem with zeroes)
-zerofree:
-zerofree: Zerofree is a utility which scans the free blocks in an ext2/3/4
-zerofree: filesystem and fills any non-zero blocks with zeroes.
-zerofree: This is useful if you have an ext2/3/4 virtual disk image
-zerofree: (e.g. VirtualBox' .vdi) that you wish to compact.
-zerofree: See project homepage for information and usage.
-zerofree:
-zerofree:
-zerofree: Homepage: http://intgat.tigress.co.uk/rmy/uml/index.html
-zerofree:
diff --git a/system/zerofree/zerofree.8 b/system/zerofree/zerofree.8
deleted file mode 100644
index fb6f277e7b..0000000000
--- a/system/zerofree/zerofree.8
+++ /dev/null
@@ -1,92 +0,0 @@
-.TH "ZEROFREE" "8"
-.SH "NAME"
-zerofree \(em zero free blocks from ext2, ext3 and ext4 file-systems
-.SH "SYNOPSIS"
-.PP
-\fBzerofree\fR [\fB-n\fP] [\fB-v\fP] [\fB-f fillval\fP] \fIfilesystem\fR
-.SH "DESCRIPTION"
-.PP
-\fBzerofree\fR finds the unallocated,
-blocks with non-zero value content in an ext2, ext3 or ext4
-\fIfilesystem\fR (e.g. /dev/hda1) and
-fills them with zeroes (or another octet of your choice).
-
-
-.PP
-Filling unused areas with zeroes is useful if the device on
-which this file-system resides is a disk image. In this case,
-depending on the type of disk image, a secondary utility may be
-able to reduce the size of the disk image after zerofree has
-been run.
-
-.PP
-Filling unused areas may also be useful with solid-state
-drives (SSDs). On some SSDs, filling blocks with ones (0xFF)
-is reported to trigger Flash block erasure by the firmware,
-possibly giving a write performance increase.
-
-.PP
-The usual way to achieve the same result (zeroing the
-unallocated blocks) is to run \fBdd\fR (1) to
-create a file full of zeroes that takes up the entire free
-space on the drive, and then delete this file. This has many
-disadvantages, which zerofree alleviates:
-.IP " \(bu" 6
-it is slow;
-.IP " \(bu" 6
-it makes the disk image (temporarily) grow to its maximal
-extent;
-.IP " \(bu" 6
-it (temporarily) uses all free space on the disk, so other
-concurrent write actions may fail.
-
-.PP
-\fIfilesystem\fR has to be unmounted or
-mounted read-only for \fBzerofree\fR to work. It
-will exit with an error message if the
-\fIfilesystem\fR is mounted writable. To
-remount the root file-system readonly, you can first switch to
-single user runlevel (\fBtelinit 1\fR) then use
-\fBmount \-o remount,ro
-\fIfilesystem\fR\fR.
-
-.PP
-\fBzerofree\fR has been written to be run
-from GNU/Linux systems installed as guest OSes inside a virtual
-machine. In this case, it is typically run from within the guest
-system, and a utility is then run from the host system to shrink
-disk image (\fBVBoxManage modifyhd \-\-compact\fR,
-provided with virtualbox, is able to do that for some disk image
-formats).
-
-.PP
-It may however be useful in other situations: for instance
-it can be used to make it more difficult to retrieve deleted
-data. Beware that securely deleting sensitive data is not in
-general an easy task and usually requires writing several times
-on the deleted blocks.
-
-.SH "OPTIONS"
-.IP "\fB-n\fP " 10
-Perform a dry run (do not modify the file-system);
-.IP "\fB-v\fP " 10
-Be verbose;
-.IP "\fB-f value\fP " 10
-Specify the octet value to fill empty blocks with (defaults to
-0). Argument must be within the range 0 to 255.
-.SH "SEE ALSO"
-.PP
-dd (1).
-.SH "AUTHOR"
-.PP
-This manual page was written by Thibaut Paumard <paumard@users.sourceforge.net> for
-the \fBDebian\fP system (but may be used by others). Permission is
-granted to copy, distribute and/or modify this document under
-the terms of the GNU General Public License, Version 2 or any
-later version published by the Free Software Foundation.
-
-.PP
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.
-
-.\" created by instant / docbook-to-man, Mon 31 Mar 2014, 15:41
diff --git a/system/zerofree/zerofree.SlackBuild b/system/zerofree/zerofree.SlackBuild
deleted file mode 100644
index a40dcdade4..0000000000
--- a/system/zerofree/zerofree.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for zerofree
-
-# Copyright 2011-2013 Roberto Neri, Palermo, Italy
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# 20180612 bkw: update to 1.1.1.
-# 20170122 bkw: update to 1.1.0, fix homepage/download URLs.
-# 20160803 bkw: update to 1.0.4, BUILD=1
-# 20141021 bkw: add man page, add sparsify, bump BUILD to 2.
-
-PRGNAM=zerofree
-VERSION=${VERSION:-1.1.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# No ./configure or "make install" provided
-make CFLAGS="$SLKCFLAGS"
-
-strip --strip-unneeded $PRGNAM 2> /dev/null
-
-mkdir -p $PKG/usr/sbin
-cp -a $PRGNAM $PKG/usr/sbin
-
-# This looks useful, include it.
-gcc $SLKCFLAGS -Wl,-s -o $PKG/usr/sbin/sparsify $CWD/sparsify.c -lext2fs
-
-# man page comes from Debian.
-mkdir -p $PKG/usr/man/man8
-gzip -9c $CWD/$PRGNAM.8 > $PKG/usr/man/man8/$PRGNAM.8.gz
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/zerofree/zerofree.info b/system/zerofree/zerofree.info
deleted file mode 100644
index 51862897eb..0000000000
--- a/system/zerofree/zerofree.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="zerofree"
-VERSION="1.1.1"
-HOMEPAGE="http://frippery.org/uml/"
-DOWNLOAD="http://frippery.org/uml/zerofree-1.1.1.tgz \
- http://frippery.org/uml/sparsify.c"
-MD5SUM="4f2d6bdba4212e54eb7dd22a8fbb6d29 \
- 919ad782c7120d1e4a9c0ccc9f45b8ef"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/zstd/README b/system/zstd/README
deleted file mode 100644
index 70e275669d..0000000000
--- a/system/zstd/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Zstd, short for Zstandard, is a fast lossless compression algorithm,
-targeting real-time compression scenarios at zlib-level and better
-compression ratios.
-
-Since 1.3.1, it is dual licensed as BSD and GPLv2.
diff --git a/system/zstd/slack-desc b/system/zstd/slack-desc
deleted file mode 100644
index 215674d549..0000000000
--- a/system/zstd/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-zstd: zstd (real-time compression algorithm)
-zstd:
-zstd: Zstandard, or zstd for short, is a real-time compression algorithm
-zstd: providing high compression ratios. It offers a very wide range of
-zstd: compression/speed trade-off, while being backed by a very fast
-zstd: decoder. It also offers a special mode for small data, called
-zstd: dictionary compression, and can create dictionaries from any sample
-zstd: set.
-zstd:
-zstd: Homepage: http://zstd.net/
-zstd:
diff --git a/system/zstd/zstd.SlackBuild b/system/zstd/zstd.SlackBuild
deleted file mode 100644
index 297b0b92f5..0000000000
--- a/system/zstd/zstd.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for zstd
-
-# Copyright 2016-2019, Zhu Qun-Ying
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=zstd
-VERSION=${VERSION:-1.4.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-zcat $CWD/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz | patch -p1 --verbose || exit 1
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Compile it:
-make CFLAGS="$SLKCFLAGS"
-make CFLAGS="$SLKCFLAGS" -C contrib/pzstd
-
-# Install it:
-make \
- prefix=/usr \
- libdir=/usr/lib${LIBDIRSUFFIX} \
- mandir=/usr/man \
- DESTDIR=$PKG \
- install
-install -Dm755 contrib/pzstd/pzstd $PKG/usr/bin/pzstd
-
-# Don't ship static library:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a
-
-# zstdmt as the same as zstd, so just make a symlink:
-( cd $PKG/usr/bin
- ln -sf zstd zstdmt
-)
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/pzstd
-cp -a CONTRIBUTING* COPYING* LICENSE README* doc $PKG/usr/doc/$PRGNAM-$VERSION
-cp contrib/pzstd/README.md $PKG/usr/doc/$PRGNAM-$VERSION/pzstd-README.md
-
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz b/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz
deleted file mode 100644
index 3e5d5d7c32..0000000000
--- a/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz
+++ /dev/null
Binary files differ
diff --git a/system/zstd/zstd.info b/system/zstd/zstd.info
deleted file mode 100644
index 5f404b9774..0000000000
--- a/system/zstd/zstd.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="zstd"
-VERSION="1.4.4"
-HOMEPAGE="http://facebook.github.io/zstd/"
-DOWNLOAD="https://github.com/facebook/zstd/releases/download/v1.4.4/zstd-1.4.4.tar.gz"
-MD5SUM="487f7ee1562dee7c1c8adf85e2a63df9"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Zhu Qun-Ying"
-EMAIL="zhu.qunying@gmail.com"