From 2fba1c878b57d3afa631b9369518be5d21221c09 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 27 Mar 2021 10:25:10 +0100 Subject: 20210327.1 global branch merge. Signed-off-by: Matteo Bernardini --- README | 16 + .../Gridcoin-Research/Gridcoin-Research.SlackBuild | 6 + academic/Gridcoin-Research/boost-1.73.patch | 54 + academic/antiprism/antiprism.SlackBuild | 2 +- academic/artha/artha.SlackBuild | 8 +- academic/artha/artha.info | 6 +- academic/geda-gaf/geda-gaf.info | 2 +- academic/gelemental/gcc.patch | 12 + academic/gelemental/gelemental.SlackBuild | 3 + academic/genius/README | 2 +- academic/genometools/genometools.SlackBuild | 2 +- academic/kile/README | 4 - academic/kile/doinst.sh | 13 - academic/kile/kile.SlackBuild | 96 - academic/kile/kile.info | 10 - academic/kile/slack-desc | 19 - academic/libqalculate/README | 4 - academic/libqalculate/libqalculate.SlackBuild | 102 - academic/libqalculate/libqalculate.info | 10 - academic/libqalculate/slack-desc | 19 - academic/primer3/primer3.SlackBuild | 4 +- academic/pulseview/pulseview.SlackBuild | 4 +- academic/pulseview/pulseview.info | 6 +- academic/root/root.SlackBuild | 9 +- academic/root/root.info | 8 +- academic/sage/sage.SlackBuild | 2 +- academic/sage/sage.info | 6 +- academic/scipy3/scipy3.SlackBuild | 2 +- academic/scipy3/scipy3.info | 6 +- academic/tophat/make_pair.patch | 24 + academic/tophat/tophat.SlackBuild | 3 + .../ugene-1.22.0-dont_hardcode_includes.patch | 24 + academic/ugene/ugene.SlackBuild | 3 + academic/veusz/veusz.SlackBuild | 3 +- accessibility/easystroke/easystroke.SlackBuild | 1 + accessibility/easystroke/gcc7-build-fix.patch | 40 + accessibility/flite/flite.info | 2 +- accessibility/jpilot/jpilot.SlackBuild | 23 +- accessibility/jpilot/jpilot.info | 6 +- accessibility/speech-dispatcher/README | 9 - accessibility/speech-dispatcher/doinst.sh | 9 - accessibility/speech-dispatcher/slack-desc | 19 - .../speech-dispatcher/speech-dispatcher.SlackBuild | 116 - .../speech-dispatcher/speech-dispatcher.info | 10 - accessibility/xsel/xsel.SlackBuild | 2 +- audio/aacgain/aacgain.SlackBuild | 2 +- .../alsamixergui-0.9.0.1.2-strsignal.patch | 13 + audio/alsamixergui/alsamixergui.SlackBuild | 2 + audio/alsamodularsynth/alsamodularsynth.SlackBuild | 9 +- audio/audacious-aac/audacious-aac.SlackBuild | 8 +- audio/audacious-aac/audacious-aac.info | 6 +- audio/audacious-cue/audacious-cue.SlackBuild | 8 +- audio/audacious-cue/audacious-cue.info | 6 +- audio/audacious-ffmpeg/README | 4 - audio/audacious-ffmpeg/audacious-ffmpeg.SlackBuild | 106 - audio/audacious-ffmpeg/audacious-ffmpeg.info | 10 - .../patches/enable_only_ffmpeg_plugin.diff | 8 - audio/audacious-ffmpeg/slack-desc | 19 - audio/audacity/audacity.SlackBuild | 8 +- audio/audacity/audacity.info | 10 +- audio/butt/butt.SlackBuild | 2 +- audio/calf-ladspa/calf-ladspa.SlackBuild | 2 +- audio/clementine/clementine.SlackBuild | 9 +- audio/clementine/clementine.info | 8 +- audio/darkice/darkice.SlackBuild | 2 +- audio/easytag/README | 5 - audio/easytag/doinst.sh | 13 - audio/easytag/easytag.SlackBuild | 106 - audio/easytag/easytag.info | 10 - audio/easytag/slack-desc | 19 - audio/fluidsynth/README | 21 - audio/fluidsynth/fluidsynth.SlackBuild | 111 - audio/fluidsynth/fluidsynth.info | 10 - audio/fluidsynth/slack-desc | 19 - audio/kid3/README | 9 - audio/kid3/doinst.sh | 9 - audio/kid3/kid3.SlackBuild | 121 - audio/kid3/kid3.info | 10 - audio/kid3/slack-desc | 19 - audio/kradio/README | 2 +- audio/kradio/kradio.SlackBuild | 18 +- audio/kradio/kradio.info | 6 +- audio/lash/lash.SlackBuild | 4 +- audio/lmms/lmms.SlackBuild | 30 +- audio/lmms/lmms.info | 10 +- audio/mac/gcc6.patch | 181 + audio/mac/mac.SlackBuild | 2 + audio/mixxx/mixxx.SlackBuild | 3 + audio/mp3blaster/mp3blaster.SlackBuild | 3 + audio/mp3splt-gtk/mp3splt-gtk.SlackBuild | 2 +- .../musepack-tools-465-fno-common.patch | 16 + audio/musepack-tools/musepack-tools.SlackBuild | 2 + audio/ncmpcpp/gcc10.patch | 26 + audio/ncmpcpp/ncmpcpp.SlackBuild | 2 + audio/non/non.SlackBuild | 1 + audio/ntk/ntk.SlackBuild | 1 + audio/ocp/ocp.SlackBuild | 2 +- audio/opus-tools/README | 2 - audio/opus-tools/opus-tools.SlackBuild | 102 - audio/opus-tools/opus-tools.info | 10 - audio/opus-tools/slack-desc | 19 - audio/opus/README | 4 - audio/opus/opus.SlackBuild | 105 - audio/opus/opus.info | 10 - audio/opus/slack-desc | 19 - audio/opusfile/README | 2 - audio/opusfile/opusfile.SlackBuild | 100 - audio/opusfile/opusfile.info | 10 - audio/opusfile/slack-desc | 19 - audio/oss/glibc-2.23.patch | 19 + audio/oss/oss.SlackBuild | 14 +- audio/oss/oss.info | 6 +- audio/pithos/doinst.sh | 6 + audio/pithos/pithos.SlackBuild | 32 +- audio/pithos/pithos.info | 10 +- audio/pithos/slack-desc | 2 +- audio/qastools/qastools.SlackBuild | 12 +- audio/qastools/qastools.info | 6 +- audio/rhythmbox/rhythmbox.SlackBuild | 2 +- audio/rhythmbox/rhythmbox.info | 6 +- audio/rumor/gcc7.diff | 12 + audio/rumor/rumor.SlackBuild | 3 + audio/shell-fm/README | 14 - audio/shell-fm/shell-fm.SlackBuild | 91 - audio/shell-fm/shell-fm.info | 10 - audio/shell-fm/slack-desc | 19 - audio/sidplayfp/sidplayfp.SlackBuild | 10 +- audio/sidplayfp/sidplayfp.info | 6 +- audio/speex/README | 7 - audio/speex/slack-desc | 19 - audio/speex/speex.SlackBuild | 116 - audio/speex/speex.info | 10 - audio/xmms2/xmms2.SlackBuild | 2 +- audio/xmms2/xmms2.info | 8 +- business/ledger/README | 5 + business/ledger/ledger.info | 2 +- desktop/arc-theme/README | 2 + desktop/arc-theme/arc-theme.SlackBuild | 14 +- desktop/arc-theme/arc-theme.info | 10 +- desktop/arc-theme/slack-desc | 2 +- desktop/awesome/awesome.SlackBuild | 2 +- desktop/bspwm/bspwm.SlackBuild | 2 +- desktop/cairo-dock-plugins/README | 2 +- .../cairo-dock-plugins.SlackBuild | 29 +- desktop/cairo-dock-plugins/cairo-dock-plugins.info | 6 +- desktop/cairo-dock/cairo-dock.SlackBuild | 15 +- desktop/cairo-dock/cairo-dock.info | 6 +- desktop/catfish/README | 3 + desktop/catfish/catfish.SlackBuild | 8 +- desktop/catfish/catfish.info | 6 +- desktop/ceti-2-theme/README | 10 - desktop/ceti-2-theme/ceti-2-theme.SlackBuild | 77 - desktop/ceti-2-theme/ceti-2-theme.info | 10 - desktop/ceti-2-theme/doinst.sh | 13 - desktop/ceti-2-theme/slack-desc | 19 - desktop/devilspie/devilspie.SlackBuild | 2 +- desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff | 26 - desktop/dmenu/dmenu-4.9-libdir_cflags_fixups.diff | 25 + desktop/dmenu/dmenu.SlackBuild | 4 +- desktop/dmenu/dmenu.info | 6 +- desktop/dwm/dwm.SlackBuild | 3 - .../dwm/sbo-patches/0001-Prepare-6.2-release.patch | 45 - desktop/elementary-xfce/README | 5 - desktop/elementary-xfce/elementary-xfce.SlackBuild | 77 - desktop/elementary-xfce/elementary-xfce.info | 10 - desktop/elementary-xfce/slack-desc | 19 - desktop/ffmpegthumbnailer/README | 4 - .../ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild | 104 - desktop/ffmpegthumbnailer/ffmpegthumbnailer.info | 10 - desktop/ffmpegthumbnailer/slack-desc | 19 - desktop/flatpak/flatpak.SlackBuild | 2 +- desktop/flatpak/flatpak.info | 6 +- desktop/gtk-theme-Greybird/README | 5 - desktop/gtk-theme-Greybird/doinst.sh | 13 - .../gtk-theme-Greybird.SlackBuild | 62 - desktop/gtk-theme-Greybird/gtk-theme-Greybird.info | 10 - desktop/gtk-theme-Greybird/slack-desc | 19 - desktop/i3/add_HAVE_strndup.diff | 11 - desktop/i3/i3.SlackBuild | 2 - desktop/kde-gtk-config/README | 9 - desktop/kde-gtk-config/doinst.sh | 6 - desktop/kde-gtk-config/gtk3proxies.diff | 11 - desktop/kde-gtk-config/gtkproxies.diff | 11 - desktop/kde-gtk-config/kde-gtk-config.SlackBuild | 104 - desktop/kde-gtk-config/kde-gtk-config.info | 10 - desktop/kde-gtk-config/slack-desc | 19 - desktop/libqtxdg/libqtxdg.SlackBuild | 2 +- desktop/libqtxdg/libqtxdg.info | 10 +- desktop/libqtxdg/slack-desc | 2 +- desktop/lumina/lumina.SlackBuild | 1 + desktop/lxpanel/lxpanel.info | 2 +- desktop/materia-theme/README | 3 - desktop/materia-theme/materia-theme.SlackBuild | 7 +- desktop/materia-theme/materia-theme.info | 6 +- desktop/mousepad/README | 6 - desktop/mousepad/doinst.sh | 15 - desktop/mousepad/mousepad.SlackBuild | 98 - desktop/mousepad/mousepad.info | 10 - desktop/mousepad/slack-desc | 19 - desktop/neofetch/README | 8 - desktop/neofetch/neofetch.SlackBuild | 60 - desktop/neofetch/neofetch.info | 10 - desktop/neofetch/slack-desc | 19 - .../papirus-icon-theme.SlackBuild | 4 +- desktop/papirus-icon-theme/papirus-icon-theme.info | 6 +- desktop/picom/README | 6 + desktop/picom/doinst.sh | 9 + desktop/picom/picom.SlackBuild | 94 + desktop/picom/picom.info | 10 + desktop/picom/slack-desc | 19 + .../00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch | 44 + desktop/polybar/polybar.SlackBuild | 5 +- desktop/q4wine/q4wine.SlackBuild | 20 +- desktop/q4wine/q4wine.info | 6 +- desktop/rss-glx/patches/pixelcity-cpp.patch | 15 + .../patches/rss-glx-0.9.1-imagemagick-7.patch | 178 + desktop/rss-glx/rss-glx.SlackBuild | 3 +- desktop/rss-guard/01_min_qt_required_is_5.9.patch | 56 + desktop/rss-guard/02_fix_random_class_name.patch | 24 + desktop/rss-guard/rss-guard.SlackBuild | 11 +- desktop/rss-guard/rss-guard.info | 6 +- desktop/seafile-client/README | 12 + desktop/seafile-client/doinst.sh | 9 + desktop/seafile-client/seafile-client.SlackBuild | 91 + desktop/seafile-client/seafile-client.info | 10 + desktop/seafile-client/slack-desc | 19 + desktop/seafile-gui/README | 12 - desktop/seafile-gui/doinst.sh | 9 - desktop/seafile-gui/seafile-gui.SlackBuild | 92 - desktop/seafile-gui/seafile-gui.info | 10 - desktop/seafile-gui/slack-desc | 19 - desktop/searchmonkey/patch.txt | 11 + desktop/searchmonkey/searchmonkey.SlackBuild | 1 + desktop/ssr/README | 6 - desktop/ssr/doinst.sh | 9 - desktop/ssr/slack-desc | 19 - desktop/ssr/ssr.SlackBuild | 105 - desktop/ssr/ssr.info | 10 - desktop/suru-plus-icon-theme/README | 3 + desktop/suru-plus-icon-theme/doinst.sh | 5 + desktop/suru-plus-icon-theme/slack-desc | 19 + .../suru-plus-icon-theme.SlackBuild | 63 + .../suru-plus-icon-theme/suru-plus-icon-theme.info | 10 + .../thunar-archive-plugin.SlackBuild | 8 +- .../thunar-archive-plugin.info | 6 +- desktop/thunar-dropbox/README | 2 - desktop/thunar-dropbox/doinst.sh | 6 - desktop/thunar-dropbox/slack-desc | 19 - desktop/thunar-dropbox/thunar-dropbox.SlackBuild | 88 - desktop/thunar-dropbox/thunar-dropbox.info | 10 - .../thunar-media-tags-plugin-0.2.1.patch | 61 - .../thunar-media-tags-plugin-0.3.0.patch | 61 + .../thunar-media-tags-plugin.SlackBuild | 10 +- .../thunar-media-tags-plugin.info | 6 +- .../thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild | 2 +- desktop/thunar-vcs-plugin/thunar-vcs-plugin.info | 6 +- .../vala-panel-appmenu.SlackBuild | 6 +- desktop/vala-panel-appmenu/vala-panel-appmenu.info | 6 +- desktop/vertex-theme/README | 6 - desktop/vertex-theme/slack-desc | 19 - desktop/vertex-theme/vertex-theme.SlackBuild | 65 - desktop/vertex-theme/vertex-theme.info | 10 - desktop/wbar/wbar.SlackBuild | 2 +- desktop/weston/README | 91 - desktop/weston/README.SBo | 112 + desktop/weston/weston-7.0.0-nopam.patch | 160 - desktop/weston/weston.SlackBuild | 20 +- desktop/weston/weston.info | 8 +- desktop/wmCalClock/wmCalClock.SlackBuild | 2 +- desktop/wmMoonClock/wmMoonClock.SlackBuild | 2 +- desktop/wmSun/wmSun.SlackBuild | 2 +- desktop/wmakerconf/patches/patch-configure | 38 + desktop/wmakerconf/patches/patch-scripts__wget.pl | 9 + desktop/wmakerconf/patches/patch-src_menu.c | 15 + desktop/wmakerconf/patches/patch-src_misc.c | 14 + desktop/wmakerconf/patches/patch-src_previews.c | 20 + desktop/wmakerconf/patches/patch-src_rootmenu.c | 11 + .../wmakerconf/patches/patch-src_themebrowser.c | 50 + desktop/wmakerconf/patches/patch-src_window.c | 20 + desktop/wmakerconf/patches/patch-src_wmconfig.c | 29 + .../wmakerconf-2.12-wmaker-0.95_support.patch | 82 - desktop/wmakerconf/wmakerconf.SlackBuild | 19 +- desktop/wmii/wmii.SlackBuild | 2 + desktop/wminfo/wminfo.SlackBuild | 2 +- desktop/wmsm.app/wmsm.app.SlackBuild | 2 +- desktop/wmtop/wmtop.SlackBuild | 2 +- desktop/wmweather/wmweather.SlackBuild | 2 +- desktop/workrave/README | 4 + desktop/workrave/doinst.sh | 19 + desktop/workrave/slack-desc | 19 + desktop/workrave/workrave.SlackBuild | 98 + desktop/workrave/workrave.info | 10 + .../xdg-desktop-portal.SlackBuild | 2 +- desktop/xdg-desktop-portal/xdg-desktop-portal.info | 8 +- .../xfce4-battery-plugin.SlackBuild | 2 +- .../xfce4-battery-plugin/xfce4-battery-plugin.info | 6 +- .../xfce4-cpufreq-plugin.SlackBuild | 10 +- .../xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.info | 6 +- .../xfce4-cpugraph-plugin.SlackBuild | 16 +- .../xfce4-cpugraph-plugin.info | 6 +- desktop/xfce4-dict/xfce4-dict.SlackBuild | 2 +- desktop/xfce4-dict/xfce4-dict.info | 6 +- .../xfce4-diskperf-plugin.SlackBuild | 16 +- .../xfce4-diskperf-plugin.info | 6 +- .../xfce4-eyes-plugin/xfce4-eyes-plugin.SlackBuild | 4 +- desktop/xfce4-eyes-plugin/xfce4-eyes-plugin.info | 6 +- .../xfce4-fsguard-plugin.SlackBuild | 2 +- .../xfce4-fsguard-plugin/xfce4-fsguard-plugin.info | 6 +- .../xfce4-genmon-plugin.SlackBuild | 14 +- .../xfce4-genmon-plugin/xfce4-genmon-plugin.info | 6 +- desktop/xfce4-kbdleds-plugin/README | 2 - desktop/xfce4-kbdleds-plugin/doinst.sh | 9 - desktop/xfce4-kbdleds-plugin/slack-desc | 19 - .../xfce4-kbdleds-plugin.SlackBuild | 92 - .../xfce4-kbdleds-plugin/xfce4-kbdleds-plugin.info | 10 - .../xfce4-mailwatch-plugin.SlackBuild | 10 +- .../xfce4-mailwatch-plugin.info | 6 +- .../xfce4-mount-plugin.SlackBuild | 11 +- desktop/xfce4-mount-plugin/xfce4-mount-plugin.info | 6 +- .../xfce4-mpc-plugin/xfce4-mpc-plugin.SlackBuild | 16 +- desktop/xfce4-mpc-plugin/xfce4-mpc-plugin.info | 6 +- .../xfce4-netload-plugin.SlackBuild | 16 +- .../xfce4-netload-plugin/xfce4-netload-plugin.info | 6 +- .../xfce4-notes-plugin.SlackBuild | 24 +- desktop/xfce4-notes-plugin/xfce4-notes-plugin.info | 6 +- .../xfce4-places-plugin.SlackBuild | 18 +- .../xfce4-places-plugin/xfce4-places-plugin.info | 6 +- desktop/xfce4-quicklauncher-plugin/README | 2 - .../allow_adding_plugin_to_panel.diff | 10 - desktop/xfce4-quicklauncher-plugin/slack-desc | 19 - .../xfce4-quicklauncher-plugin.SlackBuild | 102 - .../xfce4-quicklauncher-plugin.info | 10 - .../xfce4-sensors-plugin.SlackBuild | 20 +- .../xfce4-sensors-plugin/xfce4-sensors-plugin.info | 6 +- .../xfce4-smartbookmark-plugin.SlackBuild | 16 +- .../xfce4-smartbookmark-plugin.info | 6 +- .../xfce4-timer-plugin.SlackBuild | 8 +- desktop/xfce4-timer-plugin/xfce4-timer-plugin.info | 6 +- .../xfce4-verve-plugin.SlackBuild | 16 +- desktop/xfce4-verve-plugin/xfce4-verve-plugin.info | 6 +- .../xfce4-volumed-pulse/xfce4-volumed-pulse.info | 2 +- desktop/xfce4-whiskermenu-plugin/README | 6 - desktop/xfce4-whiskermenu-plugin/doinst.sh | 9 - desktop/xfce4-whiskermenu-plugin/slack-desc | 19 - .../xfce4-whiskermenu-plugin.SlackBuild | 102 - .../xfce4-whiskermenu-plugin.info | 10 - desktop/xfce4-windowck-plugin/README | 2 - .../xfce4-windowck-plugin.SlackBuild | 6 +- .../xfce4-windowck-plugin.info | 8 +- desktop/xfce4-xkb-plugin/slack-desc | 2 +- .../xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild | 16 +- desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info | 8 +- desktop/xfce4-xmms-plugin/README | 2 - desktop/xfce4-xmms-plugin/slack-desc | 19 - .../xfce4-xmms-plugin/xfce4-xmms-plugin.SlackBuild | 94 - desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.info | 10 - desktop/yad/README | 5 +- desktop/yad/doinst.sh | 5 + desktop/yad/slack-desc | 2 +- desktop/yad/yad.SlackBuild | 18 +- desktop/yad/yad.info | 8 +- development/ChezScheme/ChezScheme.SlackBuild | 1 + development/Coin/Coin.SlackBuild | 3 + development/Coin/memhandler-initialization.patch | 20 + development/MySQL-python/MySQL-python.SlackBuild | 2 +- development/SDL2_gfx/README | 3 - development/SDL2_gfx/SDL2_gfx.SlackBuild | 99 - development/SDL2_gfx/SDL2_gfx.info | 10 - development/SDL2_gfx/slack-desc | 19 - development/acpica/acpica.SlackBuild | 2 +- development/android-tools/README | 4 +- development/android-tools/android-tools.SlackBuild | 70 +- development/android-tools/android-tools.info | 36 +- development/android-tools/bash_completion.fastboot | 90 + development/android-tools/fix_build_core.patch | 155 +- development/android-tools/fix_build_selinux.patch | 26 - development/android-tools/generate_build.rb | 461 +- development/anjuta/anjuta.SlackBuild | 2 +- development/autoconf-archive/README | 15 - .../autoconf-archive/autoconf-archive.SlackBuild | 79 - development/autoconf-archive/autoconf-archive.info | 10 - development/autoconf-archive/slack-desc | 19 - development/autogen/autogen.SlackBuild | 7 +- development/autogen/autogen.info | 2 +- development/autogen/guile-2.2.patch | 78 + development/avr-binutils/avr-binutils.SlackBuild | 20 +- development/avr-binutils/avr-binutils.info | 6 +- development/avr-binutils/avr-size.patch | 541 +- development/avr-gcc/avr-gcc.SlackBuild | 48 +- development/avr-gcc/avr-gcc.info | 8 +- development/avr-gdb/avr-gdb.SlackBuild | 15 +- development/avr-gdb/avr-gdb.info | 8 +- development/bashdb/bashdb.SlackBuild | 4 +- development/bashdb/bashdb.info | 6 +- development/brotli/README | 7 - development/brotli/brotli.SlackBuild | 101 - development/brotli/brotli.info | 10 - development/brotli/slack-desc | 19 - development/camlp4/camlp4.SlackBuild | 18 +- development/camlp4/camlp4.info | 6 +- development/check/README | 8 - development/check/check.SlackBuild | 107 - development/check/check.info | 10 - development/check/slack-desc | 19 - development/cmake-202x/README | 14 - development/cmake-202x/README_SBo.txt | 35 - development/cmake-202x/cmake-202x.SlackBuild | 122 - development/cmake-202x/cmake-202x.info | 12 - development/cmake-202x/slack-desc | 19 - development/coccinelle/coccinelle.SlackBuild | 5 +- development/coccinelle/coccinelle.info | 6 +- .../device-tree-compiler.SlackBuild | 8 +- .../device-tree-compiler/device-tree-compiler.info | 6 +- development/docutils/README | 6 - development/docutils/docutils.SlackBuild | 73 - development/docutils/docutils.info | 10 - development/docutils/slack-desc | 19 - development/dune/README | 5 + development/dune/dune.SlackBuild | 90 + development/dune/dune.info | 10 + development/dune/slack-desc | 19 + development/elixir/elixir.SlackBuild | 8 +- development/elixir/elixir.info | 6 +- development/erlang-otp/erlang-otp.SlackBuild | 2 +- development/erlang-otp/erlang-otp.info | 10 +- development/extra-cmake-modules/README | 6 - .../extra-cmake-modules.SlackBuild | 103 - .../extra-cmake-modules/extra-cmake-modules.info | 10 - development/extra-cmake-modules/slack-desc | 19 - development/freetds/freetds.SlackBuild | 2 +- development/freetds/freetds.info | 6 +- development/gcc5/README | 46 + development/gcc5/c89.sh | 11 + development/gcc5/c99.sh | 11 + development/gcc5/ecj.sh | 5 + .../1000-fastjar-0.97-segfault.patch | 29 + .../fastjar-patches/1001-fastjar-0.97-len1.patch | 16 + .../1002-fastjar-0.97-filename0.patch | 14 + .../1003-fastjar-CVE-2010-0831.patch | 102 + .../gcc5/fastjar-patches/1004-fastjar-man.patch | 27 + development/gcc5/gcc5.SlackBuild | 569 ++ development/gcc5/gcc5.info | 17 + development/gcc5/libgcj-5.pc | 10 + ...Move-struct-ix86_frame-to-machine_function.diff | 239 + ...eference-of-struct-ix86_frame-to-avoid-cop.diff | 72 + ...use-reference-of-struct-ix86_frame-to-avoi.diff | 59 + ...6-Don-t-use-reference-of-struct-ix86_frame.diff | 63 + .../patches/0005-x86-Add-mindirect-branch-doc.diff | 279 + .../patches/0005-x86-Add-mindirect-branch.diff | 1870 +++++ .../patches/0006-x86-Add-mfunction-return-doc.diff | 300 + .../patches/0006-x86-Add-mfunction-return.diff | 1409 ++++ ...0007-x86-Add-mindirect-branch-register-doc.diff | 231 + .../0007-x86-Add-mindirect-branch-register.diff | 812 +++ ...08-x86-Add-V-register-operand-modifier-doc.diff | 65 + .../0008-x86-Add-V-register-operand-modifier.diff | 125 + ...ow-mindirect-branch-mfunction-return-with-.diff | 275 + ...mindirect-branch-mfunction-return-with-doc.diff | 102 + development/gcc5/patches/gcc-no_fixincludes.diff | 27 + development/gcc5/patches/gcc.66782.diff | 124 + development/gcc5/patches/gcc.69140.diff | 13 + development/gcc5/patches/glibc2.28-ustat.diff | 31 + development/gcc5/profile.d/gcc5.csh | 7 + development/gcc5/profile.d/gcc5.sh | 7 + development/gcc5/slack-desc.gcc5 | 19 + development/geany-plugins/geany-plugins.SlackBuild | 5 +- development/geany-plugins/geany-plugins.info | 6 +- development/geany/geany.SlackBuild | 4 +- development/geany/geany.info | 6 +- development/gedit/gedit.SlackBuild | 1 + development/glade/README | 12 - development/glade/doinst.sh | 6 - development/glade/glade.SlackBuild | 109 - development/glade/glade.info | 10 - development/glade/slack-desc | 19 - development/gnats/gnats.SlackBuild | 2 +- development/gnuradio/boost-1.70.0.patch | 36 + development/gnuradio/boost-1.73.0.patch | 720 ++ development/gnuradio/gnuradio.SlackBuild | 6 +- .../replace_boost_endian_check_with_cmake.patch | 45 + development/gnustep-base/gnustep-base.SlackBuild | 4 +- development/gnustep-base/gnustep-base.info | 6 +- development/gnustep-base/icu68.patch | 31 + development/gnustep-make/gnustep-make.SlackBuild | 4 +- development/gnustep-make/gnustep-make.info | 6 +- development/gpsim/gpsim.SlackBuild | 2 +- development/gr-osmosdr/boost-1.73.patch | 20 + development/gr-osmosdr/gr-osmosdr.SlackBuild | 3 + development/gsoap/gsoap-libtool.patch | 136 - development/gsoap/gsoap.SlackBuild | 18 +- development/gsoap/gsoap.info | 6 +- ...2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch | 12 + .../gsoap/patches/gsoap-2.8.91-shared_libs.patch | 142 + development/gtest/gtest.SlackBuild | 13 +- ...st-PR2491-Fix-gnu-install-dirs-pkg-config.patch | 166 + ...nfig-Remove-pthread-link-flag-from-Cflags.patch | 61 + .../gtkdialog/gtkdialog-0.8.3-fno-common.patch | 51 + development/gtkdialog/gtkdialog.SlackBuild | 3 + development/guile2.2/README | 10 + development/guile2.2/guile2.2.SlackBuild | 138 + development/guile2.2/guile2.2.info | 10 + development/guile2.2/slack-desc | 19 + development/hte/hte.SlackBuild | 24 +- development/hte/hte.info | 6 +- development/hte/hteditor-2.1.0-gcc-7.patch | 32 + development/icecream/README | 14 - development/icecream/doinst.sh | 30 - development/icecream/icecream.SlackBuild | 133 - development/icecream/icecream.info | 10 - development/icecream/profile.d/icecream.csh | 2 - development/icecream/profile.d/icecream.sh | 2 - development/icecream/rc.icecc-scheduler | 50 - development/icecream/rc.iceccd | 50 - development/icecream/rc.icecream.conf | 8 - development/icecream/slack-desc | 19 - development/jdk/profile.d/jdk.csh | 1 - development/jdk/profile.d/jdk.sh | 1 - development/kakoune/kakoune.SlackBuild | 4 +- development/kakoune/kakoune.info | 6 +- development/kicad/boost-1.61.patch | 347 - development/kicad/kicad.SlackBuild | 12 +- development/kicad/kicad.info | 6 +- development/kicad/kicad_boost_hdr.patch | 14 - .../fix-scanner-config-for-flex-2.6.x.patch | 23 + development/latrace/latrace.SlackBuild | 3 + development/lmdb/README | 2 - development/lmdb/lmdb.SlackBuild | 95 - development/lmdb/lmdb.info | 10 - development/lmdb/slack-desc | 19 - development/meld3/meld3.SlackBuild | 4 +- development/meld3/meld3.info | 6 +- development/meld3/python-3.8.patch | 61 + development/menhir/menhir.SlackBuild | 6 +- development/menhir/menhir.info | 6 +- development/meson/README | 9 - development/meson/meson.SlackBuild | 91 - development/meson/meson.info | 10 - development/meson/slack-desc | 19 - development/mozjs/README | 3 - development/mozjs/mozjs.SlackBuild | 143 - development/mozjs/mozjs.info | 10 - .../patches/moz38-dont-hardcode-libc-soname.patch | 15 - development/mozjs/slack-desc | 19 - development/mysql-pinba/mysql-pinba.SlackBuild | 2 +- .../mysql-workbench/mysql-workbench.SlackBuild | 5 + development/ninja/README | 4 - development/ninja/ninja.SlackBuild | 95 - development/ninja/ninja.info | 10 - development/ninja/slack-desc | 19 - development/numpy3/numpy3.SlackBuild | 2 +- development/numpy3/numpy3.info | 6 +- development/nvi/README | 7 - development/nvi/nvi.SlackBuild | 109 - development/nvi/nvi.info | 10 - development/nvi/patches/nvi.diffs | 28 - development/nvi/slack-desc | 19 - development/ocaml/configure.patch | 25 +- development/ocaml/ocaml.SlackBuild | 15 +- development/ocaml/ocaml.info | 14 +- development/ocamlbuild/ocamlbuild.SlackBuild | 4 +- development/ocamlbuild/ocamlbuild.info | 6 +- development/odb/odb.SlackBuild | 3 + development/odb/odb_gcc6.patch | 355 + development/omake/omake-warn-error.diff | 11 - development/omake/omake.SlackBuild | 32 +- development/omake/omake.info | 8 +- development/oniguruma/README | 3 - development/oniguruma/oniguruma.SlackBuild | 104 - development/oniguruma/oniguruma.info | 10 - development/oniguruma/slack-desc | 19 - development/opencl-headers/README | 3 - .../opencl-headers/opencl-headers.SlackBuild | 57 - development/opencl-headers/opencl-headers.info | 10 - development/opencl-headers/slack-desc | 19 - development/openocd/openocd.SlackBuild | 10 +- development/openocd/openocd.info | 6 +- development/perf/perf.SlackBuild | 2 +- development/perf/perf.info | 2 +- development/php-apcu/php-apcu.SlackBuild | 4 +- development/php-apcu/php-apcu.info | 6 +- .../281f93b29190c67c86c4403b96efdbac957a0162.patch | 25 + development/poedit/README | 5 +- development/poedit/poedit.SlackBuild | 6 +- development/poedit/poedit.info | 6 +- development/poedit/setvalue.diff | 11 - development/qt-creator/qt-creator.SlackBuild | 2 +- development/qt-creator/qt-creator.info | 6 +- development/re2c/README | 6 - development/re2c/re2c.SlackBuild | 109 - development/re2c/re2c.info | 10 - development/re2c/slack-desc | 19 - development/sassc/README | 12 - development/sassc/sassc.SlackBuild | 98 - development/sassc/sassc.info | 10 - development/sassc/slack-desc | 19 - .../spice-protocol/spice-protocol.SlackBuild | 32 +- development/spice-protocol/spice-protocol.info | 6 +- development/swfmill/swfmill.SlackBuild | 2 +- development/tidy-html5/README | 3 - development/tidy-html5/slack-desc | 19 - development/tidy-html5/tidy-html5.SlackBuild | 105 - development/tidy-html5/tidy-html5.info | 10 - development/tora/README | 2 + development/tora/tora.SlackBuild | 14 +- development/tora/tora.info | 8 +- development/vala/README | 4 - development/vala/patch_support-gtk318.diff | 50 - development/vala/slack-desc | 19 - development/vala/vala.SlackBuild | 100 - development/vala/vala.info | 10 - development/woff2/README | 1 - development/woff2/slack-desc | 19 - development/woff2/woff2.SlackBuild | 87 - development/woff2/woff2.info | 10 - games/0ad-data/0ad-data.SlackBuild | 2 +- games/0ad-data/0ad-data.info | 6 +- games/0ad/0ad.SlackBuild | 26 +- games/0ad/0ad.info | 8 +- games/0ad/D1852.diff | 213 - games/0ad/rust-1.50.0.patch | 40 + games/RetroArch/RetroArch.SlackBuild | 3 + .../alienarena-7.66-no-qglBlitFramebufferEXT.patch | 22 + games/alienarena/alienarena.SlackBuild | 30 +- games/alienarena/alienarena.info | 4 +- games/alienarena/checkout_code.sh | 6 + .../arx-libertatis-1.1.2-cmake3.5.patch | 12 - games/arx-libertatis/arx-libertatis.SlackBuild | 14 +- games/arx-libertatis/arx-libertatis.info | 8 +- games/assaultcube/assaultcube-gcc6.patch | 301 + games/assaultcube/assaultcube.SlackBuild | 2 + games/berusky2/berusky2.SlackBuild | 6 +- games/berusky2/berusky2.info | 6 +- games/blobwars/blobwars.SlackBuild | 2 +- games/bloodfrontier/bloodfrontier.SlackBuild | 2 +- games/brainparty/brainparty.SlackBuild | 3 + games/brainparty/patches/gcc-6.patch | 47 + games/chroma/chroma.SlackBuild | 19 +- games/chroma/gcc.patch | 30 + games/crrcsim/crrcsim.SlackBuild | 3 + games/crrcsim/fix_bug.patch | 12 + games/desmume/desmume.SlackBuild | 27 +- games/desmume/desmume.info | 6 +- games/desmume/osmesa-header-fix.patch | 11 - games/dolphin-emu/dolphin-emu.SlackBuild | 4 +- games/dolphin-emu/dolphin-emu.info | 6 +- games/etlegacy-from-source/README | 25 + games/etlegacy-from-source/doinst.sh | 3 + .../etlegacy-from-source.SlackBuild | 186 + .../etlegacy-from-source/etlegacy-from-source.info | 16 + games/etlegacy-from-source/files/etlegacy.desktop | 9 + games/etlegacy-from-source/files/etlegacy.svg | 100 + .../files/get_tarball_from_git.sh | 25 + games/etlegacy-from-source/files/openurl.sh | 15 + games/etlegacy-from-source/slack-desc | 19 + games/f1spirit/03_gcc6.patch | 12 + games/f1spirit/f1spirit.SlackBuild | 3 + games/freeorion/compilefix.diff | 36 - games/freeorion/freeorion.SlackBuild | 6 +- games/freeorion/freeorion.info | 6 +- games/frogatto/frogatto.SlackBuild | 6 +- games/gargoyle/gargoyle.SlackBuild | 2 +- games/glob2/c++14.patch | 46 + games/glob2/glob2.SlackBuild | 3 + games/gnubg/gnubg.SlackBuild | 2 - games/goonies/gcc6.patch | 12 + games/goonies/goonies.SlackBuild | 3 + games/img2xterm/img2xterm.SlackBuild | 3 + games/knights/README | 6 - games/knights/doinst.sh | 13 - games/knights/knights.SlackBuild | 118 - games/knights/knights.info | 10 - games/knights/slack-desc | 19 - games/m64py/m64py.SlackBuild | 10 +- games/m64py/m64py.info | 8 +- games/micropolis/micropolis.SlackBuild | 2 +- .../fix_multiple_definition_errors.patch | 11 + games/mupen64plus/mupen64plus.SlackBuild | 3 + games/neverball/gcc10.patch | 41 + games/neverball/neverball.SlackBuild | 2 + games/nlarn/nlarn.SlackBuild | 3 + games/noteye/noteye.SlackBuild | 3 + games/openlierox/http_curl.patch | 20 - games/openlierox/openlierox.SlackBuild | 8 +- games/openlierox/openlierox.info | 8 +- games/openttd/openttd.SlackBuild | 2 +- games/pingus/missing-header.patch | 22 + games/pingus/pingus.SlackBuild | 3 + .../pokerth-1.1.2-boost-1.70-websocket-fix1.patch | 75 + .../pokerth-1.1.2-boost-1.70-websocket-fix2.patch | 52 + .../pokerth-1.1.2-boost-1.73-placeholders.patch | 18 + games/pokerth/pokerth.SlackBuild | 38 +- games/pokerth/pokerth.info | 10 +- games/pysolfc/pillow6.patch | 47 + games/pysolfc/pysolfc.SlackBuild | 2 + games/qmc2/qmc2-qt5.15.patch | 10 + games/qmc2/qmc2-types.patch | 952 +++ games/qmc2/qmc2.SlackBuild | 3 + games/quakespasm/README | 1 + games/quakespasm/doinst.sh | 3 + games/quakespasm/quakespasm.SlackBuild | 91 + games/quakespasm/quakespasm.desktop | 9 + games/quakespasm/quakespasm.info | 10 + games/quakespasm/slack-desc | 19 + games/rlvm/gcc.patch | 24 + games/rlvm/rlvm.SlackBuild | 3 + games/roadfighter/gcc.patch | 11 + games/roadfighter/roadfighter.SlackBuild | 3 + games/roccat-tools/roccat-tools.SlackBuild | 2 +- games/scummvm/scummvm.SlackBuild | 5 +- .../speed-dreams-params-conversion.patch | 22 + games/speed-dreams/speed-dreams.SlackBuild | 3 + games/supertux/supertux-0.6.2_rc1-boost-1.73.patch | 25 + games/supertux/supertux.SlackBuild | 11 +- games/supertux/supertux.info | 6 +- games/supertuxkart/mesa-18.3.patch | 23 + games/supertuxkart/supertuxkart.SlackBuild | 3 + games/torcs/torcs.SlackBuild | 2 +- games/trackballs/trackballs.info | 2 +- games/vegastrike/cmake/FindGTK2.cmake | 946 +++ .../cmake/FindPackageHandleStandardArgs.cmake | 466 ++ games/vegastrike/cmake/FindPackageMessage.cmake | 48 + .../cmake/SelectLibraryConfigurations.cmake | 80 + games/vegastrike/patches/patch-0.5.1.r1_2 | 216 +- games/vegastrike/vegastrike.SlackBuild | 4 + games/warmux/patches/return-null.patch | 11 + games/warmux/warmux.SlackBuild | 5 +- games/widelands/widelands-gcc47.patch | 12 - games/widelands/widelands.SlackBuild | 14 +- games/widelands/widelands.info | 6 +- games/xu4/gcc7.patch | 90 + games/xu4/xu4.SlackBuild | 3 + games/xye/xye.SlackBuild | 2 +- gis/gdal/gdal.SlackBuild | 2 + gis/libLAS/Use_LIBLAS_BIG_ENDIAN.patch | 40 + gis/libLAS/boost-1.73.patch | 36 + gis/libLAS/libLAS.SlackBuild | 3 + gis/qgis/qgis.SlackBuild | 9 +- gis/qgis/qgis.info | 2 +- graphics/Blender/Blender.SlackBuild | 1 + graphics/FreeCAD/FreeCAD.SlackBuild | 13 +- graphics/FreeCAD/FreeCAD.info | 6 +- graphics/FreeCAD/addBoostHeaders-200c7c7.patch | 34 + graphics/GraphicsMagick/README | 3 + graphics/darktable/darktable.SlackBuild | 7 +- graphics/darktable/darktable.info | 8 +- graphics/digikam/README | 14 - graphics/digikam/digikam.SlackBuild | 116 - graphics/digikam/digikam.info | 10 - graphics/digikam/doinst.sh | 9 - graphics/digikam/lensfun-0.3.2.patch | 26 - graphics/digikam/libpgf.patch | 33 - graphics/digikam/slack-desc | 19 - graphics/enblend-enfuse/enblend-enfuse.SlackBuild | 2 + .../Provide-gif-quantization-for-giflib-5.2.patch | 384 + graphics/exact-image/exact-image.SlackBuild | 1 + graphics/fim/fim.SlackBuild | 16 +- graphics/fim/fim.info | 6 +- graphics/gimagereader/gimagereader.SlackBuild | 12 +- graphics/gimagereader/gimagereader.info | 6 +- .../gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild | 8 +- graphics/gimp-plugin-bimp/gimp-plugin-bimp.info | 6 +- graphics/glslang/README | 5 - graphics/glslang/SPIRV-Tools-shared.patch | 61 - graphics/glslang/glslang.SlackBuild | 103 - graphics/glslang/glslang.info | 10 - graphics/glslang/slack-desc | 19 - graphics/gmic/gmic.SlackBuild | 17 +- graphics/gmic/gmic.info | 10 +- graphics/gmic/zart-opencv4.patch | 59 - graphics/goocanvas/goocanvas.SlackBuild | 1 + graphics/gpaint/gpaint.SlackBuild | 1 + graphics/graphene/README | 22 - graphics/graphene/graphene.SlackBuild | 107 - graphics/graphene/graphene.info | 10 - graphics/graphene/slack-desc | 19 - graphics/graphite2/README | 10 - graphics/graphite2/graphite2.SlackBuild | 97 - graphics/graphite2/graphite2.info | 10 - graphics/graphite2/slack-desc | 19 - graphics/graphviz/graphviz.SlackBuild | 1 + graphics/inkscape/README | 2 - graphics/inkscape/inkscape.SlackBuild | 63 +- graphics/inkscape/inkscape.info | 8 +- graphics/k3d/README | 1 - graphics/k3d/gcc7.patch | 23 + graphics/k3d/k3d.SlackBuild | 3 + graphics/k3d/k3d.info | 2 +- graphics/kphotoalbum/kphotoalbum.SlackBuild | 15 +- graphics/kphotoalbum/kphotoalbum.info | 6 +- graphics/kuickshow/README | 12 +- graphics/kuickshow/kuickshow.SlackBuild | 16 +- graphics/kuickshow/kuickshow.info | 6 +- graphics/mcomix/README | 20 - graphics/mcomix/doinst.sh | 13 - graphics/mcomix/mcomix.SlackBuild | 86 - graphics/mcomix/mcomix.info | 10 - graphics/mcomix/slack-desc | 19 - graphics/mypaint/mypaint.SlackBuild | 8 +- graphics/mypaint/mypaint.info | 8 +- graphics/nomacs/nomacs.SlackBuild | 14 +- graphics/nomacs/nomacs.info | 14 +- graphics/opencollada/opencollada.SlackBuild | 3 + graphics/opencollada/pcre.patch | 13 + graphics/opencolorio/opencolorio.SlackBuild | 2 +- graphics/openscad/openscad.SlackBuild | 20 +- graphics/openscad/openscad.info | 8 +- graphics/photoprint/photoprint.SlackBuild | 20 +- .../c6fd41478e818f3a651d40f96cab3d790e1c09a4.diff | 86 + graphics/photoqt/photoqt.SlackBuild | 2 + graphics/povray/povray.SlackBuild | 10 +- graphics/povray/povray.info | 6 +- graphics/qrencode/README | 4 - graphics/qrencode/qrencode.SlackBuild | 100 - graphics/qrencode/qrencode.info | 10 - graphics/qrencode/slack-desc | 19 - graphics/rawstudio/rawstudio.SlackBuild | 2 +- graphics/rawtherapee/rawtherapee.SlackBuild | 2 +- graphics/rawtherapee/rawtherapee.info | 6 +- graphics/ristretto/ristretto.SlackBuild | 2 +- graphics/ristretto/ristretto.info | 6 +- .../scantailor-advanced.SlackBuild | 9 +- .../scantailor-advanced/scantailor-advanced.info | 6 +- graphics/scantailor/README | 6 - graphics/scantailor/doinst.sh | 9 - graphics/scantailor/scantailor.SlackBuild | 86 - graphics/scantailor/scantailor.desktop | 11 - graphics/scantailor/scantailor.info | 10 - graphics/scantailor/slack-desc | 19 - graphics/screengrab/screengrab.SlackBuild | 19 +- graphics/screengrab/screengrab.info | 10 +- graphics/simple-scan/libwebpmux.patch | 38 + graphics/simple-scan/simple-scan.SlackBuild | 6 +- graphics/simple-scan/simple-scan.info | 8 +- graphics/simple-scan/slack-desc | 2 +- .../patches/0001-Change-use-of-header-files.patch | 30 + .../patches/0002-Use-symbolic-error-code.patch | 26 + .../0003-ufraw-0.22-fix_omp_definitions.patch | 32 + graphics/ufraw/ufraw.SlackBuild | 4 + graphics/vulkan-sdk/README | 11 - graphics/vulkan-sdk/slack-desc | 19 - graphics/vulkan-sdk/vulkan-loader-cmake.patch | 13 - graphics/vulkan-sdk/vulkan-sdk.SlackBuild | 217 - graphics/vulkan-sdk/vulkan-sdk.info | 18 - graphics/wayland-protocols/README | 9 - graphics/wayland-protocols/slack-desc | 19 - .../wayland-protocols/wayland-protocols.SlackBuild | 71 - graphics/wayland-protocols/wayland-protocols.info | 10 - .../yafaray-blender/yafaray-blender.SlackBuild | 28 +- graphics/yafaray-blender/yafaray-blender.info | 6 +- graphics/yafaray/README | 8 +- graphics/yafaray/yafaray.SlackBuild | 92 +- graphics/yafaray/yafaray.info | 8 +- ham/fldigi/fldigi.SlackBuild | 2 +- ham/soundmodem/soundmodem.SlackBuild | 2 +- ham/svxlink/gcc6.patch | 23 + ham/svxlink/svxlink.SlackBuild | 5 +- .../4eebc8016f68719e1ccdf460754a97d1f4d6ef05.patch | 48 - haskell/ghc/ghc.1 | 1765 +++-- haskell/ghc/ghc.SlackBuild | 24 +- haskell/ghc/ghc.info | 18 +- libraries/Atlas-C++/Atlas-C++.SlackBuild | 2 +- libraries/CEGUI0.7/CEGUI0.7.SlackBuild | 2 +- libraries/FreeImage/010_avoid-raw-literal.diff | 44 - libraries/FreeImage/FreeImage.SlackBuild | 6 +- libraries/FreeImage/FreeImage.info | 6 +- libraries/OpenAL/OpenAL.SlackBuild | 92 - libraries/OpenAL/OpenAL.info | 10 - libraries/OpenAL/README | 2 - libraries/OpenAL/slack-desc | 19 - .../OpenSceneGraph/0008-Fix_wxWidgets_gl.patch | 12 + libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild | 3 + libraries/PyQt5/PyQt5.SlackBuild | 125 - libraries/PyQt5/PyQt5.info | 10 - libraries/PyQt5/README | 2 - libraries/PyQt5/patches/pyqt5-python2-crash.patch | 13 - libraries/PyQt5/slack-desc | 19 - libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild | 103 - libraries/QScintilla-qt5/QScintilla-qt5.info | 10 - libraries/QScintilla-qt5/README | 11 - libraries/QScintilla-qt5/slack-desc | 19 - libraries/SDL2/README | 9 - libraries/SDL2/SDL2.SlackBuild | 100 - libraries/SDL2/SDL2.info | 10 - libraries/SDL2/slack-desc | 19 - libraries/SDL2_image/README | 6 - libraries/SDL2_image/SDL2_image.SlackBuild | 98 - libraries/SDL2_image/SDL2_image.info | 10 - libraries/SDL2_image/slack-desc | 19 - libraries/SDL2_mixer/README | 13 - libraries/SDL2_mixer/SDL2_mixer.SlackBuild | 98 - libraries/SDL2_mixer/SDL2_mixer.info | 10 - libraries/SDL2_mixer/slack-desc | 19 - libraries/SDL2_net/README | 5 - libraries/SDL2_net/SDL2_net.SlackBuild | 99 - libraries/SDL2_net/SDL2_net.info | 10 - libraries/SDL2_net/slack-desc | 19 - libraries/SDL2_ttf/README | 6 - libraries/SDL2_ttf/SDL2_ttf.SlackBuild | 99 - libraries/SDL2_ttf/SDL2_ttf.info | 10 - libraries/SDL2_ttf/slack-desc | 19 - libraries/SDL_sound/README | 2 - libraries/SDL_sound/SDL_sound.SlackBuild | 93 - libraries/SDL_sound/SDL_sound.info | 10 - libraries/SDL_sound/slack-desc | 19 - libraries/SFGUI/SFGUI.SlackBuild | 18 +- libraries/SFGUI/SFGUI.info | 6 +- libraries/VTK/VTK.SlackBuild | 14 + libraries/VTK/patch-gcc10.diff | 40 + ...k-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch | 18 + libraries/afflib/afflib.SlackBuild | 2 +- libraries/afflib/afflib.info | 6 +- libraries/agg/agg.SlackBuild | 1 + libraries/agg/patches/0016-bad-const.patch | 12 + libraries/allegro4/allegro4.SlackBuild | 6 +- libraries/allegro4/allegro4.info | 6 +- libraries/allegro4/texinfo-6.7.patch | 10 + libraries/argon2/README | 11 - libraries/argon2/argon2.SlackBuild | 94 - libraries/argon2/argon2.info | 10 - libraries/argon2/slack-desc | 19 - libraries/avr-libc/avr-libc.SlackBuild | 15 +- libraries/avr-libc/avr-libc.info | 6 +- libraries/bamf/add_compile_warning_flags.patch | 71 + libraries/bamf/bamf.SlackBuild | 6 +- libraries/bamf/bamf.info | 2 +- libraries/beignet/beignet.SlackBuild | 4 +- libraries/beignet/beignet.info | 6 +- libraries/beignet/llvm6.patch | 30 + libraries/belle-sip/belle-sip.SlackBuild | 2 + libraries/belle-sip/gcc9.patch | 19 + libraries/ccrtp/ccrtp.SlackBuild | 2 +- libraries/ccrtp/ccrtp.info | 6 +- libraries/cffi/cffi.SlackBuild | 2 +- libraries/cffi/cffi.info | 6 +- libraries/cfitsio/README | 13 - libraries/cfitsio/cfitsio.SlackBuild | 109 - libraries/cfitsio/cfitsio.info | 10 - libraries/cfitsio/slack-desc | 19 - libraries/cppo/README | 2 + libraries/cppo/cppo.SlackBuild | 87 + libraries/cppo/cppo.info | 10 + libraries/cppo/slack-desc | 19 + libraries/cpprestsdk/cpprestsdk.SlackBuild | 10 +- libraries/cpprestsdk/cpprestsdk.info | 6 +- libraries/cpprestsdk/cpprestsdk.patch | 13 - libraries/cracklib/README | 12 - libraries/cracklib/cracklib.SlackBuild | 116 - libraries/cracklib/cracklib.info | 12 - libraries/cracklib/slack-desc | 19 - libraries/cryptopp/README | 4 - libraries/cryptopp/cryptopp.SlackBuild | 95 - libraries/cryptopp/cryptopp.info | 10 - libraries/cryptopp/cryptopp.pc | 13 - libraries/cryptopp/slack-desc | 19 - libraries/cuneiform/cuneiform-gcc.patch | 98 + libraries/cuneiform/cuneiform.SlackBuild | 14 +- libraries/cuneiform/strings.patch | 19 + libraries/dotconf/README | 2 - libraries/dotconf/dotconf.SlackBuild | 97 - libraries/dotconf/dotconf.info | 10 - libraries/dotconf/slack-desc | 19 - libraries/efivar/README | 1 - libraries/efivar/efivar.SlackBuild | 95 - libraries/efivar/efivar.info | 10 - libraries/efivar/slack-desc | 19 - libraries/efl/efl.SlackBuild | 4 +- libraries/efl/efl.info | 6 +- libraries/enchant2/enchant2.SlackBuild | 4 +- libraries/enchant2/enchant2.info | 10 +- libraries/enum34/README | 2 - libraries/enum34/enum34.SlackBuild | 85 - libraries/enum34/enum34.info | 10 - libraries/enum34/slack-desc | 19 - libraries/flatbuffers/flatbuffers.SlackBuild | 5 +- libraries/flatbuffers/flatbuffers.info | 6 +- libraries/flatbuffers/flatbuffers.patch | 19 - libraries/frei0r/README | 6 - libraries/frei0r/frei0r.SlackBuild | 126 - libraries/frei0r/frei0r.info | 10 - libraries/frei0r/slack-desc | 19 - libraries/fuzzylite/fuzzylite.SlackBuild | 6 +- libraries/fuzzylite/fuzzylite.info | 6 +- libraries/gdl/gdl.SlackBuild | 4 +- libraries/gdl/gdl.info | 6 +- .../gstreamer-editing-services.SlackBuild | 2 +- .../gstreamer-editing-services.info | 6 +- libraries/gstreamermm/fix_warnings.patch | 15 + libraries/gstreamermm/gstreamermm.SlackBuild | 3 + libraries/gtkglext/0002-GCC-8-fixes.patch | 34 + libraries/gtkglext/gtkglext.SlackBuild | 3 +- libraries/gtksourceview3/README | 4 - libraries/gtksourceview3/gtksourceview3.SlackBuild | 104 - libraries/gtksourceview3/gtksourceview3.info | 10 - libraries/gtksourceview3/slack-desc | 19 - libraries/gtksourceview4/README | 4 + libraries/gtksourceview4/gtksourceview4.SlackBuild | 104 + libraries/gtksourceview4/gtksourceview4.info | 10 + libraries/gtksourceview4/slack-desc | 19 + libraries/hdf/hdf.SlackBuild | 2 +- libraries/hidapi/configure.ac.patch | 13 + libraries/hidapi/hidapi.SlackBuild | 2 + libraries/hpx/gcc7.patch | 23 + libraries/hpx/hpx.SlackBuild | 4 + libraries/http-parser/http-parser.SlackBuild | 2 +- libraries/hyperscan/hyperscan.SlackBuild | 2 - libraries/hyphen/README | 1 - libraries/hyphen/hyphen.SlackBuild | 94 - libraries/hyphen/hyphen.info | 10 - libraries/hyphen/slack-desc | 19 - libraries/id3lib/README | 10 - libraries/id3lib/id3lib.SlackBuild | 121 - libraries/id3lib/id3lib.info | 10 - libraries/id3lib/patches/id3lib.c_wrapper.patch | 58 - libraries/id3lib/patches/id3lib.cppheaders.patch | 22 - libraries/id3lib/patches/id3lib.manpages.patch | 198 - libraries/id3lib/patches/id3lib.mkstemp.patch | 54 - .../id3lib/patches/id3lib.nullpointer_check.patch | 12 - libraries/id3lib/patches/id3lib.utf8_writing.patch | 38 - .../id3lib/patches/id3lib.vbr_stack_smash.patch | 19 - libraries/id3lib/slack-desc | 19 - libraries/isl/README | 8 - libraries/isl/isl.SlackBuild | 115 - libraries/isl/isl.info | 10 - libraries/isl/slack-desc | 19 - libraries/jansson/README | 1 - libraries/jansson/jansson.SlackBuild | 99 - libraries/jansson/jansson.info | 10 - libraries/jansson/slack-desc | 19 - libraries/json-glib/README | 3 - libraries/json-glib/json-glib.SlackBuild | 97 - libraries/json-glib/json-glib.info | 10 - libraries/json-glib/slack-desc | 19 - libraries/keybinder/README | 5 + libraries/keybinder/keybinder.SlackBuild | 100 + libraries/keybinder/keybinder.info | 10 + libraries/keybinder/slack-desc | 19 + libraries/lablgtk/README | 2 +- libraries/lablgtk/lablgtk.SlackBuild | 10 +- libraries/lablgtk/lablgtk.info | 10 +- libraries/lame/CVE-2017-15018.patch.gz | Bin 307 -> 0 bytes libraries/lame/README | 5 - libraries/lame/lame.SlackBuild | 118 - libraries/lame/lame.info | 10 - libraries/lame/slack-desc | 19 - libraries/lensfun/README | 9 - .../lensfun/lensfun-fix-python-install-dir.patch | 27 - libraries/lensfun/lensfun.SlackBuild | 99 - libraries/lensfun/lensfun.info | 10 - libraries/lensfun/slack-desc | 19 - libraries/libalkimia/README | 3 - libraries/libalkimia/libalkimia.SlackBuild | 97 - libraries/libalkimia/libalkimia.info | 10 - libraries/libalkimia/slack-desc | 19 - libraries/libart-lgpl/README | 3 + libraries/libart-lgpl/libart-lgpl.SlackBuild | 100 + libraries/libart-lgpl/libart-lgpl.info | 10 + libraries/libart-lgpl/slack-desc | 20 + libraries/libbluray/README | 15 - libraries/libbluray/libbluray.SlackBuild | 111 - libraries/libbluray/libbluray.info | 10 - libraries/libbluray/slack-desc | 19 - libraries/libburn/README | 3 - libraries/libburn/libburn.SlackBuild | 104 - libraries/libburn/libburn.info | 10 - libraries/libburn/slack-desc | 19 - libraries/libc++/README | 5 - libraries/libc++/libc++.SlackBuild | 116 - libraries/libc++/libc++.info | 14 - libraries/libc++/slack-desc | 19 - libraries/libclaw/lib.patch | 11 - libraries/libclaw/libclaw.SlackBuild | 6 +- .../libclaw/patches/01_libclaw-1.7.4-libdir.patch | 36 + .../libclaw/patches/02_libclaw-1.7.4-gcc62.patch | 89 + .../libclaw/patches/03_libclaw-1.7.4-gcc7.patch | 36 + libraries/libcue/README | 1 - libraries/libcue/libcue.SlackBuild | 93 - libraries/libcue/libcue.info | 10 - libraries/libcue/slack-desc | 19 - libraries/libcuefile/libcuefile.SlackBuild | 18 +- libraries/libdbus-c++/gcc47.patch | 10 - libraries/libdbus-c++/libdbus-c++.SlackBuild | 22 +- libraries/libdbus-c++/libdbus-c++.info | 6 +- libraries/libdbus-c++/nested_variant_map.patch | 11 - .../libdbus-c++/patches/libdbus-c++-gcc7.patch | 11 + .../patches/libdbus-c++-glibmm-2.43.patch | 13 + .../patches/libdbus-c++-nodocdatetime.patch | 25 + .../libdbus-c++/patches/libdbus-c++-noreturn.patch | 21 + .../libdbus-c++/patches/libdbus-c++-pthread.patch | 11 + .../libdbus-c++/patches/libdbus-c++-sover.patch | 28 + .../0001_no-deprecated-gnome-common-macros.patch | 12 - libraries/libdbusmenu/README | 8 - libraries/libdbusmenu/libdbusmenu.SlackBuild | 105 - libraries/libdbusmenu/libdbusmenu.info | 10 - libraries/libdbusmenu/slack-desc | 19 - libraries/libdmtx/README | 7 - libraries/libdmtx/libdmtx.SlackBuild | 85 - libraries/libdmtx/libdmtx.info | 10 - libraries/libdmtx/slack-desc | 19 - .../libechonest-fix-double-encoding-on-qt4.patch | 75 - libraries/libechonest/libechonest.SlackBuild | 4 +- libraries/libedit/README | 12 - libraries/libedit/libedit.SlackBuild | 105 - libraries/libedit/libedit.info | 10 - libraries/libedit/slack-desc | 19 - libraries/libevhtp/libevhtp.SlackBuild | 10 +- libraries/libevhtp/libevhtp.info | 6 +- libraries/libffado/libffado-mixer.patch | 45 - libraries/libffado/libffado.SlackBuild | 30 +- libraries/libffado/libffado.info | 8 +- libraries/libfilezilla/libfilezilla.SlackBuild | 2 +- libraries/libfilezilla/libfilezilla.info | 6 +- libraries/libftdi1/libftdi1.SlackBuild | 13 +- libraries/libftdi1/libftdi1.info | 6 +- libraries/libgaminggear/libgaminggear.SlackBuild | 4 +- libraries/libgee/README | 4 - libraries/libgee/libgee.SlackBuild | 100 - libraries/libgee/libgee.info | 10 - libraries/libgee/slack-desc | 19 - libraries/libgexiv2/README | 3 - libraries/libgexiv2/libgexiv2.SlackBuild | 95 - libraries/libgexiv2/libgexiv2.info | 10 - libraries/libgexiv2/slack-desc | 19 - libraries/libgksu/libgksu.SlackBuild | 1 + libraries/libgme/libgme.SlackBuild | 2 +- libraries/libgme/libgme.info | 6 +- libraries/libgnome/libgnome.SlackBuild | 6 + libraries/libgnome/libgnome.info | 2 +- libraries/libgnomecanvas/libgnomecanvas.info | 2 +- libraries/libgnomeprint/libgnomeprint.SlackBuild | 1 + libraries/libgnomeprint/libgnomeprint.info | 2 +- .../libgnomeprintui/libgnomeprintui.SlackBuild | 2 +- libraries/libgnomeui/libgnomeui.SlackBuild | 6 + libraries/libidn2/README | 5 - libraries/libidn2/libidn2.SlackBuild | 107 - libraries/libidn2/libidn2.info | 10 - libraries/libidn2/slack-desc | 19 - libraries/libido3/libido3.SlackBuild | 3 + libraries/libindicator3/libindicator3.SlackBuild | 3 + libraries/libinput/README | 11 - libraries/libinput/libinput.SlackBuild | 93 - libraries/libinput/libinput.info | 10 - libraries/libinput/slack-desc | 19 - libraries/libircclient/libircclient.SlackBuild | 4 + libraries/libkqueue/libkqueue.SlackBuild | 28 +- libraries/libkqueue/libkqueue.info | 6 +- libraries/liblrdf/liblrdf.info | 2 +- libraries/libmemcached/libmemcached.SlackBuild | 2 + .../libmemcached/patches/libmemcached-build.patch | 60 + libraries/libmirage/libmirage-3.2.4-gcc-10.patch | 34 + libraries/libmirage/libmirage.SlackBuild | 2 + .../libmp4v2-2.0.0-unsigned-int-cast.patch | 96 + libraries/libmp4v2/libmp4v2.SlackBuild | 3 + libraries/libmspub/libmspub.SlackBuild | 3 + libraries/libmusicbrainz/libmusicbrainz.SlackBuild | 2 +- .../libmusicbrainz5/libmusicbrainz5.SlackBuild | 3 + libraries/libmusicbrainz5/no_wildcards.patch | 24 + libraries/libmwaw/libmwaw.SlackBuild | 2 +- libraries/libnice/README | 12 - libraries/libnice/libnice.SlackBuild | 99 - libraries/libnice/libnice.info | 10 - libraries/libnice/slack-desc | 19 - .../liboauth/liboauth-1.0.3-openssl-1.1.0-2.patch | 147 + libraries/liboauth/liboauth.SlackBuild | 3 + libraries/libopenshot/512.patch | 51 + libraries/libopenshot/libopenshot.SlackBuild | 1 + libraries/libopusenc/README | 2 - libraries/libopusenc/libopusenc.SlackBuild | 99 - libraries/libopusenc/libopusenc.info | 10 - libraries/libopusenc/slack-desc | 19 - libraries/libpeas/libpeas.SlackBuild | 45 +- libraries/libpeas/libpeas.info | 6 +- libraries/libpinyin/README | 4 - libraries/libpinyin/libpinyin.SlackBuild | 104 - libraries/libpinyin/libpinyin.info | 10 - libraries/libpinyin/slack-desc | 19 - libraries/libportal/README | 1 + libraries/libportal/libportal.SlackBuild | 101 + libraries/libportal/libportal.info | 10 + libraries/libportal/slack-desc | 19 + libraries/libpwquality/README | 11 - libraries/libpwquality/libpwquality.SlackBuild | 106 - libraries/libpwquality/libpwquality.info | 10 - libraries/libpwquality/slack-desc | 19 - libraries/libqinfinity/libqinfinity.SlackBuild | 2 +- .../libquicktime/libquicktime-1.2.4-ffmpeg4.patch | 342 + libraries/libquicktime/libquicktime.SlackBuild | 3 +- libraries/libqxt/libqxt-gcc6.patch | 11 + libraries/libqxt/libqxt.SlackBuild | 3 + libraries/libreplaygain/libreplaygain.SlackBuild | 16 +- libraries/libsass/README | 13 - libraries/libsass/libsass.SlackBuild | 98 - libraries/libsass/libsass.info | 10 - libraries/libsass/slack-desc | 19 - libraries/libsearpc/libsearpc.SlackBuild | 14 +- libraries/libsearpc/libsearpc.info | 4 +- libraries/libsidplayfp/libsidplayfp.SlackBuild | 8 +- libraries/libsidplayfp/libsidplayfp.info | 6 +- libraries/libsigrok/libsigrok.SlackBuild | 6 +- libraries/libsigrok/libsigrok.info | 6 +- .../libsigrokdecode/libsigrokdecode.SlackBuild | 8 +- libraries/libsigrokdecode/libsigrokdecode.info | 6 +- libraries/libsodium/README | 2 - libraries/libsodium/libsodium.SlackBuild | 98 - libraries/libsodium/libsodium.info | 10 - libraries/libsodium/slack-desc | 19 - libraries/libsrtp/libsrtp.SlackBuild | 1 - libraries/libtxc_dxtn/README | 5 - libraries/libtxc_dxtn/libtxc_dxtn.SlackBuild | 96 - libraries/libtxc_dxtn/libtxc_dxtn.info | 10 - libraries/libtxc_dxtn/slack-desc | 19 - libraries/libunicap/gcc10.patch | 25 + libraries/libunicap/libunicap.SlackBuild | 2 + libraries/libunwind/README | 9 - libraries/libunwind/libunwind.SlackBuild | 104 - libraries/libunwind/libunwind.info | 10 - libraries/libunwind/slack-desc | 19 - libraries/libuv/README | 1 - libraries/libuv/libuv.SlackBuild | 96 - libraries/libuv/libuv.info | 10 - libraries/libuv/slack-desc | 19 - .../libvirt-glib-4.0.0-cast-align.patch | 12 + libraries/libvirt-glib/libvirt-glib.SlackBuild | 33 +- libraries/libvirt-glib/libvirt-glib.info | 6 +- libraries/libvirt-python/libvirt-python.SlackBuild | 8 +- libraries/libvirt-python/libvirt-python.info | 8 +- libraries/libvirt/README | 16 +- libraries/libvirt/libvirt.SlackBuild | 77 +- libraries/libvirt/libvirt.info | 8 +- libraries/libvirt/rc.libvirt | 35 +- libraries/libwacom/README | 5 - libraries/libwacom/libwacom.SlackBuild | 102 - libraries/libwacom/libwacom.info | 10 - libraries/libwacom/slack-desc | 19 - libraries/libwebp/README | 18 - libraries/libwebp/libwebp.SlackBuild | 98 - libraries/libwebp/libwebp.info | 10 - libraries/libwebp/slack-desc | 19 - libraries/libwnck3/README | 5 - libraries/libwnck3/libwnck3.SlackBuild | 124 - libraries/libwnck3/libwnck3.info | 10 - libraries/libwnck3/slack-desc | 19 - libraries/libwps/libwps.SlackBuild | 2 +- libraries/libxkbcommon/README | 11 - libraries/libxkbcommon/libxkbcommon.SlackBuild | 97 - libraries/libxkbcommon/libxkbcommon.info | 10 - libraries/libxkbcommon/slack-desc | 19 - libraries/libzdb/libzdb.SlackBuild | 1 - libraries/libzrtpcpp/libzrtpcpp.SlackBuild | 4 +- libraries/libzrtpcpp/libzrtpcpp.info | 6 +- libraries/live555/live555.SlackBuild | 4 + libraries/luacrypto/luacrypto.SlackBuild | 3 +- .../lxqt-build-tools/lxqt-build-tools.SlackBuild | 11 +- libraries/lxqt-build-tools/lxqt-build-tools.info | 6 +- libraries/marisa/README | 3 - libraries/marisa/marisa.SlackBuild | 100 - libraries/marisa/marisa.info | 10 - libraries/marisa/slack-desc | 19 - libraries/med/med.SlackBuild | 1 + libraries/menu-cache/menu-cache.SlackBuild | 2 +- .../patches/Support-gcc10-compilation.patch | 108 + libraries/mongo-c-driver/mongo-c-driver.SlackBuild | 40 +- libraries/mongo-c-driver/mongo-c-driver.info | 6 +- libraries/npth/README | 11 - libraries/npth/npth.SlackBuild | 95 - libraries/npth/npth.info | 10 - libraries/npth/slack-desc | 19 - libraries/nx-libs/nx-libs.SlackBuild | 12 +- libraries/nx-libs/nx-libs.info | 6 +- libraries/ocaml-camomile/ocaml-camomile.SlackBuild | 49 +- libraries/ocaml-camomile/ocaml-camomile.info | 6 +- libraries/ocaml-findlib/ocaml-findlib.SlackBuild | 8 +- libraries/ocaml-findlib/ocaml-findlib.info | 10 +- libraries/ocl-icd/README | 19 - libraries/ocl-icd/ocl-icd.SlackBuild | 110 - libraries/ocl-icd/ocl-icd.info | 10 - libraries/ocl-icd/slack-desc | 19 - libraries/opal/README | 2 +- libraries/opal/ffmpeg2.patch | 398 - libraries/opal/opal.SlackBuild | 12 +- libraries/openbabel/openbabel.SlackBuild | 14 +- libraries/openbabel/openbabel.info | 6 +- libraries/opencv/README | 79 - libraries/opencv/opencv.SlackBuild | 140 - libraries/opencv/opencv.info | 12 - libraries/opencv/slack-desc | 19 - libraries/pangox-compat/pangox-compat.SlackBuild | 21 +- libraries/pangox-compat/pangox-compat.info | 6 +- ...o_x_get_shaper_map-it-is-still-used-in-th.patch | 39 + .../patches/0002-disable-shaper.patch | 15 + libraries/pcre2/README | 2 - libraries/pcre2/pcre2.SlackBuild | 103 - libraries/pcre2/pcre2.info | 10 - libraries/pcre2/slack-desc | 19 - libraries/php-pgsql/php-pgsql.SlackBuild | 10 +- libraries/php-pgsql/php-pgsql.info | 6 +- libraries/physfs/physfs.SlackBuild | 4 +- libraries/pipewire/README | 4 - libraries/pipewire/pipewire.SlackBuild | 96 - libraries/pipewire/pipewire.info | 10 - libraries/pipewire/slack-desc | 19 - libraries/podofo/podofo.SlackBuild | 2 + libraries/poppler-qt5/README | 4 - libraries/poppler-qt5/poppler-qt5.SlackBuild | 106 - libraries/poppler-qt5/poppler-qt5.info | 10 - libraries/poppler-qt5/slack-desc | 19 - .../ptlib/ptlib-2.10.10-mga-bison-parameter.patch | 39 - libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch | 2951 ++++++++ libraries/ptlib/ptlib-2.10.11-openssl11.patch | 212 + libraries/ptlib/ptlib-gcc8.patch | 12 + libraries/ptlib/ptlib.SlackBuild | 8 +- libraries/ptlib/ssl3.patch | 19 - libraries/python3-PyQt5/README | 2 - libraries/python3-PyQt5/python3-PyQt5.SlackBuild | 110 - libraries/python3-PyQt5/python3-PyQt5.info | 10 - libraries/python3-PyQt5/slack-desc | 19 - .../python3-PyQtWebEngine.SlackBuild | 6 +- .../python3-PyQtWebEngine.info | 6 +- libraries/python3-PyYAML/python3-PyYAML.SlackBuild | 2 +- libraries/python3-PyYAML/python3-PyYAML.info | 6 +- libraries/python3-pillow/README | 8 - libraries/python3-pillow/python3-pillow.SlackBuild | 107 - libraries/python3-pillow/python3-pillow.info | 10 - libraries/python3-pillow/slack-desc | 19 - .../qca-qt5/Add_support_for_OpenSSL_1.1.0.diff.gz | Bin 10948 -> 0 bytes libraries/qca-qt5/README | 11 - libraries/qca-qt5/qca-qt5.SlackBuild | 118 - libraries/qca-qt5/qca-qt5.info | 10 - libraries/qca-qt5/qca.tlsunittest.cpp.diff.gz | Bin 632 -> 0 bytes libraries/qca-qt5/slack-desc | 19 - libraries/qmltermwidget/gcc-10.patch | 46 + libraries/qmltermwidget/qmltermwidget.SlackBuild | 4 +- .../patches/0001-fix-build-against-Qt-5.15.patch | 44 + .../patches/0002-fix-gtk2-background.patch | 25 + .../qt5-styleplugins/qt5-styleplugins.SlackBuild | 3 + libraries/qt5-webkit/README | 3 - libraries/qt5-webkit/doinst.sh | 9 - libraries/qt5-webkit/qt5-webkit.SlackBuild | 107 - libraries/qt5-webkit/qt5-webkit.info | 10 - libraries/qt5-webkit/slack-desc | 19 - libraries/qt5/README | 134 - libraries/qt5/README.ccache | 46 - libraries/qt5/desktop/assistant-qt5.desktop | 8 - libraries/qt5/desktop/designer-qt5.desktop | 10 - libraries/qt5/desktop/linguist-qt5.desktop | 9 - libraries/qt5/desktop/qdbusviewer-qt5.desktop | 9 - libraries/qt5/doinst.sh | 9 - libraries/qt5/patches/qt5.mysql.h.diff | 12 - .../qt5.qtbase_cmake_isystem_includes.patch | 14 - libraries/qt5/profile.d/qt5.csh | 17 - libraries/qt5/profile.d/qt5.sh | 17 - libraries/qt5/qt5.SlackBuild | 319 - libraries/qt5/qt5.info | 10 - libraries/qt5/slack-desc | 19 - libraries/qtermwidget/qtermwidget.SlackBuild | 4 +- libraries/qtermwidget/qtermwidget.info | 6 +- libraries/quazip-qt5/README | 11 - libraries/quazip-qt5/quazip-qt5.SlackBuild | 98 - libraries/quazip-qt5/quazip-qt5.info | 10 - libraries/quazip-qt5/slack-desc | 19 - libraries/qwt/qwt.SlackBuild | 2 +- libraries/rapidjson/rapidjson.SlackBuild | 2 +- libraries/rasqal/README | 6 + libraries/rasqal/rasqal.SlackBuild | 106 + libraries/rasqal/rasqal.info | 10 + libraries/rasqal/slack-desc | 19 + libraries/redland/README | 6 + libraries/redland/redland.SlackBuild | 110 + libraries/redland/redland.info | 10 + libraries/redland/slack-desc | 19 + libraries/rudiments/rudiments.SlackBuild | 8 +- libraries/rudiments/rudiments.info | 6 +- libraries/sdformat/cmake.patch | 20 + libraries/sdformat/sdformat.SlackBuild | 3 + libraries/swfdec/swfdec.info | 2 +- libraries/t4k_common/916060_bugfix.patch | 32 + libraries/t4k_common/t4k_common.SlackBuild | 3 + libraries/tcl-tls/tcl-tls.SlackBuild | 10 +- libraries/tcl-tls/tcl-tls.info | 8 +- .../totem-pl-parser/totem-pl-parser.SlackBuild | 42 +- libraries/totem-pl-parser/totem-pl-parser.info | 8 +- libraries/ucl/ucl.SlackBuild | 1 + libraries/ucommon/ucommon.SlackBuild | 2 +- libraries/ucommon/ucommon.info | 6 +- libraries/vid.stab/README | 5 - libraries/vid.stab/slack-desc | 19 - libraries/vid.stab/vid.stab.SlackBuild | 116 - libraries/vid.stab/vid.stab.info | 10 - libraries/vte2/README | 7 + libraries/vte2/fix_meta_alt_keybinding.patch | 74 + libraries/vte2/slack-desc | 19 + libraries/vte2/vte.escape.cpu.usage.diff | 89 + libraries/vte2/vte2.SlackBuild | 109 + libraries/vte2/vte2.info | 10 + libraries/vte3/README | 7 - libraries/vte3/slack-desc | 19 - libraries/vte3/vte3.SlackBuild | 101 - libraries/vte3/vte3.info | 10 - libraries/wayland/README | 16 - libraries/wayland/slack-desc | 19 - libraries/wayland/wayland.SlackBuild | 112 - libraries/wayland/wayland.info | 10 - libraries/webkit2gtk/webkit2gtk.SlackBuild | 31 +- libraries/webkit2gtk/webkit2gtk.info | 8 +- libraries/webkitgtk/bison-3.7.1.patch | 18 + libraries/webkitgtk/icu4c-65.1.patch | 39 + libraries/webkitgtk/webkitgtk.SlackBuild | 8 +- libraries/webkitgtk3/bison-3.7.1.patch | 18 + libraries/webkitgtk3/icu4c-65.1.patch | 39 + libraries/webkitgtk3/webkitgtk3.SlackBuild | 10 +- libraries/wpebackend-fdo/README | 7 + libraries/wpebackend-fdo/slack-desc | 19 + libraries/wpebackend-fdo/wpebackend-fdo.SlackBuild | 94 + libraries/wpebackend-fdo/wpebackend-fdo.info | 10 + libraries/wvstreams/patches/01_kfreebsd_ftbfs.diff | 28 + libraries/wvstreams/patches/02_doc_path.diff | 24 + libraries/wvstreams/patches/03_html_sgml.diff | 18 + libraries/wvstreams/patches/04_signed_request.diff | 18 + libraries/wvstreams/patches/05_gcc-4.7.diff | 19 + libraries/wvstreams/patches/05_gcc.diff | 41 - libraries/wvstreams/patches/06_buildflags.diff | 34 + libraries/wvstreams/patches/07_openssl-1.0.diff | 18 + libraries/wvstreams/patches/08_glibc-2.12.diff | 30 + libraries/wvstreams/patches/09_readline.diff | 16 + libraries/wvstreams/patches/10_typos.diff | 39 + libraries/wvstreams/patches/11_gcc-6.patch | 42 + .../wvstreams/patches/12_increase_task_stack.patch | 15 + .../patches/13_wvstreams_openssl1.1.patch | 539 ++ libraries/wvstreams/patches/14_cross.diff | 53 + .../15_Fix-narrowing-conversion-error.patch | 29 + .../patches/16_wvstreams-4.6.1-parallel-make.patch | 58 + .../wvstreams/patches/wvstreams-4.6.1-gcc47.patch | 10 - .../patches/wvstreams-4.6.1-parallel-make.patch | 58 - libraries/wvstreams/wvstreams.SlackBuild | 39 +- libraries/wxPython4/newer_setuptools.patch | 29 + libraries/wxPython4/wxPython4.SlackBuild | 2 + libraries/wxsvg/wxsvg.SlackBuild | 4 +- libraries/wxsvg/wxsvg.info | 6 +- libraries/xerces-c/xerces-c.SlackBuild | 4 +- libraries/xerces-c/xerces-c.info | 6 +- libraries/xf86-input-libinput/README | 20 - libraries/xf86-input-libinput/slack-desc | 19 - .../xf86-input-libinput.SlackBuild | 116 - .../xf86-input-libinput/xf86-input-libinput.info | 10 - libraries/xulrunner/README | 12 - libraries/xulrunner/ftfntfmt.patch | 35 - libraries/xulrunner/gold/gold | 2 - libraries/xulrunner/gold/ld | 2 - libraries/xulrunner/slack-desc | 19 - libraries/xulrunner/xulrunner.SlackBuild | 162 - libraries/xulrunner/xulrunner.info | 10 - libraries/xview/xinitrc.olvwm | 16 + libraries/xview/xinitrc.olwm | 16 + libraries/xview/xview.SlackBuild | 2 +- misc/dmg2img/0001-openssl-1.1-compatibility.patch | 219 + misc/dmg2img/dmg2img.SlackBuild | 3 + misc/fcitx-configtool/README | 1 - misc/fcitx-configtool/fcitx-configtool.SlackBuild | 93 - misc/fcitx-configtool/fcitx-configtool.info | 10 - misc/fcitx-configtool/slack-desc | 19 - misc/fcitx-libpinyin/README | 1 - misc/fcitx-libpinyin/fcitx-libpinyin.SlackBuild | 91 - misc/fcitx-libpinyin/fcitx-libpinyin.info | 10 - misc/fcitx-libpinyin/slack-desc | 19 - misc/fcitx-qt5/README | 1 - misc/fcitx-qt5/fcitx-qt5.SlackBuild | 94 - misc/fcitx-qt5/fcitx-qt5.info | 10 - misc/fcitx-qt5/slack-desc | 19 - misc/fcitx/README | 21 - misc/fcitx/doinst.sh | 17 - misc/fcitx/fcitx-autostart.patch | 30 - misc/fcitx/fcitx.SlackBuild | 110 - misc/fcitx/fcitx.info | 10 - misc/fcitx/slack-desc | 19 - misc/g15daemon/g15daemon.SlackBuild | 2 +- misc/glogg/glogg.SlackBuild | 4 +- misc/glogg/glogg.info | 8 +- misc/gourmet/gourmet.SlackBuild | 5 +- misc/gourmet/gourmet.info | 2 +- misc/gourmet/slack-desc | 2 +- misc/gourmet/tostring-to-tobytes.patch | 26 + misc/ibus-anthy/README | 8 - misc/ibus-anthy/ibus-anthy.SlackBuild | 81 - misc/ibus-anthy/ibus-anthy.info | 10 - misc/ibus-anthy/slack-desc | 19 - misc/ibus-hangul/README | 3 - misc/ibus-hangul/doinst.sh | 6 - misc/ibus-hangul/ibus-hangul.SlackBuild | 95 - misc/ibus-hangul/ibus-hangul.info | 10 - misc/ibus-hangul/slack-desc | 19 - misc/ibus-unikey/README | 1 - misc/ibus-unikey/gcc-6.diff | 227 - misc/ibus-unikey/ibus-unikey.SlackBuild | 89 - misc/ibus-unikey/ibus-unikey.info | 10 - misc/ibus-unikey/slack-desc | 19 - misc/ibus/README | 19 - misc/ibus/doinst.sh | 20 - misc/ibus/ibus-autostart | 23 - misc/ibus/ibus-autostart.desktop | 32 - misc/ibus/ibus.SlackBuild | 114 - misc/ibus/ibus.info | 12 - misc/ibus/slack-desc | 19 - misc/kcm-fcitx/README | 2 - misc/kcm-fcitx/doinst.sh | 3 - misc/kcm-fcitx/kcm-fcitx.SlackBuild | 93 - misc/kcm-fcitx/kcm-fcitx.info | 10 - misc/kcm-fcitx/slack-desc | 19 - misc/krename/README | 9 - misc/krename/doinst.sh | 16 - misc/krename/krename.SlackBuild | 96 - misc/krename/krename.info | 10 - misc/krename/slack-desc | 19 - misc/opencc/README | 4 - misc/opencc/opencc.SlackBuild | 89 - misc/opencc/opencc.info | 10 - misc/opencc/slack-desc | 19 - misc/pinfo/gcc10-stringop.diff | 28 + misc/pinfo/pinfo.SlackBuild | 4 +- misc/po4a/po4a.info | 2 +- misc/projectM/projectM.SlackBuild | 40 +- misc/projectM/projectM.info | 8 +- misc/qtkeychain/README | 11 - misc/qtkeychain/qtkeychain.SlackBuild | 95 - misc/qtkeychain/qtkeychain.info | 10 - misc/qtkeychain/slack-desc | 19 - misc/qtspell/qtspell.SlackBuild | 2 +- misc/qtspell/qtspell.info | 6 +- misc/stardict-tools/stardict-tools.SlackBuild | 3 + misc/yapet/gcc6.patch | 11 + misc/yapet/yapet.SlackBuild | 3 + .../fix-boolean-value-with-json-c-0.14.patch | 83 + misc/ykpers/ykpers.SlackBuild | 5 +- misc/zinnia/zinnia-fixes-gcc6-compile.patch | 22 + misc/zinnia/zinnia.SlackBuild | 3 + multimedia/MuseScore/MuseScore.SlackBuild | 2 +- multimedia/MuseScore/MuseScore.info | 4 +- multimedia/aegisub/aegisub.SlackBuild | 5 +- multimedia/aegisub/patches/boost.patch | 34 + multimedia/aegisub/patches/icu.patch | 11 + multimedia/aegisub/patches/make-4.3.patch | 23 + multimedia/avidemux/avidemux.SlackBuild | 2 + multimedia/avidemux/qt-5.15.diff | 11 + multimedia/bombono-dvd/bombono-dvd.SlackBuild | 2 + .../patches/fix_operator_ambiguity.patch | 352 + .../patches/fix_throw_specifications.patch | 24 + multimedia/cantata/cantata.SlackBuild | 2 +- multimedia/cantata/cantata.info | 6 +- .../ccextractor/ccextractor-0.88-fno-common.patch | 55 + multimedia/ccextractor/ccextractor.SlackBuild | 3 + multimedia/cinelerra/README | 2 + multimedia/cinelerra/cinelerra.SlackBuild | 32 +- multimedia/cinelerra/cinelerra.desktop | 10 + multimedia/cinelerra/cinelerra.info | 8 +- multimedia/cinelerra/slack-desc | 6 +- multimedia/dvdauthor/README | 2 - multimedia/dvdauthor/dvdauthor.SlackBuild | 102 - multimedia/dvdauthor/dvdauthor.info | 10 - multimedia/dvdauthor/slack-desc | 19 - multimedia/dvdstyler/dvdstyler.SlackBuild | 4 +- multimedia/dvdstyler/dvdstyler.info | 6 +- multimedia/dvgrab/dvgrab.SlackBuild | 2 +- multimedia/farsight2/farsight2.SlackBuild | 6 +- multimedia/farsight2/make-4.3.patch | 122 + multimedia/farstream/README | 7 - multimedia/farstream/farstream.SlackBuild | 101 - multimedia/farstream/farstream.info | 10 - multimedia/farstream/slack-desc | 19 - multimedia/ffmpeg/README | 70 - .../ffmpeg/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch | 11 - multimedia/ffmpeg/ffmpeg-3.2.4-openjpeg2.3.patch | 102 - multimedia/ffmpeg/ffmpeg.SlackBuild | 261 - multimedia/ffmpeg/ffmpeg.info | 10 - multimedia/ffmpeg/slack-desc | 19 - multimedia/ffmpeg4/README | 86 - multimedia/ffmpeg4/ffmpeg4.SlackBuild | 238 - multimedia/ffmpeg4/ffmpeg4.info | 10 - multimedia/ffmpeg4/slack-desc | 19 - multimedia/gnash/gnash.SlackBuild | 42 +- multimedia/gnash/gnash.info | 8 +- .../58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch | 25 - .../cc22f2d0597f3a9547980f4786d918f8b5635472.patch | 31 - multimedia/gnash/patch/gcc47.patch | 11 - .../gnash/patch/gnash-0.8.10-boost-1.50.patch | 24 - .../gnash/patch/gnash-0.8.10-cve-2012-1175.patch | 63 - .../gnash/patch/gnash-0.8.10-kde4-libdir.patch | 12 - multimedia/gnash/patch/gnash-0.8.10-klash.patch | 12 - multimedia/gnash/patch/gnash-boost.patch | 14 - multimedia/gpac/gpac-ffmpeg-4.0.patch | 42 + multimedia/gpac/gpac.SlackBuild | 6 + multimedia/gst-libav/README | 2 - multimedia/gst-libav/gst-libav.SlackBuild | 96 - multimedia/gst-libav/gst-libav.info | 10 - multimedia/gst-libav/slack-desc | 19 - multimedia/gst-plugins-bad/README | 16 +- .../gst-plugins-bad/gst-plugins-bad.SlackBuild | 49 +- multimedia/gst-plugins-bad/gst-plugins-bad.info | 6 +- .../gst-plugins-ugly/gst-plugins-ugly.SlackBuild | 41 +- multimedia/gst-plugins-ugly/gst-plugins-ugly.info | 6 +- multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild | 2 + multimedia/gst0-ffmpeg/orc-0.4.30.patch | 26 + multimedia/gst0-plugins-bad/README | 9 - .../gst0-plugins-bad/drop-vpx-compat-defines.patch | 27 - .../gst0-plugins-bad/gst0-plugins-bad.SlackBuild | 111 - multimedia/gst0-plugins-bad/gst0-plugins-bad.info | 10 - .../gst0-plugins-bad/libmodplug-include.patch | 12 - multimedia/gst0-plugins-bad/slack-desc | 19 - multimedia/gst0-plugins-base/README | 6 + .../gst0-plugins-base/gst0-plugins-base.SlackBuild | 114 + .../gst0-plugins-base/gst0-plugins-base.info | 10 + .../patches/00-fix-crash-0-byte-ogg.patch | 22 + .../patches/01-colorbalance-fix-abi.patch | 23 + .../patches/02-ayuv64-lanczos.patch | 236 + .../patches/03-videoscale-fix-negotiation.patch | 171 + .../patches/04-gstaudio-symbols.patch | 10 + .../patches/05-enum_headers.patch | 132 + multimedia/gst0-plugins-base/slack-desc | 19 + multimedia/gst0-plugins-base/x86.patch | 35 + multimedia/gst0-plugins-good/README | 3 + .../gst0-plugins-good/gst0-plugins-good.SlackBuild | 116 + .../gst0-plugins-good/gst0-plugins-good.info | 10 + .../patches/00-test-rtp-payloading.patch | 422 ++ .../gst0-plugins-good/patches/01-souptest.patch | 28 + .../patches/02-v4l.compile.fixes.diff | 57 + multimedia/gst0-plugins-good/slack-desc | 19 + .../gstreamer0/gstreamer-0.10.36-bison3.patch | 31 + multimedia/gstreamer0/gstreamer0.SlackBuild | 113 + multimedia/gstreamer0/gstreamer0.info | 10 + multimedia/gstreamer0/slack-desc | 19 + multimedia/gtkpod/gtkpod.SlackBuild | 2 +- multimedia/kdenlive/README | 18 - multimedia/kdenlive/doinst.sh | 19 - multimedia/kdenlive/kdenlive.SlackBuild | 131 - multimedia/kdenlive/kdenlive.info | 10 - multimedia/kdenlive/slack-desc | 19 - multimedia/lives/lives.SlackBuild | 4 +- multimedia/lives/lives.info | 6 +- multimedia/minidlna/minidlna.SlackBuild | 12 +- multimedia/minidlna/minidlna.info | 6 +- multimedia/mkvtoolnix/mkvtoolnix.SlackBuild | 2 +- multimedia/mkvtoolnix/mkvtoolnix.info | 6 +- multimedia/mlt/README | 11 - multimedia/mlt/doinst.sh | 20 - multimedia/mlt/mlt.SlackBuild | 217 - multimedia/mlt/mlt.info | 10 - multimedia/mlt/slack-desc | 19 - multimedia/mythtv/libvpxenc.patch | 42 - multimedia/mythtv/mythtv.SlackBuild | 8 +- multimedia/mythtv/mythtv.info | 8 +- multimedia/obs-studio/obs-studio.SlackBuild | 4 +- multimedia/obs-studio/obs-studio.info | 8 +- multimedia/oggvideotools/oggvideotools.SlackBuild | 2 +- multimedia/rtmpdump/rtmpdump.SlackBuild | 8 +- multimedia/smpeg/smpeg.SlackBuild | 4 +- .../subtitleeditor/subtitleeditor.SlackBuild | 16 +- multimedia/subtitleeditor/subtitleeditor.info | 8 +- multimedia/transcode/transcode-1.1.7-ffmpeg4.patch | 508 ++ multimedia/transcode/transcode-1.1.7-gcc10.patch | 48 + .../transcode/transcode-1.1.7-glibc-2.32.patch | 47 + .../transcode/transcode-1.1.7-imagemagick7.patch | 794 ++ multimedia/transcode/transcode.SlackBuild | 11 +- .../tvheadend/tvheadend-4.2.8-fno-common.patch | 55 + multimedia/tvheadend/tvheadend-4.2.8-gcc9.patch | 36 + multimedia/tvheadend/tvheadend.SlackBuild | 17 +- multimedia/tvheadend/tvheadend.info | 8 +- multimedia/tvtime/tvtime.SlackBuild | 23 +- multimedia/tvtime/tvtime.info | 6 +- multimedia/vcdimager/vcdimager.SlackBuild | 8 +- multimedia/vcdimager/vcdimager.info | 6 +- multimedia/vlc/README | 9 +- multimedia/vlc/vlc.SlackBuild | 12 +- multimedia/w_scan/gcc-10.patch | 37 + multimedia/w_scan/w_scan.SlackBuild | 2 + multimedia/xmltv/README.SBo | 6 - multimedia/xmltv/xmltv.SlackBuild | 24 +- multimedia/xmltv/xmltv.info | 6 +- network/MEGAsync/MEGAsync.SlackBuild | 4 +- network/MEGAsync/MEGAsync.info | 10 +- .../NetworkManager-openconnect.SlackBuild | 1 + .../NetworkManager-openvpn.SlackBuild | 117 - .../NetworkManager-openvpn.info | 10 - network/NetworkManager-openvpn/README | 5 - network/NetworkManager-openvpn/slack-desc | 19 - .../NetworkManager-pptp.SlackBuild | 8 +- .../NetworkManager-pptp/NetworkManager-pptp.info | 6 +- .../NetworkManager-vpnc.SlackBuild | 3 +- .../NetworkManager-vpnc/NetworkManager-vpnc.info | 6 +- network/aMule/aMule.SlackBuild | 26 +- network/aMule/aMule.info | 6 +- network/aircrack-ng/aircrack-ng.SlackBuild | 2 +- network/avahi/README | 3 +- network/avahi/avahi.SlackBuild | 1 + network/bip/bip.SlackBuild | 2 +- network/bitcoin/bitcoin.SlackBuild | 2 + network/bwm-ng/bwm-ng.SlackBuild | 3 + network/bwm-ng/fix_gcc7_inline.patch | 40 + network/ccnet/ccnet.SlackBuild | 10 +- network/ccnet/ccnet.info | 6 +- network/cherokee/cherokee.SlackBuild | 8 +- network/cherokee/cherokee.info | 6 +- network/dmitry/dmitry.SlackBuild | 2 +- network/dobbscoin/dobbscoin.SlackBuild | 9 +- .../dovecot-pigeonhole.SlackBuild | 2 +- network/dovecot-pigeonhole/dovecot-pigeonhole.info | 6 +- network/dovecot/README | 27 - network/dovecot/doinst.sh | 26 - network/dovecot/dovecot.SlackBuild | 133 - network/dovecot/dovecot.info | 10 - network/dovecot/rc.dovecot | 55 - network/dovecot/slack-desc | 19 - network/dsniff/dsniff.SlackBuild | 9 +- network/dsniff/dsniff_2.4b1+debian-18.diff.gz | Bin 44819 -> 0 bytes network/dsniff/patches/01_time.h.patch | 26 + network/dsniff/patches/02_mailsnarf_corrupt.patch | 17 + network/dsniff/patches/03_pcap_read_dump.patch | 534 ++ network/dsniff/patches/04_multiple_intf.patch | 56 + network/dsniff/patches/05_amd64_fix.patch | 221 + network/dsniff/patches/06_urlsnarf_zeropad.patch | 17 + network/dsniff/patches/07_libnet_1.1.patch | 906 +++ network/dsniff/patches/08_openssl-0.9.8.patch | 15 + network/dsniff/patches/09_sysconf_clocks.patch | 23 + network/dsniff/patches/10_urlsnarf_escape.patch | 89 + network/dsniff/patches/11_string_header.patch | 166 + network/dsniff/patches/12_arpa_inet_header.patch | 65 + network/dsniff/patches/13_pop_with_version.patch | 30 + network/dsniff/patches/14_obsolete_time.patch | 36 + network/dsniff/patches/15_checksum_libnids.patch | 98 + network/dsniff/patches/16_TDS_decoder.patch | 20 + network/dsniff/patches/17_checksum.patch | 29 + network/dsniff/patches/18_sshcrypto.patch | 17 + .../19_rewrite-and-modernize-POP-decoder.patch | 132 + network/dsniff/patches/20_debian_dirs.patch | 62 + network/dsniff/patches/21_msgsnarf_segfault.patch | 15 + network/dsniff/patches/22_handlepp.patch | 17 + network/dsniff/patches/23_urlsnarf_timestamp.patch | 82 + .../dsniff/patches/24_Fix-OpenSSL1.1.0-Build.patch | 202 + .../dsniff/patches/25_fix-spelling-errors.patch | 17 + ...of-add-r-switch-to-poison-both-directions.patch | 170 + ...arpspoof-allow-use-of-of-multiple-targets.patch | 194 + ...poof-allow-selection-of-source-hw-address.patch | 230 + network/dsniff/patches/29_libnet_name2addr4.patch | 144 + network/dsniff/patches/30_pntohl_shift.patch | 19 + network/dsniff/patches/31_sysconf_clocks.patch | 31 + network/dsniff/patches/32_rpc_segfault.patch | 19 + network/dsniff/patches/33_sshcrypto_DES.patch | 65 + network/dsniff/patches/34_fix-parallel-FTBFS.patch | 109 + network/dsniff/patches/35_Add_CPPFLAGS.patch | 50 + .../dsniff/patches/36_implicit_declarations.patch | 59 + .../dsniff/patches/37_fix-lib-and-share-dirs.patch | 14 + network/dsniff/patches/38_fix-pcap_init.patch | 63 + network/dsniff/patches/39_libtirpc.patch | 51 + network/ekiga/ekiga-4.0.1-boost-signals2.patch | 2179 ++++++ network/ekiga/ekiga-4.0.1-libresolv.patch | 13 + network/ekiga/ekiga.SlackBuild | 4 +- network/emacs-w3m/emacs-w3m.SlackBuild | 8 +- network/emacs-w3m/emacs-w3m.info | 6 +- network/falkon/README | 11 - network/falkon/doinst.sh | 9 - network/falkon/falkon.SlackBuild | 100 - network/falkon/falkon.info | 10 - network/falkon/slack-desc | 19 - network/fcgiwrap/fcgiwrap.SlackBuild | 2 +- network/filezilla/filezilla.SlackBuild | 5 +- network/filezilla/filezilla.info | 6 +- .../interface_Mainfrm_h_include_list.patch | 12 + network/fqterm/fqterm.SlackBuild | 32 +- network/fqterm/fqterm.info | 6 +- .../freeradius-server/freeradius-server.SlackBuild | 4 +- network/freeradius-server/freeradius-server.info | 6 +- network/freerdp/freerdp.SlackBuild | 2 +- network/glusterfs/glusterfs.SlackBuild | 2 +- network/grsync/grsync.SlackBuild | 2 +- network/hping3/hping3.SlackBuild | 2 +- network/httrack/httrack.SlackBuild | 2 +- network/httrack/httrack.info | 6 +- network/hylafax/gcc.patch | 12 + network/hylafax/hylafax.SlackBuild | 2 + network/ifstatus/README | 10 - network/ifstatus/ifstatus.SlackBuild | 91 - network/ifstatus/ifstatus.info | 10 - network/ifstatus/ifstatus.patch | 66 - network/ifstatus/slack-desc | 19 - network/iperf/iperf.SlackBuild | 29 +- network/iperf/iperf.info | 6 +- .../iperf/patches/0_iperf-2.0.8-debuginfo.patch | 17 + network/iperf/patches/1_iperf-2.0.8-bindfail.patch | 42 + network/iperf/patches/2_iperf-2.0.8-math.patch | 75 + network/jigdo/jigdo-0.7.3-gcc7.patch | 39 + network/jigdo/jigdo.SlackBuild | 3 + network/jitsi/jitsi.SlackBuild | 18 +- network/jitsi/jitsi.info | 8 +- network/kmess/README | 5 - network/kmess/doinst.sh | 10 - network/kmess/giflib-5.0.patch | 95 - network/kmess/kmess.SlackBuild | 100 - network/kmess/kmess.info | 10 - network/kmess/slack-desc | 19 - network/knock/knock.SlackBuild | 26 +- network/knock/knock.info | 6 +- network/konversation/README | 7 - network/konversation/doinst.sh | 10 - network/konversation/konversation.SlackBuild | 104 - network/konversation/konversation.info | 10 - network/konversation/slack-desc | 19 - network/krb5/EXPORT | 13 - network/krb5/README | 10 - network/krb5/README.krb5 | 52 - network/krb5/doinst.sh | 26 - network/krb5/krb5.SlackBuild | 116 - network/krb5/krb5.info | 10 - network/krb5/rc.kadmind | 54 - network/krb5/rc.krb5kdc | 54 - network/krb5/slack-desc | 19 - network/leechcraft/README | 26 - network/leechcraft/doinst.sh | 22 - network/leechcraft/leechcraft.SlackBuild | 111 - network/leechcraft/leechcraft.info | 10 - network/leechcraft/slack-desc | 19 - network/lighttpd/lighttpd.SlackBuild | 2 +- network/lighttpd/lighttpd.info | 6 +- network/linuxdcpp/linuxdcpp.SlackBuild | 2 +- network/memcached/memcached.SlackBuild | 2 +- network/memcached/memcached.info | 6 +- network/midori/README | 10 +- network/midori/doinst.sh | 16 - network/midori/midori.SlackBuild | 47 +- network/midori/midori.info | 10 +- network/midori/slack-desc | 6 +- network/mldonkey/mldonkey.SlackBuild | 20 +- network/mldonkey/mldonkey.info | 6 +- network/mosh/mosh.SlackBuild | 2 +- network/museek+/README | 23 - network/museek+/doinst.sh | 26 - network/museek+/museek+.SlackBuild | 90 - network/museek+/museek+.info | 10 - network/museek+/museek-python.diff | 44 - network/museek+/rc.museekd | 105 - network/museek+/slack-desc | 19 - network/nagios/nagios.SlackBuild | 2 +- network/ncrack/ncrack.SlackBuild | 2 +- network/netsurf/enable-deprecated.diff | 10 - network/netsurf/netsurf.SlackBuild | 2 +- network/netsurf/netsurf.info | 6 +- .../nextcloud-server/nextcloud-server.SlackBuild | 2 +- network/nextcloud-server/nextcloud-server.info | 6 +- network/nghttp2/README | 4 - network/nghttp2/nghttp2.SlackBuild | 102 - network/nghttp2/nghttp2.info | 10 - network/nghttp2/slack-desc | 19 - network/opendkim/opendkim.SlackBuild | 3 + network/opendkim/openssl_1.1.0_compat.patch | 90 + network/opensmtpd/aliases | 34 +- .../opensmtpd/fix-crash-on-authentication.patch | 43 - network/opensmtpd/openbsd64-020-smtpd.patch | 31 - network/opensmtpd/openbsd65-029-smptd-tls.patch | 52 - .../opensmtpd/openbsd65-031-smtpd-envelope.patch | 199 - network/opensmtpd/openbsd66-019-smtpd-exec.patch | 46 - network/opensmtpd/opensmtpd.SlackBuild | 31 +- network/opensmtpd/opensmtpd.info | 6 +- network/owncloud-client/owncloud-client.SlackBuild | 2 + network/phodav/phodav.SlackBuild | 18 +- network/phodav/phodav.info | 6 +- .../pidgin-musictracker.SlackBuild | 2 +- network/pidgin-sipe/pidgin-sipe.SlackBuild | 2 +- network/pidgin-sipe/pidgin-sipe.info | 6 +- network/postfix/README | 39 - network/postfix/doinst.sh | 40 - network/postfix/patches/postconf.diff | 31 - network/postfix/postfix.SlackBuild | 199 - network/postfix/postfix.info | 10 - network/postfix/rc.postfix | 67 - network/postfix/slack-desc | 19 - network/pptp/pptp.SlackBuild | 2 +- network/pptp/pptp.info | 6 +- network/qTox/qTox.SlackBuild | 2 + network/quassel-qt5/quassel-0.13.1-qt5.14.patch | 118 + network/quassel-qt5/quassel-qt5.SlackBuild | 2 + network/remmina/remmina.SlackBuild | 2 +- .../bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch | 65 + network/retroshare/retroshare.SlackBuild | 8 +- network/retroshare/retroshare.info | 6 +- network/rspamd/rspamd.SlackBuild | 4 +- network/rspamd/rspamd.info | 6 +- network/rtorrent/README | 2 + network/rtorrent/rtorrent.SlackBuild | 10 +- network/s-nail/README | 16 - network/s-nail/doinst.sh | 13 - network/s-nail/s-nail.SlackBuild | 135 - network/s-nail/s-nail.info | 10 - network/s-nail/slack-desc | 19 - network/seafile-client/README | 15 - network/seafile-client/seafile-client.SlackBuild | 103 - network/seafile-client/seafile-client.info | 10 - network/seafile-client/slack-desc | 19 - network/seafile/README | 15 + network/seafile/seafile.SlackBuild | 102 + network/seafile/seafile.info | 10 + network/seafile/slack-desc | 19 + network/snort/snort.SlackBuild | 12 +- network/snort/snort.info | 8 +- network/socat/README | 12 - network/socat/slack-desc | 19 - network/socat/socat.SlackBuild | 101 - network/socat/socat.info | 10 - network/spice-gtk/spice-gtk.SlackBuild | 59 +- network/spice-gtk/spice-gtk.info | 6 +- network/spice/spice.SlackBuild | 4 +- network/spice/spice.info | 6 +- network/sqlrelay/sqlrelay.SlackBuild | 8 +- network/sqlrelay/sqlrelay.info | 6 +- network/sshfs-fuse/README | 12 - network/sshfs-fuse/slack-desc | 19 - network/sshfs-fuse/sshfs-fuse.SlackBuild | 115 - network/sshfs-fuse/sshfs-fuse.info | 10 - network/sshfs-fuse/sshfs.1.gz | Bin 5085 -> 0 bytes network/synergy/030_openssl.diff | 11 + network/synergy/synergy.SlackBuild | 1 + network/tor/rc.tor | 2 + network/transmission-remote-gtk/gcc10.patch | 25 + .../transmission-remote-gtk.SlackBuild | 2 + network/transmission/transmission.SlackBuild | 3 - network/trojita/trojita.SlackBuild | 4 +- network/trojita/trojita.info | 6 +- network/vde2/vde2.SlackBuild | 3 + ...de_cryptcab-compile-against-openssl-1.1.0.patch | 92 + network/verlihub/verlihub-gcc7.patch | 18 + network/verlihub/verlihub.SlackBuild | 3 + network/webalizer/gcc10.patch | 19 + network/webalizer/webalizer.SlackBuild | 2 + network/wireguard-tools/README | 20 - network/wireguard-tools/slack-desc | 19 - network/wireguard-tools/wireguard-tools.SlackBuild | 105 - network/wireguard-tools/wireguard-tools.info | 10 - network/x11spice/README | 16 + network/x11spice/slack-desc | 11 + network/x11spice/x11spice.SlackBuild | 104 + network/x11spice/x11spice.info | 10 + network/x11vnc/gcc10.patch | 42 + network/x11vnc/x11vnc.SlackBuild | 2 + network/x2goclient/x2goclient.SlackBuild | 2 +- network/x2goclient/x2goclient.info | 6 +- network/x2goserver/x2goserver.SlackBuild | 2 +- network/x2goserver/x2goserver.info | 6 +- network/xaric/xaric.SlackBuild | 2 +- office/LibreOffice/LibreOffice.SlackBuild | 42 +- office/LibreOffice/LibreOffice.info | 12 +- office/LibreOffice/README | 38 +- office/LibreOffice/no-check-if-root.diff | 30 +- office/abook/abook.SlackBuild | 2 +- office/apvlv/apvlv.SlackBuild | 25 +- office/apvlv/apvlv.info | 6 +- office/asymptote/asymptote.SlackBuild | 2 +- office/asymptote/asymptote.info | 8 +- office/calibre/calibre.SlackBuild | 10 +- office/calibre/calibre.info | 8 +- office/calibre/patches/icu.patch | 31 + office/calibre/patches/qt-5.15.patch | 40 + .../patches/remove-desktop-integration.patch | 13 +- office/evince/evince.SlackBuild | 25 +- office/evince/evince.info | 6 +- office/evince/shim.h | 25 - office/fbreader/fbreader-qt5.patch | 510 ++ office/fbreader/fbreader.SlackBuild | 10 +- office/gbgoffice/gbgoffice.SlackBuild | 1 + office/gbgoffice/patches/12_gcc6.patch | 21 + office/gnokii/gnokii-0.6.31-gcc7.patch | 17 + office/gnokii/gnokii.SlackBuild | 3 + office/gnucash-docs/README | 2 +- office/gnucash-docs/gnucash-docs.SlackBuild | 2 +- office/gnucash-docs/gnucash-docs.info | 6 +- office/gnucash-legacy/gnucash-legacy.info | 2 +- office/gnucash/gnucash.SlackBuild | 2 +- office/gnucash/gnucash.info | 6 +- office/gnumeric/gnumeric.SlackBuild | 4 + office/goldendict/goldendict.SlackBuild | 11 +- office/goldendict/patches/goldendict-ffmpeg4.patch | 167 + .../goldendict/patches/goldendict-qt-5.11-1.patch | 34 + .../goldendict/patches/goldendict-qt-5.11-2.patch | 22 + office/juffed/README | 6 - office/juffed/doinst.sh | 3 - office/juffed/juffed.SlackBuild | 98 - office/juffed/juffed.info | 10 - office/juffed/slack-desc | 19 - office/kbgoffice/gcc6.patch | 17 + office/kbgoffice/kbgoffice.SlackBuild | 3 + office/kbibtex/README | 13 +- office/kbibtex/kbibtex.SlackBuild | 11 +- office/kbibtex/kbibtex.info | 6 +- office/kbibtex/slack-desc | 16 +- office/kmymoney/README | 6 - office/kmymoney/doinst.sh | 13 - office/kmymoney/kmymoney.SlackBuild | 101 - office/kmymoney/kmymoney.info | 10 - office/kmymoney/slack-desc | 19 - office/mu/mu.SlackBuild | 4 +- office/mu/mu.info | 6 +- office/pdfpc/pdfpc.SlackBuild | 6 +- office/pdfpc/pdfpc.info | 6 +- office/pdftk/README | 7 + office/pdftk/pdftk-1.44-add_custom_optflags.patch | 26 - office/pdftk/pdftk-2.02-use-gcc5.patch | 15 + office/pdftk/pdftk.SlackBuild | 11 +- office/pdftk/pdftk.info | 2 +- office/qpdfview-qt5/qpdfview-qt5.SlackBuild | 2 + office/qpdfview-qt5/qt-5.15.patch | 24 + office/referencer/referencer-lib_path.patch | 11 + office/referencer/referencer.SlackBuild | 3 + office/sc-im/README | 2 - office/sc-im/sc-im.SlackBuild | 99 - office/sc-im/sc-im.info | 10 - office/sc-im/slack-desc | 19 - office/scribus/README | 3 +- office/scribus/poppler-21.3.0.patch | 81 + office/scribus/scribus.SlackBuild | 13 +- office/scribus/scribus.info | 6 +- office/teapot/teapot.SlackBuild | 2 +- office/texlive/README | 14 - office/texlive/README.tlpkg | 17 - office/texlive/doinst.sh | 5 - office/texlive/patches/tabu.sty.diff | 32 - office/texlive/prep/texmf_get.sh | 1146 --- office/texlive/slack-desc | 19 - office/texlive/texlive.SlackBuild | 253 - office/texlive/texlive.info | 12 - perl/Net-SSLeay/Net-SSLeay.SlackBuild | 93 - perl/Net-SSLeay/Net-SSLeay.info | 10 - perl/Net-SSLeay/README | 5 - perl/Net-SSLeay/slack-desc | 19 - perl/perl-Authen-SASL/README | 5 - perl/perl-Authen-SASL/perl-Authen-SASL.SlackBuild | 107 - perl/perl-Authen-SASL/perl-Authen-SASL.info | 10 - perl/perl-Authen-SASL/slack-desc | 19 - perl/perl-Crypt-OpenSSL-Guess/README | 4 + .../perl-Crypt-OpenSSL-Guess.SlackBuild | 109 + .../perl-Crypt-OpenSSL-Guess.info | 10 + perl/perl-Crypt-OpenSSL-Guess/slack-desc | 19 + .../perl-Crypt-OpenSSL-RSA.SlackBuild | 2 +- .../perl-Crypt-OpenSSL-RSA.info | 8 +- .../perl-DateTime-Format-Strptime.SlackBuild | 1 - perl/perl-Devel-CheckLib/README | 2 - .../perl-Devel-CheckLib.SlackBuild | 98 - perl/perl-Devel-CheckLib/perl-Devel-CheckLib.info | 10 - perl/perl-Devel-CheckLib/slack-desc | 19 - perl/perl-File-Slurp/perl-File-Slurp.SlackBuild | 4 +- perl/perl-File-Slurp/perl-File-Slurp.info | 6 +- perl/perl-Gnome2-Vte/perl-Gnome2-Vte.info | 2 +- perl/perl-IO-Socket-SSL/README | 10 - .../perl-IO-Socket-SSL.SlackBuild | 86 - perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info | 10 - perl/perl-IO-Socket-SSL/slack-desc | 19 - perl/perl-Image-Magick/README | 6 - .../perl-Image-Magick/perl-Image-Magick.SlackBuild | 106 - perl/perl-Image-Magick/perl-Image-Magick.info | 10 - perl/perl-Image-Magick/slack-desc | 19 - perl/perl-Module-Runtime/README | 2 - .../perl-Module-Runtime.SlackBuild | 106 - perl/perl-Module-Runtime/perl-Module-Runtime.info | 10 - perl/perl-Module-Runtime/slack-desc | 19 - perl/perl-Moo/README | 2 - perl/perl-Moo/perl-Moo.SlackBuild | 100 - perl/perl-Moo/perl-Moo.info | 10 - perl/perl-Moo/slack-desc | 19 - perl/perl-Path-Tiny/README | 1 - perl/perl-Path-Tiny/perl-Path-Tiny.SlackBuild | 101 - perl/perl-Path-Tiny/perl-Path-Tiny.info | 10 - perl/perl-Path-Tiny/slack-desc | 19 - perl/perl-Pod-Coverage/perl-Pod-Coverage.info | 2 +- perl/perl-Pod-Parser/README | 7 + perl/perl-Pod-Parser/perl-Pod-Parser.SlackBuild | 97 + perl/perl-Pod-Parser/perl-Pod-Parser.info | 10 + perl/perl-Pod-Parser/slack-desc | 19 + .../perl-Razor2-Client-Agent.SlackBuild | 2 +- perl/perl-Sub-Quote/README | 1 - perl/perl-Sub-Quote/perl-Sub-Quote.SlackBuild | 100 - perl/perl-Sub-Quote/perl-Sub-Quote.info | 10 - perl/perl-Sub-Quote/slack-desc | 19 - perl/perl-Template-Toolkit/README | 6 - .../perl-Template-Toolkit.SlackBuild | 82 - .../perl-Template-Toolkit.info | 10 - perl/perl-Template-Toolkit/slack-desc | 19 - perl/perl-Tk-TableMatrix/pTk-1.22.patch | 18 - .../perl-Tk-TableMatrix.SlackBuild | 15 +- perl/perl-Tk-TableMatrix/perl-Tk-TableMatrix.info | 6 +- perl/perl-libnet/README | 3 - .../libnet-3.08-Do-not-create-Net-libnet.cfg.patch | 43 - perl/perl-libnet/perl-libnet.SlackBuild | 105 - perl/perl-libnet/perl-libnet.info | 10 - perl/perl-libnet/slack-desc | 19 - python/Mako/Mako.SlackBuild | 75 - python/Mako/Mako.info | 10 - python/Mako/README | 11 - python/Mako/slack-desc | 19 - python/Markdown/Markdown.SlackBuild | 5 - python/Pygments/Pygments.SlackBuild | 81 - python/Pygments/Pygments.info | 10 - python/Pygments/README | 11 - python/Pygments/slack-desc | 19 - python/cryptography/cryptography.SlackBuild | 2 +- python/cryptography/cryptography.info | 8 +- python/css-parser/README | 3 + python/css-parser/css-parser.SlackBuild | 83 + python/css-parser/css-parser.info | 10 + python/css-parser/slack-desc | 19 + python/dbus-python3/README | 6 - python/dbus-python3/dbus-python3.SlackBuild | 101 - python/dbus-python3/dbus-python3.info | 10 - python/dbus-python3/slack-desc | 19 - python/dnspython/README | 3 - python/dnspython/dnspython.SlackBuild | 4 - python/dulwich/dulwich.SlackBuild | 5 + python/gst-python/gst-python.SlackBuild | 8 +- python/gst-python/gst-python.info | 6 +- .../gst-python3/fix-builds-with-python-3.8.patch | 43 + python/gst-python3/gst-python3.SlackBuild | 29 +- python/gst-python3/gst-python3.info | 6 +- python/halberd/halberd.SlackBuild | 3 - python/halberd/make-pdf-manual.diff | 14 - python/hg-git/hg-git.SlackBuild | 2 +- python/idna/README | 3 - python/idna/idna.SlackBuild | 89 - python/idna/idna.info | 10 - python/idna/slack-desc | 19 - python/llfuse/llfuse.SlackBuild | 22 +- python/llfuse/llfuse.info | 10 +- python/llfuse/slack-desc | 2 +- python/packaging/README | 1 - python/packaging/packaging.SlackBuild | 86 - python/packaging/packaging.info | 10 - python/packaging/slack-desc | 19 - python/pip/README | 24 - python/pip/pip.SlackBuild | 71 - python/pip/pip.info | 10 - python/pip/pip.sh | 9 - python/pip/slack-desc | 19 - python/ply/README | 2 - python/ply/ply.SlackBuild | 90 - python/ply/ply.info | 10 - python/ply/slack-desc | 19 - python/py3cairo/README | 8 - python/py3cairo/py3cairo.SlackBuild | 108 - python/py3cairo/py3cairo.info | 10 - .../py3cairo/pycairo-1.10.0-waf_python_3_4-1.patch | 19 - python/py3cairo/pycairo-1.10.0-waf_unpack-1.patch | 20 - python/py3cairo/slack-desc | 19 - python/pygobject3-python3/README | 3 - .../pygobject3-python3.SlackBuild | 100 - python/pygobject3-python3/pygobject3-python3.info | 10 - python/pygobject3-python3/slack-desc | 19 - python/pyicu/pyicu.SlackBuild | 2 +- python/pyicu/pyicu.info | 6 +- python/pyparsing/README | 5 - python/pyparsing/pyparsing.SlackBuild | 87 - python/pyparsing/pyparsing.info | 10 - python/pyparsing/slack-desc | 19 - python/pypoppler/pypoppler.SlackBuild | 2 +- python/python-certifi/README | 10 - python/python-certifi/python-certifi.SlackBuild | 87 - python/python-certifi/python-certifi.info | 10 - python/python-certifi/slack-desc | 19 - python/python-chardet/README | 3 - python/python-chardet/python-chardet.SlackBuild | 76 - python/python-chardet/python-chardet.info | 10 - python/python-chardet/slack-desc | 19 - python/python-distro/README | 3 - python/python-distro/python-distro.SlackBuild | 91 - python/python-distro/python-distro.info | 10 - python/python-distro/slack-desc | 19 - python/python-future/README | 3 - python/python-future/doinst.sh | 3 - python/python-future/python-future.SlackBuild | 87 - python/python-future/python-future.info | 10 - python/python-future/slack-desc | 19 - .../dont_hardcode_python_versions.patch | 19 + python/python-gattlib/python-gattlib.SlackBuild | 2 + python/python-notify2/README | 4 - python/python-notify2/python-notify2.SlackBuild | 91 - python/python-notify2/python-notify2.info | 10 - python/python-notify2/slack-desc | 19 - python/python-requests/README | 4 - python/python-requests/python-requests.SlackBuild | 91 - python/python-requests/python-requests.info | 10 - python/python-requests/slack-desc | 19 - python/python-urllib3/README | 12 - python/python-urllib3/python-urllib3.SlackBuild | 89 - python/python-urllib3/python-urllib3.info | 10 - python/python-urllib3/slack-desc | 19 - python/python-xlib/python-xlib.SlackBuild | 8 - python/python-xlib/setup.patch | 61 - python/python2-pillow/README | 5 + python/python2-pillow/python2-pillow.SlackBuild | 88 + python/python2-pillow/python2-pillow.info | 10 + python/python2-pillow/slack-desc | 19 + python/python2-sip/README | 15 - python/python2-sip/python2-sip.SlackBuild | 118 - python/python2-sip/python2-sip.info | 10 - python/python2-sip/slack-desc | 19 - python/python3-Cython/README | 5 - python/python3-Cython/python3-Cython.SlackBuild | 89 - python/python3-Cython/python3-Cython.info | 10 - python/python3-Cython/slack-desc | 19 - python/python3-appdirs/README | 2 - python/python3-appdirs/python3-appdirs.SlackBuild | 86 - python/python3-appdirs/python3-appdirs.info | 10 - python/python3-appdirs/slack-desc | 19 - python/python3-future/README | 3 - python/python3-future/doinst.sh | 3 - python/python3-future/python3-future.SlackBuild | 87 - python/python3-future/python3-future.info | 10 - python/python3-future/slack-desc | 19 - python/python3-packaging/README | 2 - .../python3-packaging/python3-packaging.SlackBuild | 89 - python/python3-packaging/python3-packaging.info | 10 - python/python3-packaging/slack-desc | 19 - python/python3-pyparsing/README | 8 - .../python3-pyparsing/python3-pyparsing.SlackBuild | 88 - python/python3-pyparsing/python3-pyparsing.info | 10 - python/python3-pyparsing/slack-desc | 19 - python/python3-sip/README | 4 - python/python3-sip/python3-sip.SlackBuild | 111 - python/python3-sip/python3-sip.info | 10 - python/python3-sip/slack-desc | 19 - python/python3-six/README | 4 - python/python3-six/python3-six.SlackBuild | 76 - python/python3-six/python3-six.info | 10 - python/python3-six/slack-desc | 19 - python/python3/README | 18 - .../python3/patches/python3.no-static-library.diff | 50 - .../python3.readline.set_pre_input_hook.diff | 12 - python/python3/patches/python3.x86_64.diff | 156 - python/python3/python3.SlackBuild | 157 - python/python3/python3.info | 10 - python/python3/slack-desc | 19 - python/pyxdg/README | 3 - python/pyxdg/pyxdg.SlackBuild | 75 - python/pyxdg/pyxdg.info | 10 - python/pyxdg/slack-desc | 19 - python/six/README | 6 - python/six/six.SlackBuild | 83 - python/six/six.info | 10 - python/six/slack-desc | 19 - python/thunarx-python/thunarx-python.SlackBuild | 8 +- python/thunarx-python/thunarx-python.info | 6 +- python/typing/README | 4 - python/typing/slack-desc | 19 - python/typing/typing.SlackBuild | 90 - python/typing/typing.info | 10 - ruby/rubygem-bundler/README | 6 - ruby/rubygem-bundler/rubygem-bundler.SlackBuild | 113 - ruby/rubygem-bundler/rubygem-bundler.info | 10 - ruby/rubygem-bundler/slack-desc | 19 - system/acpi_call/acpi_call.SlackBuild | 3 + system/afpfs-ng/afpfs-ng.SlackBuild | 2 +- system/aterm/aterm.SlackBuild | 2 + system/audit/audit.SlackBuild | 20 +- system/audit/audit.info | 6 +- system/audit/doinst.sh | 12 +- system/brasero/brasero.SlackBuild | 2 +- system/bulk_extractor/bulk_extractor.SlackBuild | 6 +- system/bulk_extractor/bulk_extractor.info | 6 +- system/busybox/5-busybox-dot-config.1.32.x | 1198 +++ system/busybox/busybox.SlackBuild | 4 +- system/busybox/busybox.info | 6 +- system/caprice32/caprice32.SlackBuild | 2 + system/cdrkit/cdrkit-1.1.11-gcc10.patch | 12 + system/cdrkit/cdrkit.SlackBuild | 2 + system/cldr-emoji-annotation/README | 4 - .../cldr-emoji-annotation.SlackBuild | 96 - .../cldr-emoji-annotation.info | 10 - system/cldr-emoji-annotation/slack-desc | 19 - system/colord/colord.SlackBuild | 5 + system/conky/conky-1.10.6-gcc7.patch | 11 + system/conky/conky.SlackBuild | 3 + system/cpulimit/cpulimit.SlackBuild | 3 + system/cpulimit/glibc-2.32.patch | 19 + system/cups-bjnp/cups-bjnp.SlackBuild | 2 +- system/dahdi-complete/dahdi-complete.SlackBuild | 17 +- system/dahdi-complete/dahdi-complete.info | 6 +- system/dash/README | 4 - system/dash/dash.SlackBuild | 90 - system/dash/dash.info | 10 - system/dash/slack-desc | 19 - system/ddcutil/ddcutil.SlackBuild | 5 +- system/ddcutil/ddcutil.info | 6 +- system/dislocker/dislocker.SlackBuild | 6 +- system/dislocker/dislocker.info | 6 +- system/dosbox-x/doinst.sh | 9 + system/dosbox-x/dosbox-x.SlackBuild | 5 +- system/dosbox-x/dosbox-x.info | 8 +- system/dymo-cups-drivers/cups-ppd-header.patch | 40 + .../dymo-cups-drivers/dymo-cups-drivers.SlackBuild | 3 + system/dynamips/dynamips.SlackBuild | 1 + system/ecryptfs-utils/ecryptfs-utils.SlackBuild | 4 +- system/ecryptfs-utils/openssl.patch | 76 + system/efitools/efitools.SlackBuild | 11 +- system/efitools/efitools.info | 6 +- system/evilvte/evilvte.info | 2 +- .../extundelete/extundelete-e2fsprogs-1.44.1.patch | 12 + system/extundelete/extundelete.SlackBuild | 2 + system/f2fs_tools/README | 1 - system/f2fs_tools/f2fs_tools.SlackBuild | 88 - system/f2fs_tools/f2fs_tools.info | 10 - system/f2fs_tools/slack-desc | 19 - system/facter/facter.SlackBuild | 2 +- system/file-roller/file-roller.SlackBuild | 34 +- system/file-roller/file-roller.info | 6 +- system/foremost/foremost.SlackBuild | 2 + system/foremost/gcc10.patch | 99 + system/fsv/fsv.SlackBuild | 4 +- system/fuse3/README | 15 - system/fuse3/fuse3.SlackBuild | 106 - system/fuse3/fuse3.info | 10 - system/fuse3/slack-desc | 19 - system/fwupdate/fwupdate.SlackBuild | 3 + system/geoclue/geoclue.SlackBuild | 1 - .../gnome-disk-utility.SlackBuild | 40 +- system/gnome-disk-utility/gnome-disk-utility.info | 6 +- system/gnome-terminal/gnome-terminal.info | 2 +- system/gnome-vfs/gnome-vfs.SlackBuild | 2 + system/gnome-vfs/openssl-1.1.patch | 26 + system/gnomint/doinst.sh | 9 +- system/gnomint/gnomint.SlackBuild | 9 +- system/gnomint/patches/01-ldd.patch | 14 - system/gnomint/patches/01_cflags.patch | 15 + system/gnomint/patches/02-cflags.patch | 28 - system/gnomint/patches/02_682432.patch | 16 + system/gnomint/patches/03_fix-autoreconf.patch | 16 + system/gnomint/patches/04_gsettings-port.patch | 383 + .../patches/05_export-private-key-crash.patch | 83 + system/gnomint/patches/06_desktop-file.patch | 22 + system/gnomint/patches/07_spelling-errors.patch | 39 + system/gnomint/patches/08_gtk3-port.patch | 7655 ++++++++++++++++++++ system/gnomint/patches/09_gcc-10.patch | 33 + system/gnomint/patches/gnutls3.patch | 31 - system/guefi/README | 3 + system/guefi/guefi.SlackBuild | 91 + system/guefi/guefi.info | 10 + system/guefi/slack-desc | 19 + system/hack-font-ttf/README | 7 - system/hack-font-ttf/doinst.sh | 11 - system/hack-font-ttf/hack-font-ttf.SlackBuild | 64 - system/hack-font-ttf/hack-font-ttf.info | 10 - system/hack-font-ttf/slack-desc | 19 - system/haveged/README | 27 - system/haveged/doinst.sh | 28 - system/haveged/haveged.SlackBuild | 121 - system/haveged/haveged.info | 10 - system/haveged/rc.haveged | 47 - system/haveged/slack-desc | 19 - system/innotop/README | 6 - system/innotop/innotop.SlackBuild | 74 - system/innotop/innotop.info | 10 - system/innotop/slack-desc | 19 - system/inxi/README | 4 - system/inxi/inxi.SlackBuild | 68 - system/inxi/inxi.info | 10 - system/inxi/slack-desc | 19 - system/iscan-data/README | 2 + system/iscan-data/iscan-data.SlackBuild | 100 + system/iscan-data/iscan-data.info | 10 + system/iscan-data/slack-desc | 19 + system/iscan/README | 4 + system/iscan/doinst.sh | 29 + system/iscan/iscan.SlackBuild | 144 + system/iscan/iscan.info | 10 + .../patches/iscan-2.30.3_x86-unknown-types.patch | 12 + system/iscan/patches/iscan_png15.patch | 52 + system/iscan/patches/jpegstream.cc.patch | 21 + system/iscan/slack-desc | 19 + system/jmtpfs/README | 10 - system/jmtpfs/jmtpfs.SlackBuild | 91 - system/jmtpfs/jmtpfs.info | 10 - system/jmtpfs/slack-desc | 19 - system/krusader/README | 13 - system/krusader/doinst.sh | 9 - system/krusader/krusader.SlackBuild | 107 - system/krusader/krusader.info | 10 - system/krusader/slack-desc | 19 - system/lbzip2/README | 2 - system/lbzip2/lbzip2.SlackBuild | 121 - system/lbzip2/lbzip2.info | 10 - system/lbzip2/slack-desc | 19 - system/lhasa/README | 17 - system/lhasa/doinst.sh | 5 - system/lhasa/lhasa.SlackBuild | 84 - system/lhasa/lhasa.info | 10 - system/lhasa/slack-desc | 19 - system/lilyterm/lilyterm.SlackBuild | 2 +- system/lilyterm/lilyterm.info | 8 +- system/luckybackup/luckybackup.SlackBuild | 2 +- system/lxtask/fix-no-common.patch | 73 + system/lxtask/lxtask.SlackBuild | 3 + system/lxterminal/lxterminal.info | 2 +- system/lz4/README | 9 - system/lz4/lz4.SlackBuild | 96 - system/lz4/lz4.info | 10 - system/lz4/slack-desc | 19 - system/man-db/README | 14 - system/man-db/README.Slackware | 49 - system/man-db/doinst.sh | 48 - system/man-db/dont_write_in_usr.diff | 50 - system/man-db/man-db.SlackBuild | 225 - system/man-db/man-db.cron | 30 - system/man-db/man-db.csh | 12 - system/man-db/man-db.info | 12 - system/man-db/man-db.sh | 16 - system/man-db/man_db.conf.new.gz | Bin 2404 -> 0 bytes system/man-db/slack-desc | 19 - system/mlocate/README | 31 - system/mlocate/doinst.sh | 24 - system/mlocate/mlocate-run-updatedb | 4 - system/mlocate/mlocate.SlackBuild | 120 - system/mlocate/mlocate.cron | 2 - system/mlocate/mlocate.info | 10 - system/mlocate/slack-desc | 19 - system/mlocate/updatedb.conf.new | 4 - system/mongodb/mongodb.SlackBuild | 2 +- system/mongodb/mongodb.info | 6 +- system/mpich/mpich.SlackBuild | 3 + system/noto-fonts/66-noto-mono.conf | 16 - system/noto-fonts/66-noto-sans.conf | 16 - system/noto-fonts/66-noto-serif.conf | 16 - system/noto-fonts/README | 14 - system/noto-fonts/doinst.sh | 11 - system/noto-fonts/noto-fonts.SlackBuild | 75 - system/noto-fonts/noto-fonts.info | 10 - system/noto-fonts/slack-desc | 19 - system/nss-pam-ldapd/README | 5 - system/nss-pam-ldapd/doinst.sh | 26 - system/nss-pam-ldapd/nss-pam-ldapd.SlackBuild | 117 - system/nss-pam-ldapd/nss-pam-ldapd.info | 10 - system/nss-pam-ldapd/rc.nss-pam-ldapd | 37 - system/nss-pam-ldapd/slack-desc | 19 - .../nvidia-legacy304-driver.SlackBuild | 6 +- system/nvidia-legacy304-driver/nvidia-switch | 4 - system/nvidia-legacy304-kernel/4.14_kernel.patch | 26 + system/nvidia-legacy304-kernel/4.15_kernel.patch | 48 + .../nvidia-legacy304-kernel.SlackBuild | 4 + .../nvidia-legacy340-driver.SlackBuild | 8 +- system/nvidia-legacy340-driver/nvidia-switch | 4 +- .../nvidia-legacy390-driver.SlackBuild | 2 +- system/nvidia-legacy390-driver/nvidia-switch | 2 - .../nvidia-legacy390-kernel.SlackBuild | 1 + system/nvme-cli/README | 6 - system/nvme-cli/doinst.sh | 14 - system/nvme-cli/nvme-cli.SlackBuild | 100 - system/nvme-cli/nvme-cli.info | 10 - system/nvme-cli/slack-desc | 19 - system/opam/README | 13 +- system/opam/opam.SlackBuild | 10 +- system/opam/opam.info | 6 +- system/open-vm-tools/open-vm-tools.SlackBuild | 2 + system/p7zip/gcc10.patch | 22 + system/p7zip/p7zip.SlackBuild | 8 +- system/packagekit/doinst.sh | 1 - system/packagekit/packagekit.SlackBuild | 3 +- system/packagekit/packagekit.info | 8 +- system/parallel/README | 9 - system/parallel/parallel.SlackBuild | 101 - system/parallel/parallel.info | 12 - system/parallel/slack-desc | 19 - system/patchelf/README | 3 - system/patchelf/patchelf.SlackBuild | 97 - system/patchelf/patchelf.info | 10 - system/patchelf/slack-desc | 19 - system/percona-xtrabackup/README | 2 - .../percona-xtrabackup.SlackBuild | 155 - system/percona-xtrabackup/percona-xtrabackup.info | 10 - system/percona-xtrabackup/slack-desc | 19 - system/qemu/linker-no-pie.patch | 40 + system/qemu/qemu.SlackBuild | 14 +- system/qemu/qemu.info | 6 +- system/qstardict/doinst.sh | 6 + system/qstardict/gcc4.4.patch | 12 - .../qstardict/qstardict-1.0.1-glib_includes.patch | 14 - system/qstardict/qstardict.SlackBuild | 56 +- system/qstardict/qstardict.info | 6 +- system/qterminal/qterminal.SlackBuild | 4 +- system/qterminal/qterminal.info | 6 +- system/rEFInd/rEFInd.SlackBuild | 3 + system/rabbitmq-server/rabbitmq-server.SlackBuild | 4 +- system/rabbitmq-server/rabbitmq-server.info | 8 +- system/roxterm/roxterm.info | 2 +- system/rxvt-unicode/README | 8 - system/rxvt-unicode/rxvt-unicode.SlackBuild | 162 - system/rxvt-unicode/rxvt-unicode.desktop | 9 - system/rxvt-unicode/rxvt-unicode.info | 10 - system/rxvt-unicode/slack-desc | 19 - system/rxvt-unicode/urxvt.xpm | 141 - system/sbsigntools/autogen.patch | 277 - system/sbsigntools/ccan_makefile.patch | 20 - system/sbsigntools/fix_efi_arch.patch | 26 - system/sbsigntools/sbsigntools.SlackBuild | 33 +- system/sbsigntools/sbsigntools.info | 8 +- system/sddm/README | 24 - system/sddm/consolekit.patch | 12 - system/sddm/doinst.sh | 26 - system/sddm/sddm.SlackBuild | 122 - system/sddm/sddm.conf.new | 129 - system/sddm/sddm.info | 10 - system/sddm/slack-desc | 19 - system/sddm/xsession.patch | 25 - system/slackyd/slackyd.SlackBuild | 2 +- system/spacefm/gcc10.patch | 92 + system/spacefm/glibc-2.28.patch | 12 + system/spacefm/spacefm.SlackBuild | 5 + system/t1utils/README | 17 - system/t1utils/slack-desc | 19 - system/t1utils/t1utils.SlackBuild | 101 - system/t1utils/t1utils.info | 10 - system/terminator/terminator.info | 2 +- .../the_silver_searcher.SlackBuild | 2 +- system/tinyterm/tinyterm.info | 2 +- system/ttyrec/ttyrec-1.0.8-flags.patch | 19 + system/ttyrec/ttyrec-1.0.8-glibc-2.30.patch | 30 + system/ttyrec/ttyrec-1.0.8.RHEL5.patch | 33 - system/ttyrec/ttyrec.SlackBuild | 6 +- system/uhd/uhd.SlackBuild | 14 +- system/uhd/uhd.info | 8 +- system/vhba-module/vhba-module.SlackBuild | 2 + system/vice/vice.SlackBuild | 2 +- system/vifm/vifm.SlackBuild | 2 +- system/vifm/vifm.info | 6 +- .../virt-manager/Add-Slackware-to-OS-choices.patch | 53 +- system/virt-manager/virt-manager.SlackBuild | 10 +- system/virt-manager/virt-manager.info | 8 +- system/virtualbox-addons/rc.vboxadd.diff | 303 +- .../virtualbox-addons/virtualbox-addons.SlackBuild | 44 +- system/virtualbox-addons/virtualbox-addons.info | 6 +- .../virtualbox-extension-pack.SlackBuild | 4 +- .../virtualbox-extension-pack.info | 6 +- .../virtualbox-kernel-addons.SlackBuild | 22 +- .../virtualbox-kernel-addons.info | 6 +- .../virtualbox-kernel/virtualbox-kernel.SlackBuild | 23 +- system/virtualbox-kernel/virtualbox-kernel.info | 6 +- .../virtualbox/006-rdesktop-vrdp-keymap-path.patch | 4 +- system/virtualbox/10-virtualbox.rules | 5 +- system/virtualbox/LocalConfig.kmk | 11 + system/virtualbox/vboxdrv.sh-setup.diff | 360 +- system/virtualbox/virtualbox-gsoap.patch | 40 - system/virtualbox/virtualbox.SlackBuild | 40 +- system/virtualbox/virtualbox.info | 18 +- system/wacomtablet/README | 2 - system/wacomtablet/slack-desc | 19 - system/wacomtablet/wacomtablet.SlackBuild | 100 - system/wacomtablet/wacomtablet.info | 10 - system/xdg-dbus-proxy/README | 3 + system/xdg-dbus-proxy/slack-desc | 19 + system/xdg-dbus-proxy/xdg-dbus-proxy.SlackBuild | 100 + system/xdg-dbus-proxy/xdg-dbus-proxy.info | 10 + system/xfburn/xfburn.SlackBuild | 2 +- system/xfburn/xfburn.info | 6 +- system/xnp2/gcc6.patch | 17 + system/xnp2/xnp2.SlackBuild | 3 + system/yakuake/README | 9 - system/yakuake/doinst.sh | 11 - system/yakuake/slack-desc | 19 - system/yakuake/yakuake.SlackBuild | 109 - system/yakuake/yakuake.info | 10 - system/zerofree/README | 7 - system/zerofree/slack-desc | 19 - system/zerofree/zerofree.8 | 92 - system/zerofree/zerofree.SlackBuild | 100 - system/zerofree/zerofree.info | 12 - system/zstd/README | 5 - system/zstd/slack-desc | 19 - system/zstd/zstd.SlackBuild | 107 - ...std.dont.link.pzstd.to.static.libzstd.a.diff.gz | Bin 325 -> 0 bytes system/zstd/zstd.info | 10 - 2565 files changed, 53348 insertions(+), 47271 deletions(-) create mode 100644 academic/Gridcoin-Research/boost-1.73.patch create mode 100644 academic/gelemental/gcc.patch delete mode 100644 academic/kile/README delete mode 100644 academic/kile/doinst.sh delete mode 100644 academic/kile/kile.SlackBuild delete mode 100644 academic/kile/kile.info delete mode 100644 academic/kile/slack-desc delete mode 100644 academic/libqalculate/README delete mode 100644 academic/libqalculate/libqalculate.SlackBuild delete mode 100644 academic/libqalculate/libqalculate.info delete mode 100644 academic/libqalculate/slack-desc create mode 100644 academic/tophat/make_pair.patch create mode 100644 academic/ugene/ugene-1.22.0-dont_hardcode_includes.patch create mode 100644 accessibility/easystroke/gcc7-build-fix.patch delete mode 100644 accessibility/speech-dispatcher/README delete mode 100644 accessibility/speech-dispatcher/doinst.sh delete mode 100644 accessibility/speech-dispatcher/slack-desc delete mode 100644 accessibility/speech-dispatcher/speech-dispatcher.SlackBuild delete mode 100644 accessibility/speech-dispatcher/speech-dispatcher.info create mode 100644 audio/alsamixergui/alsamixergui-0.9.0.1.2-strsignal.patch delete mode 100644 audio/audacious-ffmpeg/README delete mode 100644 audio/audacious-ffmpeg/audacious-ffmpeg.SlackBuild delete mode 100644 audio/audacious-ffmpeg/audacious-ffmpeg.info delete mode 100644 audio/audacious-ffmpeg/patches/enable_only_ffmpeg_plugin.diff delete mode 100644 audio/audacious-ffmpeg/slack-desc delete mode 100644 audio/easytag/README delete mode 100644 audio/easytag/doinst.sh delete mode 100644 audio/easytag/easytag.SlackBuild delete mode 100644 audio/easytag/easytag.info delete mode 100644 audio/easytag/slack-desc delete mode 100644 audio/fluidsynth/README delete mode 100644 audio/fluidsynth/fluidsynth.SlackBuild delete mode 100644 audio/fluidsynth/fluidsynth.info delete mode 100644 audio/fluidsynth/slack-desc delete mode 100644 audio/kid3/README delete mode 100644 audio/kid3/doinst.sh delete mode 100644 audio/kid3/kid3.SlackBuild delete mode 100644 audio/kid3/kid3.info delete mode 100644 audio/kid3/slack-desc create mode 100644 audio/mac/gcc6.patch create mode 100644 audio/musepack-tools/musepack-tools-465-fno-common.patch create mode 100644 audio/ncmpcpp/gcc10.patch delete mode 100644 audio/opus-tools/README delete mode 100644 audio/opus-tools/opus-tools.SlackBuild delete mode 100644 audio/opus-tools/opus-tools.info delete mode 100644 audio/opus-tools/slack-desc delete mode 100644 audio/opus/README delete mode 100644 audio/opus/opus.SlackBuild delete mode 100644 audio/opus/opus.info delete mode 100644 audio/opus/slack-desc delete mode 100644 audio/opusfile/README delete mode 100644 audio/opusfile/opusfile.SlackBuild delete mode 100644 audio/opusfile/opusfile.info delete mode 100644 audio/opusfile/slack-desc create mode 100644 audio/oss/glibc-2.23.patch create mode 100644 audio/rumor/gcc7.diff delete mode 100644 audio/shell-fm/README delete mode 100644 audio/shell-fm/shell-fm.SlackBuild delete mode 100644 audio/shell-fm/shell-fm.info delete mode 100644 audio/shell-fm/slack-desc delete mode 100644 audio/speex/README delete mode 100644 audio/speex/slack-desc delete mode 100644 audio/speex/speex.SlackBuild delete mode 100644 audio/speex/speex.info delete mode 100644 desktop/ceti-2-theme/README delete mode 100644 desktop/ceti-2-theme/ceti-2-theme.SlackBuild delete mode 100644 desktop/ceti-2-theme/ceti-2-theme.info delete mode 100644 desktop/ceti-2-theme/doinst.sh delete mode 100644 desktop/ceti-2-theme/slack-desc delete mode 100644 desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff create mode 100644 desktop/dmenu/dmenu-4.9-libdir_cflags_fixups.diff delete mode 100644 desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch delete mode 100644 desktop/elementary-xfce/README delete mode 100644 desktop/elementary-xfce/elementary-xfce.SlackBuild delete mode 100644 desktop/elementary-xfce/elementary-xfce.info delete mode 100644 desktop/elementary-xfce/slack-desc delete mode 100644 desktop/ffmpegthumbnailer/README delete mode 100644 desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild delete mode 100644 desktop/ffmpegthumbnailer/ffmpegthumbnailer.info delete mode 100644 desktop/ffmpegthumbnailer/slack-desc delete mode 100644 desktop/gtk-theme-Greybird/README delete mode 100644 desktop/gtk-theme-Greybird/doinst.sh delete mode 100644 desktop/gtk-theme-Greybird/gtk-theme-Greybird.SlackBuild delete mode 100644 desktop/gtk-theme-Greybird/gtk-theme-Greybird.info delete mode 100644 desktop/gtk-theme-Greybird/slack-desc delete mode 100644 desktop/i3/add_HAVE_strndup.diff delete mode 100644 desktop/kde-gtk-config/README delete mode 100644 desktop/kde-gtk-config/doinst.sh delete mode 100644 desktop/kde-gtk-config/gtk3proxies.diff delete mode 100644 desktop/kde-gtk-config/gtkproxies.diff delete mode 100644 desktop/kde-gtk-config/kde-gtk-config.SlackBuild delete mode 100644 desktop/kde-gtk-config/kde-gtk-config.info delete mode 100644 desktop/kde-gtk-config/slack-desc delete mode 100644 desktop/mousepad/README delete mode 100644 desktop/mousepad/doinst.sh delete mode 100644 desktop/mousepad/mousepad.SlackBuild delete mode 100644 desktop/mousepad/mousepad.info delete mode 100644 desktop/mousepad/slack-desc delete mode 100644 desktop/neofetch/README delete mode 100644 desktop/neofetch/neofetch.SlackBuild delete mode 100644 desktop/neofetch/neofetch.info delete mode 100644 desktop/neofetch/slack-desc create mode 100644 desktop/picom/README create mode 100644 desktop/picom/doinst.sh create mode 100644 desktop/picom/picom.SlackBuild create mode 100644 desktop/picom/picom.info create mode 100644 desktop/picom/slack-desc create mode 100644 desktop/polybar/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch create mode 100644 desktop/rss-glx/patches/pixelcity-cpp.patch create mode 100644 desktop/rss-glx/patches/rss-glx-0.9.1-imagemagick-7.patch create mode 100644 desktop/rss-guard/01_min_qt_required_is_5.9.patch create mode 100644 desktop/rss-guard/02_fix_random_class_name.patch create mode 100644 desktop/seafile-client/README create mode 100644 desktop/seafile-client/doinst.sh create mode 100644 desktop/seafile-client/seafile-client.SlackBuild create mode 100644 desktop/seafile-client/seafile-client.info create mode 100644 desktop/seafile-client/slack-desc delete mode 100644 desktop/seafile-gui/README delete mode 100644 desktop/seafile-gui/doinst.sh delete mode 100644 desktop/seafile-gui/seafile-gui.SlackBuild delete mode 100644 desktop/seafile-gui/seafile-gui.info delete mode 100644 desktop/seafile-gui/slack-desc create mode 100644 desktop/searchmonkey/patch.txt delete mode 100644 desktop/ssr/README delete mode 100644 desktop/ssr/doinst.sh delete mode 100644 desktop/ssr/slack-desc delete mode 100644 desktop/ssr/ssr.SlackBuild delete mode 100644 desktop/ssr/ssr.info create mode 100644 desktop/suru-plus-icon-theme/README create mode 100644 desktop/suru-plus-icon-theme/doinst.sh create mode 100644 desktop/suru-plus-icon-theme/slack-desc create mode 100644 desktop/suru-plus-icon-theme/suru-plus-icon-theme.SlackBuild create mode 100644 desktop/suru-plus-icon-theme/suru-plus-icon-theme.info delete mode 100644 desktop/thunar-dropbox/README delete mode 100644 desktop/thunar-dropbox/doinst.sh delete mode 100644 desktop/thunar-dropbox/slack-desc delete mode 100644 desktop/thunar-dropbox/thunar-dropbox.SlackBuild delete mode 100644 desktop/thunar-dropbox/thunar-dropbox.info delete mode 100644 desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.patch create mode 100644 desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.patch delete mode 100644 desktop/vertex-theme/README delete mode 100644 desktop/vertex-theme/slack-desc delete mode 100644 desktop/vertex-theme/vertex-theme.SlackBuild delete mode 100644 desktop/vertex-theme/vertex-theme.info create mode 100644 desktop/weston/README.SBo delete mode 100644 desktop/weston/weston-7.0.0-nopam.patch create mode 100644 desktop/wmakerconf/patches/patch-configure create mode 100644 desktop/wmakerconf/patches/patch-scripts__wget.pl create mode 100644 desktop/wmakerconf/patches/patch-src_menu.c create mode 100644 desktop/wmakerconf/patches/patch-src_misc.c create mode 100644 desktop/wmakerconf/patches/patch-src_previews.c create mode 100644 desktop/wmakerconf/patches/patch-src_rootmenu.c create mode 100644 desktop/wmakerconf/patches/patch-src_themebrowser.c create mode 100644 desktop/wmakerconf/patches/patch-src_window.c create mode 100644 desktop/wmakerconf/patches/patch-src_wmconfig.c delete mode 100644 desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch create mode 100644 desktop/workrave/README create mode 100644 desktop/workrave/doinst.sh create mode 100644 desktop/workrave/slack-desc create mode 100644 desktop/workrave/workrave.SlackBuild create mode 100644 desktop/workrave/workrave.info delete mode 100644 desktop/xfce4-kbdleds-plugin/README delete mode 100644 desktop/xfce4-kbdleds-plugin/doinst.sh delete mode 100644 desktop/xfce4-kbdleds-plugin/slack-desc delete mode 100644 desktop/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin.SlackBuild delete mode 100644 desktop/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin.info delete mode 100644 desktop/xfce4-quicklauncher-plugin/README delete mode 100644 desktop/xfce4-quicklauncher-plugin/allow_adding_plugin_to_panel.diff delete mode 100644 desktop/xfce4-quicklauncher-plugin/slack-desc delete mode 100644 desktop/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.SlackBuild delete mode 100644 desktop/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.info delete mode 100644 desktop/xfce4-whiskermenu-plugin/README delete mode 100644 desktop/xfce4-whiskermenu-plugin/doinst.sh delete mode 100644 desktop/xfce4-whiskermenu-plugin/slack-desc delete mode 100644 desktop/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild delete mode 100644 desktop/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.info delete mode 100644 desktop/xfce4-xmms-plugin/README delete mode 100644 desktop/xfce4-xmms-plugin/slack-desc delete mode 100644 desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.SlackBuild delete mode 100644 desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.info create mode 100644 development/Coin/memhandler-initialization.patch delete mode 100644 development/SDL2_gfx/README delete mode 100644 development/SDL2_gfx/SDL2_gfx.SlackBuild delete mode 100644 development/SDL2_gfx/SDL2_gfx.info delete mode 100644 development/SDL2_gfx/slack-desc create mode 100644 development/android-tools/bash_completion.fastboot delete mode 100644 development/android-tools/fix_build_selinux.patch delete mode 100644 development/autoconf-archive/README delete mode 100644 development/autoconf-archive/autoconf-archive.SlackBuild delete mode 100644 development/autoconf-archive/autoconf-archive.info delete mode 100644 development/autoconf-archive/slack-desc create mode 100644 development/autogen/guile-2.2.patch delete mode 100644 development/brotli/README delete mode 100644 development/brotli/brotli.SlackBuild delete mode 100644 development/brotli/brotli.info delete mode 100644 development/brotli/slack-desc delete mode 100644 development/check/README delete mode 100644 development/check/check.SlackBuild delete mode 100644 development/check/check.info delete mode 100644 development/check/slack-desc delete mode 100644 development/cmake-202x/README delete mode 100644 development/cmake-202x/README_SBo.txt delete mode 100644 development/cmake-202x/cmake-202x.SlackBuild delete mode 100644 development/cmake-202x/cmake-202x.info delete mode 100644 development/cmake-202x/slack-desc delete mode 100644 development/docutils/README delete mode 100644 development/docutils/docutils.SlackBuild delete mode 100644 development/docutils/docutils.info delete mode 100644 development/docutils/slack-desc create mode 100644 development/dune/README create mode 100644 development/dune/dune.SlackBuild create mode 100644 development/dune/dune.info create mode 100644 development/dune/slack-desc delete mode 100644 development/extra-cmake-modules/README delete mode 100644 development/extra-cmake-modules/extra-cmake-modules.SlackBuild delete mode 100644 development/extra-cmake-modules/extra-cmake-modules.info delete mode 100644 development/extra-cmake-modules/slack-desc create mode 100644 development/gcc5/README create mode 100644 development/gcc5/c89.sh create mode 100644 development/gcc5/c99.sh create mode 100644 development/gcc5/ecj.sh create mode 100644 development/gcc5/fastjar-patches/1000-fastjar-0.97-segfault.patch create mode 100644 development/gcc5/fastjar-patches/1001-fastjar-0.97-len1.patch create mode 100644 development/gcc5/fastjar-patches/1002-fastjar-0.97-filename0.patch create mode 100644 development/gcc5/fastjar-patches/1003-fastjar-CVE-2010-0831.patch create mode 100644 development/gcc5/fastjar-patches/1004-fastjar-man.patch create mode 100644 development/gcc5/gcc5.SlackBuild create mode 100644 development/gcc5/gcc5.info create mode 100644 development/gcc5/libgcj-5.pc create mode 100644 development/gcc5/patches/0001-i386-Move-struct-ix86_frame-to-machine_function.diff create mode 100644 development/gcc5/patches/0002-i386-Use-reference-of-struct-ix86_frame-to-avoid-cop.diff create mode 100644 development/gcc5/patches/0003-i386-More-use-reference-of-struct-ix86_frame-to-avoi.diff create mode 100644 development/gcc5/patches/0004-i386-Don-t-use-reference-of-struct-ix86_frame.diff create mode 100644 development/gcc5/patches/0005-x86-Add-mindirect-branch-doc.diff create mode 100644 development/gcc5/patches/0005-x86-Add-mindirect-branch.diff create mode 100644 development/gcc5/patches/0006-x86-Add-mfunction-return-doc.diff create mode 100644 development/gcc5/patches/0006-x86-Add-mfunction-return.diff create mode 100644 development/gcc5/patches/0007-x86-Add-mindirect-branch-register-doc.diff create mode 100644 development/gcc5/patches/0007-x86-Add-mindirect-branch-register.diff create mode 100644 development/gcc5/patches/0008-x86-Add-V-register-operand-modifier-doc.diff create mode 100644 development/gcc5/patches/0008-x86-Add-V-register-operand-modifier.diff create mode 100644 development/gcc5/patches/0009-x86-Disallow-mindirect-branch-mfunction-return-with-.diff create mode 100644 development/gcc5/patches/0009-x86-Disallow-mindirect-branch-mfunction-return-with-doc.diff create mode 100644 development/gcc5/patches/gcc-no_fixincludes.diff create mode 100644 development/gcc5/patches/gcc.66782.diff create mode 100644 development/gcc5/patches/gcc.69140.diff create mode 100644 development/gcc5/patches/glibc2.28-ustat.diff create mode 100644 development/gcc5/profile.d/gcc5.csh create mode 100644 development/gcc5/profile.d/gcc5.sh create mode 100644 development/gcc5/slack-desc.gcc5 delete mode 100644 development/glade/README delete mode 100644 development/glade/doinst.sh delete mode 100644 development/glade/glade.SlackBuild delete mode 100644 development/glade/glade.info delete mode 100644 development/glade/slack-desc create mode 100644 development/gnuradio/boost-1.70.0.patch create mode 100644 development/gnuradio/boost-1.73.0.patch create mode 100644 development/gnuradio/replace_boost_endian_check_with_cmake.patch create mode 100644 development/gnustep-base/icu68.patch create mode 100644 development/gr-osmosdr/boost-1.73.patch delete mode 100644 development/gsoap/gsoap-libtool.patch create mode 100644 development/gsoap/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch create mode 100644 development/gsoap/patches/gsoap-2.8.91-shared_libs.patch create mode 100644 development/gtest/patches/gtest-PR2491-Fix-gnu-install-dirs-pkg-config.patch create mode 100644 development/gtest/patches/gtest-PR2556-pkg-config-Remove-pthread-link-flag-from-Cflags.patch create mode 100644 development/gtkdialog/gtkdialog-0.8.3-fno-common.patch create mode 100644 development/guile2.2/README create mode 100644 development/guile2.2/guile2.2.SlackBuild create mode 100644 development/guile2.2/guile2.2.info create mode 100644 development/guile2.2/slack-desc create mode 100644 development/hte/hteditor-2.1.0-gcc-7.patch delete mode 100644 development/icecream/README delete mode 100644 development/icecream/doinst.sh delete mode 100644 development/icecream/icecream.SlackBuild delete mode 100644 development/icecream/icecream.info delete mode 100644 development/icecream/profile.d/icecream.csh delete mode 100644 development/icecream/profile.d/icecream.sh delete mode 100644 development/icecream/rc.icecc-scheduler delete mode 100644 development/icecream/rc.iceccd delete mode 100644 development/icecream/rc.icecream.conf delete mode 100644 development/icecream/slack-desc delete mode 100644 development/kicad/boost-1.61.patch delete mode 100644 development/kicad/kicad_boost_hdr.patch create mode 100644 development/latrace/fix-scanner-config-for-flex-2.6.x.patch delete mode 100644 development/lmdb/README delete mode 100644 development/lmdb/lmdb.SlackBuild delete mode 100644 development/lmdb/lmdb.info delete mode 100644 development/lmdb/slack-desc create mode 100644 development/meld3/python-3.8.patch delete mode 100644 development/meson/README delete mode 100644 development/meson/meson.SlackBuild delete mode 100644 development/meson/meson.info delete mode 100644 development/meson/slack-desc delete mode 100644 development/mozjs/README delete mode 100644 development/mozjs/mozjs.SlackBuild delete mode 100644 development/mozjs/mozjs.info delete mode 100644 development/mozjs/patches/moz38-dont-hardcode-libc-soname.patch delete mode 100644 development/mozjs/slack-desc delete mode 100644 development/ninja/README delete mode 100644 development/ninja/ninja.SlackBuild delete mode 100644 development/ninja/ninja.info delete mode 100644 development/ninja/slack-desc delete mode 100644 development/nvi/README delete mode 100644 development/nvi/nvi.SlackBuild delete mode 100644 development/nvi/nvi.info delete mode 100644 development/nvi/patches/nvi.diffs delete mode 100644 development/nvi/slack-desc create mode 100644 development/odb/odb_gcc6.patch delete mode 100644 development/omake/omake-warn-error.diff delete mode 100644 development/oniguruma/README delete mode 100644 development/oniguruma/oniguruma.SlackBuild delete mode 100644 development/oniguruma/oniguruma.info delete mode 100644 development/oniguruma/slack-desc delete mode 100644 development/opencl-headers/README delete mode 100644 development/opencl-headers/opencl-headers.SlackBuild delete mode 100644 development/opencl-headers/opencl-headers.info delete mode 100644 development/opencl-headers/slack-desc create mode 100644 development/poedit/281f93b29190c67c86c4403b96efdbac957a0162.patch delete mode 100644 development/poedit/setvalue.diff delete mode 100644 development/re2c/README delete mode 100644 development/re2c/re2c.SlackBuild delete mode 100644 development/re2c/re2c.info delete mode 100644 development/re2c/slack-desc delete mode 100644 development/sassc/README delete mode 100644 development/sassc/sassc.SlackBuild delete mode 100644 development/sassc/sassc.info delete mode 100644 development/sassc/slack-desc delete mode 100644 development/tidy-html5/README delete mode 100644 development/tidy-html5/slack-desc delete mode 100644 development/tidy-html5/tidy-html5.SlackBuild delete mode 100644 development/tidy-html5/tidy-html5.info delete mode 100644 development/vala/README delete mode 100644 development/vala/patch_support-gtk318.diff delete mode 100644 development/vala/slack-desc delete mode 100644 development/vala/vala.SlackBuild delete mode 100644 development/vala/vala.info delete mode 100644 development/woff2/README delete mode 100644 development/woff2/slack-desc delete mode 100644 development/woff2/woff2.SlackBuild delete mode 100644 development/woff2/woff2.info delete mode 100644 games/0ad/D1852.diff create mode 100644 games/0ad/rust-1.50.0.patch create mode 100644 games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch create mode 100644 games/alienarena/checkout_code.sh delete mode 100644 games/arx-libertatis/arx-libertatis-1.1.2-cmake3.5.patch create mode 100644 games/assaultcube/assaultcube-gcc6.patch create mode 100644 games/brainparty/patches/gcc-6.patch create mode 100644 games/chroma/gcc.patch create mode 100644 games/crrcsim/fix_bug.patch delete mode 100644 games/desmume/osmesa-header-fix.patch create mode 100644 games/etlegacy-from-source/README create mode 100644 games/etlegacy-from-source/doinst.sh create mode 100644 games/etlegacy-from-source/etlegacy-from-source.SlackBuild create mode 100644 games/etlegacy-from-source/etlegacy-from-source.info create mode 100644 games/etlegacy-from-source/files/etlegacy.desktop create mode 100644 games/etlegacy-from-source/files/etlegacy.svg create mode 100644 games/etlegacy-from-source/files/get_tarball_from_git.sh create mode 100644 games/etlegacy-from-source/files/openurl.sh create mode 100644 games/etlegacy-from-source/slack-desc create mode 100644 games/f1spirit/03_gcc6.patch delete mode 100644 games/freeorion/compilefix.diff create mode 100644 games/glob2/c++14.patch create mode 100644 games/goonies/gcc6.patch delete mode 100644 games/knights/README delete mode 100644 games/knights/doinst.sh delete mode 100644 games/knights/knights.SlackBuild delete mode 100644 games/knights/knights.info delete mode 100644 games/knights/slack-desc create mode 100644 games/mupen64plus/fix_multiple_definition_errors.patch create mode 100644 games/neverball/gcc10.patch delete mode 100644 games/openlierox/http_curl.patch create mode 100644 games/pingus/missing-header.patch create mode 100644 games/pokerth/patches/pokerth-1.1.2-boost-1.70-websocket-fix1.patch create mode 100644 games/pokerth/patches/pokerth-1.1.2-boost-1.70-websocket-fix2.patch create mode 100644 games/pokerth/patches/pokerth-1.1.2-boost-1.73-placeholders.patch create mode 100644 games/pysolfc/pillow6.patch create mode 100644 games/qmc2/qmc2-qt5.15.patch create mode 100644 games/qmc2/qmc2-types.patch create mode 100644 games/quakespasm/README create mode 100644 games/quakespasm/doinst.sh create mode 100644 games/quakespasm/quakespasm.SlackBuild create mode 100644 games/quakespasm/quakespasm.desktop create mode 100644 games/quakespasm/quakespasm.info create mode 100644 games/quakespasm/slack-desc create mode 100644 games/rlvm/gcc.patch create mode 100644 games/roadfighter/gcc.patch create mode 100644 games/speed-dreams/speed-dreams-params-conversion.patch create mode 100644 games/supertux/supertux-0.6.2_rc1-boost-1.73.patch create mode 100644 games/supertuxkart/mesa-18.3.patch create mode 100644 games/vegastrike/cmake/FindGTK2.cmake create mode 100644 games/vegastrike/cmake/FindPackageHandleStandardArgs.cmake create mode 100644 games/vegastrike/cmake/FindPackageMessage.cmake create mode 100644 games/vegastrike/cmake/SelectLibraryConfigurations.cmake create mode 100644 games/warmux/patches/return-null.patch delete mode 100644 games/widelands/widelands-gcc47.patch create mode 100644 games/xu4/gcc7.patch create mode 100644 gis/libLAS/Use_LIBLAS_BIG_ENDIAN.patch create mode 100644 gis/libLAS/boost-1.73.patch create mode 100644 graphics/FreeCAD/addBoostHeaders-200c7c7.patch delete mode 100644 graphics/digikam/README delete mode 100644 graphics/digikam/digikam.SlackBuild delete mode 100644 graphics/digikam/digikam.info delete mode 100644 graphics/digikam/doinst.sh delete mode 100644 graphics/digikam/lensfun-0.3.2.patch delete mode 100644 graphics/digikam/libpgf.patch delete mode 100644 graphics/digikam/slack-desc create mode 100644 graphics/exact-image/Provide-gif-quantization-for-giflib-5.2.patch delete mode 100644 graphics/glslang/README delete mode 100644 graphics/glslang/SPIRV-Tools-shared.patch delete mode 100644 graphics/glslang/glslang.SlackBuild delete mode 100644 graphics/glslang/glslang.info delete mode 100644 graphics/glslang/slack-desc delete mode 100644 graphics/gmic/zart-opencv4.patch delete mode 100644 graphics/graphene/README delete mode 100644 graphics/graphene/graphene.SlackBuild delete mode 100644 graphics/graphene/graphene.info delete mode 100644 graphics/graphene/slack-desc delete mode 100644 graphics/graphite2/README delete mode 100644 graphics/graphite2/graphite2.SlackBuild delete mode 100644 graphics/graphite2/graphite2.info delete mode 100644 graphics/graphite2/slack-desc create mode 100644 graphics/k3d/gcc7.patch delete mode 100644 graphics/mcomix/README delete mode 100644 graphics/mcomix/doinst.sh delete mode 100644 graphics/mcomix/mcomix.SlackBuild delete mode 100644 graphics/mcomix/mcomix.info delete mode 100644 graphics/mcomix/slack-desc create mode 100644 graphics/opencollada/pcre.patch create mode 100644 graphics/photoqt/c6fd41478e818f3a651d40f96cab3d790e1c09a4.diff delete mode 100644 graphics/qrencode/README delete mode 100644 graphics/qrencode/qrencode.SlackBuild delete mode 100644 graphics/qrencode/qrencode.info delete mode 100644 graphics/qrencode/slack-desc delete mode 100644 graphics/scantailor/README delete mode 100644 graphics/scantailor/doinst.sh delete mode 100644 graphics/scantailor/scantailor.SlackBuild delete mode 100644 graphics/scantailor/scantailor.desktop delete mode 100644 graphics/scantailor/scantailor.info delete mode 100644 graphics/scantailor/slack-desc create mode 100644 graphics/simple-scan/libwebpmux.patch create mode 100644 graphics/ufraw/patches/0001-Change-use-of-header-files.patch create mode 100644 graphics/ufraw/patches/0002-Use-symbolic-error-code.patch create mode 100644 graphics/ufraw/patches/0003-ufraw-0.22-fix_omp_definitions.patch delete mode 100644 graphics/vulkan-sdk/README delete mode 100644 graphics/vulkan-sdk/slack-desc delete mode 100644 graphics/vulkan-sdk/vulkan-loader-cmake.patch delete mode 100644 graphics/vulkan-sdk/vulkan-sdk.SlackBuild delete mode 100644 graphics/vulkan-sdk/vulkan-sdk.info delete mode 100644 graphics/wayland-protocols/README delete mode 100644 graphics/wayland-protocols/slack-desc delete mode 100644 graphics/wayland-protocols/wayland-protocols.SlackBuild delete mode 100644 graphics/wayland-protocols/wayland-protocols.info create mode 100644 ham/svxlink/gcc6.patch delete mode 100644 haskell/ghc/4eebc8016f68719e1ccdf460754a97d1f4d6ef05.patch delete mode 100644 libraries/FreeImage/010_avoid-raw-literal.diff delete mode 100644 libraries/OpenAL/OpenAL.SlackBuild delete mode 100644 libraries/OpenAL/OpenAL.info delete mode 100644 libraries/OpenAL/README delete mode 100644 libraries/OpenAL/slack-desc create mode 100644 libraries/OpenSceneGraph/0008-Fix_wxWidgets_gl.patch delete mode 100644 libraries/PyQt5/PyQt5.SlackBuild delete mode 100644 libraries/PyQt5/PyQt5.info delete mode 100644 libraries/PyQt5/README delete mode 100644 libraries/PyQt5/patches/pyqt5-python2-crash.patch delete mode 100644 libraries/PyQt5/slack-desc delete mode 100644 libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild delete mode 100644 libraries/QScintilla-qt5/QScintilla-qt5.info delete mode 100644 libraries/QScintilla-qt5/README delete mode 100644 libraries/QScintilla-qt5/slack-desc delete mode 100644 libraries/SDL2/README delete mode 100644 libraries/SDL2/SDL2.SlackBuild delete mode 100644 libraries/SDL2/SDL2.info delete mode 100644 libraries/SDL2/slack-desc delete mode 100644 libraries/SDL2_image/README delete mode 100644 libraries/SDL2_image/SDL2_image.SlackBuild delete mode 100644 libraries/SDL2_image/SDL2_image.info delete mode 100644 libraries/SDL2_image/slack-desc delete mode 100644 libraries/SDL2_mixer/README delete mode 100644 libraries/SDL2_mixer/SDL2_mixer.SlackBuild delete mode 100644 libraries/SDL2_mixer/SDL2_mixer.info delete mode 100644 libraries/SDL2_mixer/slack-desc delete mode 100644 libraries/SDL2_net/README delete mode 100644 libraries/SDL2_net/SDL2_net.SlackBuild delete mode 100644 libraries/SDL2_net/SDL2_net.info delete mode 100644 libraries/SDL2_net/slack-desc delete mode 100644 libraries/SDL2_ttf/README delete mode 100644 libraries/SDL2_ttf/SDL2_ttf.SlackBuild delete mode 100644 libraries/SDL2_ttf/SDL2_ttf.info delete mode 100644 libraries/SDL2_ttf/slack-desc delete mode 100644 libraries/SDL_sound/README delete mode 100644 libraries/SDL_sound/SDL_sound.SlackBuild delete mode 100644 libraries/SDL_sound/SDL_sound.info delete mode 100644 libraries/SDL_sound/slack-desc create mode 100644 libraries/VTK/patch-gcc10.diff create mode 100644 libraries/VTK/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch create mode 100644 libraries/agg/patches/0016-bad-const.patch create mode 100644 libraries/allegro4/texinfo-6.7.patch delete mode 100644 libraries/argon2/README delete mode 100644 libraries/argon2/argon2.SlackBuild delete mode 100644 libraries/argon2/argon2.info delete mode 100644 libraries/argon2/slack-desc create mode 100644 libraries/bamf/add_compile_warning_flags.patch create mode 100644 libraries/beignet/llvm6.patch create mode 100644 libraries/belle-sip/gcc9.patch delete mode 100644 libraries/cfitsio/README delete mode 100644 libraries/cfitsio/cfitsio.SlackBuild delete mode 100644 libraries/cfitsio/cfitsio.info delete mode 100644 libraries/cfitsio/slack-desc create mode 100644 libraries/cppo/README create mode 100644 libraries/cppo/cppo.SlackBuild create mode 100644 libraries/cppo/cppo.info create mode 100644 libraries/cppo/slack-desc delete mode 100644 libraries/cpprestsdk/cpprestsdk.patch delete mode 100644 libraries/cracklib/README delete mode 100644 libraries/cracklib/cracklib.SlackBuild delete mode 100644 libraries/cracklib/cracklib.info delete mode 100644 libraries/cracklib/slack-desc delete mode 100644 libraries/cryptopp/README delete mode 100644 libraries/cryptopp/cryptopp.SlackBuild delete mode 100644 libraries/cryptopp/cryptopp.info delete mode 100644 libraries/cryptopp/cryptopp.pc delete mode 100644 libraries/cryptopp/slack-desc create mode 100644 libraries/cuneiform/cuneiform-gcc.patch create mode 100644 libraries/cuneiform/strings.patch delete mode 100644 libraries/dotconf/README delete mode 100644 libraries/dotconf/dotconf.SlackBuild delete mode 100644 libraries/dotconf/dotconf.info delete mode 100644 libraries/dotconf/slack-desc delete mode 100644 libraries/efivar/README delete mode 100644 libraries/efivar/efivar.SlackBuild delete mode 100644 libraries/efivar/efivar.info delete mode 100644 libraries/efivar/slack-desc delete mode 100644 libraries/enum34/README delete mode 100644 libraries/enum34/enum34.SlackBuild delete mode 100644 libraries/enum34/enum34.info delete mode 100644 libraries/enum34/slack-desc delete mode 100644 libraries/flatbuffers/flatbuffers.patch delete mode 100644 libraries/frei0r/README delete mode 100644 libraries/frei0r/frei0r.SlackBuild delete mode 100644 libraries/frei0r/frei0r.info delete mode 100644 libraries/frei0r/slack-desc create mode 100644 libraries/gstreamermm/fix_warnings.patch create mode 100644 libraries/gtkglext/0002-GCC-8-fixes.patch delete mode 100644 libraries/gtksourceview3/README delete mode 100644 libraries/gtksourceview3/gtksourceview3.SlackBuild delete mode 100644 libraries/gtksourceview3/gtksourceview3.info delete mode 100644 libraries/gtksourceview3/slack-desc create mode 100644 libraries/gtksourceview4/README create mode 100644 libraries/gtksourceview4/gtksourceview4.SlackBuild create mode 100644 libraries/gtksourceview4/gtksourceview4.info create mode 100644 libraries/gtksourceview4/slack-desc create mode 100644 libraries/hidapi/configure.ac.patch create mode 100644 libraries/hpx/gcc7.patch delete mode 100644 libraries/hyphen/README delete mode 100644 libraries/hyphen/hyphen.SlackBuild delete mode 100644 libraries/hyphen/hyphen.info delete mode 100644 libraries/hyphen/slack-desc delete mode 100644 libraries/id3lib/README delete mode 100644 libraries/id3lib/id3lib.SlackBuild delete mode 100644 libraries/id3lib/id3lib.info delete mode 100644 libraries/id3lib/patches/id3lib.c_wrapper.patch delete mode 100644 libraries/id3lib/patches/id3lib.cppheaders.patch delete mode 100644 libraries/id3lib/patches/id3lib.manpages.patch delete mode 100644 libraries/id3lib/patches/id3lib.mkstemp.patch delete mode 100644 libraries/id3lib/patches/id3lib.nullpointer_check.patch delete mode 100644 libraries/id3lib/patches/id3lib.utf8_writing.patch delete mode 100644 libraries/id3lib/patches/id3lib.vbr_stack_smash.patch delete mode 100644 libraries/id3lib/slack-desc delete mode 100644 libraries/isl/README delete mode 100644 libraries/isl/isl.SlackBuild delete mode 100644 libraries/isl/isl.info delete mode 100644 libraries/isl/slack-desc delete mode 100644 libraries/jansson/README delete mode 100644 libraries/jansson/jansson.SlackBuild delete mode 100644 libraries/jansson/jansson.info delete mode 100644 libraries/jansson/slack-desc delete mode 100644 libraries/json-glib/README delete mode 100644 libraries/json-glib/json-glib.SlackBuild delete mode 100644 libraries/json-glib/json-glib.info delete mode 100644 libraries/json-glib/slack-desc create mode 100644 libraries/keybinder/README create mode 100644 libraries/keybinder/keybinder.SlackBuild create mode 100644 libraries/keybinder/keybinder.info create mode 100644 libraries/keybinder/slack-desc delete mode 100644 libraries/lame/CVE-2017-15018.patch.gz delete mode 100644 libraries/lame/README delete mode 100644 libraries/lame/lame.SlackBuild delete mode 100644 libraries/lame/lame.info delete mode 100644 libraries/lame/slack-desc delete mode 100644 libraries/lensfun/README delete mode 100644 libraries/lensfun/lensfun-fix-python-install-dir.patch delete mode 100644 libraries/lensfun/lensfun.SlackBuild delete mode 100644 libraries/lensfun/lensfun.info delete mode 100644 libraries/lensfun/slack-desc delete mode 100644 libraries/libalkimia/README delete mode 100644 libraries/libalkimia/libalkimia.SlackBuild delete mode 100644 libraries/libalkimia/libalkimia.info delete mode 100644 libraries/libalkimia/slack-desc create mode 100644 libraries/libart-lgpl/README create mode 100644 libraries/libart-lgpl/libart-lgpl.SlackBuild create mode 100644 libraries/libart-lgpl/libart-lgpl.info create mode 100644 libraries/libart-lgpl/slack-desc delete mode 100644 libraries/libbluray/README delete mode 100644 libraries/libbluray/libbluray.SlackBuild delete mode 100644 libraries/libbluray/libbluray.info delete mode 100644 libraries/libbluray/slack-desc delete mode 100644 libraries/libburn/README delete mode 100644 libraries/libburn/libburn.SlackBuild delete mode 100644 libraries/libburn/libburn.info delete mode 100644 libraries/libburn/slack-desc delete mode 100644 libraries/libc++/README delete mode 100644 libraries/libc++/libc++.SlackBuild delete mode 100644 libraries/libc++/libc++.info delete mode 100644 libraries/libc++/slack-desc delete mode 100644 libraries/libclaw/lib.patch create mode 100644 libraries/libclaw/patches/01_libclaw-1.7.4-libdir.patch create mode 100644 libraries/libclaw/patches/02_libclaw-1.7.4-gcc62.patch create mode 100644 libraries/libclaw/patches/03_libclaw-1.7.4-gcc7.patch delete mode 100644 libraries/libcue/README delete mode 100644 libraries/libcue/libcue.SlackBuild delete mode 100644 libraries/libcue/libcue.info delete mode 100644 libraries/libcue/slack-desc delete mode 100644 libraries/libdbus-c++/gcc47.patch delete mode 100644 libraries/libdbus-c++/nested_variant_map.patch create mode 100644 libraries/libdbus-c++/patches/libdbus-c++-gcc7.patch create mode 100644 libraries/libdbus-c++/patches/libdbus-c++-glibmm-2.43.patch create mode 100644 libraries/libdbus-c++/patches/libdbus-c++-nodocdatetime.patch create mode 100644 libraries/libdbus-c++/patches/libdbus-c++-noreturn.patch create mode 100644 libraries/libdbus-c++/patches/libdbus-c++-pthread.patch create mode 100644 libraries/libdbus-c++/patches/libdbus-c++-sover.patch delete mode 100644 libraries/libdbusmenu/0001_no-deprecated-gnome-common-macros.patch delete mode 100644 libraries/libdbusmenu/README delete mode 100644 libraries/libdbusmenu/libdbusmenu.SlackBuild delete mode 100644 libraries/libdbusmenu/libdbusmenu.info delete mode 100644 libraries/libdbusmenu/slack-desc delete mode 100644 libraries/libdmtx/README delete mode 100644 libraries/libdmtx/libdmtx.SlackBuild delete mode 100644 libraries/libdmtx/libdmtx.info delete mode 100644 libraries/libdmtx/slack-desc delete mode 100644 libraries/libechonest/libechonest-fix-double-encoding-on-qt4.patch delete mode 100644 libraries/libedit/README delete mode 100644 libraries/libedit/libedit.SlackBuild delete mode 100644 libraries/libedit/libedit.info delete mode 100644 libraries/libedit/slack-desc delete mode 100644 libraries/libffado/libffado-mixer.patch delete mode 100644 libraries/libgee/README delete mode 100644 libraries/libgee/libgee.SlackBuild delete mode 100644 libraries/libgee/libgee.info delete mode 100644 libraries/libgee/slack-desc delete mode 100644 libraries/libgexiv2/README delete mode 100644 libraries/libgexiv2/libgexiv2.SlackBuild delete mode 100644 libraries/libgexiv2/libgexiv2.info delete mode 100644 libraries/libgexiv2/slack-desc delete mode 100644 libraries/libidn2/README delete mode 100644 libraries/libidn2/libidn2.SlackBuild delete mode 100644 libraries/libidn2/libidn2.info delete mode 100644 libraries/libidn2/slack-desc delete mode 100644 libraries/libinput/README delete mode 100644 libraries/libinput/libinput.SlackBuild delete mode 100644 libraries/libinput/libinput.info delete mode 100644 libraries/libinput/slack-desc create mode 100644 libraries/libmemcached/patches/libmemcached-build.patch create mode 100644 libraries/libmirage/libmirage-3.2.4-gcc-10.patch create mode 100644 libraries/libmp4v2/libmp4v2-2.0.0-unsigned-int-cast.patch create mode 100644 libraries/libmusicbrainz5/no_wildcards.patch delete mode 100644 libraries/libnice/README delete mode 100644 libraries/libnice/libnice.SlackBuild delete mode 100644 libraries/libnice/libnice.info delete mode 100644 libraries/libnice/slack-desc create mode 100644 libraries/liboauth/liboauth-1.0.3-openssl-1.1.0-2.patch create mode 100644 libraries/libopenshot/512.patch delete mode 100644 libraries/libopusenc/README delete mode 100644 libraries/libopusenc/libopusenc.SlackBuild delete mode 100644 libraries/libopusenc/libopusenc.info delete mode 100644 libraries/libopusenc/slack-desc delete mode 100644 libraries/libpinyin/README delete mode 100644 libraries/libpinyin/libpinyin.SlackBuild delete mode 100644 libraries/libpinyin/libpinyin.info delete mode 100644 libraries/libpinyin/slack-desc create mode 100644 libraries/libportal/README create mode 100644 libraries/libportal/libportal.SlackBuild create mode 100644 libraries/libportal/libportal.info create mode 100644 libraries/libportal/slack-desc delete mode 100644 libraries/libpwquality/README delete mode 100644 libraries/libpwquality/libpwquality.SlackBuild delete mode 100644 libraries/libpwquality/libpwquality.info delete mode 100644 libraries/libpwquality/slack-desc create mode 100644 libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch create mode 100644 libraries/libqxt/libqxt-gcc6.patch delete mode 100644 libraries/libsass/README delete mode 100644 libraries/libsass/libsass.SlackBuild delete mode 100644 libraries/libsass/libsass.info delete mode 100644 libraries/libsass/slack-desc delete mode 100644 libraries/libsodium/README delete mode 100644 libraries/libsodium/libsodium.SlackBuild delete mode 100644 libraries/libsodium/libsodium.info delete mode 100644 libraries/libsodium/slack-desc delete mode 100644 libraries/libtxc_dxtn/README delete mode 100644 libraries/libtxc_dxtn/libtxc_dxtn.SlackBuild delete mode 100644 libraries/libtxc_dxtn/libtxc_dxtn.info delete mode 100644 libraries/libtxc_dxtn/slack-desc create mode 100644 libraries/libunicap/gcc10.patch delete mode 100644 libraries/libunwind/README delete mode 100644 libraries/libunwind/libunwind.SlackBuild delete mode 100644 libraries/libunwind/libunwind.info delete mode 100644 libraries/libunwind/slack-desc delete mode 100644 libraries/libuv/README delete mode 100644 libraries/libuv/libuv.SlackBuild delete mode 100644 libraries/libuv/libuv.info delete mode 100644 libraries/libuv/slack-desc create mode 100644 libraries/libvirt-glib/libvirt-glib-4.0.0-cast-align.patch delete mode 100644 libraries/libwacom/README delete mode 100644 libraries/libwacom/libwacom.SlackBuild delete mode 100644 libraries/libwacom/libwacom.info delete mode 100644 libraries/libwacom/slack-desc delete mode 100644 libraries/libwebp/README delete mode 100644 libraries/libwebp/libwebp.SlackBuild delete mode 100644 libraries/libwebp/libwebp.info delete mode 100644 libraries/libwebp/slack-desc delete mode 100644 libraries/libwnck3/README delete mode 100644 libraries/libwnck3/libwnck3.SlackBuild delete mode 100644 libraries/libwnck3/libwnck3.info delete mode 100644 libraries/libwnck3/slack-desc delete mode 100644 libraries/libxkbcommon/README delete mode 100644 libraries/libxkbcommon/libxkbcommon.SlackBuild delete mode 100644 libraries/libxkbcommon/libxkbcommon.info delete mode 100644 libraries/libxkbcommon/slack-desc delete mode 100644 libraries/marisa/README delete mode 100644 libraries/marisa/marisa.SlackBuild delete mode 100644 libraries/marisa/marisa.info delete mode 100644 libraries/marisa/slack-desc create mode 100644 libraries/menu-cache/patches/Support-gcc10-compilation.patch delete mode 100644 libraries/npth/README delete mode 100644 libraries/npth/npth.SlackBuild delete mode 100644 libraries/npth/npth.info delete mode 100644 libraries/npth/slack-desc delete mode 100644 libraries/ocl-icd/README delete mode 100644 libraries/ocl-icd/ocl-icd.SlackBuild delete mode 100644 libraries/ocl-icd/ocl-icd.info delete mode 100644 libraries/ocl-icd/slack-desc delete mode 100644 libraries/opal/ffmpeg2.patch delete mode 100644 libraries/opencv/README delete mode 100644 libraries/opencv/opencv.SlackBuild delete mode 100644 libraries/opencv/opencv.info delete mode 100644 libraries/opencv/slack-desc create mode 100644 libraries/pangox-compat/patches/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch create mode 100644 libraries/pangox-compat/patches/0002-disable-shaper.patch delete mode 100644 libraries/pcre2/README delete mode 100644 libraries/pcre2/pcre2.SlackBuild delete mode 100644 libraries/pcre2/pcre2.info delete mode 100644 libraries/pcre2/slack-desc delete mode 100644 libraries/pipewire/README delete mode 100644 libraries/pipewire/pipewire.SlackBuild delete mode 100644 libraries/pipewire/pipewire.info delete mode 100644 libraries/pipewire/slack-desc delete mode 100644 libraries/poppler-qt5/README delete mode 100644 libraries/poppler-qt5/poppler-qt5.SlackBuild delete mode 100644 libraries/poppler-qt5/poppler-qt5.info delete mode 100644 libraries/poppler-qt5/slack-desc delete mode 100644 libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch create mode 100644 libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch create mode 100644 libraries/ptlib/ptlib-2.10.11-openssl11.patch create mode 100644 libraries/ptlib/ptlib-gcc8.patch delete mode 100644 libraries/ptlib/ssl3.patch delete mode 100644 libraries/python3-PyQt5/README delete mode 100644 libraries/python3-PyQt5/python3-PyQt5.SlackBuild delete mode 100644 libraries/python3-PyQt5/python3-PyQt5.info delete mode 100644 libraries/python3-PyQt5/slack-desc delete mode 100644 libraries/python3-pillow/README delete mode 100644 libraries/python3-pillow/python3-pillow.SlackBuild delete mode 100644 libraries/python3-pillow/python3-pillow.info delete mode 100644 libraries/python3-pillow/slack-desc delete mode 100644 libraries/qca-qt5/Add_support_for_OpenSSL_1.1.0.diff.gz delete mode 100644 libraries/qca-qt5/README delete mode 100644 libraries/qca-qt5/qca-qt5.SlackBuild delete mode 100644 libraries/qca-qt5/qca-qt5.info delete mode 100644 libraries/qca-qt5/qca.tlsunittest.cpp.diff.gz delete mode 100644 libraries/qca-qt5/slack-desc create mode 100644 libraries/qmltermwidget/gcc-10.patch create mode 100644 libraries/qt5-styleplugins/patches/0001-fix-build-against-Qt-5.15.patch create mode 100644 libraries/qt5-styleplugins/patches/0002-fix-gtk2-background.patch delete mode 100644 libraries/qt5-webkit/README delete mode 100644 libraries/qt5-webkit/doinst.sh delete mode 100644 libraries/qt5-webkit/qt5-webkit.SlackBuild delete mode 100644 libraries/qt5-webkit/qt5-webkit.info delete mode 100644 libraries/qt5-webkit/slack-desc delete mode 100644 libraries/qt5/README delete mode 100644 libraries/qt5/README.ccache delete mode 100644 libraries/qt5/desktop/assistant-qt5.desktop delete mode 100644 libraries/qt5/desktop/designer-qt5.desktop delete mode 100644 libraries/qt5/desktop/linguist-qt5.desktop delete mode 100644 libraries/qt5/desktop/qdbusviewer-qt5.desktop delete mode 100644 libraries/qt5/doinst.sh delete mode 100644 libraries/qt5/patches/qt5.mysql.h.diff delete mode 100644 libraries/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch delete mode 100644 libraries/qt5/profile.d/qt5.csh delete mode 100644 libraries/qt5/profile.d/qt5.sh delete mode 100644 libraries/qt5/qt5.SlackBuild delete mode 100644 libraries/qt5/qt5.info delete mode 100644 libraries/qt5/slack-desc delete mode 100644 libraries/quazip-qt5/README delete mode 100644 libraries/quazip-qt5/quazip-qt5.SlackBuild delete mode 100644 libraries/quazip-qt5/quazip-qt5.info delete mode 100644 libraries/quazip-qt5/slack-desc create mode 100644 libraries/rasqal/README create mode 100644 libraries/rasqal/rasqal.SlackBuild create mode 100644 libraries/rasqal/rasqal.info create mode 100644 libraries/rasqal/slack-desc create mode 100644 libraries/redland/README create mode 100644 libraries/redland/redland.SlackBuild create mode 100644 libraries/redland/redland.info create mode 100644 libraries/redland/slack-desc create mode 100644 libraries/sdformat/cmake.patch create mode 100644 libraries/t4k_common/916060_bugfix.patch delete mode 100644 libraries/vid.stab/README delete mode 100644 libraries/vid.stab/slack-desc delete mode 100644 libraries/vid.stab/vid.stab.SlackBuild delete mode 100644 libraries/vid.stab/vid.stab.info create mode 100644 libraries/vte2/README create mode 100644 libraries/vte2/fix_meta_alt_keybinding.patch create mode 100644 libraries/vte2/slack-desc create mode 100644 libraries/vte2/vte.escape.cpu.usage.diff create mode 100644 libraries/vte2/vte2.SlackBuild create mode 100644 libraries/vte2/vte2.info delete mode 100644 libraries/vte3/README delete mode 100644 libraries/vte3/slack-desc delete mode 100644 libraries/vte3/vte3.SlackBuild delete mode 100644 libraries/vte3/vte3.info delete mode 100644 libraries/wayland/README delete mode 100644 libraries/wayland/slack-desc delete mode 100644 libraries/wayland/wayland.SlackBuild delete mode 100644 libraries/wayland/wayland.info create mode 100644 libraries/webkitgtk/bison-3.7.1.patch create mode 100644 libraries/webkitgtk/icu4c-65.1.patch create mode 100644 libraries/webkitgtk3/bison-3.7.1.patch create mode 100644 libraries/webkitgtk3/icu4c-65.1.patch create mode 100644 libraries/wpebackend-fdo/README create mode 100644 libraries/wpebackend-fdo/slack-desc create mode 100644 libraries/wpebackend-fdo/wpebackend-fdo.SlackBuild create mode 100644 libraries/wpebackend-fdo/wpebackend-fdo.info create mode 100644 libraries/wvstreams/patches/01_kfreebsd_ftbfs.diff create mode 100644 libraries/wvstreams/patches/02_doc_path.diff create mode 100644 libraries/wvstreams/patches/03_html_sgml.diff create mode 100644 libraries/wvstreams/patches/04_signed_request.diff create mode 100644 libraries/wvstreams/patches/05_gcc-4.7.diff delete mode 100644 libraries/wvstreams/patches/05_gcc.diff create mode 100644 libraries/wvstreams/patches/06_buildflags.diff create mode 100644 libraries/wvstreams/patches/07_openssl-1.0.diff create mode 100644 libraries/wvstreams/patches/08_glibc-2.12.diff create mode 100644 libraries/wvstreams/patches/09_readline.diff create mode 100644 libraries/wvstreams/patches/10_typos.diff create mode 100644 libraries/wvstreams/patches/11_gcc-6.patch create mode 100644 libraries/wvstreams/patches/12_increase_task_stack.patch create mode 100644 libraries/wvstreams/patches/13_wvstreams_openssl1.1.patch create mode 100644 libraries/wvstreams/patches/14_cross.diff create mode 100644 libraries/wvstreams/patches/15_Fix-narrowing-conversion-error.patch create mode 100644 libraries/wvstreams/patches/16_wvstreams-4.6.1-parallel-make.patch delete mode 100644 libraries/wvstreams/patches/wvstreams-4.6.1-gcc47.patch delete mode 100644 libraries/wvstreams/patches/wvstreams-4.6.1-parallel-make.patch create mode 100644 libraries/wxPython4/newer_setuptools.patch delete mode 100644 libraries/xf86-input-libinput/README delete mode 100644 libraries/xf86-input-libinput/slack-desc delete mode 100644 libraries/xf86-input-libinput/xf86-input-libinput.SlackBuild delete mode 100644 libraries/xf86-input-libinput/xf86-input-libinput.info delete mode 100644 libraries/xulrunner/README delete mode 100644 libraries/xulrunner/ftfntfmt.patch delete mode 100644 libraries/xulrunner/gold/gold delete mode 100644 libraries/xulrunner/gold/ld delete mode 100644 libraries/xulrunner/slack-desc delete mode 100644 libraries/xulrunner/xulrunner.SlackBuild delete mode 100644 libraries/xulrunner/xulrunner.info create mode 100644 libraries/xview/xinitrc.olvwm create mode 100644 libraries/xview/xinitrc.olwm create mode 100644 misc/dmg2img/0001-openssl-1.1-compatibility.patch delete mode 100644 misc/fcitx-configtool/README delete mode 100644 misc/fcitx-configtool/fcitx-configtool.SlackBuild delete mode 100644 misc/fcitx-configtool/fcitx-configtool.info delete mode 100644 misc/fcitx-configtool/slack-desc delete mode 100644 misc/fcitx-libpinyin/README delete mode 100644 misc/fcitx-libpinyin/fcitx-libpinyin.SlackBuild delete mode 100644 misc/fcitx-libpinyin/fcitx-libpinyin.info delete mode 100644 misc/fcitx-libpinyin/slack-desc delete mode 100644 misc/fcitx-qt5/README delete mode 100644 misc/fcitx-qt5/fcitx-qt5.SlackBuild delete mode 100644 misc/fcitx-qt5/fcitx-qt5.info delete mode 100644 misc/fcitx-qt5/slack-desc delete mode 100644 misc/fcitx/README delete mode 100644 misc/fcitx/doinst.sh delete mode 100644 misc/fcitx/fcitx-autostart.patch delete mode 100644 misc/fcitx/fcitx.SlackBuild delete mode 100644 misc/fcitx/fcitx.info delete mode 100644 misc/fcitx/slack-desc create mode 100644 misc/gourmet/tostring-to-tobytes.patch delete mode 100644 misc/ibus-anthy/README delete mode 100644 misc/ibus-anthy/ibus-anthy.SlackBuild delete mode 100644 misc/ibus-anthy/ibus-anthy.info delete mode 100644 misc/ibus-anthy/slack-desc delete mode 100644 misc/ibus-hangul/README delete mode 100644 misc/ibus-hangul/doinst.sh delete mode 100644 misc/ibus-hangul/ibus-hangul.SlackBuild delete mode 100644 misc/ibus-hangul/ibus-hangul.info delete mode 100644 misc/ibus-hangul/slack-desc delete mode 100644 misc/ibus-unikey/README delete mode 100644 misc/ibus-unikey/gcc-6.diff delete mode 100644 misc/ibus-unikey/ibus-unikey.SlackBuild delete mode 100644 misc/ibus-unikey/ibus-unikey.info delete mode 100644 misc/ibus-unikey/slack-desc delete mode 100644 misc/ibus/README delete mode 100644 misc/ibus/doinst.sh delete mode 100644 misc/ibus/ibus-autostart delete mode 100644 misc/ibus/ibus-autostart.desktop delete mode 100644 misc/ibus/ibus.SlackBuild delete mode 100644 misc/ibus/ibus.info delete mode 100644 misc/ibus/slack-desc delete mode 100644 misc/kcm-fcitx/README delete mode 100644 misc/kcm-fcitx/doinst.sh delete mode 100644 misc/kcm-fcitx/kcm-fcitx.SlackBuild delete mode 100644 misc/kcm-fcitx/kcm-fcitx.info delete mode 100644 misc/kcm-fcitx/slack-desc delete mode 100644 misc/krename/README delete mode 100644 misc/krename/doinst.sh delete mode 100644 misc/krename/krename.SlackBuild delete mode 100644 misc/krename/krename.info delete mode 100644 misc/krename/slack-desc delete mode 100644 misc/opencc/README delete mode 100644 misc/opencc/opencc.SlackBuild delete mode 100644 misc/opencc/opencc.info delete mode 100644 misc/opencc/slack-desc create mode 100644 misc/pinfo/gcc10-stringop.diff delete mode 100644 misc/qtkeychain/README delete mode 100644 misc/qtkeychain/qtkeychain.SlackBuild delete mode 100644 misc/qtkeychain/qtkeychain.info delete mode 100644 misc/qtkeychain/slack-desc create mode 100644 misc/yapet/gcc6.patch create mode 100644 misc/ykpers/fix-boolean-value-with-json-c-0.14.patch create mode 100644 misc/zinnia/zinnia-fixes-gcc6-compile.patch create mode 100644 multimedia/aegisub/patches/boost.patch create mode 100644 multimedia/aegisub/patches/icu.patch create mode 100644 multimedia/aegisub/patches/make-4.3.patch create mode 100644 multimedia/avidemux/qt-5.15.diff create mode 100644 multimedia/bombono-dvd/patches/fix_operator_ambiguity.patch create mode 100644 multimedia/bombono-dvd/patches/fix_throw_specifications.patch create mode 100644 multimedia/ccextractor/ccextractor-0.88-fno-common.patch create mode 100644 multimedia/cinelerra/cinelerra.desktop delete mode 100644 multimedia/dvdauthor/README delete mode 100644 multimedia/dvdauthor/dvdauthor.SlackBuild delete mode 100644 multimedia/dvdauthor/dvdauthor.info delete mode 100644 multimedia/dvdauthor/slack-desc create mode 100644 multimedia/farsight2/make-4.3.patch delete mode 100644 multimedia/farstream/README delete mode 100644 multimedia/farstream/farstream.SlackBuild delete mode 100644 multimedia/farstream/farstream.info delete mode 100644 multimedia/farstream/slack-desc delete mode 100644 multimedia/ffmpeg/README delete mode 100644 multimedia/ffmpeg/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch delete mode 100644 multimedia/ffmpeg/ffmpeg-3.2.4-openjpeg2.3.patch delete mode 100644 multimedia/ffmpeg/ffmpeg.SlackBuild delete mode 100644 multimedia/ffmpeg/ffmpeg.info delete mode 100644 multimedia/ffmpeg/slack-desc delete mode 100644 multimedia/ffmpeg4/README delete mode 100644 multimedia/ffmpeg4/ffmpeg4.SlackBuild delete mode 100644 multimedia/ffmpeg4/ffmpeg4.info delete mode 100644 multimedia/ffmpeg4/slack-desc delete mode 100644 multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch delete mode 100644 multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch delete mode 100644 multimedia/gnash/patch/gcc47.patch delete mode 100644 multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch delete mode 100644 multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch delete mode 100644 multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch delete mode 100644 multimedia/gnash/patch/gnash-0.8.10-klash.patch delete mode 100644 multimedia/gnash/patch/gnash-boost.patch create mode 100644 multimedia/gpac/gpac-ffmpeg-4.0.patch delete mode 100644 multimedia/gst-libav/README delete mode 100644 multimedia/gst-libav/gst-libav.SlackBuild delete mode 100644 multimedia/gst-libav/gst-libav.info delete mode 100644 multimedia/gst-libav/slack-desc create mode 100644 multimedia/gst0-ffmpeg/orc-0.4.30.patch delete mode 100644 multimedia/gst0-plugins-bad/README delete mode 100644 multimedia/gst0-plugins-bad/drop-vpx-compat-defines.patch delete mode 100644 multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild delete mode 100644 multimedia/gst0-plugins-bad/gst0-plugins-bad.info delete mode 100644 multimedia/gst0-plugins-bad/libmodplug-include.patch delete mode 100644 multimedia/gst0-plugins-bad/slack-desc create mode 100644 multimedia/gst0-plugins-base/README create mode 100644 multimedia/gst0-plugins-base/gst0-plugins-base.SlackBuild create mode 100644 multimedia/gst0-plugins-base/gst0-plugins-base.info create mode 100644 multimedia/gst0-plugins-base/patches/00-fix-crash-0-byte-ogg.patch create mode 100644 multimedia/gst0-plugins-base/patches/01-colorbalance-fix-abi.patch create mode 100644 multimedia/gst0-plugins-base/patches/02-ayuv64-lanczos.patch create mode 100644 multimedia/gst0-plugins-base/patches/03-videoscale-fix-negotiation.patch create mode 100644 multimedia/gst0-plugins-base/patches/04-gstaudio-symbols.patch create mode 100644 multimedia/gst0-plugins-base/patches/05-enum_headers.patch create mode 100644 multimedia/gst0-plugins-base/slack-desc create mode 100644 multimedia/gst0-plugins-base/x86.patch create mode 100644 multimedia/gst0-plugins-good/README create mode 100644 multimedia/gst0-plugins-good/gst0-plugins-good.SlackBuild create mode 100644 multimedia/gst0-plugins-good/gst0-plugins-good.info create mode 100644 multimedia/gst0-plugins-good/patches/00-test-rtp-payloading.patch create mode 100644 multimedia/gst0-plugins-good/patches/01-souptest.patch create mode 100644 multimedia/gst0-plugins-good/patches/02-v4l.compile.fixes.diff create mode 100644 multimedia/gst0-plugins-good/slack-desc create mode 100644 multimedia/gstreamer0/gstreamer-0.10.36-bison3.patch create mode 100644 multimedia/gstreamer0/gstreamer0.SlackBuild create mode 100644 multimedia/gstreamer0/gstreamer0.info create mode 100644 multimedia/gstreamer0/slack-desc delete mode 100644 multimedia/kdenlive/README delete mode 100644 multimedia/kdenlive/doinst.sh delete mode 100644 multimedia/kdenlive/kdenlive.SlackBuild delete mode 100644 multimedia/kdenlive/kdenlive.info delete mode 100644 multimedia/kdenlive/slack-desc delete mode 100644 multimedia/mlt/README delete mode 100644 multimedia/mlt/doinst.sh delete mode 100644 multimedia/mlt/mlt.SlackBuild delete mode 100644 multimedia/mlt/mlt.info delete mode 100644 multimedia/mlt/slack-desc delete mode 100644 multimedia/mythtv/libvpxenc.patch create mode 100644 multimedia/transcode/transcode-1.1.7-ffmpeg4.patch create mode 100644 multimedia/transcode/transcode-1.1.7-gcc10.patch create mode 100644 multimedia/transcode/transcode-1.1.7-glibc-2.32.patch create mode 100644 multimedia/transcode/transcode-1.1.7-imagemagick7.patch create mode 100644 multimedia/tvheadend/tvheadend-4.2.8-fno-common.patch create mode 100644 multimedia/tvheadend/tvheadend-4.2.8-gcc9.patch create mode 100644 multimedia/w_scan/gcc-10.patch delete mode 100644 network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild delete mode 100644 network/NetworkManager-openvpn/NetworkManager-openvpn.info delete mode 100644 network/NetworkManager-openvpn/README delete mode 100644 network/NetworkManager-openvpn/slack-desc create mode 100644 network/bwm-ng/fix_gcc7_inline.patch delete mode 100644 network/dovecot/README delete mode 100644 network/dovecot/doinst.sh delete mode 100644 network/dovecot/dovecot.SlackBuild delete mode 100644 network/dovecot/dovecot.info delete mode 100644 network/dovecot/rc.dovecot delete mode 100644 network/dovecot/slack-desc delete mode 100644 network/dsniff/dsniff_2.4b1+debian-18.diff.gz create mode 100644 network/dsniff/patches/01_time.h.patch create mode 100644 network/dsniff/patches/02_mailsnarf_corrupt.patch create mode 100644 network/dsniff/patches/03_pcap_read_dump.patch create mode 100644 network/dsniff/patches/04_multiple_intf.patch create mode 100644 network/dsniff/patches/05_amd64_fix.patch create mode 100644 network/dsniff/patches/06_urlsnarf_zeropad.patch create mode 100644 network/dsniff/patches/07_libnet_1.1.patch create mode 100644 network/dsniff/patches/08_openssl-0.9.8.patch create mode 100644 network/dsniff/patches/09_sysconf_clocks.patch create mode 100644 network/dsniff/patches/10_urlsnarf_escape.patch create mode 100644 network/dsniff/patches/11_string_header.patch create mode 100644 network/dsniff/patches/12_arpa_inet_header.patch create mode 100644 network/dsniff/patches/13_pop_with_version.patch create mode 100644 network/dsniff/patches/14_obsolete_time.patch create mode 100644 network/dsniff/patches/15_checksum_libnids.patch create mode 100644 network/dsniff/patches/16_TDS_decoder.patch create mode 100644 network/dsniff/patches/17_checksum.patch create mode 100644 network/dsniff/patches/18_sshcrypto.patch create mode 100644 network/dsniff/patches/19_rewrite-and-modernize-POP-decoder.patch create mode 100644 network/dsniff/patches/20_debian_dirs.patch create mode 100644 network/dsniff/patches/21_msgsnarf_segfault.patch create mode 100644 network/dsniff/patches/22_handlepp.patch create mode 100644 network/dsniff/patches/23_urlsnarf_timestamp.patch create mode 100644 network/dsniff/patches/24_Fix-OpenSSL1.1.0-Build.patch create mode 100644 network/dsniff/patches/25_fix-spelling-errors.patch create mode 100644 network/dsniff/patches/26_arpspoof-add-r-switch-to-poison-both-directions.patch create mode 100644 network/dsniff/patches/27_arpspoof-allow-use-of-of-multiple-targets.patch create mode 100644 network/dsniff/patches/28_arpspoof-allow-selection-of-source-hw-address.patch create mode 100644 network/dsniff/patches/29_libnet_name2addr4.patch create mode 100644 network/dsniff/patches/30_pntohl_shift.patch create mode 100644 network/dsniff/patches/31_sysconf_clocks.patch create mode 100644 network/dsniff/patches/32_rpc_segfault.patch create mode 100644 network/dsniff/patches/33_sshcrypto_DES.patch create mode 100644 network/dsniff/patches/34_fix-parallel-FTBFS.patch create mode 100644 network/dsniff/patches/35_Add_CPPFLAGS.patch create mode 100644 network/dsniff/patches/36_implicit_declarations.patch create mode 100644 network/dsniff/patches/37_fix-lib-and-share-dirs.patch create mode 100644 network/dsniff/patches/38_fix-pcap_init.patch create mode 100644 network/dsniff/patches/39_libtirpc.patch create mode 100644 network/ekiga/ekiga-4.0.1-boost-signals2.patch create mode 100644 network/ekiga/ekiga-4.0.1-libresolv.patch delete mode 100644 network/falkon/README delete mode 100644 network/falkon/doinst.sh delete mode 100644 network/falkon/falkon.SlackBuild delete mode 100644 network/falkon/falkon.info delete mode 100644 network/falkon/slack-desc create mode 100644 network/filezilla/interface_Mainfrm_h_include_list.patch create mode 100644 network/hylafax/gcc.patch delete mode 100644 network/ifstatus/README delete mode 100644 network/ifstatus/ifstatus.SlackBuild delete mode 100644 network/ifstatus/ifstatus.info delete mode 100644 network/ifstatus/ifstatus.patch delete mode 100644 network/ifstatus/slack-desc create mode 100644 network/iperf/patches/0_iperf-2.0.8-debuginfo.patch create mode 100644 network/iperf/patches/1_iperf-2.0.8-bindfail.patch create mode 100644 network/iperf/patches/2_iperf-2.0.8-math.patch create mode 100644 network/jigdo/jigdo-0.7.3-gcc7.patch delete mode 100644 network/kmess/README delete mode 100644 network/kmess/doinst.sh delete mode 100644 network/kmess/giflib-5.0.patch delete mode 100644 network/kmess/kmess.SlackBuild delete mode 100644 network/kmess/kmess.info delete mode 100644 network/kmess/slack-desc delete mode 100644 network/konversation/README delete mode 100644 network/konversation/doinst.sh delete mode 100644 network/konversation/konversation.SlackBuild delete mode 100644 network/konversation/konversation.info delete mode 100644 network/konversation/slack-desc delete mode 100644 network/krb5/EXPORT delete mode 100644 network/krb5/README delete mode 100644 network/krb5/README.krb5 delete mode 100644 network/krb5/doinst.sh delete mode 100644 network/krb5/krb5.SlackBuild delete mode 100644 network/krb5/krb5.info delete mode 100644 network/krb5/rc.kadmind delete mode 100644 network/krb5/rc.krb5kdc delete mode 100644 network/krb5/slack-desc delete mode 100644 network/leechcraft/README delete mode 100644 network/leechcraft/doinst.sh delete mode 100644 network/leechcraft/leechcraft.SlackBuild delete mode 100644 network/leechcraft/leechcraft.info delete mode 100644 network/leechcraft/slack-desc delete mode 100644 network/museek+/README delete mode 100644 network/museek+/doinst.sh delete mode 100644 network/museek+/museek+.SlackBuild delete mode 100644 network/museek+/museek+.info delete mode 100644 network/museek+/museek-python.diff delete mode 100644 network/museek+/rc.museekd delete mode 100644 network/museek+/slack-desc delete mode 100644 network/netsurf/enable-deprecated.diff delete mode 100644 network/nghttp2/README delete mode 100644 network/nghttp2/nghttp2.SlackBuild delete mode 100644 network/nghttp2/nghttp2.info delete mode 100644 network/nghttp2/slack-desc create mode 100644 network/opendkim/openssl_1.1.0_compat.patch delete mode 100644 network/opensmtpd/fix-crash-on-authentication.patch delete mode 100644 network/opensmtpd/openbsd64-020-smtpd.patch delete mode 100644 network/opensmtpd/openbsd65-029-smptd-tls.patch delete mode 100644 network/opensmtpd/openbsd65-031-smtpd-envelope.patch delete mode 100644 network/opensmtpd/openbsd66-019-smtpd-exec.patch delete mode 100644 network/postfix/README delete mode 100644 network/postfix/doinst.sh delete mode 100644 network/postfix/patches/postconf.diff delete mode 100644 network/postfix/postfix.SlackBuild delete mode 100644 network/postfix/postfix.info delete mode 100644 network/postfix/rc.postfix delete mode 100644 network/postfix/slack-desc create mode 100644 network/quassel-qt5/quassel-0.13.1-qt5.14.patch create mode 100644 network/retroshare/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch delete mode 100644 network/s-nail/README delete mode 100644 network/s-nail/doinst.sh delete mode 100644 network/s-nail/s-nail.SlackBuild delete mode 100644 network/s-nail/s-nail.info delete mode 100644 network/s-nail/slack-desc delete mode 100644 network/seafile-client/README delete mode 100644 network/seafile-client/seafile-client.SlackBuild delete mode 100644 network/seafile-client/seafile-client.info delete mode 100644 network/seafile-client/slack-desc create mode 100644 network/seafile/README create mode 100644 network/seafile/seafile.SlackBuild create mode 100644 network/seafile/seafile.info create mode 100644 network/seafile/slack-desc delete mode 100644 network/socat/README delete mode 100644 network/socat/slack-desc delete mode 100644 network/socat/socat.SlackBuild delete mode 100644 network/socat/socat.info delete mode 100644 network/sshfs-fuse/README delete mode 100644 network/sshfs-fuse/slack-desc delete mode 100644 network/sshfs-fuse/sshfs-fuse.SlackBuild delete mode 100644 network/sshfs-fuse/sshfs-fuse.info delete mode 100644 network/sshfs-fuse/sshfs.1.gz create mode 100644 network/synergy/030_openssl.diff create mode 100644 network/transmission-remote-gtk/gcc10.patch create mode 100644 network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch create mode 100644 network/verlihub/verlihub-gcc7.patch create mode 100644 network/webalizer/gcc10.patch delete mode 100644 network/wireguard-tools/README delete mode 100644 network/wireguard-tools/slack-desc delete mode 100644 network/wireguard-tools/wireguard-tools.SlackBuild delete mode 100644 network/wireguard-tools/wireguard-tools.info create mode 100644 network/x11spice/README create mode 100644 network/x11spice/slack-desc create mode 100644 network/x11spice/x11spice.SlackBuild create mode 100644 network/x11spice/x11spice.info create mode 100644 network/x11vnc/gcc10.patch create mode 100644 office/calibre/patches/icu.patch create mode 100644 office/calibre/patches/qt-5.15.patch delete mode 100644 office/evince/shim.h create mode 100644 office/fbreader/fbreader-qt5.patch create mode 100644 office/gbgoffice/patches/12_gcc6.patch create mode 100644 office/gnokii/gnokii-0.6.31-gcc7.patch create mode 100644 office/goldendict/patches/goldendict-ffmpeg4.patch create mode 100644 office/goldendict/patches/goldendict-qt-5.11-1.patch create mode 100644 office/goldendict/patches/goldendict-qt-5.11-2.patch delete mode 100644 office/juffed/README delete mode 100644 office/juffed/doinst.sh delete mode 100644 office/juffed/juffed.SlackBuild delete mode 100644 office/juffed/juffed.info delete mode 100644 office/juffed/slack-desc create mode 100644 office/kbgoffice/gcc6.patch delete mode 100644 office/kmymoney/README delete mode 100644 office/kmymoney/doinst.sh delete mode 100644 office/kmymoney/kmymoney.SlackBuild delete mode 100644 office/kmymoney/kmymoney.info delete mode 100644 office/kmymoney/slack-desc delete mode 100644 office/pdftk/pdftk-1.44-add_custom_optflags.patch create mode 100644 office/pdftk/pdftk-2.02-use-gcc5.patch create mode 100644 office/qpdfview-qt5/qt-5.15.patch create mode 100644 office/referencer/referencer-lib_path.patch delete mode 100644 office/sc-im/README delete mode 100644 office/sc-im/sc-im.SlackBuild delete mode 100644 office/sc-im/sc-im.info delete mode 100644 office/sc-im/slack-desc create mode 100644 office/scribus/poppler-21.3.0.patch delete mode 100644 office/texlive/README delete mode 100644 office/texlive/README.tlpkg delete mode 100644 office/texlive/doinst.sh delete mode 100644 office/texlive/patches/tabu.sty.diff delete mode 100644 office/texlive/prep/texmf_get.sh delete mode 100644 office/texlive/slack-desc delete mode 100644 office/texlive/texlive.SlackBuild delete mode 100644 office/texlive/texlive.info delete mode 100644 perl/Net-SSLeay/Net-SSLeay.SlackBuild delete mode 100644 perl/Net-SSLeay/Net-SSLeay.info delete mode 100644 perl/Net-SSLeay/README delete mode 100644 perl/Net-SSLeay/slack-desc delete mode 100644 perl/perl-Authen-SASL/README delete mode 100644 perl/perl-Authen-SASL/perl-Authen-SASL.SlackBuild delete mode 100644 perl/perl-Authen-SASL/perl-Authen-SASL.info delete mode 100644 perl/perl-Authen-SASL/slack-desc create mode 100644 perl/perl-Crypt-OpenSSL-Guess/README create mode 100644 perl/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.SlackBuild create mode 100644 perl/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.info create mode 100644 perl/perl-Crypt-OpenSSL-Guess/slack-desc delete mode 100644 perl/perl-Devel-CheckLib/README delete mode 100644 perl/perl-Devel-CheckLib/perl-Devel-CheckLib.SlackBuild delete mode 100644 perl/perl-Devel-CheckLib/perl-Devel-CheckLib.info delete mode 100644 perl/perl-Devel-CheckLib/slack-desc delete mode 100644 perl/perl-IO-Socket-SSL/README delete mode 100644 perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.SlackBuild delete mode 100644 perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info delete mode 100644 perl/perl-IO-Socket-SSL/slack-desc delete mode 100644 perl/perl-Image-Magick/README delete mode 100644 perl/perl-Image-Magick/perl-Image-Magick.SlackBuild delete mode 100644 perl/perl-Image-Magick/perl-Image-Magick.info delete mode 100644 perl/perl-Image-Magick/slack-desc delete mode 100644 perl/perl-Module-Runtime/README delete mode 100644 perl/perl-Module-Runtime/perl-Module-Runtime.SlackBuild delete mode 100644 perl/perl-Module-Runtime/perl-Module-Runtime.info delete mode 100644 perl/perl-Module-Runtime/slack-desc delete mode 100644 perl/perl-Moo/README delete mode 100644 perl/perl-Moo/perl-Moo.SlackBuild delete mode 100644 perl/perl-Moo/perl-Moo.info delete mode 100644 perl/perl-Moo/slack-desc delete mode 100644 perl/perl-Path-Tiny/README delete mode 100644 perl/perl-Path-Tiny/perl-Path-Tiny.SlackBuild delete mode 100644 perl/perl-Path-Tiny/perl-Path-Tiny.info delete mode 100644 perl/perl-Path-Tiny/slack-desc create mode 100644 perl/perl-Pod-Parser/README create mode 100644 perl/perl-Pod-Parser/perl-Pod-Parser.SlackBuild create mode 100644 perl/perl-Pod-Parser/perl-Pod-Parser.info create mode 100644 perl/perl-Pod-Parser/slack-desc delete mode 100644 perl/perl-Sub-Quote/README delete mode 100644 perl/perl-Sub-Quote/perl-Sub-Quote.SlackBuild delete mode 100644 perl/perl-Sub-Quote/perl-Sub-Quote.info delete mode 100644 perl/perl-Sub-Quote/slack-desc delete mode 100644 perl/perl-Template-Toolkit/README delete mode 100644 perl/perl-Template-Toolkit/perl-Template-Toolkit.SlackBuild delete mode 100644 perl/perl-Template-Toolkit/perl-Template-Toolkit.info delete mode 100644 perl/perl-Template-Toolkit/slack-desc delete mode 100644 perl/perl-Tk-TableMatrix/pTk-1.22.patch delete mode 100644 perl/perl-libnet/README delete mode 100644 perl/perl-libnet/libnet-3.08-Do-not-create-Net-libnet.cfg.patch delete mode 100644 perl/perl-libnet/perl-libnet.SlackBuild delete mode 100644 perl/perl-libnet/perl-libnet.info delete mode 100644 perl/perl-libnet/slack-desc delete mode 100644 python/Mako/Mako.SlackBuild delete mode 100644 python/Mako/Mako.info delete mode 100644 python/Mako/README delete mode 100644 python/Mako/slack-desc delete mode 100644 python/Pygments/Pygments.SlackBuild delete mode 100644 python/Pygments/Pygments.info delete mode 100644 python/Pygments/README delete mode 100644 python/Pygments/slack-desc create mode 100644 python/css-parser/README create mode 100644 python/css-parser/css-parser.SlackBuild create mode 100644 python/css-parser/css-parser.info create mode 100644 python/css-parser/slack-desc delete mode 100644 python/dbus-python3/README delete mode 100644 python/dbus-python3/dbus-python3.SlackBuild delete mode 100644 python/dbus-python3/dbus-python3.info delete mode 100644 python/dbus-python3/slack-desc create mode 100644 python/gst-python3/fix-builds-with-python-3.8.patch delete mode 100644 python/halberd/make-pdf-manual.diff delete mode 100644 python/idna/README delete mode 100644 python/idna/idna.SlackBuild delete mode 100644 python/idna/idna.info delete mode 100644 python/idna/slack-desc delete mode 100644 python/packaging/README delete mode 100644 python/packaging/packaging.SlackBuild delete mode 100644 python/packaging/packaging.info delete mode 100644 python/packaging/slack-desc delete mode 100644 python/pip/README delete mode 100644 python/pip/pip.SlackBuild delete mode 100644 python/pip/pip.info delete mode 100644 python/pip/pip.sh delete mode 100644 python/pip/slack-desc delete mode 100644 python/ply/README delete mode 100644 python/ply/ply.SlackBuild delete mode 100644 python/ply/ply.info delete mode 100644 python/ply/slack-desc delete mode 100644 python/py3cairo/README delete mode 100644 python/py3cairo/py3cairo.SlackBuild delete mode 100644 python/py3cairo/py3cairo.info delete mode 100644 python/py3cairo/pycairo-1.10.0-waf_python_3_4-1.patch delete mode 100644 python/py3cairo/pycairo-1.10.0-waf_unpack-1.patch delete mode 100644 python/py3cairo/slack-desc delete mode 100644 python/pygobject3-python3/README delete mode 100644 python/pygobject3-python3/pygobject3-python3.SlackBuild delete mode 100644 python/pygobject3-python3/pygobject3-python3.info delete mode 100644 python/pygobject3-python3/slack-desc delete mode 100644 python/pyparsing/README delete mode 100644 python/pyparsing/pyparsing.SlackBuild delete mode 100644 python/pyparsing/pyparsing.info delete mode 100644 python/pyparsing/slack-desc delete mode 100644 python/python-certifi/README delete mode 100644 python/python-certifi/python-certifi.SlackBuild delete mode 100644 python/python-certifi/python-certifi.info delete mode 100644 python/python-certifi/slack-desc delete mode 100644 python/python-chardet/README delete mode 100644 python/python-chardet/python-chardet.SlackBuild delete mode 100644 python/python-chardet/python-chardet.info delete mode 100644 python/python-chardet/slack-desc delete mode 100644 python/python-distro/README delete mode 100644 python/python-distro/python-distro.SlackBuild delete mode 100644 python/python-distro/python-distro.info delete mode 100644 python/python-distro/slack-desc delete mode 100644 python/python-future/README delete mode 100644 python/python-future/doinst.sh delete mode 100644 python/python-future/python-future.SlackBuild delete mode 100644 python/python-future/python-future.info delete mode 100644 python/python-future/slack-desc create mode 100644 python/python-gattlib/dont_hardcode_python_versions.patch delete mode 100644 python/python-notify2/README delete mode 100644 python/python-notify2/python-notify2.SlackBuild delete mode 100644 python/python-notify2/python-notify2.info delete mode 100644 python/python-notify2/slack-desc delete mode 100644 python/python-requests/README delete mode 100644 python/python-requests/python-requests.SlackBuild delete mode 100644 python/python-requests/python-requests.info delete mode 100644 python/python-requests/slack-desc delete mode 100644 python/python-urllib3/README delete mode 100644 python/python-urllib3/python-urllib3.SlackBuild delete mode 100644 python/python-urllib3/python-urllib3.info delete mode 100644 python/python-urllib3/slack-desc delete mode 100644 python/python-xlib/setup.patch create mode 100644 python/python2-pillow/README create mode 100644 python/python2-pillow/python2-pillow.SlackBuild create mode 100644 python/python2-pillow/python2-pillow.info create mode 100644 python/python2-pillow/slack-desc delete mode 100644 python/python2-sip/README delete mode 100644 python/python2-sip/python2-sip.SlackBuild delete mode 100644 python/python2-sip/python2-sip.info delete mode 100644 python/python2-sip/slack-desc delete mode 100644 python/python3-Cython/README delete mode 100644 python/python3-Cython/python3-Cython.SlackBuild delete mode 100644 python/python3-Cython/python3-Cython.info delete mode 100644 python/python3-Cython/slack-desc delete mode 100644 python/python3-appdirs/README delete mode 100644 python/python3-appdirs/python3-appdirs.SlackBuild delete mode 100644 python/python3-appdirs/python3-appdirs.info delete mode 100644 python/python3-appdirs/slack-desc delete mode 100644 python/python3-future/README delete mode 100644 python/python3-future/doinst.sh delete mode 100644 python/python3-future/python3-future.SlackBuild delete mode 100644 python/python3-future/python3-future.info delete mode 100644 python/python3-future/slack-desc delete mode 100644 python/python3-packaging/README delete mode 100644 python/python3-packaging/python3-packaging.SlackBuild delete mode 100644 python/python3-packaging/python3-packaging.info delete mode 100644 python/python3-packaging/slack-desc delete mode 100644 python/python3-pyparsing/README delete mode 100644 python/python3-pyparsing/python3-pyparsing.SlackBuild delete mode 100644 python/python3-pyparsing/python3-pyparsing.info delete mode 100644 python/python3-pyparsing/slack-desc delete mode 100644 python/python3-sip/README delete mode 100644 python/python3-sip/python3-sip.SlackBuild delete mode 100644 python/python3-sip/python3-sip.info delete mode 100644 python/python3-sip/slack-desc delete mode 100644 python/python3-six/README delete mode 100644 python/python3-six/python3-six.SlackBuild delete mode 100644 python/python3-six/python3-six.info delete mode 100644 python/python3-six/slack-desc delete mode 100644 python/python3/README delete mode 100644 python/python3/patches/python3.no-static-library.diff delete mode 100644 python/python3/patches/python3.readline.set_pre_input_hook.diff delete mode 100644 python/python3/patches/python3.x86_64.diff delete mode 100644 python/python3/python3.SlackBuild delete mode 100644 python/python3/python3.info delete mode 100644 python/python3/slack-desc delete mode 100644 python/pyxdg/README delete mode 100644 python/pyxdg/pyxdg.SlackBuild delete mode 100644 python/pyxdg/pyxdg.info delete mode 100644 python/pyxdg/slack-desc delete mode 100644 python/six/README delete mode 100644 python/six/six.SlackBuild delete mode 100644 python/six/six.info delete mode 100644 python/six/slack-desc delete mode 100644 python/typing/README delete mode 100644 python/typing/slack-desc delete mode 100644 python/typing/typing.SlackBuild delete mode 100644 python/typing/typing.info delete mode 100644 ruby/rubygem-bundler/README delete mode 100644 ruby/rubygem-bundler/rubygem-bundler.SlackBuild delete mode 100644 ruby/rubygem-bundler/rubygem-bundler.info delete mode 100644 ruby/rubygem-bundler/slack-desc create mode 100644 system/busybox/5-busybox-dot-config.1.32.x create mode 100644 system/cdrkit/cdrkit-1.1.11-gcc10.patch delete mode 100644 system/cldr-emoji-annotation/README delete mode 100644 system/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild delete mode 100644 system/cldr-emoji-annotation/cldr-emoji-annotation.info delete mode 100644 system/cldr-emoji-annotation/slack-desc create mode 100644 system/conky/conky-1.10.6-gcc7.patch create mode 100644 system/cpulimit/glibc-2.32.patch delete mode 100644 system/dash/README delete mode 100644 system/dash/dash.SlackBuild delete mode 100644 system/dash/dash.info delete mode 100644 system/dash/slack-desc create mode 100644 system/dosbox-x/doinst.sh create mode 100644 system/dymo-cups-drivers/cups-ppd-header.patch create mode 100644 system/ecryptfs-utils/openssl.patch create mode 100644 system/extundelete/extundelete-e2fsprogs-1.44.1.patch delete mode 100644 system/f2fs_tools/README delete mode 100644 system/f2fs_tools/f2fs_tools.SlackBuild delete mode 100644 system/f2fs_tools/f2fs_tools.info delete mode 100644 system/f2fs_tools/slack-desc create mode 100644 system/foremost/gcc10.patch delete mode 100644 system/fuse3/README delete mode 100644 system/fuse3/fuse3.SlackBuild delete mode 100644 system/fuse3/fuse3.info delete mode 100644 system/fuse3/slack-desc create mode 100644 system/gnome-vfs/openssl-1.1.patch delete mode 100644 system/gnomint/patches/01-ldd.patch create mode 100644 system/gnomint/patches/01_cflags.patch delete mode 100644 system/gnomint/patches/02-cflags.patch create mode 100644 system/gnomint/patches/02_682432.patch create mode 100644 system/gnomint/patches/03_fix-autoreconf.patch create mode 100644 system/gnomint/patches/04_gsettings-port.patch create mode 100644 system/gnomint/patches/05_export-private-key-crash.patch create mode 100644 system/gnomint/patches/06_desktop-file.patch create mode 100644 system/gnomint/patches/07_spelling-errors.patch create mode 100644 system/gnomint/patches/08_gtk3-port.patch create mode 100644 system/gnomint/patches/09_gcc-10.patch delete mode 100644 system/gnomint/patches/gnutls3.patch create mode 100644 system/guefi/README create mode 100644 system/guefi/guefi.SlackBuild create mode 100644 system/guefi/guefi.info create mode 100644 system/guefi/slack-desc delete mode 100644 system/hack-font-ttf/README delete mode 100644 system/hack-font-ttf/doinst.sh delete mode 100644 system/hack-font-ttf/hack-font-ttf.SlackBuild delete mode 100644 system/hack-font-ttf/hack-font-ttf.info delete mode 100644 system/hack-font-ttf/slack-desc delete mode 100644 system/haveged/README delete mode 100644 system/haveged/doinst.sh delete mode 100644 system/haveged/haveged.SlackBuild delete mode 100644 system/haveged/haveged.info delete mode 100644 system/haveged/rc.haveged delete mode 100644 system/haveged/slack-desc delete mode 100644 system/innotop/README delete mode 100644 system/innotop/innotop.SlackBuild delete mode 100644 system/innotop/innotop.info delete mode 100644 system/innotop/slack-desc delete mode 100644 system/inxi/README delete mode 100644 system/inxi/inxi.SlackBuild delete mode 100644 system/inxi/inxi.info delete mode 100644 system/inxi/slack-desc create mode 100644 system/iscan-data/README create mode 100644 system/iscan-data/iscan-data.SlackBuild create mode 100644 system/iscan-data/iscan-data.info create mode 100644 system/iscan-data/slack-desc create mode 100644 system/iscan/README create mode 100644 system/iscan/doinst.sh create mode 100644 system/iscan/iscan.SlackBuild create mode 100644 system/iscan/iscan.info create mode 100644 system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch create mode 100644 system/iscan/patches/iscan_png15.patch create mode 100644 system/iscan/patches/jpegstream.cc.patch create mode 100644 system/iscan/slack-desc delete mode 100644 system/jmtpfs/README delete mode 100644 system/jmtpfs/jmtpfs.SlackBuild delete mode 100644 system/jmtpfs/jmtpfs.info delete mode 100644 system/jmtpfs/slack-desc delete mode 100644 system/krusader/README delete mode 100644 system/krusader/doinst.sh delete mode 100644 system/krusader/krusader.SlackBuild delete mode 100644 system/krusader/krusader.info delete mode 100644 system/krusader/slack-desc delete mode 100644 system/lbzip2/README delete mode 100644 system/lbzip2/lbzip2.SlackBuild delete mode 100644 system/lbzip2/lbzip2.info delete mode 100644 system/lbzip2/slack-desc delete mode 100644 system/lhasa/README delete mode 100644 system/lhasa/doinst.sh delete mode 100644 system/lhasa/lhasa.SlackBuild delete mode 100644 system/lhasa/lhasa.info delete mode 100644 system/lhasa/slack-desc create mode 100644 system/lxtask/fix-no-common.patch delete mode 100644 system/lz4/README delete mode 100644 system/lz4/lz4.SlackBuild delete mode 100644 system/lz4/lz4.info delete mode 100644 system/lz4/slack-desc delete mode 100644 system/man-db/README delete mode 100644 system/man-db/README.Slackware delete mode 100644 system/man-db/doinst.sh delete mode 100644 system/man-db/dont_write_in_usr.diff delete mode 100644 system/man-db/man-db.SlackBuild delete mode 100644 system/man-db/man-db.cron delete mode 100644 system/man-db/man-db.csh delete mode 100644 system/man-db/man-db.info delete mode 100644 system/man-db/man-db.sh delete mode 100644 system/man-db/man_db.conf.new.gz delete mode 100644 system/man-db/slack-desc delete mode 100644 system/mlocate/README delete mode 100644 system/mlocate/doinst.sh delete mode 100644 system/mlocate/mlocate-run-updatedb delete mode 100644 system/mlocate/mlocate.SlackBuild delete mode 100644 system/mlocate/mlocate.cron delete mode 100644 system/mlocate/mlocate.info delete mode 100644 system/mlocate/slack-desc delete mode 100644 system/mlocate/updatedb.conf.new delete mode 100644 system/noto-fonts/66-noto-mono.conf delete mode 100644 system/noto-fonts/66-noto-sans.conf delete mode 100644 system/noto-fonts/66-noto-serif.conf delete mode 100644 system/noto-fonts/README delete mode 100644 system/noto-fonts/doinst.sh delete mode 100644 system/noto-fonts/noto-fonts.SlackBuild delete mode 100644 system/noto-fonts/noto-fonts.info delete mode 100644 system/noto-fonts/slack-desc delete mode 100644 system/nss-pam-ldapd/README delete mode 100644 system/nss-pam-ldapd/doinst.sh delete mode 100644 system/nss-pam-ldapd/nss-pam-ldapd.SlackBuild delete mode 100644 system/nss-pam-ldapd/nss-pam-ldapd.info delete mode 100644 system/nss-pam-ldapd/rc.nss-pam-ldapd delete mode 100644 system/nss-pam-ldapd/slack-desc create mode 100644 system/nvidia-legacy304-kernel/4.14_kernel.patch create mode 100644 system/nvidia-legacy304-kernel/4.15_kernel.patch delete mode 100644 system/nvme-cli/README delete mode 100644 system/nvme-cli/doinst.sh delete mode 100644 system/nvme-cli/nvme-cli.SlackBuild delete mode 100644 system/nvme-cli/nvme-cli.info delete mode 100644 system/nvme-cli/slack-desc create mode 100644 system/p7zip/gcc10.patch delete mode 100644 system/parallel/README delete mode 100644 system/parallel/parallel.SlackBuild delete mode 100644 system/parallel/parallel.info delete mode 100644 system/parallel/slack-desc delete mode 100644 system/patchelf/README delete mode 100644 system/patchelf/patchelf.SlackBuild delete mode 100644 system/patchelf/patchelf.info delete mode 100644 system/patchelf/slack-desc delete mode 100644 system/percona-xtrabackup/README delete mode 100644 system/percona-xtrabackup/percona-xtrabackup.SlackBuild delete mode 100644 system/percona-xtrabackup/percona-xtrabackup.info delete mode 100644 system/percona-xtrabackup/slack-desc create mode 100644 system/qemu/linker-no-pie.patch delete mode 100644 system/qstardict/gcc4.4.patch delete mode 100644 system/qstardict/qstardict-1.0.1-glib_includes.patch delete mode 100644 system/rxvt-unicode/README delete mode 100644 system/rxvt-unicode/rxvt-unicode.SlackBuild delete mode 100644 system/rxvt-unicode/rxvt-unicode.desktop delete mode 100644 system/rxvt-unicode/rxvt-unicode.info delete mode 100644 system/rxvt-unicode/slack-desc delete mode 100644 system/rxvt-unicode/urxvt.xpm delete mode 100644 system/sbsigntools/autogen.patch delete mode 100644 system/sbsigntools/ccan_makefile.patch delete mode 100644 system/sbsigntools/fix_efi_arch.patch delete mode 100644 system/sddm/README delete mode 100644 system/sddm/consolekit.patch delete mode 100644 system/sddm/doinst.sh delete mode 100644 system/sddm/sddm.SlackBuild delete mode 100644 system/sddm/sddm.conf.new delete mode 100644 system/sddm/sddm.info delete mode 100644 system/sddm/slack-desc delete mode 100644 system/sddm/xsession.patch create mode 100644 system/spacefm/gcc10.patch create mode 100644 system/spacefm/glibc-2.28.patch delete mode 100644 system/t1utils/README delete mode 100644 system/t1utils/slack-desc delete mode 100644 system/t1utils/t1utils.SlackBuild delete mode 100644 system/t1utils/t1utils.info create mode 100644 system/ttyrec/ttyrec-1.0.8-flags.patch create mode 100644 system/ttyrec/ttyrec-1.0.8-glibc-2.30.patch delete mode 100644 system/ttyrec/ttyrec-1.0.8.RHEL5.patch delete mode 100644 system/virtualbox/virtualbox-gsoap.patch delete mode 100644 system/wacomtablet/README delete mode 100644 system/wacomtablet/slack-desc delete mode 100644 system/wacomtablet/wacomtablet.SlackBuild delete mode 100644 system/wacomtablet/wacomtablet.info create mode 100644 system/xdg-dbus-proxy/README create mode 100644 system/xdg-dbus-proxy/slack-desc create mode 100644 system/xdg-dbus-proxy/xdg-dbus-proxy.SlackBuild create mode 100644 system/xdg-dbus-proxy/xdg-dbus-proxy.info create mode 100644 system/xnp2/gcc6.patch delete mode 100644 system/yakuake/README delete mode 100644 system/yakuake/doinst.sh delete mode 100644 system/yakuake/slack-desc delete mode 100644 system/yakuake/yakuake.SlackBuild delete mode 100644 system/yakuake/yakuake.info delete mode 100644 system/zerofree/README delete mode 100644 system/zerofree/slack-desc delete mode 100644 system/zerofree/zerofree.8 delete mode 100644 system/zerofree/zerofree.SlackBuild delete mode 100644 system/zerofree/zerofree.info delete mode 100644 system/zstd/README delete mode 100644 system/zstd/slack-desc delete mode 100644 system/zstd/zstd.SlackBuild delete mode 100644 system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz delete mode 100644 system/zstd/zstd.info 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 73603623be..354a1e7e40 100644 --- a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild +++ b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild @@ -70,6 +70,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 $/a #include ' 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/artha/artha.SlackBuild b/academic/artha/artha.SlackBuild index 53eb0478d2..dbb2a3bf9c 100644 --- a/academic/artha/artha.SlackBuild +++ b/academic/artha/artha.SlackBuild @@ -5,13 +5,13 @@ # Written by Mikhail Zotov PRGNAM=artha -VERSION=${VERSION:-1.0.3} +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 @@ -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/academic/artha/artha.info b/academic/artha/artha.info index 1512888a8b..40037f5817 100644 --- a/academic/artha/artha.info +++ b/academic/artha/artha.info @@ -1,8 +1,8 @@ PRGNAM="artha" -VERSION="1.0.3" +VERSION="1.0.5" HOMEPAGE="http://artha.sourceforge.net/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/artha-1.0.3.tar.bz2" -MD5SUM="9bc69f5666a1f494e21a0a0add9ebb16" +DOWNLOAD="https://downloads.sourceforge.net/artha/artha-1.0.5.tar.bz2" +MD5SUM="a916a7a943ac676a60f03cc839b04f37" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="WordNet" 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(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 0814b7dc9e..6b3c0a762c 100644 --- a/academic/genometools/genometools.SlackBuild +++ b/academic/genometools/genometools.SlackBuild @@ -77,7 +77,7 @@ sed -i "s:lib/libgenometools:lib${LIBDIRSUFFIX}/libgenometools:g" Makefile sed -i "s:\$(prefix)/lib:\$(prefix)/lib${LIBDIRSUFFIX}:g" Makefile sed -i "s:/share/man/:/man/:g" Makefile -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=format-truncation=" \ CXXFLAGS="$SLKCFLAGS" \ make $BUILDARCH \ prefix=/usr diff --git a/academic/kile/README b/academic/kile/README deleted file mode 100644 index d083e911fe..0000000000 --- a/academic/kile/README +++ /dev/null @@ -1,4 +0,0 @@ -To build Kile, you will need a Latex distribution like TeTeX or -Tex-Live. Slackware 13.0 (and lower) include the former distribution -and it is available on the installation disk(s) if you did not do a -full install. diff --git a/academic/kile/doinst.sh b/academic/kile/doinst.sh deleted file mode 100644 index aea0f894eb..0000000000 --- a/academic/kile/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/academic/kile/kile.SlackBuild b/academic/kile/kile.SlackBuild deleted file mode 100644 index 8b054abe8f..0000000000 --- a/academic/kile/kile.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -# Slackware build script for Kile - -# Copyright 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. - -PRGNAM=kile -VERSION=${VERSION:-2.1.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 $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 {} \; - -mkdir build && cd build - cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX="$LIBDIRSUFFIX" \ - .. - 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/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog 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 -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/academic/kile/kile.info b/academic/kile/kile.info deleted file mode 100644 index edc969bd33..0000000000 --- a/academic/kile/kile.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kile" -VERSION="2.1.3" -HOMEPAGE="http://kile.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/kile/kile-2.1.3.tar.bz2" -MD5SUM="f3129e73eea21890c40781de80b44808" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/academic/kile/slack-desc b/academic/kile/slack-desc deleted file mode 100644 index a98e5da34c..0000000000 --- a/academic/kile/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------------------------------------------------------| -kile: kile (Latex editor) -kile: -kile: Kile is a user friendly TeX/LaTeX editor for the KDE -kile: desktop environment. -kile: This package is a Beta version for use with KDE 4. -kile: -kile: Homepage: http://kile.sourceforge.net/ -kile: License: GNU General Public License v2 -kile: -kile: -kile: diff --git a/academic/libqalculate/README b/academic/libqalculate/README deleted file mode 100644 index aa40e23964..0000000000 --- a/academic/libqalculate/README +++ /dev/null @@ -1,4 +0,0 @@ -Qalculate! is a multi-purpose desktop calculator for GNU/Linux (and Mac -OS). It is small and simple to use but with much power and versatility -underneath. Features include customizable functions, units, arbitrary -precision, plotting, and a user-friendly interface (GTK+ and CLI). diff --git a/academic/libqalculate/libqalculate.SlackBuild b/academic/libqalculate/libqalculate.SlackBuild deleted file mode 100644 index 9d906e36f5..0000000000 --- a/academic/libqalculate/libqalculate.SlackBuild +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -# Slackware build script for libqalculate - -# Copyright 2016-2020 Larry Hajali -# 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=libqalculate -VERSION=${VERSION:-3.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.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 \ - --disable-silent-rules \ - --enable-static=no \ - --disable-rpath \ - --enable-defs2doc \ - --with-libcurl \ - --with-icu \ - --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 {} \; - -cp -a AUTHORS ChangeLog 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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/academic/libqalculate/libqalculate.info b/academic/libqalculate/libqalculate.info deleted file mode 100644 index a2ac9c6801..0000000000 --- a/academic/libqalculate/libqalculate.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libqalculate" -VERSION="3.10.0" -HOMEPAGE="https://qalculate.github.io/" -DOWNLOAD="https://github.com/Qalculate/libqalculate/releases/download/v3.10.0/libqalculate-3.10.0.tar.gz" -MD5SUM="2f68e3dfeb36de2c88fc7078cb86ab4c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Larry Hajali" -EMAIL="larryhaja[at]gmail[dot]com" diff --git a/academic/libqalculate/slack-desc b/academic/libqalculate/slack-desc deleted file mode 100644 index 84c06b2451..0000000000 --- a/academic/libqalculate/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------------------------------------------------------| -libqalculate: libqalculate (desktop caculator library) -libqalculate: -libqalculate: Qalculate! is a multi-purpose desktop calculator for GNU/Linux (and -libqalculate: Mac OS). It is small and simple to use but with much power and -libqalculate: versatility underneath. Features include customizable functions, -libqalculate: units, arbitrary precision, plotting, and a user-friendly interface -libqalculate: (GTK+ and CLI). -libqalculate: -libqalculate: Homepage: http://qalculate.github.io/ -libqalculate: -libqalculate: 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/pulseview/pulseview.SlackBuild b/academic/pulseview/pulseview.SlackBuild index afeee1876a..65f1943ebf 100644 --- a/academic/pulseview/pulseview.SlackBuild +++ b/academic/pulseview/pulseview.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pulseview -VERSION=${VERSION:-0.4.1} +VERSION=${VERSION:-20210103_d023660} 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/academic/pulseview/pulseview.info b/academic/pulseview/pulseview.info index 631c5fefbc..29f53cc1eb 100644 --- a/academic/pulseview/pulseview.info +++ b/academic/pulseview/pulseview.info @@ -1,8 +1,8 @@ PRGNAM="pulseview" -VERSION="0.4.1" +VERSION="20210103_d023660" HOMEPAGE="https://sigrok.org/wiki/PulseView" -DOWNLOAD="https://sigrok.org/download/source/pulseview/pulseview-0.4.1.tar.gz" -MD5SUM="6056c6e42cc6eae094110cac2351558a" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/pulseview-20210103_d023660.tar.xz" +MD5SUM="b9160d5d5777d723db68b5139a4b4ea6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5 libsigrok libsigrokdecode" 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/sage/sage.SlackBuild b/academic/sage/sage.SlackBuild index 6cb41edaa4..d8f9bf7128 100644 --- a/academic/sage/sage.SlackBuild +++ b/academic/sage/sage.SlackBuild @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sage -VERSION=${VERSION:-9.1} +VERSION=${VERSION:-9.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/academic/sage/sage.info b/academic/sage/sage.info index 141f25c9ef..e90ff5d18e 100644 --- a/academic/sage/sage.info +++ b/academic/sage/sage.info @@ -1,8 +1,8 @@ PRGNAM="sage" -VERSION="9.1" +VERSION="9.2" HOMEPAGE="http://www.sagemath.org" -DOWNLOAD="http://mirrors.mit.edu/sage/src/sage-9.1.tar.gz" -MD5SUM="35e0ecbc6cc2ae4e1a68479598e70b7a" +DOWNLOAD="http://mirrors.mit.edu/sage/src/sage-9.2.tar.gz" +MD5SUM="fe61d651df8e12a0b657f8447cb622ad" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/academic/scipy3/scipy3.SlackBuild b/academic/scipy3/scipy3.SlackBuild index 22cbb37f31..bd54ad5152 100644 --- a/academic/scipy3/scipy3.SlackBuild +++ b/academic/scipy3/scipy3.SlackBuild @@ -30,7 +30,7 @@ PRGNAM="scipy3" SRCNAM="scipy" -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-1.5.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/academic/scipy3/scipy3.info b/academic/scipy3/scipy3.info index afdc113a2e..12af2fd433 100644 --- a/academic/scipy3/scipy3.info +++ b/academic/scipy3/scipy3.info @@ -1,8 +1,8 @@ PRGNAM="scipy3" -VERSION="1.1.0" +VERSION="1.5.4" HOMEPAGE="https://www.scipy.org/" -DOWNLOAD="https://github.com/scipy/scipy/releases/download/v1.1.0/scipy-1.1.0.tar.gz" -MD5SUM="aa6bcc85276b6f25e17bcfc4dede8718" +DOWNLOAD="https://github.com/scipy/scipy/releases/download/v1.5.4/scipy-1.5.4.tar.gz" +MD5SUM="293401ee7ac354a2f2313373b497f40e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="numpy3 lapack" 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(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(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 45a5a5885a..9ebc39636d 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/academic/veusz/veusz.SlackBuild b/academic/veusz/veusz.SlackBuild index b11846a622..6be6101ac4 100644 --- a/academic/veusz/veusz.SlackBuild +++ b/academic/veusz/veusz.SlackBuild @@ -69,8 +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 {} \; -PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) -export SIP_EXE=/usr/bin/python3-sip +export SIP_EXE=/usr/bin/sip3 python3 setup.py install --root $PKG 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 +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 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 + #include + #include ++#include // 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/speech-dispatcher/README b/accessibility/speech-dispatcher/README deleted file mode 100644 index c0074427a8..0000000000 --- a/accessibility/speech-dispatcher/README +++ /dev/null @@ -1,9 +0,0 @@ -Speech Dispatcher is a device independent layer for speech synthesis -that provides a common easy to use interface for both client -applications (programs that want to speak) and for software -synthesizers (programs actually able to convert text to speech). To -use Speech Dispatcher, you will also need a Software synthesizer, such -as espeak, flite (available on Slackbuilds.org), or festival (not -available on Slackbuilds.org). - -festival-freebsoft-utils is an optional dependency. diff --git a/accessibility/speech-dispatcher/doinst.sh b/accessibility/speech-dispatcher/doinst.sh deleted file mode 100644 index d99dba1aac..0000000000 --- a/accessibility/speech-dispatcher/doinst.sh +++ /dev/null @@ -1,9 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - rm $NEW - fi -} diff --git a/accessibility/speech-dispatcher/slack-desc b/accessibility/speech-dispatcher/slack-desc deleted file mode 100644 index 8f2d065439..0000000000 --- a/accessibility/speech-dispatcher/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------------------------------------------------------| -speech-dispatcher: speech-dispatcher (device independent speech synthesizer) -speech-dispatcher: -speech-dispatcher: Speech Dispatcher is a device independent layer for speech synthesis -speech-dispatcher: that provides a common easy to use interface for both client -speech-dispatcher: applications (programs that want to speak) and for software -speech-dispatcher: synthesizers (programs actually able to convert text to speech). -speech-dispatcher: -speech-dispatcher: Homepage: https://devel.freebsoft.org/speechd/ -speech-dispatcher: -speech-dispatcher: -speech-dispatcher: diff --git a/accessibility/speech-dispatcher/speech-dispatcher.SlackBuild b/accessibility/speech-dispatcher/speech-dispatcher.SlackBuild deleted file mode 100644 index 53ae6c4e76..0000000000 --- a/accessibility/speech-dispatcher/speech-dispatcher.SlackBuild +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh - -# Slackware build script for speech-dispatcher - -# Copyright 2016-2020 Edward W. Koenig, Vancouver, WA -# 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=speech-dispatcher -VERSION=${VERSION:-0.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} - -DOC_LIST="ANNOUNCE AUTHORS BUGS COPYING.* FAQ INSTALL NEWS README.* TODO" - -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 {} \; - -./build.sh - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-shared \ - --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 - -rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/*.info* - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOC_LIST $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 - echo "" >> $PKG/install/doinst.sh - - find etc/$PRGNAM -name '*.conf' -print \ - -exec sh -c "echo 'config {}.new' >> $PKG/install/doinst.sh" \; \ - -exec mv {} {}.new \; - - echo "" >> $PKG/install/doinst.sh -cd - - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/accessibility/speech-dispatcher/speech-dispatcher.info b/accessibility/speech-dispatcher/speech-dispatcher.info deleted file mode 100644 index deaa4708b5..0000000000 --- a/accessibility/speech-dispatcher/speech-dispatcher.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="speech-dispatcher" -VERSION="0.10.1" -HOMEPAGE="https://devel.freebsoft.org/speechd/" -DOWNLOAD="https://github.com/brailcom/speechd/releases/download/0.10.1/speech-dispatcher-0.10.1.tar.gz" -MD5SUM="49bc64d8517762d9c9818f5ef3d3bc42" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="dotconf python3 pyxdg" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" diff --git a/accessibility/xsel/xsel.SlackBuild b/accessibility/xsel/xsel.SlackBuild index 583fc8ea29..8aa2d58e55 100644 --- a/accessibility/xsel/xsel.SlackBuild +++ b/accessibility/xsel/xsel.SlackBuild @@ -56,7 +56,7 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ # anyone else's compiler but the specific version they use. Grr. sed -i 's,-Werror,,g' configure -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/alsamixergui/alsamixergui-0.9.0.1.2-strsignal.patch b/audio/alsamixergui/alsamixergui-0.9.0.1.2-strsignal.patch new file mode 100644 index 0000000000..cd72309f9a --- /dev/null +++ b/audio/alsamixergui/alsamixergui-0.9.0.1.2-strsignal.patch @@ -0,0 +1,13 @@ +diff --git a/src/alsamixer.cxx b/src/alsamixer.cxx +index c7fda51..0d17e21 100644 +--- a/src/alsamixer.cxx ++++ b/src/alsamixer.cxx +@@ -2081,7 +2081,7 @@ static void + mixer_signal_handler (int signal) + { + if (signal != SIGSEGV) +- mixer_abort (ERR_SIGNAL, sys_siglist[signal], 0); ++ mixer_abort (ERR_SIGNAL, strsignal(signal), 0); + else + { + fprintf (stderr, "\nSegmentation fault.\n"); diff --git a/audio/alsamixergui/alsamixergui.SlackBuild b/audio/alsamixergui/alsamixergui.SlackBuild index d7a599d26f..326ee8ac5c 100644 --- a/audio/alsamixergui/alsamixergui.SlackBuild +++ b/audio/alsamixergui/alsamixergui.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/alsamixergui-0.9.0.1.2-strsignal.patch + # Fix autotools and broken FLTK detection: zcat $CWD/alsamixergui_0.9.0rc2-1-9.1.diff.gz | patch -p1 chmod +x configure 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 -# Copyright 2011-2019 Matteo Bernardini +# Copyright 2011-2020 Matteo Bernardini # 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..e4fd4b5db0 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_420_g596cd9b0a} +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..18e86f2005 100644 --- a/audio/clementine/clementine.info +++ b/audio/clementine/clementine.info @@ -1,10 +1,10 @@ PRGNAM="clementine" -VERSION="1.4.0rc1" +VERSION="1.4.0rc1_420_g596cd9b0a" 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-420-g596cd9b0a/clementine-1.4.0rc1-420-g596cd9b0a.tar.xz" +MD5SUM="9087b85ebfd7950e4a3c89524a805764" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="chromaprint cryptopp libechonest protobuf qt5" +REQUIRES="chromaprint cryptopp protobuf qt5" MAINTAINER="Dave Woodfall" EMAIL="dave@slackbuilds.org" 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 -# Copyright 2013-2014 LEVAI Daniel -# Copyright 2017, 2020 Dominik Drobek -# 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 a5daa0a947..0000000000 --- a/audio/fluidsynth/README +++ /dev/null @@ -1,21 +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, -libinstpatch. These are autodetected at build time, but can be -disabled via the environment. - -Build options (environment variables): - -IPATCH=yes|no - libinstpatch (DLS and GIG soundfonts). Default: yes. -JACK=yes|no - JACK audio output, if present. Default: yes. -LADSPA=yes|no - LADSPA plugins, if present. Default: yes. -LASH=yes|no - LASH session management, if present. Default: yes. -OSS=yes|no - old-style OSS audio output. Default: no. -PORTAUDIO=yes|no - PortAudio audio output, if present. Default: yes. -PULSE=yes|no - PulseAudio audio output. Default: yes. -SDL2=yes|no - SDL2 audio output, if present. Default: yes. diff --git a/audio/fluidsynth/fluidsynth.SlackBuild b/audio/fluidsynth/fluidsynth.SlackBuild deleted file mode 100644 index 3fcb1f23ed..0000000000 --- a/audio/fluidsynth/fluidsynth.SlackBuild +++ /dev/null @@ -1,111 +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. - -# 20201109 bkw: update for v2.1.5, add IPATCH -# 20200404 bkw: take over maintenance, update for v2.1.1 - -PRGNAM=fluidsynth -VERSION=${VERSION:-2.1.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 {} \+ - -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-libinstpatch="${IPATCH:-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 eb6ca5c794..0000000000 --- a/audio/fluidsynth/fluidsynth.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fluidsynth" -VERSION="2.1.5" -HOMEPAGE="http://www.fluidsynth.org/" -DOWNLOAD="https://github.com/FluidSynth/fluidsynth/archive/v2.1.5/fluidsynth-2.1.5.tar.gz" -MD5SUM="45b63c843a93bd689917fadc4af65c58" -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/kid3/README b/audio/kid3/README deleted file mode 100644 index 1d8db2c536..0000000000 --- a/audio/kid3/README +++ /dev/null @@ -1,9 +0,0 @@ -If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, -MP2, Speex, TrueAudio and WavPack files (e.g. full albums) without -typing the same information again and again and have control over both -ID3v1 and ID3v2 tags, then Kid3 is the program you are looking for. - -kid3-cli for command line execution. - -libmp4v2 (for MP4 support), chromaprint (for fingerprinting detection) -and ffmpeg are optional dependencies. diff --git a/audio/kid3/doinst.sh b/audio/kid3/doinst.sh deleted file mode 100644 index 65c7e2eeb9..0000000000 --- a/audio/kid3/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/audio/kid3/kid3.SlackBuild b/audio/kid3/kid3.SlackBuild deleted file mode 100644 index 4d587c0c77..0000000000 --- a/audio/kid3/kid3.SlackBuild +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh -# Slackware build script for -# Written by Michales Michaloudes korgie@gmail.com - -PRGNAM=kid3 -VERSION=${VERSION:-3.5.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -MP4TAG=${MP4TAG:-yes} -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 - -# Autodetection of kde4 -if [ -f /usr/bin/kde4 ]; then - KDE4=";KDE" -else - KDE4="" -fi - -# Autodetection of libmp4v2 -if [ -h /usr/lib$LIBDIRSUFFIX/libmp4v2.so ]; then - MP4TAG="ON" -else - MP4TAG="OFF" -fi - -# Autodetection of chromaprint -if pkg-config --exists libchromaprint ; then - CHROMA="ON" -else - CHROMA="OFF" -fi - -# Autodetection of phonon -if pkg-config --exists phonon ; then - PHONON="ON" -else - PHONON="OFF" -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 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX:STRING=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc \ - -DINCLUDE_INSTALL_DIR=/usr/include \ - -DWITH_CHROMAPRINT="$CHROMA" \ - -DWITH_MP4V2="$MP4TAG" \ - -DWITH_APPS="Qt;CLI$KDE4" \ - -DWITH_PHONON="$PHONON" \ - -DWITH_DOCDIR="doc/$PRGNAM-$VERSION" \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -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 \ - AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -if [ -d $PKG/usr/share/man ]; then - mv $PKG/usr/share/man $PKG/usr/ -fi - -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/kid3/kid3.info b/audio/kid3/kid3.info deleted file mode 100644 index 97b10f52de..0000000000 --- a/audio/kid3/kid3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kid3" -VERSION="3.5.0" -HOMEPAGE="http://kid3.sourceforge.net/" -DOWNLOAD="http://prdownloads.sourceforge.net/kid3/kid3-3.5.0.tar.gz" -MD5SUM="83f12a3336a200f86ce85b8126d9c0ad" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="id3lib" -MAINTAINER="Michales Michaloudes" -EMAIL="korgie@gmail.com" diff --git a/audio/kid3/slack-desc b/audio/kid3/slack-desc deleted file mode 100644 index 3d7bd74226..0000000000 --- a/audio/kid3/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------------------------------------------------------| -kid3: kid3 (KDE4 ID3 Tagger) -kid3: -kid3: If you want to easily tag multiple MP3 files (e.g. full albums) -kid3: without typing the same information again and again and have control -kid3: over both ID3v1 and ID3v2 tags, then Kid3 is the program you are -kid3: looking for. -kid3: -kid3: -kid3: -kid3: -kid3: diff --git a/audio/kradio/README b/audio/kradio/README index 1d2fb5115b..0bdad04e08 100644 --- a/audio/kradio/README +++ b/audio/kradio/README @@ -2,4 +2,4 @@ KRadio is a comfortable KDE4/Linux internet and AM/FM radio application. You need to configure ALSA correctly for this to work. -Optional dependencies: lame and lirc +Optional dependency: lirc diff --git a/audio/kradio/kradio.SlackBuild b/audio/kradio/kradio.SlackBuild index 50ed5f7e92..36e402c250 100644 --- a/audio/kradio/kradio.SlackBuild +++ b/audio/kradio/kradio.SlackBuild @@ -24,14 +24,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=kradio -SRCNAM=kradio4 -VERSION=${VERSION:-4.0.8} +VERSION=${VERSION:-5.0.0_beta1} +SRCVER=$(echo $VERSION | tr _ - ) 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,9 +61,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 ${PRGNAM}5-$SRCVER +tar xvf $CWD/${PRGNAM}5-$SRCVER.tar.bz2 +cd ${PRGNAM}5-$SRCVER chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -92,7 +92,7 @@ install -m 0644 debian/*.1 $PKG/usr/man/man1 gzip -9 $PKG/usr/man/man1/*.? mkdir -p $PKG/usr/doc -mv $PKG/usr/share/doc/kradio4 $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/doc/${PRGNAM}5 $PKG/usr/doc/$PRGNAM-$VERSION rm -rf $PKG/usr/share/doc cp -a dot-lircrc.example $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/audio/kradio/kradio.info b/audio/kradio/kradio.info index b0228b91ae..348414b139 100644 --- a/audio/kradio/kradio.info +++ b/audio/kradio/kradio.info @@ -1,8 +1,8 @@ PRGNAM="kradio" -VERSION="4.0.8" +VERSION="5.0.0_beta1" HOMEPAGE="http://kradio.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/kradio/kradio4-4.0.8.tar.bz2" -MD5SUM="35915b48c15a11b7a5085cee66bcaedf" +DOWNLOAD="http://downloads.sourceforge.net/kradio/kradio5-5.0.0-beta1.tar.bz2" +MD5SUM="37cdd8275e78762a41cde2adf38e6296" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ffmpeg libmms" diff --git a/audio/lash/lash.SlackBuild b/audio/lash/lash.SlackBuild index 281ad2b76e..fb725e250d 100644 --- a/audio/lash/lash.SlackBuild +++ b/audio/lash/lash.SlackBuild @@ -80,7 +80,9 @@ if $( which texi2html >/dev/null 2>&1 ); then manual=docs/lash-manual-html-one-page/lash-manual.html fi -CFLAGS="$SLKCFLAGS" \ +export LDFLAGS="-ldl -lm -ltirpc" + +CFLAGS="$SLKCFLAGS -I/usr/include/tirpc" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/audio/lmms/lmms.SlackBuild b/audio/lmms/lmms.SlackBuild index c895d0c74a..6aeb55b098 100644 --- a/audio/lmms/lmms.SlackBuild +++ b/audio/lmms/lmms.SlackBuild @@ -7,13 +7,10 @@ # 20200415 bkw: modified by SlackBuilds.org PRGNAM=lmms -VERSION=${VERSION:-1.2.1} +VERSION=${VERSION:-1.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# 20200415 bkw: rpmalloc version -LIBVER=${LIBVER:-20190202_d9b5ee0} - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -46,23 +43,13 @@ 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 - -# 20200415 bkw: upstream didn't bother to include rpmalloc in their -# release tarball. The lmms build system is set up to expect rpmalloc -# source, not a library in e.g. /usr/lib64, so we can't just make a -# rpmalloc build and make it a depencency of lmms. Furthermore, we can't -# just use an autogenerated github tarball, as it doesn't contain the -# CMakeLists.txt required by lmms. The rpmalloc source here came from -# the rpmalloc submodule from a git clone of lmms. -cd src/3rdparty - rm -rf rpmalloc - tar xvf $CWD/rpmalloc-$LIBVER.tar.?z - # mv rpmalloc-$LIBVER rpmalloc # only need for rpmalloc releases -cd - - +rm -rf $PRGNAM +tar xvf $CWD/${PRGNAM}_$VERSION.tar.?z +cd $PRGNAM +# Fix symlink +( cd plugins/carlabase/carla/bin/carla.lv2 + rm resources + ln -s ../../resources . ) chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -80,6 +67,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ -DBASHCOMP_PKG_PATH=$PKG/usr/share/bash-completion/completions \ + -DWANT_QT5=1 \ .. make VERBOSE=1 make install DESTDIR=$PKG diff --git a/audio/lmms/lmms.info b/audio/lmms/lmms.info index 634bffd503..1ce8e69627 100644 --- a/audio/lmms/lmms.info +++ b/audio/lmms/lmms.info @@ -1,12 +1,10 @@ PRGNAM="lmms" -VERSION="1.2.1" +VERSION="1.2.2" HOMEPAGE="https://lmms.io/" -DOWNLOAD="https://github.com/LMMS/lmms/archive/v1.2.1/lmms-1.2.1.tar.gz \ - https://slackware.uk/~urchlay/src/rpmalloc-20190202_d9b5ee0.tar.xz" -MD5SUM="b669265b5c811a3ed4ed9336be2babc0 \ - c7c9f171a93af5b65b6293cb6bfcc8ee" +DOWNLOAD="https://github.com/LMMS/lmms/releases/download/v1.2.2/lmms_1.2.2.tar.xz" +MD5SUM="ca4fdbe0d24556254d196eaca68f2254" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="fltk" +REQUIRES="fltk stk" MAINTAINER="Zbigniew Baniewski" EMAIL="Zbigniew [dot] Baniewski [at] gmail [dot] com" 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 +--- 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 18a05fe4a1..0d7be9a60e 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/mp3splt-gtk/mp3splt-gtk.SlackBuild b/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild index 7a99787933..96e5bf1a02 100644 --- a/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild +++ b/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild @@ -91,7 +91,7 @@ find -L . \ patch -p1 < $CWD/default_player-r1509.diff # Disabled audacious support, upstream mp3splt-gtk does not yet support audacious-3.6 -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/audio/musepack-tools/musepack-tools-465-fno-common.patch b/audio/musepack-tools/musepack-tools-465-fno-common.patch new file mode 100644 index 0000000000..0fb9f5e5eb --- /dev/null +++ b/audio/musepack-tools/musepack-tools-465-fno-common.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/706992 +--- a/libmpcdec/requant.h ++++ b/libmpcdec/requant.h +@@ -47,9 +47,9 @@ + + + /* C O N S T A N T S */ +-const mpc_uint8_t Res_bit [18]; ///< Bits per sample for chosen quantizer +-const MPC_SAMPLE_FORMAT __Cc [1 + 18]; ///< Requantization coefficients +-const mpc_int16_t __Dc [1 + 18]; ///< Requantization offset ++extern const mpc_uint8_t Res_bit [18]; ///< Bits per sample for chosen quantizer ++extern const MPC_SAMPLE_FORMAT __Cc [1 + 18]; ///< Requantization coefficients ++extern const mpc_int16_t __Dc [1 + 18]; ///< Requantization offset + + #define Cc (__Cc + 1) + #define Dc (__Dc + 1) diff --git a/audio/musepack-tools/musepack-tools.SlackBuild b/audio/musepack-tools/musepack-tools.SlackBuild index def1358310..c68169380a 100644 --- a/audio/musepack-tools/musepack-tools.SlackBuild +++ b/audio/musepack-tools/musepack-tools.SlackBuild @@ -53,6 +53,8 @@ find -L . \ # sane defaults (hints from Gentoo) patch -p1 < $CWD/musepack-tools-475.patch +# fix building with -fno-common +patch -p1 < $CWD/musepack-tools-465-fno-common.patch mkdir -p build cd build diff --git a/audio/ncmpcpp/gcc10.patch b/audio/ncmpcpp/gcc10.patch new file mode 100644 index 0000000000..466abceecf --- /dev/null +++ b/audio/ncmpcpp/gcc10.patch @@ -0,0 +1,26 @@ +From 399e0f47008b487df3505476c959b4f42d8bc1b1 Mon Sep 17 00:00:00 2001 +From: Louis Sautier +Date: Sat, 9 May 2020 14:31:52 +0200 +Subject: [PATCH] Fix build with GCC 10 by adding missing include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes the following error: +./mpdpp.h:438:15: error: ‘runtime_error’ is not a member of ‘std’ +--- + src/mpdpp.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/mpdpp.h b/src/mpdpp.h +index a2bb79eb..abd3666c 100644 +--- a/src/mpdpp.h ++++ b/src/mpdpp.h +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + #include diff --git a/audio/ncmpcpp/ncmpcpp.SlackBuild b/audio/ncmpcpp/ncmpcpp.SlackBuild index 3bb21baf73..74bd75aaf6 100644 --- a/audio/ncmpcpp/ncmpcpp.SlackBuild +++ b/audio/ncmpcpp/ncmpcpp.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/gcc10.patch + sed -ie 's/if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))/if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4))/g' src/tags.cpp ./autogen.sh diff --git a/audio/non/non.SlackBuild b/audio/non/non.SlackBuild index 5198e64f95..93eeb6d986 100644 --- a/audio/non/non.SlackBuild +++ b/audio/non/non.SlackBuild @@ -54,6 +54,7 @@ cd $TMP rm -rf $PRGNAM-git-$VERSION tar xvf $CWD/$PRGNAM-git-$VERSION.tar.bz2 cd $PRGNAM-git-$VERSION +rm nonlib/nonlib chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/audio/ntk/ntk.SlackBuild b/audio/ntk/ntk.SlackBuild index c546364f34..12f92e8f5a 100644 --- a/audio/ntk/ntk.SlackBuild +++ b/audio/ntk/ntk.SlackBuild @@ -52,6 +52,7 @@ cd $TMP rm -rf $SRCNAM-git-$VERSION tar xvf $CWD/$SRCNAM-git-$VERSION.tar.xz cd $SRCNAM-git-$VERSION +rm nonlib/nonlib chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/audio/ocp/ocp.SlackBuild b/audio/ocp/ocp.SlackBuild index eeef8745b6..c17f48f509 100644 --- a/audio/ocp/ocp.SlackBuild +++ b/audio/ocp/ocp.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 -w -Wl,--allow-multiple-definition" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ 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 , 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 -# 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 , 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 +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 + #include + #include ++#include + #include + + #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 , Pisa, Italy +# Copyright 2012-2020 Matteo Bernardini , 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 -# 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 -# Copyright (c) 2012 Vliegendehuiskat -# Copyright (c) 2014-2016 Matteo Bernardini -# 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/README b/business/ledger/README index 18141c655e..33dbe598d7 100644 --- a/business/ledger/README +++ b/business/ledger/README @@ -1,2 +1,7 @@ Ledger is a powerful, double-entry accounting system that is accessed from the UNIX command-line. + +* IMPORTANT NOTE * +seems like utfcpp actually breaks compilation in current so be sure +to remove that package if you have installed before trying to build +ledger diff --git a/business/ledger/ledger.info b/business/ledger/ledger.info index 49666f11fc..9ab04f37db 100644 --- a/business/ledger/ledger.info +++ b/business/ledger/ledger.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/ledger/ledger/archive/v3.2.1/ledger-3.2.1.tar.gz" MD5SUM="4f82445bf8a39010e51b6367cf82c6d9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="utfcpp" +REQUIRES="" MAINTAINER="simotrone" EMAIL="simotrone@gmail.com" 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..cd0112921d 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:-20201121_81130a2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -56,13 +56,16 @@ else LIBDIRSUFFIX="" fi +gnome_shell="--disable-gnome-shell" ; [[ $(which gnome-shell) ]] && gnome_shell="" +cinnamon="--disable-cinnamon" ; [[ $(which cinnamon-session) ]] && cinnamon="" + 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 +74,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 {} \; -sh autogen.sh +sed -i "s|export-png=|export-type=png --export-filename=|" common/*/*.am || exit 1 + 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 \ + $cinnamon \ --build=$ARCH-slackware-linux make diff --git a/desktop/arc-theme/arc-theme.info b/desktop/arc-theme/arc-theme.info index e653a09f81..f3be718dc8 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="20201121_81130a2" +HOMEPAGE="https://github.com/jnsh/arc-theme" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/arc-theme-20201121_81130a2.tar.xz" +MD5SUM="bffd762770faf368ad2849534c5e3ad4" 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..f697d27e12 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/jnsh/arc-theme arc-theme: arc-theme: arc-theme: diff --git a/desktop/awesome/awesome.SlackBuild b/desktop/awesome/awesome.SlackBuild index ecd4b6c63b..3b70fa467b 100644 --- a/desktop/awesome/awesome.SlackBuild +++ b/desktop/awesome/awesome.SlackBuild @@ -72,7 +72,7 @@ find -L . \ mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -ldl" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -ldl -w -Wl,--allow-multiple-definition" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DAWESOME_MAN_PATH=/usr/man \ -DAWESOME_DOC_PATH=/usr/doc/$PRGNAM-$VERSION \ diff --git a/desktop/bspwm/bspwm.SlackBuild b/desktop/bspwm/bspwm.SlackBuild index 3dacd7706e..94669e4be8 100644 --- a/desktop/bspwm/bspwm.SlackBuild +++ b/desktop/bspwm/bspwm.SlackBuild @@ -73,7 +73,7 @@ find -L . \ sed -i "s|share/man|man|" Makefile sed -i "s|share/doc/bspwm|doc/bspwm-$VERSION|" Makefile -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ make PREFIX=/usr make PREFIX=/usr DESTDIR=$PKG install 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..01054d0e60 100644 --- a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild +++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild @@ -23,13 +23,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cairo-dock-plugins -VERSION=${VERSION:-3.3.2} +SRCNAM=cairo-dock-plug-ins +VERSION=${VERSION:-20201022_a0d3415} 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" @@ -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.gz -cd $PRGNAM-$VERSION +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 \ @@ -69,25 +70,27 @@ 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 \ - -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..64b7e384db 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="20201022_a0d3415" 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="http://ponce.cc/slackware/sources/repo/cairo-dock-plug-ins-20201022_a0d3415.tar.xz" +MD5SUM="154b87a595455b0e6d76b7f7ae58a07a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cairo-dock" diff --git a/desktop/cairo-dock/cairo-dock.SlackBuild b/desktop/cairo-dock/cairo-dock.SlackBuild index f12d52fb2d..aeb753d398 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:-20201103_0836f5d} 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,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..a2c5bcc197 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="20201103_0836f5d" 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="http://ponce.cc/slackware/sources/repo/cairo-dock-20201103_0836f5d.tar.xz" +MD5SUM="d3f40b569839ef03d4d8970e87d5a4b2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtkglext" diff --git a/desktop/catfish/README b/desktop/catfish/README index 8ae5a9634f..6568d1ef83 100644 --- a/desktop/catfish/README +++ b/desktop/catfish/README @@ -8,3 +8,6 @@ needs by using several command line options. Supported backends: find, (s)locate, doodle, tracker, beagle, strigi and pinot + +NOTE: for this to work the dependencies must be built +with python3 support (have a look at their READMEs) diff --git a/desktop/catfish/catfish.SlackBuild b/desktop/catfish/catfish.SlackBuild index 2a1a9ad252..24d5952f2a 100644 --- a/desktop/catfish/catfish.SlackBuild +++ b/desktop/catfish/catfish.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=catfish -VERSION=${VERSION:-1.4.2} +VERSION=${VERSION:-4.16.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -45,7 +45,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 . \ @@ -54,7 +54,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 {} \; -python 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 @@ -65,7 +65,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 ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING NEWS INSTALL 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/desktop/catfish/catfish.info b/desktop/catfish/catfish.info index 9dc977a3f9..17a60da155 100644 --- a/desktop/catfish/catfish.info +++ b/desktop/catfish/catfish.info @@ -1,8 +1,8 @@ PRGNAM="catfish" -VERSION="1.4.2" +VERSION="4.16.0" HOMEPAGE="http://www.twotoasts.de/index.php/catfish/" -DOWNLOAD="https://launchpad.net/catfish-search/1.4/1.4.2/+download/catfish-1.4.2.tar.gz" -MD5SUM="4166efbd6afd411a69714dde94028716" +DOWNLOAD="https://archive.xfce.org/src/apps/catfish/4.16/catfish-4.16.0.tar.bz2" +MD5SUM="9974def9a922bf23b872bd5a9037daec" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pyxdg pexpect python-distutils-extra" 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/dwm/dwm.SlackBuild b/desktop/dwm/dwm.SlackBuild index 49f2c5028e..2ccc21a802 100644 --- a/desktop/dwm/dwm.SlackBuild +++ b/desktop/dwm/dwm.SlackBuild @@ -111,9 +111,6 @@ find -L . \ # patch -p0 < $CWD/patches/$i #done -# Reverse commit to continue support for fontconfig 2.11.1 -patch -R -p1 <$CWD/sbo-patches/0001-Prepare-6.2-release.patch - ## Fix options for our compilers, ## thanks to Brenton Earl. sed -i \ diff --git a/desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch b/desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch deleted file mode 100644 index 22da3facea..0000000000 --- a/desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/drw.c b/drw.c -index c638323..8fd1ca4 100644 ---- a/drw.c -+++ b/drw.c -@@ -132,6 +132,19 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) - die("no font specified."); - } - -+ /* Do not allow using color fonts. This is a workaround for a BadLength -+ * error from Xft with color glyphs. Modelled on the Xterm workaround. See -+ * https://bugzilla.redhat.com/show_bug.cgi?id=1498269 -+ * https://lists.suckless.org/dev/1701/30932.html -+ * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349 -+ * and lots more all over the internet. -+ */ -+ FcBool iscol; -+ if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) { -+ XftFontClose(drw->dpy, xfont); -+ return NULL; -+ } -+ - font = ecalloc(1, sizeof(Fnt)); - font->xfont = xfont; - font->pattern = pattern; -@@ -200,7 +213,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) - Clr *ret; - - /* need at least two colors for a scheme */ -- if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(Clr)))) -+ if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) - return NULL; - - for (i = 0; i < clrcount; i++) -@@ -337,6 +350,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp - fcpattern = FcPatternDuplicate(drw->fonts->pattern); - FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); - FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); -+ FcPatternAddBool(fcpattern, FC_COLOR, FcFalse); - - FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); - FcDefaultSubstitute(fcpattern); - ---------------false-- - - diff --git a/desktop/elementary-xfce/README b/desktop/elementary-xfce/README deleted file mode 100644 index 83dd2c0866..0000000000 --- a/desktop/elementary-xfce/README +++ /dev/null @@ -1,5 +0,0 @@ -Elementary-Xfce is an icon theme maintained with Xfce in mind, but it -supports other desktops as well. It's a fork of the upstream Elementary -project, which took place because the team decided to drop a lot of -desktop-specific symlinks. This icon theme is supposed to keep -everything working. diff --git a/desktop/elementary-xfce/elementary-xfce.SlackBuild b/desktop/elementary-xfce/elementary-xfce.SlackBuild deleted file mode 100644 index 09bd3ecf1a..0000000000 --- a/desktop/elementary-xfce/elementary-xfce.SlackBuild +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh - -# Slackware build script for elementary-xfce - -# Written by Niki Kovacs -# Copyright 2018 Andrzej Telszewski, Szczecin -# 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=elementary-xfce -VERSION=${VERSION:-0.12} -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-$PRGNAM-$VERSION -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 {} \; - -mkdir -p $PKG/usr/share/icons -cp -a elementary-xfce{,-dark,-darker,-darkest} $PKG/usr/share/icons - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/elementary-xfce -mv $PKG/usr/share/icons/elementary-xfce/{AUTHORS,CONTRIBUTORS,LICENSE} \ - $PKG/usr/doc/$PRGNAM-$VERSION/elementary-xfce -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/elementary-xfce-dark -mv $PKG/usr/share/icons/elementary-xfce-dark/{AUTHORS,CONTRIBUTORS,LICENSE} \ - $PKG/usr/doc/$PRGNAM-$VERSION/elementary-xfce-dark -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/elementary-xfce-darker -mv $PKG/usr/share/icons/elementary-xfce-darker/{AUTHORS,CONTRIBUTORS,LICENSE} \ - $PKG/usr/doc/$PRGNAM-$VERSION/elementary-xfce-darker -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/elementary-xfce-darkest -mv $PKG/usr/share/icons/elementary-xfce-darkest/{AUTHORS,CONTRIBUTORS,LICENSE} \ - $PKG/usr/doc/$PRGNAM-$VERSION/elementary-xfce-darkest - -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/desktop/elementary-xfce/elementary-xfce.info b/desktop/elementary-xfce/elementary-xfce.info deleted file mode 100644 index 3c933c227f..0000000000 --- a/desktop/elementary-xfce/elementary-xfce.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="elementary-xfce" -VERSION="0.12" -HOMEPAGE="https://github.com/shimmerproject/elementary-xfce" -DOWNLOAD="https://github.com/shimmerproject/elementary-xfce/archive/elementary-xfce-0.12/elementary-xfce-elementary-xfce-0.12.tar.gz" -MD5SUM="1e68d2e02584325419687e8c96b0231e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Andrzej Telszewski" -EMAIL="atelszewski@gmail.com" diff --git a/desktop/elementary-xfce/slack-desc b/desktop/elementary-xfce/slack-desc deleted file mode 100644 index 2c23b7733c..0000000000 --- a/desktop/elementary-xfce/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------------------------------------------------------| -elementary-xfce: elementary-xfce (icon theme) -elementary-xfce: -elementary-xfce: Elementary-Xfce is an icon theme maintained with Xfce in mind, but it -elementary-xfce: supports other desktops as well. It's a fork of the upstream -elementary-xfce: Elementary project, which took place because the team decided to drop -elementary-xfce: a lot of desktop-specific symlinks. This icon theme is supposed to -elementary-xfce: keep everything working. -elementary-xfce: -elementary-xfce: Homepage: https://github.com/shimmerproject/elementary-xfce -elementary-xfce: -elementary-xfce: diff --git a/desktop/ffmpegthumbnailer/README b/desktop/ffmpegthumbnailer/README deleted file mode 100644 index 814e96fe45..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 -# 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/flatpak/flatpak.SlackBuild b/desktop/flatpak/flatpak.SlackBuild index f2748c9de4..87decddac6 100644 --- a/desktop/flatpak/flatpak.SlackBuild +++ b/desktop/flatpak/flatpak.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=flatpak -VERSION=${VERSION:-1.6.2} +VERSION=${VERSION:-1.8.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/flatpak/flatpak.info b/desktop/flatpak/flatpak.info index a6256b4950..71b99309d1 100644 --- a/desktop/flatpak/flatpak.info +++ b/desktop/flatpak/flatpak.info @@ -1,8 +1,8 @@ PRGNAM="flatpak" -VERSION="1.6.2" +VERSION="1.8.3" HOMEPAGE="https://flatpak.org/" -DOWNLOAD="https://github.com/flatpak/flatpak/releases/download/1.6.2/flatpak-1.6.2.tar.xz" -MD5SUM="59cd8b14f63164506e7891bba09afb97" +DOWNLOAD="https://github.com/flatpak/flatpak/releases/download/1.8.3/flatpak-1.8.3.tar.xz" +MD5SUM="e0babce042b5a630c4ba1e9c2239143d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="bubblewrap ostree appstream-glib json-glib libseccomp xdg-desktop-portal-gtk" diff --git a/desktop/gtk-theme-Greybird/README b/desktop/gtk-theme-Greybird/README deleted file mode 100644 index d9185b2e3e..0000000000 --- a/desktop/gtk-theme-Greybird/README +++ /dev/null @@ -1,5 +0,0 @@ -gtk-theme-Greybird (Desktop Suite for Xfce) - -Greybird is a Desktop Suite for Xfce. - -Optional dependencies: gtk-engines, gtk-engines-unico, murrine. diff --git a/desktop/gtk-theme-Greybird/doinst.sh b/desktop/gtk-theme-Greybird/doinst.sh deleted file mode 100644 index aea0f894eb..0000000000 --- a/desktop/gtk-theme-Greybird/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/gtk-theme-Greybird/gtk-theme-Greybird.SlackBuild b/desktop/gtk-theme-Greybird/gtk-theme-Greybird.SlackBuild deleted file mode 100644 index 5470e6eb76..0000000000 --- a/desktop/gtk-theme-Greybird/gtk-theme-Greybird.SlackBuild +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# -# Slackware build script for gtk-theme-Greybird. -# -# Copyright 2016-2017 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="gtk-theme-Greybird" -VERSION=${VERSION:-3.18.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} -CWD=$(pwd) - -set -e - -SRCNAM="Greybird" - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -mv $SRCNAM-$VERSION $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -chown -R root:root . - -mkdir -p $PKG/usr/share/themes/Greybird -cp -r gtk-* metacity-1 xfce-* xfwm4* Greybird.emerald index.theme $PKG/usr/share/themes/Greybird - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp 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/desktop/gtk-theme-Greybird/gtk-theme-Greybird.info b/desktop/gtk-theme-Greybird/gtk-theme-Greybird.info deleted file mode 100644 index 2c37b506f7..0000000000 --- a/desktop/gtk-theme-Greybird/gtk-theme-Greybird.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gtk-theme-Greybird" -VERSION="3.18.0" -HOMEPAGE="https://github.com/shimmerproject/Greybird/" -DOWNLOAD="https://github.com/shimmerproject/Greybird/archive/v3.18.0/Greybird-3.18.0.tar.gz" -MD5SUM="39396e921b047424b0dc634de7d69dc7" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Aaditya Bagga" -EMAIL="aaditya_gnulinux@zoho.com" diff --git a/desktop/gtk-theme-Greybird/slack-desc b/desktop/gtk-theme-Greybird/slack-desc deleted file mode 100644 index 01d6aac45a..0000000000 --- a/desktop/gtk-theme-Greybird/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------------------------------------------------------| -gtk-theme-Greybird: gtk-theme-Greybird (Desktop Suite for Xfce) -gtk-theme-Greybird: -gtk-theme-Greybird: Greybird is a Desktop Suite for Xfce. -gtk-theme-Greybird: -gtk-theme-Greybird: Home page: https://github.com/shimmerproject/Greybird/ -gtk-theme-Greybird: -gtk-theme-Greybird: -gtk-theme-Greybird: -gtk-theme-Greybird: -gtk-theme-Greybird: -gtk-theme-Greybird: diff --git a/desktop/i3/add_HAVE_strndup.diff b/desktop/i3/add_HAVE_strndup.diff deleted file mode 100644 index d780aec8d9..0000000000 --- a/desktop/i3/add_HAVE_strndup.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- include/libi3.h 2020-07-26 05:11:37.000000000 -0300 -+++ include/libi3.h 2020-09-20 18:15:40.063201808 -0300 -@@ -341,6 +341,8 @@ - */ - uint32_t get_colorpixel(const char *hex) __attribute__((const)); - -+#define HAVE_strndup 1 -+ - #ifndef HAVE_strndup - /** - * Taken from FreeBSD diff --git a/desktop/i3/i3.SlackBuild b/desktop/i3/i3.SlackBuild index d37335bf75..aa671ea17a 100644 --- a/desktop/i3/i3.SlackBuild +++ b/desktop/i3/i3.SlackBuild @@ -75,8 +75,6 @@ find -L . \ autoreconf -fi -cat ${CWD}/add_HAVE_strndup.diff | patch -p0 || exit - mkdir -p build ( cd build CFLAGS="$SLKCFLAGS" \ diff --git a/desktop/kde-gtk-config/README b/desktop/kde-gtk-config/README deleted file mode 100644 index 3ec12f0e2d..0000000000 --- a/desktop/kde-gtk-config/README +++ /dev/null @@ -1,9 +0,0 @@ -GTK2 and GTK3 Configurator for KDE. - -Configuration dialog to adapt GTK applications appearance to -your taste under KDE. Among its many features, it lets you: -- Choose which theme is used for GTK2 and GTK3 applications. -- Tweak some GTK applications behaviour. -- Select what icon theme to use in GTK applications. -- Select GTK applications default fonts. -- Easily browse and install new GTK2 and GTK3 themes. diff --git a/desktop/kde-gtk-config/doinst.sh b/desktop/kde-gtk-config/doinst.sh deleted file mode 100644 index 19400050fd..0000000000 --- a/desktop/kde-gtk-config/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/kde-gtk-config/gtk3proxies.diff b/desktop/kde-gtk-config/gtk3proxies.diff deleted file mode 100644 index 8d0ef483fc..0000000000 --- a/desktop/kde-gtk-config/gtk3proxies.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gtk3proxies/CMakeLists.txt 2017-03-16 20:19:44.291236607 -0400 -+++ b/gtk3proxies/CMakeLists.txt 2017-03-16 20:19:37.305236276 -0400 -@@ -2,7 +2,7 @@ - - include_directories(${GTK3_INCLUDE_DIRS}) - --add_definitions(-DDATA_DIR="\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"") -+add_definitions(-DDATA_DIR=\"${DATA_INSTALL_DIR}/kcm-gtk-module\") - - add_executable(gtk3_preview preview3.c) - target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY}) diff --git a/desktop/kde-gtk-config/gtkproxies.diff b/desktop/kde-gtk-config/gtkproxies.diff deleted file mode 100644 index 45eac7ced7..0000000000 --- a/desktop/kde-gtk-config/gtkproxies.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gtkproxies/CMakeLists.txt 2017-03-15 19:19:53.000000000 -0400 -+++ b/gtkproxies/CMakeLists.txt 2017-03-16 20:21:14.239240865 -0400 -@@ -6,7 +6,7 @@ - target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES}) - install(TARGETS reload_gtk_apps RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}") - --add_definitions(-DDATA_DIR="\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"") -+add_definitions(-DDATA_DIR=\"${DATA_INSTALL_DIR}/kcm-gtk-module\") - - add_executable(gtk_preview preview.c) - target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY}) diff --git a/desktop/kde-gtk-config/kde-gtk-config.SlackBuild b/desktop/kde-gtk-config/kde-gtk-config.SlackBuild deleted file mode 100644 index 46747081c7..0000000000 --- a/desktop/kde-gtk-config/kde-gtk-config.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -# Slackware build script for kde-gtk-config - -# Copyright 2017 Daniel Prosser | Lexington Park, MD -# All rights reserved. -# -# Originally by Luis Henrique -# and Ryan P.C. McQuen - -# 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 2 of the License, or -# (at your option) any later version, with the following exception: -# the text of the GPL license may be omitted. - -# 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. Compiling, -# interpreting, executing or merely reading the text of the program -# may result in lapses of consciousness and/or very being, up to and -# including the end of all existence and the Universe as we know it. -# See the GNU General Public License for more details. - -# You may have received a copy of the GNU General Public License along -# with this program (most likely, a file named COPYING). If not, see -# . - -PRGNAM=kde-gtk-config -VERSION=${VERSION:-2.2_git} -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 -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -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 {} \; - -# Patch some errors in cmake files to fix gtk_preview and gtk3_preview -patch -p1 < $CWD/gtkproxies.diff -patch -p1 < $CWD/gtk3proxies.diff - -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 ChangeLog 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 -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/kde-gtk-config/kde-gtk-config.info b/desktop/kde-gtk-config/kde-gtk-config.info deleted file mode 100644 index 6e59a1bbc0..0000000000 --- a/desktop/kde-gtk-config/kde-gtk-config.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kde-gtk-config" -VERSION="2.2_git" -HOMEPAGE="https://projects.kde.org/kde-gtk-config" -DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/kde-gtk-config/kde-gtk-config-2.2_git.tar.gz" -MD5SUM="cabcba1af684f092c5e1cebb86be7c58" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Daniel Prosser" -EMAIL="dpross1100@msn.com" diff --git a/desktop/kde-gtk-config/slack-desc b/desktop/kde-gtk-config/slack-desc deleted file mode 100644 index 002197d8b8..0000000000 --- a/desktop/kde-gtk-config/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------------------------------------------------------| -kde-gtk-config: kde-gtk-config (GTK2 and GTK3 Configurator for KDE) -kde-gtk-config: -kde-gtk-config: Configuration dialog to adapt GTK applications appearance to -kde-gtk-config: your taste under KDE. Among its many features, it lets you: -kde-gtk-config: - Choose which theme is used for GTK2 and GTK3 applications. -kde-gtk-config: - Tweak some GTK applications behaviour. -kde-gtk-config: - Select what icon theme to use in GTK applications. -kde-gtk-config: - Select GTK applications default fonts. -kde-gtk-config: - Easily browse and install new GTK2 and GTK3 themes. -kde-gtk-config: -kde-gtk-config: homepage: https://projects.kde.org/kde-gtk-config diff --git a/desktop/libqtxdg/libqtxdg.SlackBuild b/desktop/libqtxdg/libqtxdg.SlackBuild index 6bb31cc848..8c852d5c00 100644 --- a/desktop/libqtxdg/libqtxdg.SlackBuild +++ b/desktop/libqtxdg/libqtxdg.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libqtxdg -VERSION=${VERSION:-3.2.0} +VERSION=${VERSION:-3.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/libqtxdg/libqtxdg.info b/desktop/libqtxdg/libqtxdg.info index b97ae20872..b7b9c9ab79 100644 --- a/desktop/libqtxdg/libqtxdg.info +++ b/desktop/libqtxdg/libqtxdg.info @@ -1,10 +1,10 @@ PRGNAM="libqtxdg" -VERSION="3.2.0" -HOMEPAGE="https://lxqt.org/" -DOWNLOAD="https://downloads.lxqt.org/downloads/libqtxdg/3.2.0/libqtxdg-3.2.0.tar.xz" -MD5SUM="8a01a31ad7a92ae44dc4d4b1127ae43f" +VERSION="3.6.0" +HOMEPAGE="https://lxqt.org" +DOWNLOAD="https://github.com/lxqt/libqtxdg/releases/download/3.6.0/libqtxdg-3.6.0.tar.xz" +MD5SUM="36e74199662e706ec5b54b5887830e23" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="qt5" +REQUIRES="lxqt-build-tools" MAINTAINER="Egor Zayats" EMAIL="ea.zayac@gmail.com" diff --git a/desktop/libqtxdg/slack-desc b/desktop/libqtxdg/slack-desc index 278acf3cd4..eab3da3457 100644 --- a/desktop/libqtxdg/slack-desc +++ b/desktop/libqtxdg/slack-desc @@ -11,7 +11,7 @@ libqtxdg: libqtxdg: libqtxdg is a Qt 5 implementation of freedesktop.org XDG libqtxdg: specifications. libqtxdg: -libqtxdg: +libqtxdg: homepage: https://lxqt.org libqtxdg: libqtxdg: libqtxdg: 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/materia-theme/README b/desktop/materia-theme/README index 55dac77726..f3b1f169da 100644 --- a/desktop/materia-theme/README +++ b/desktop/materia-theme/README @@ -1,6 +1,3 @@ Materia (formerly Flat-Plat) is a Material Design theme for GNOME/GTK+ based desktop environments. It supports GTK+ 3, GTK+ 2, GNOME Shell, Budgie, Cinnamon, MATE, Unity, LightDM, GDM, Chrome theme, etc. - -Note: this is not the latest version but the last one supporting - GTK+ 3.18 and therefore suitable for Slackware 14.2 diff --git a/desktop/materia-theme/materia-theme.SlackBuild b/desktop/materia-theme/materia-theme.SlackBuild index 5330170ef8..46feb5c06a 100644 --- a/desktop/materia-theme/materia-theme.SlackBuild +++ b/desktop/materia-theme/materia-theme.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for materia-theme -# Copyright 2018 Leonardo Citrolo, Italy +# Copyright 2018-2020 Leonardo Citrolo, 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=materia-theme -VERSION=${VERSION:-20180928} +VERSION=${VERSION:-20200916} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -50,11 +50,8 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; mkdir -p $PKG/usr/share/themes - ./install.sh --dest $PKG/usr/share/themes -find -L $PKG/usr/share/themes -type f -name index.theme -exec chmod 644 {} \; - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING HACKING.md README.md TODO.md \ $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/desktop/materia-theme/materia-theme.info b/desktop/materia-theme/materia-theme.info index 4590ccf1d3..85c27f5a4b 100644 --- a/desktop/materia-theme/materia-theme.info +++ b/desktop/materia-theme/materia-theme.info @@ -1,8 +1,8 @@ PRGNAM="materia-theme" -VERSION="20180928" +VERSION="20200916" HOMEPAGE="https://github.com/nana-4/materia-theme" -DOWNLOAD="https://github.com/nana-4/materia-theme/archive/v20180928/materia-theme-20180928.tar.gz" -MD5SUM="b794dc86b0c68daf336c0e8308007eaa" +DOWNLOAD="https://github.com/nana-4/materia-theme/archive/v20200916/materia-theme-20200916.tar.gz" +MD5SUM="c9c9f2851c9677879801a7e04b8d3643" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="murrine" diff --git a/desktop/mousepad/README b/desktop/mousepad/README deleted file mode 100644 index ec574e9a54..0000000000 --- a/desktop/mousepad/README +++ /dev/null @@ -1,6 +0,0 @@ -Mousepad is a simple, fast and easy-to-use text editor for the Xfce -desktop environment, based on the Leafpad text editor. - -Mousepad includes complete support for UTF-8 text, the usual -cut/copy/paste functionality, font selection support, the possibility -to display line numbers, drag and drop and printing support. diff --git a/desktop/mousepad/doinst.sh b/desktop/mousepad/doinst.sh deleted file mode 100644 index 401d987795..0000000000 --- a/desktop/mousepad/doinst.sh +++ /dev/null @@ -1,15 +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/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/desktop/mousepad/mousepad.SlackBuild b/desktop/mousepad/mousepad.SlackBuild deleted file mode 100644 index 66df980dbb..0000000000 --- a/desktop/mousepad/mousepad.SlackBuild +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -# Slackware build script for mousepad - -# Copyright 2014-2018 Aaditya Bagga -# 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=mousepad -VERSION=${VERSION:-0.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 - -DOCS="AUTHORS COPYING INSTALL NEWS README" - -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-debug=minimum \ - --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 -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/mousepad/mousepad.info b/desktop/mousepad/mousepad.info deleted file mode 100644 index 5b01f4a958..0000000000 --- a/desktop/mousepad/mousepad.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mousepad" -VERSION="0.4.1" -HOMEPAGE="https://git.xfce.org/apps/mousepad/about/" -DOWNLOAD="https://archive.xfce.org/src/apps/mousepad/0.4/mousepad-0.4.1.tar.bz2" -MD5SUM="fb85c23bcb096a46aee9ec22b4e4fdf5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gtksourceview3" -MAINTAINER="Aaditya Bagga" -EMAIL="aaditya_gnulinux@zoho.com" diff --git a/desktop/mousepad/slack-desc b/desktop/mousepad/slack-desc deleted file mode 100644 index 00f50f69f1..0000000000 --- a/desktop/mousepad/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------------------------------------------------------| -mousepad: mousepad (simple text editor) -mousepad: -mousepad: Mousepad is a simple, fast and easy-to-use text editor -mousepad: for the Xfce desktop environment, based on the Leafpad text editor. -mousepad: -mousepad: Mousepad includes complete support for UTF-8 text, -mousepad: the usual cut/copy/paste functionality, font selection support, etc. -mousepad: -mousepad: Website: https://git.xfce.org/apps/mousepad/about/ -mousepad: -mousepad: 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/papirus-icon-theme/papirus-icon-theme.SlackBuild b/desktop/papirus-icon-theme/papirus-icon-theme.SlackBuild index 1cbf14b5a1..bc3998483a 100644 --- a/desktop/papirus-icon-theme/papirus-icon-theme.SlackBuild +++ b/desktop/papirus-icon-theme/papirus-icon-theme.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=papirus-icon-theme -VERSION=${VERSION:-20180311} +VERSION=${VERSION:-20201031} 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 {} \; -THEMES=$(sed -ne '/^THEMES=/s/.*:-\([^}]*\)}.*/\1/p' install.sh) +THEMES=$(grep \{ICON_THEMES install.sh | cut -d= -f2 | cut -d} -f1) mkdir -p $PKG/usr/share/icons for theme in $THEMES; do diff --git a/desktop/papirus-icon-theme/papirus-icon-theme.info b/desktop/papirus-icon-theme/papirus-icon-theme.info index 8e6677c52f..70ab06556e 100644 --- a/desktop/papirus-icon-theme/papirus-icon-theme.info +++ b/desktop/papirus-icon-theme/papirus-icon-theme.info @@ -1,8 +1,8 @@ PRGNAM="papirus-icon-theme" -VERSION="20180311" +VERSION="20201031" HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme" -DOWNLOAD="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20180311/papirus-icon-theme-20180311.tar.gz" -MD5SUM="1314232bc80f3952bf18a72214dce7a2" +DOWNLOAD="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20201031/papirus-icon-theme-20201031.tar.gz" +MD5SUM="c879de9fbc29ee1f35597e9440ba7396" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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/picom/doinst.sh b/desktop/picom/doinst.sh new file mode 100644 index 0000000000..65c7e2eeb9 --- /dev/null +++ b/desktop/picom/doinst.sh @@ -0,0 +1,9 @@ +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/desktop/picom/picom.SlackBuild b/desktop/picom/picom.SlackBuild new file mode 100644 index 0000000000..7a79d2e895 --- /dev/null +++ b/desktop/picom/picom.SlackBuild @@ -0,0 +1,94 @@ +#!/bin/sh + +# Slackware build script for picom + +# Copyright 2020 Matteo Bernardini , 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:-8.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.?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..780f08e9e3 --- /dev/null +++ b/desktop/picom/picom.info @@ -0,0 +1,10 @@ +PRGNAM="picom" +VERSION="8.2" +HOMEPAGE="https://github.com/yshui/picom/" +DOWNLOAD="https://github.com/yshui/picom/archive/v8.2/picom-8.2.tar.gz" +MD5SUM="f27ecdf8e13388a021659e38d1dae899" +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 +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/q4wine/q4wine.SlackBuild b/desktop/q4wine/q4wine.SlackBuild index fdd4ff4946..1aa4a6b89a 100644 --- a/desktop/q4wine/q4wine.SlackBuild +++ b/desktop/q4wine/q4wine.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=q4wine -VERSION=${VERSION:-1.3} +VERSION=${VERSION:-1.3.12} 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 @@ -43,8 +43,8 @@ OUTPUT=${OUTPUT:-/tmp} # Leave this here for now - it is needed if we use an -rc version. SRCVERSION=$(echo $VERSION | tr _ -) -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" @@ -67,10 +67,10 @@ tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.?z* cd $PRGNAM-$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 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 @@ -83,9 +83,9 @@ mkdir build make make install DESTDIR=$PKG -) || exit +) || exit 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 # Move man pages in to the correct place and compress them. diff --git a/desktop/q4wine/q4wine.info b/desktop/q4wine/q4wine.info index 2bf4b18352..1ebd41c85d 100644 --- a/desktop/q4wine/q4wine.info +++ b/desktop/q4wine/q4wine.info @@ -1,8 +1,8 @@ PRGNAM="q4wine" -VERSION="1.3" +VERSION="1.3.12" HOMEPAGE="https://sourceforge.net/projects/q4wine/" -DOWNLOAD="http://downloads.sourceforge.net/q4wine/q4wine-1.3.tar.bz2" -MD5SUM="3290726d2423e28cef0354774ea3a17b" +DOWNLOAD="http://downloads.sourceforge.net/q4wine/q4wine-1.3.12.tar.bz2" +MD5SUM="632dea3d1314850437d3f4f7b8e89ef5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="icoutils fuseiso" 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 + ++#ifdef HAVE_MAGICK_API_H ++#ifdef HAVE_WAND_MAGICK_WAND_H + #include + #include ++#endif /* HAVE_WAND_MAGICK_WAND_H */ ++#endif /* HAVE_MAGICK_API_H */ ++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H ++#ifdef HAVE_MAGICKWAND_MAGICKWAND_H ++#include ++#include ++#endif /* HAVE_MAGICKWAND_MAGICKWAND_H */ ++#endif /* HAVE_MAGICKCORE_MAGICKCORE_H */ ++ + #include + #include + #include +@@ -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 + #include ++#endif /* HAVE_WAND_MAGICK_WAND_H */ ++#endif /* HAVE_MAGICK_API_H */ ++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H ++#ifdef HAVE_MAGICKWAND_MAGICKWAND_H ++#include ++#include ++#endif /* HAVE_MAGICKWAND_MAGICKWAND_H */ ++#endif /* HAVE_MAGICKCORE_MAGICKCORE_H */ ++ + #include + #include + #include +@@ -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..f528db955f 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") \ @@ -94,7 +96,6 @@ RSS_LIST="biof busyspheres colorfire cyclone drempels euphoria feedback fieldlin for RSS in $RSS_LIST ; do mv $PKG/usr/share/xscreensaver/config/${RSS}.xml $PKG/usr/share/xscreensaver/config/rss-${RSS}.xml sed -i "s/$RSS/rss-$RSS/g" $PKG/usr/share/xscreensaver/config/rss-${RSS}.xml - sed -i "s/$RSS/rss-$RSS/g" $PKG/usr/share/kde4/services/ScreenSavers/${RSS}.desktop sed -i "s/$RSS/rss-$RSS/g" $PKG/usr/bin/rss-glx_install.pl done 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 + #include +-#include + #include + #include + ++#include ++ + 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 dist(std::numeric_limits().min() + 1000000UL, ++ std::numeric_limits().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 +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 dist(std::numeric_limits().min() + 1000000UL, +- std::numeric_limits().max()); ++ std::uniform_int_distribution dist(std::numeric_limits().min() + 1000000UL, ++ std::numeric_limits().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 , Pisa, Italy +# Copyright 2012-2019 Matteo Bernardini , 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-client/README b/desktop/seafile-client/README new file mode 100644 index 0000000000..94ced6564e --- /dev/null +++ b/desktop/seafile-client/README @@ -0,0 +1,12 @@ +Graphical desktop client for the Seafile next-generation open +source cloud storage system with advanced support for file syncing, +privacy protection and teamwork. + +Collections of files are called libraries, and each library can be +synced separately. A library can be encrypted with a user chosen +password. This password is not stored on the server, so even the +server admin cannot view a file's contents. + +Seafile allows users to create groups with file syncing, wiki, and +discussion to enable easy collaboration around documents within a +team. diff --git a/desktop/seafile-client/doinst.sh b/desktop/seafile-client/doinst.sh new file mode 100644 index 0000000000..65c7e2eeb9 --- /dev/null +++ b/desktop/seafile-client/doinst.sh @@ -0,0 +1,9 @@ +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/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 +# 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/README b/desktop/seafile-gui/README deleted file mode 100644 index 94ced6564e..0000000000 --- a/desktop/seafile-gui/README +++ /dev/null @@ -1,12 +0,0 @@ -Graphical desktop client for the Seafile next-generation open -source cloud storage system with advanced support for file syncing, -privacy protection and teamwork. - -Collections of files are called libraries, and each library can be -synced separately. A library can be encrypted with a user chosen -password. This password is not stored on the server, so even the -server admin cannot view a file's contents. - -Seafile allows users to create groups with file syncing, wiki, and -discussion to enable easy collaboration around documents within a -team. diff --git a/desktop/seafile-gui/doinst.sh b/desktop/seafile-gui/doinst.sh deleted file mode 100644 index 65c7e2eeb9..0000000000 --- a/desktop/seafile-gui/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/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 -# 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 6d78559a71..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 498cc54261..0000000000 --- a/desktop/ssr/ssr.SlackBuild +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh - -# SlackBuild script for ssr - -# Copyright 2014-2021 Benjamin Trigona-Harany -# 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.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 -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 8efda9a0ef..0000000000 --- a/desktop/ssr/ssr.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ssr" -VERSION="0.4.3" -HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/" -DOWNLOAD="https://github.com/MaartenBaert/ssr/archive/0.4.3/ssr-0.4.3.tar.gz" -MD5SUM="3f8337db93f5a6a3f64525e7249815d6" -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 , 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 7da19c3132..0000000000 --- a/desktop/thunar-dropbox/README +++ /dev/null @@ -1,2 +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 -# 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/vertex-theme/README b/desktop/vertex-theme/README deleted file mode 100644 index 3d59ac17fe..0000000000 --- a/desktop/vertex-theme/README +++ /dev/null @@ -1,6 +0,0 @@ -Vertex is a theme for GTK 3, GTK 2, Gnome-Shell and Cinnamon. -It supports GTK 3 and GTK 2 based desktop environments like Gnome, -Cinnamon, Mate, XFCE, Budgie, Pantheon, etc. -Themes for Chrome/Chromium and Firefox browser are included, too. -The theme comes with three variants to choose from: the default -variant with dark header-bars, a light variant, and a dark variant. diff --git a/desktop/vertex-theme/slack-desc b/desktop/vertex-theme/slack-desc deleted file mode 100644 index a949ef7561..0000000000 --- a/desktop/vertex-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------------------------------------------------------| -vertex-theme: vertex-theme (theme for GTK 3, GTK 2, Gnome-Shell and Cinnamon) -vertex-theme: -vertex-theme: Vertex is a theme for GTK 3, GTK 2, Gnome-Shell and Cinnamon. -vertex-theme: It supports GTK 3 and GTK 2 based desktop environments like Gnome, -vertex-theme: Cinnamon, Mate, XFCE, Budgie, Pantheon, etc. -vertex-theme: Themes for Chrome/Chromium and Firefox browser are included, too. -vertex-theme: The theme comes with three variants to choose from: the default -vertex-theme: variant with dark header-bars, a light variant, and a dark variant. -vertex-theme: -vertex-theme: Homepage: https://github.com/horst3180/vertex-theme -vertex-theme: diff --git a/desktop/vertex-theme/vertex-theme.SlackBuild b/desktop/vertex-theme/vertex-theme.SlackBuild deleted file mode 100644 index b3bcf7277e..0000000000 --- a/desktop/vertex-theme/vertex-theme.SlackBuild +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -# Slackware build script for vertex-theme - -# Copyright 2018 Leonardo Citrolo, 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=vertex-theme -VERSION=${VERSION:-20170128} -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 {} \; - -./autogen.sh --prefix=/usr -make -make install DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING HACKING.md 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/desktop/vertex-theme/vertex-theme.info b/desktop/vertex-theme/vertex-theme.info deleted file mode 100644 index 9940c366bc..0000000000 --- a/desktop/vertex-theme/vertex-theme.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="vertex-theme" -VERSION="20170128" -HOMEPAGE="https://github.com/horst3180/vertex-theme" -DOWNLOAD="https://github.com/horst3180/vertex-theme/archive/20170128/vertex-theme-20170128.tar.gz" -MD5SUM="47b6a180620bf5da7f502d514b3c3300" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="murrine" -MAINTAINER="Leo C." -EMAIL="leoc@gmx.com" 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 49412fa858..390aa05e91 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. @@ -18,86 +10,3 @@ 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. - -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. diff --git a/desktop/weston/README.SBo b/desktop/weston/README.SBo new file mode 100644 index 0000000000..b7a939af79 --- /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 9.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 - #include --#include - - #ifdef HAVE_SYSTEMD_LOGIN - #include -@@ -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..02aaf48a3a 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:-9.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..332af5663f 100644 --- a/desktop/weston/weston.info +++ b/desktop/weston/weston.info @@ -1,10 +1,10 @@ PRGNAM="weston" -VERSION="7.0.0" +VERSION="9.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/9.0.0/weston-9.0.0.tar.gz" +MD5SUM="6c1cd2986d3d0782701d213e302b96e8" 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/patches/patch-configure b/desktop/wmakerconf/patches/patch-configure new file mode 100644 index 0000000000..c7dcb3cc6a --- /dev/null +++ b/desktop/wmakerconf/patches/patch-configure @@ -0,0 +1,38 @@ +--- configure.orig 2007-04-12 10:52:31 UTC ++++ configure +@@ -3458,7 +3458,7 @@ fi + libwmfun="no" + # Checks for wraster lib + # Extract the first word of "get-wings-flags", so it can be a program name with args. +-set dummy get-wings-flags; ac_word=$2 ++set dummy pkg-config; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_wraster+set}" = set; then +@@ -3486,7 +3486,7 @@ done + ;; + esac + fi +-wraster=$ac_cv_path_wraster ++wraster="$ac_cv_path_wraster wrlib" + + if test -n "$wraster"; then + echo "$as_me:$LINENO: result: $wraster" >&5 +@@ -3497,7 +3497,7 @@ echo "${ECHO_T}no" >&6 + fi + + if test -n "$wraster"; then +- WRASTERLIBS=`($wraster --ldflags --libs 2>/dev/null || $wraster --lflags --libs) | xargs` ++ WRASTERLIBS=`$wraster --libs` + WRASTERINCLUDES=`$wraster --cflags` + MKPREVIEW="mkpreview" + OLD_LDFLAGS="$LDFLAGS" +@@ -5818,7 +5818,7 @@ echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 +- for ac_prog in lynx wget ++ for ac_prog in lynx fetch + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 diff --git a/desktop/wmakerconf/patches/patch-scripts__wget.pl b/desktop/wmakerconf/patches/patch-scripts__wget.pl new file mode 100644 index 0000000000..1956f065fd --- /dev/null +++ b/desktop/wmakerconf/patches/patch-scripts__wget.pl @@ -0,0 +1,9 @@ +--- scripts/wget.pl.orig Mon Jan 26 07:20:31 2004 ++++ scripts/wget.pl Wed Jun 2 01:56:42 2004 +@@ -1,5 +1,5 @@ + quit ("Wget not installed") if $wwwget eq ""; + +-$rc = system ("$wwwget --quiet -c --tries=0 -O$tmpfile '$url'"); ++$rc = system ("$wwwget --q -o $tmpfile '$url'"); + + quit ("HTTP response error.") if $rc; diff --git a/desktop/wmakerconf/patches/patch-src_menu.c b/desktop/wmakerconf/patches/patch-src_menu.c new file mode 100644 index 0000000000..99eb03f14b --- /dev/null +++ b/desktop/wmakerconf/patches/patch-src_menu.c @@ -0,0 +1,15 @@ +--- src/menu.c.orig 2004-12-05 04:19:25.000000000 +0100 ++++ src/menu.c 2020-12-19 10:50:15.292392000 +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 --git a/desktop/wmakerconf/patches/patch-src_misc.c b/desktop/wmakerconf/patches/patch-src_misc.c new file mode 100644 index 0000000000..a83094e9b0 --- /dev/null +++ b/desktop/wmakerconf/patches/patch-src_misc.c @@ -0,0 +1,14 @@ +--- src/misc.c.orig 2004-12-05 01:49:32 UTC ++++ src/misc.c +@@ -482,9 +482,9 @@ copy_file (const char *dst, const char *src) + if (dir) /* directory is destination */ + { + closedir (dir); +- if (streq (dst, g_dirname (src))) ++ if (streq (dst, g_path_get_dirname (src))) + return 0; +- dst_name = g_strconcat (dst, "/", g_basename (src), NULL); ++ dst_name = g_strconcat (dst, "/", g_path_get_basename (src), NULL); + } + else + dst_name = g_strdup (dst); diff --git a/desktop/wmakerconf/patches/patch-src_previews.c b/desktop/wmakerconf/patches/patch-src_previews.c new file mode 100644 index 0000000000..19a949b906 --- /dev/null +++ b/desktop/wmakerconf/patches/patch-src_previews.c @@ -0,0 +1,20 @@ +--- src/previews.c.orig 2004-12-07 00:37:10 UTC ++++ src/previews.c +@@ -326,7 +326,7 @@ make_preview (GtkWidget *entry, char *name) + Free (pname); + } + +- gtk_tooltips_set_tip (tooltips, data->button, g_basename (name), NULL); ++ gtk_tooltips_set_tip (tooltips, data->button, g_path_get_basename (name), NULL); + gtk_container_set_border_width (GTK_CONTAINER (data->button), 2); + gtk_container_add (GTK_CONTAINER (data->button), pixmap); + gtk_widget_show_all (data->button); +@@ -344,7 +344,7 @@ set_selection (GtkWidget *widget, GdkEventButton *even + GtkWidget *entry = gtk_object_get_user_data (GTK_OBJECT (pixmap)); + previewdata_t *data = (previewdata_t *) ptr; + +- gtk_entry_set_text (GTK_ENTRY (entry), g_basename (data->name)); ++ gtk_entry_set_text (GTK_ENTRY (entry), g_path_get_basename (data->name)); + + if (event->type == GDK_2BUTTON_PRESS) + gtk_signal_emit_by_name (GTK_OBJECT (ok_button), "clicked"); diff --git a/desktop/wmakerconf/patches/patch-src_rootmenu.c b/desktop/wmakerconf/patches/patch-src_rootmenu.c new file mode 100644 index 0000000000..ecfd417b8f --- /dev/null +++ b/desktop/wmakerconf/patches/patch-src_rootmenu.c @@ -0,0 +1,11 @@ +--- src/rootmenu.c.orig 2005-02-26 15:31:26.000000000 +0100 ++++ src/rootmenu.c 2020-12-19 11:01:13.863392000 +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 --git a/desktop/wmakerconf/patches/patch-src_themebrowser.c b/desktop/wmakerconf/patches/patch-src_themebrowser.c new file mode 100644 index 0000000000..be409657b4 --- /dev/null +++ b/desktop/wmakerconf/patches/patch-src_themebrowser.c @@ -0,0 +1,50 @@ +--- src/themebrowser.c.orig 2007-04-12 10:38:44 UTC ++++ src/themebrowser.c +@@ -917,7 +917,7 @@ append_directory (const char *dirname, GtkCTree *tree, + GtkCTreeNode *rootsibling = NULL; + + if (parent) +- root = append_node ((char *) g_basename (dirname), tree, parent, ++ root = append_node ((char *) g_path_get_basename (dirname), tree, parent, + sibling, NO); + else + root = append_node ((char *) dirname, tree, parent, sibling, NO); +@@ -2284,7 +2284,7 @@ leave_preview (GtkWidget *button, gpointer ptr) + g_list_length (list) > 1 + ? _("Show next preview") + : _("Leave preview mode"), NULL, leave_preview, list, +- _("Preview of `%s'"), g_basename (name)); ++ _("Preview of `%s'"), g_path_get_basename (name)); + } + } + +@@ -2705,7 +2705,7 @@ save_theme_backend (GtkWidget *widget, gpointer ptr) + 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" +@@ -3526,17 +3526,17 @@ compute_preview (GtkWidget *progress_bar, GtkWidget *p + path = get_pixmap_path (pname); + + gtk_progress_bar_update (GTK_PROGRESS_BAR (progress_bar), n / (double) nelem); +- gtk_label_set_text (GTK_LABEL (progress_label), g_basename (name)); ++ gtk_label_set_text (GTK_LABEL (progress_label), g_path_get_basename (name)); + while (gtk_events_pending ()) + gtk_main_iteration (); + + if (!path) + { +- DIR *dir = opendir (g_dirname (pname)); ++ DIR *dir = opendir (g_path_get_dirname (pname)); + + if (!dir) /* Make ~/.wmakerconf directory */ + { +- if (make_directory (g_dirname (pname))) ++ if (make_directory (g_path_get_dirname (pname))) + { + Free (pname); + return; diff --git a/desktop/wmakerconf/patches/patch-src_window.c b/desktop/wmakerconf/patches/patch-src_window.c new file mode 100644 index 0000000000..9ab84dc4c5 --- /dev/null +++ b/desktop/wmakerconf/patches/patch-src_window.c @@ -0,0 +1,20 @@ +--- src/window.c.orig 2004-07-22 03:09:55 UTC ++++ src/window.c +@@ -898,7 +898,7 @@ make_pixmap (const char *name, int width, int height, + gdk_imlib_render (image, max (width, 22), max (height, 22)); + pixmap = gdk_imlib_move_image (image); + mask = gdk_imlib_move_mask (image); +- if (strchr (g_basename (path), '.')) /* don't cache x-of-day */ ++ if (strchr (g_path_get_basename (path), '.')) /* don't cache x-of-day */ + gdk_imlib_destroy_image (image); + else + gdk_imlib_kill_image (image); +@@ -1069,7 +1069,7 @@ save_config_file (GtkWidget *widget, gpointer ptr) + 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 --git a/desktop/wmakerconf/patches/patch-src_wmconfig.c b/desktop/wmakerconf/patches/patch-src_wmconfig.c new file mode 100644 index 0000000000..f1b0295299 --- /dev/null +++ b/desktop/wmakerconf/patches/patch-src_wmconfig.c @@ -0,0 +1,29 @@ +--- src/wmconfig.c.orig 2007-05-18 12:41:22.000000000 +0200 ++++ src/wmconfig.c 2020-12-19 11:03:44.037392000 +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-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 index a971aba9b7..54ee03c70c 100644 --- a/desktop/wmakerconf/wmakerconf.SlackBuild +++ b/desktop/wmakerconf/wmakerconf.SlackBuild @@ -7,12 +7,12 @@ PRGNAM=wmakerconf VERSION=${VERSION:-2.12} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} 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,8 +23,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,14 +53,13 @@ find -L . \ \( -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 +# Use freebsd patches, as the *BSD seem the only one who still keep maintaining this... +for i in $CWD/patches/* ; do patch -p0 < $i ; done -# Fix linking to X11 libs -sed -e "/^LIBS =/s/$/ -lX11/" -i src/Makefile.in +# Fix linking +sed -e "/^LIBS =/s/$/ -lX11 -lWUtil/" -i src/Makefile.in -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-deprecated-declarations" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/desktop/wmii/wmii.SlackBuild b/desktop/wmii/wmii.SlackBuild index d7e25f3518..c733145d48 100644 --- a/desktop/wmii/wmii.SlackBuild +++ b/desktop/wmii/wmii.SlackBuild @@ -82,6 +82,8 @@ sed -zi 's,\.P[^@]@DOCDIR@/wmii\.pdf,,' man/wmii.1 sed -i "s,@DOCDIR@,/usr/doc/$PRGNAM-$VERSION,g" man/wmii.1 sed -i "s,@CONFPREFIX@,/etc,g" man/wmii.1 +export CFLAGS="$SLKCFLAGS -fcommon" + LDFLAGS="-lX11 -lXrender" \ make \ OPT="$SLKCFLAGS" \ 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 , 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/xdg-desktop-portal/xdg-desktop-portal.SlackBuild b/desktop/xdg-desktop-portal/xdg-desktop-portal.SlackBuild index 662dd018b5..b7603cd1a4 100644 --- a/desktop/xdg-desktop-portal/xdg-desktop-portal.SlackBuild +++ b/desktop/xdg-desktop-portal/xdg-desktop-portal.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xdg-desktop-portal -VERSION=${VERSION:-1.4.2} +VERSION=${VERSION:-1.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/xdg-desktop-portal/xdg-desktop-portal.info b/desktop/xdg-desktop-portal/xdg-desktop-portal.info index 3bb841118d..0b32a0450f 100644 --- a/desktop/xdg-desktop-portal/xdg-desktop-portal.info +++ b/desktop/xdg-desktop-portal/xdg-desktop-portal.info @@ -1,10 +1,10 @@ PRGNAM="xdg-desktop-portal" -VERSION="1.4.2" +VERSION="1.8.0" HOMEPAGE="https://github.com/flatpak/xdg-desktop-portal/" -DOWNLOAD="https://github.com/flatpak/xdg-desktop-portal/releases/download/1.4.2/xdg-desktop-portal-1.4.2.tar.xz" -MD5SUM="0afda886f8cc0eb4ed1edefca69a25e5" +DOWNLOAD="https://github.com/flatpak/xdg-desktop-portal/releases/download/1.8.0/xdg-desktop-portal-1.8.0.tar.xz" +MD5SUM="2755b3cd9ff5f41a56ae01808a928d77" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="pipewire json-glib" +REQUIRES="libportal pipewire json-glib" MAINTAINER="Vincent Batts" EMAIL="vbatts@hashbangbash.com" diff --git a/desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild b/desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild index 115f341541..902d05dd4e 100644 --- a/desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild +++ b/desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-battery-plugin -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-1.1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/xfce4-battery-plugin/xfce4-battery-plugin.info b/desktop/xfce4-battery-plugin/xfce4-battery-plugin.info index 5ba3cba890..16d1d6d6d8 100644 --- a/desktop/xfce4-battery-plugin/xfce4-battery-plugin.info +++ b/desktop/xfce4-battery-plugin/xfce4-battery-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-battery-plugin" -VERSION="1.1.0" +VERSION="1.1.3" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-1.1.0.tar.bz2" -MD5SUM="f78d8d0cc13d40753a207a836869b953" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-1.1.3.tar.bz2" +MD5SUM="9f82c7e77de0a417716d68d33367973b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.SlackBuild b/desktop/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.SlackBuild index 7be597ec73..07a3227cd5 100644 --- a/desktop/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.SlackBuild +++ b/desktop/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-cpufreq-plugin -VERSION=${VERSION:-1.1.3} +VERSION=${VERSION:-1.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -64,10 +64,10 @@ 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 {} \; CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.info b/desktop/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.info index 06591da537..845b617f13 100644 --- a/desktop/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.info +++ b/desktop/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-cpufreq-plugin" -VERSION="1.1.3" +VERSION="1.2.2" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.1/xfce4-cpufreq-plugin-1.1.3.tar.bz2" -MD5SUM="859122da0a8cd991ee2fbeee434bc948" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.2/xfce4-cpufreq-plugin-1.2.2.tar.bz2" +MD5SUM="706ed7954682ee4de3cc9f0e73ae7ef6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild index d84dbc7eb4..d7758122b0 100644 --- a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild +++ b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild @@ -25,13 +25,13 @@ # Currently maintained by Peter Wang PRGNAM=xfce4-cpugraph-plugin -VERSION=${VERSION:-1.0.5} +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 @@ -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" @@ -66,10 +66,10 @@ 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 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info index 0c682c405a..0654653c68 100644 --- a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info +++ b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-cpugraph-plugin" -VERSION="1.0.5" +VERSION="1.1.0" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-1.0.5.tar.bz2" -MD5SUM="f0ebfabb273adf69361b37a3fa4b7912" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.1/xfce4-cpugraph-plugin-1.1.0.tar.bz2" +MD5SUM="48ead9dcc019212795637c170d9e2ca2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-dict/xfce4-dict.SlackBuild b/desktop/xfce4-dict/xfce4-dict.SlackBuild index 6154323de3..a99d98b9c0 100644 --- a/desktop/xfce4-dict/xfce4-dict.SlackBuild +++ b/desktop/xfce4-dict/xfce4-dict.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-dict -VERSION=${VERSION:-0.7.2} +VERSION=${VERSION:-0.8.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/xfce4-dict/xfce4-dict.info b/desktop/xfce4-dict/xfce4-dict.info index a69536272b..049044f629 100644 --- a/desktop/xfce4-dict/xfce4-dict.info +++ b/desktop/xfce4-dict/xfce4-dict.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-dict" -VERSION="0.7.2" +VERSION="0.8.4" HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-dict" -DOWNLOAD="https://archive.xfce.org/src/apps/xfce4-dict/0.7/xfce4-dict-0.7.2.tar.bz2" -MD5SUM="3a199187068e58d623b74db48b62e8b8" +DOWNLOAD="https://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-0.8.4.tar.bz2" +MD5SUM="e4612e86e5ff6c0619a73ee1c8775fe0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild b/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild index c978f147af..0dde4c43d3 100644 --- a/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild +++ b/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-diskperf-plugin -VERSION=${VERSION:-2.5.4} +VERSION=${VERSION:-2.6.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 @@ -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" @@ -64,10 +64,10 @@ 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 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.info b/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.info index 9af89c71b2..b6ade47401 100644 --- a/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.info +++ b/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-diskperf-plugin" -VERSION="2.5.4" +VERSION="2.6.3" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.5/xfce4-diskperf-plugin-2.5.4.tar.bz2" -MD5SUM="2db453fc3ea2e4fe073ec313a25b0961" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-2.6.3.tar.bz2" +MD5SUM="2ad57a6fa5dc6468f66f3cc7c9d6f101" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-eyes-plugin/xfce4-eyes-plugin.SlackBuild b/desktop/xfce4-eyes-plugin/xfce4-eyes-plugin.SlackBuild index 776c0e24b2..dc1a480266 100644 --- a/desktop/xfce4-eyes-plugin/xfce4-eyes-plugin.SlackBuild +++ b/desktop/xfce4-eyes-plugin/xfce4-eyes-plugin.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-eyes-plugin -VERSION=${VERSION:-4.5.0} +VERSION=${VERSION:-4.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -92,7 +92,7 @@ find $PKG -name perllocal.pod \ | xargs rm -f mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog NEWS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/xfce4-eyes-plugin/xfce4-eyes-plugin.info b/desktop/xfce4-eyes-plugin/xfce4-eyes-plugin.info index 018c1e0791..b1edd42c46 100644 --- a/desktop/xfce4-eyes-plugin/xfce4-eyes-plugin.info +++ b/desktop/xfce4-eyes-plugin/xfce4-eyes-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-eyes-plugin" -VERSION="4.5.0" +VERSION="4.5.1" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-eyes-plugin/4.5/xfce4-eyes-plugin-4.5.0.tar.bz2" -MD5SUM="6e274ceda37c7a8ae0821d9d49e965e9" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-eyes-plugin/4.5/xfce4-eyes-plugin-4.5.1.tar.bz2" +MD5SUM="2bc3dfd7b4e8364eed17525a8ba583d4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-fsguard-plugin/xfce4-fsguard-plugin.SlackBuild b/desktop/xfce4-fsguard-plugin/xfce4-fsguard-plugin.SlackBuild index a6896f4bf8..7e5b8602ba 100644 --- a/desktop/xfce4-fsguard-plugin/xfce4-fsguard-plugin.SlackBuild +++ b/desktop/xfce4-fsguard-plugin/xfce4-fsguard-plugin.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-fsguard-plugin -VERSION=${VERSION:-1.0.2} +VERSION=${VERSION:-1.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/xfce4-fsguard-plugin/xfce4-fsguard-plugin.info b/desktop/xfce4-fsguard-plugin/xfce4-fsguard-plugin.info index e83f1e647f..b9ecf7cc09 100644 --- a/desktop/xfce4-fsguard-plugin/xfce4-fsguard-plugin.info +++ b/desktop/xfce4-fsguard-plugin/xfce4-fsguard-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-fsguard-plugin" -VERSION="1.0.2" +VERSION="1.1.1" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-fsguard-plugin/1.0/xfce4-fsguard-plugin-1.0.2.tar.bz2" -MD5SUM="db7741d1827e428b005e94d25e2ec00a" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-fsguard-plugin/1.1/xfce4-fsguard-plugin-1.1.1.tar.bz2" +MD5SUM="d1e1fda4e80c36741643b1d9eca5c5c1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild b/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild index e59c53287c..1a93e3a5b3 100644 --- a/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild +++ b/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild @@ -23,8 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-genmon-plugin -VERSION=${VERSION:-3.4.0} -TARVERS=3.4 +VERSION=${VERSION:-4.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,14 +61,13 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$TARVERS -chown -R root:root . +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" \ ./configure \ diff --git a/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.info b/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.info index fd27f181f4..2f86786ca3 100644 --- a/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.info +++ b/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-genmon-plugin" -VERSION="3.4.0" +VERSION="4.1.0" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-genmon-plugin/3.4/xfce4-genmon-plugin-3.4.0.tar.bz2" -MD5SUM="24108b339bb040ed360266f53a245224" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-genmon-plugin/4.1/xfce4-genmon-plugin-4.1.0.tar.bz2" +MD5SUM="29f05962092aedac84c5f040429ce37a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-kbdleds-plugin/README b/desktop/xfce4-kbdleds-plugin/README deleted file mode 100644 index 978d13ff37..0000000000 --- a/desktop/xfce4-kbdleds-plugin/README +++ /dev/null @@ -1,2 +0,0 @@ -This plugin shows the state of your keyboard LEDs: Caps, Scroll -and Num Lock in the Xfce panel. diff --git a/desktop/xfce4-kbdleds-plugin/doinst.sh b/desktop/xfce4-kbdleds-plugin/doinst.sh deleted file mode 100644 index 65c7e2eeb9..0000000000 --- a/desktop/xfce4-kbdleds-plugin/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/desktop/xfce4-kbdleds-plugin/slack-desc b/desktop/xfce4-kbdleds-plugin/slack-desc deleted file mode 100644 index 5b2163df3f..0000000000 --- a/desktop/xfce4-kbdleds-plugin/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------------------------------------------------------| -xfce4-kbdleds-plugin: xfce4-kbdleds-plugin (keyboard LEDs plugin for the Xfce panel) -xfce4-kbdleds-plugin: -xfce4-kbdleds-plugin: This plugin shows the state of your keyboard LEDs: Caps, Scroll -xfce4-kbdleds-plugin: and Num Lock in the Xfce panel. -xfce4-kbdleds-plugin: -xfce4-kbdleds-plugin: Homepage: -xfce4-kbdleds-plugin: https://goodies.xfce.org/projects/panel-plugins/xfce4-kbdleds-plugin -xfce4-kbdleds-plugin: -xfce4-kbdleds-plugin: -xfce4-kbdleds-plugin: -xfce4-kbdleds-plugin: diff --git a/desktop/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin.SlackBuild b/desktop/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin.SlackBuild deleted file mode 100644 index 839ee7ae50..0000000000 --- a/desktop/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin.SlackBuild +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh - -# Slackware build script for xfce4-kbdleds-plugin - -# Copyright 2014 Fridrich von Stauffenberg -# 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=xfce4-kbdleds-plugin -VERSION=${VERSION:-0.0.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 $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} \ - --disable-debug \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING* ChangeLog 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 -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/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin.info b/desktop/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin.info deleted file mode 100644 index d4e3e8f54c..0000000000 --- a/desktop/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="xfce4-kbdleds-plugin" -VERSION="0.0.6" -HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-kbdleds-plugin" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/xfce4-kbdleds-plugin-0.0.6.tar.bz2" -MD5SUM="db6ad8e3502f3373f087ba2034141552" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere.com" diff --git a/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.SlackBuild b/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.SlackBuild index f6c7ce5660..b97b649ca7 100644 --- a/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.SlackBuild +++ b/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.SlackBuild @@ -27,13 +27,13 @@ # Modified by Ján Sučan PRGNAM=xfce4-mailwatch-plugin -VERSION=${VERSION:-1.2.0} +VERSION=${VERSION:-1.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 @@ -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" @@ -71,7 +71,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" \ diff --git a/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.info b/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.info index 4b578178c7..94d974088b 100644 --- a/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.info +++ b/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-mailwatch-plugin" -VERSION="1.2.0" +VERSION="1.3.0" HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/1.2/xfce4-mailwatch-plugin-1.2.0.tar.bz2" -MD5SUM="7263114ec0f2987a3aff15afeeb45577" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/1.3/xfce4-mailwatch-plugin-1.3.0.tar.bz2" +MD5SUM="60911e1370c4d69eababede3195d28eb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-mount-plugin/xfce4-mount-plugin.SlackBuild b/desktop/xfce4-mount-plugin/xfce4-mount-plugin.SlackBuild index f833c778fa..286d9ffaa1 100644 --- a/desktop/xfce4-mount-plugin/xfce4-mount-plugin.SlackBuild +++ b/desktop/xfce4-mount-plugin/xfce4-mount-plugin.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-mount-plugin -VERSION=${VERSION:-1.1.2} +VERSION=${VERSION:-1.1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -63,12 +63,11 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . -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" \ diff --git a/desktop/xfce4-mount-plugin/xfce4-mount-plugin.info b/desktop/xfce4-mount-plugin/xfce4-mount-plugin.info index 65c467e419..8230fffe46 100644 --- a/desktop/xfce4-mount-plugin/xfce4-mount-plugin.info +++ b/desktop/xfce4-mount-plugin/xfce4-mount-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-mount-plugin" -VERSION="1.1.2" +VERSION="1.1.4" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-mount-plugin/1.1/xfce4-mount-plugin-1.1.2.tar.bz2" -MD5SUM="7eba9696d82433a5577741214d34b588" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-mount-plugin/1.1/xfce4-mount-plugin-1.1.4.tar.bz2" +MD5SUM="5418323795dbe1499e19c8a8162eba7b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-mpc-plugin/xfce4-mpc-plugin.SlackBuild b/desktop/xfce4-mpc-plugin/xfce4-mpc-plugin.SlackBuild index 4de87a8bbe..56b88c2cfd 100644 --- a/desktop/xfce4-mpc-plugin/xfce4-mpc-plugin.SlackBuild +++ b/desktop/xfce4-mpc-plugin/xfce4-mpc-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-mpc-plugin -VERSION=${VERSION:-0.4.4} +VERSION=${VERSION:-0.5.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" @@ -64,10 +64,10 @@ 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 {} \; CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/xfce4-mpc-plugin/xfce4-mpc-plugin.info b/desktop/xfce4-mpc-plugin/xfce4-mpc-plugin.info index 882cc8429b..469f0a2c10 100644 --- a/desktop/xfce4-mpc-plugin/xfce4-mpc-plugin.info +++ b/desktop/xfce4-mpc-plugin/xfce4-mpc-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-mpc-plugin" -VERSION="0.4.4" +VERSION="0.5.2" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-mpc-plugin/0.4/xfce4-mpc-plugin-0.4.4.tar.bz2" -MD5SUM="1c126ca71d6db1ac6a0cc6720554e7bd" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-mpc-plugin/0.5/xfce4-mpc-plugin-0.5.2.tar.bz2" +MD5SUM="26a1e8658df2b51967dc2250e23f467d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="mpd" diff --git a/desktop/xfce4-netload-plugin/xfce4-netload-plugin.SlackBuild b/desktop/xfce4-netload-plugin/xfce4-netload-plugin.SlackBuild index 325049b4c7..f491127012 100644 --- a/desktop/xfce4-netload-plugin/xfce4-netload-plugin.SlackBuild +++ b/desktop/xfce4-netload-plugin/xfce4-netload-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-netload-plugin -VERSION=${VERSION:-1.2.4} +VERSION=${VERSION:-1.3.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" @@ -64,10 +64,10 @@ 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 {} \; CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/xfce4-netload-plugin/xfce4-netload-plugin.info b/desktop/xfce4-netload-plugin/xfce4-netload-plugin.info index 3b836faa58..ebeb13406c 100644 --- a/desktop/xfce4-netload-plugin/xfce4-netload-plugin.info +++ b/desktop/xfce4-netload-plugin/xfce4-netload-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-netload-plugin" -VERSION="1.2.4" +VERSION="1.3.2" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.2/xfce4-netload-plugin-1.2.4.tar.bz2" -MD5SUM="ce53e1135e4bff5afcd899627110bd11" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.3/xfce4-netload-plugin-1.3.2.tar.bz2" +MD5SUM="ae4652711812a77a58c3dc96650a74dc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-notes-plugin/xfce4-notes-plugin.SlackBuild b/desktop/xfce4-notes-plugin/xfce4-notes-plugin.SlackBuild index 8982fabb7e..0de42e8eba 100644 --- a/desktop/xfce4-notes-plugin/xfce4-notes-plugin.SlackBuild +++ b/desktop/xfce4-notes-plugin/xfce4-notes-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-notes-plugin -VERSION=${VERSION:-1.8.1} +VERSION=${VERSION:-20201231_b38052b} 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,18 +60,18 @@ 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 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 \ +./autogen.sh \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc/xfce \ @@ -83,12 +83,12 @@ 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/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README \ + AUTHORS COPYING NEWS README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/desktop/xfce4-notes-plugin/xfce4-notes-plugin.info b/desktop/xfce4-notes-plugin/xfce4-notes-plugin.info index b25130073f..a8b7b4c818 100644 --- a/desktop/xfce4-notes-plugin/xfce4-notes-plugin.info +++ b/desktop/xfce4-notes-plugin/xfce4-notes-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-notes-plugin" -VERSION="1.8.1" +VERSION="20201231_b38052b" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.8/xfce4-notes-plugin-1.8.1.tar.bz2" -MD5SUM="31cb9520b01512a94344770b4befdb3b" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/xfce4-notes-plugin-20201231_b38052b.tar.xz" +MD5SUM="0fef6e1496c87850999ce34553090908" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libunique" diff --git a/desktop/xfce4-places-plugin/xfce4-places-plugin.SlackBuild b/desktop/xfce4-places-plugin/xfce4-places-plugin.SlackBuild index 288a615200..05df3546cc 100644 --- a/desktop/xfce4-places-plugin/xfce4-places-plugin.SlackBuild +++ b/desktop/xfce4-places-plugin/xfce4-places-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-places-plugin -VERSION=${VERSION:-1.7.0} +VERSION=${VERSION:-1.8.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" @@ -64,12 +64,10 @@ 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 {} \; - -patch -p1 < $CWD/0001-Bug-11939-xfce4-places-plugin-1.7.0-crashes-with-und.patch + \( -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/desktop/xfce4-places-plugin/xfce4-places-plugin.info b/desktop/xfce4-places-plugin/xfce4-places-plugin.info index 62c564f471..89cdb37ecb 100644 --- a/desktop/xfce4-places-plugin/xfce4-places-plugin.info +++ b/desktop/xfce4-places-plugin/xfce4-places-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-places-plugin" -VERSION="1.7.0" +VERSION="1.8.1" HOMEPAGE="https://goodies.xfce.org" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.7/xfce4-places-plugin-1.7.0.tar.bz2" -MD5SUM="fcae9b38a8affcd82699a94991bba29b" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.8/xfce4-places-plugin-1.8.1.tar.bz2" +MD5SUM="bde92cbd08f129d517524784e5060816" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-quicklauncher-plugin/README b/desktop/xfce4-quicklauncher-plugin/README deleted file mode 100644 index f5081a3b4f..0000000000 --- a/desktop/xfce4-quicklauncher-plugin/README +++ /dev/null @@ -1,2 +0,0 @@ -xfce4-quicklauncher-plugin allows you to have lots of -launchers in the panel displayed on separate lines. diff --git a/desktop/xfce4-quicklauncher-plugin/allow_adding_plugin_to_panel.diff b/desktop/xfce4-quicklauncher-plugin/allow_adding_plugin_to_panel.diff deleted file mode 100644 index 787962c0ff..0000000000 --- a/desktop/xfce4-quicklauncher-plugin/allow_adding_plugin_to_panel.diff +++ /dev/null @@ -1,10 +0,0 @@ -diff -Nur xfce4-quicklauncher-plugin-1.9.4.orig//panel-plugin/quicklauncher.desktop.in.in xfce4-quicklauncher-plugin-1.9.4/panel-plugin/quicklauncher.desktop.in.in ---- xfce4-quicklauncher-plugin-1.9.4.orig//panel-plugin/quicklauncher.desktop.in.in 2005-09-25 14:08:43.000000000 -0500 -+++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/quicklauncher.desktop.in.in 2011-01-01 15:41:49.621453224 -0600 -@@ -4,4 +4,5 @@ - _Name=Quicklauncher - _Comment=Program with several launchers - Icon=gnome-fs-executable --X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libquicklauncher.so -+X-XFCE-Module=quicklauncher -+X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@ diff --git a/desktop/xfce4-quicklauncher-plugin/slack-desc b/desktop/xfce4-quicklauncher-plugin/slack-desc deleted file mode 100644 index a5e77c2c2e..0000000000 --- a/desktop/xfce4-quicklauncher-plugin/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------------------------------------------------------| -xfce4-quicklauncher-plugin: xfce4-quicklauncher-plugin (quicklauncher plugin for Xfce) -xfce4-quicklauncher-plugin: -xfce4-quicklauncher-plugin: The quicklauncher plugin allows you to have lots of -xfce4-quicklauncher-plugin: launchers in the panel displayed on separate lines. -xfce4-quicklauncher-plugin: -xfce4-quicklauncher-plugin: -xfce4-quicklauncher-plugin: -xfce4-quicklauncher-plugin: -xfce4-quicklauncher-plugin: -xfce4-quicklauncher-plugin: -xfce4-quicklauncher-plugin: diff --git a/desktop/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.SlackBuild b/desktop/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.SlackBuild deleted file mode 100644 index e17ebdb5eb..0000000000 --- a/desktop/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.SlackBuild +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -# Slackware build script for xfce4-quicklauncher-plugin - -# Copyright 2006-2011 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=xfce4-quicklauncher-plugin -VERSION=${VERSION:-1.9.4} -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Show the quicklauncher as an option to be added -patch -p1 < $CWD/allow_adding_plugin_to_panel.diff - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/xfce \ - --enable-shared=yes \ - --enable-static=no \ - --enable-debug=no \ - --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 COPYING ChangeLog 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/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.info b/desktop/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.info deleted file mode 100644 index 77a7bd6be5..0000000000 --- a/desktop/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="xfce4-quicklauncher-plugin" -VERSION="1.9.4" -HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-quicklauncher-plugin/1.9/xfce4-quicklauncher-plugin-1.9.4.tar.bz2" -MD5SUM="299e17f196ecfa5fb018cf65abb19b56" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libxfcegui4" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" diff --git a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild index 4f18f9e307..d451413322 100644 --- a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild +++ b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-sensors-plugin -VERSION=${VERSION:-1.2.6} +VERSION=${VERSION:-20201116_a487acb} 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,18 +60,18 @@ 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 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 \ +./autogen.sh \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc/xfce \ diff --git a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info index 4a05477394..65f87ed7f8 100644 --- a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info +++ b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-sensors-plugin" -VERSION="1.2.6" +VERSION="20201116_a487acb" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.2/xfce4-sensors-plugin-1.2.6.tar.bz2" -MD5SUM="33c2e343c1224d9c4ae757a70cbe08eb" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/xfce4-sensors-plugin-20201116_a487acb.tar.xz" +MD5SUM="95a44a1f0c9c29c6bd849357a96cb61b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.SlackBuild b/desktop/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.SlackBuild index e4db6072cd..77ea3c62a1 100644 --- a/desktop/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.SlackBuild +++ b/desktop/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-smartbookmark-plugin -VERSION=${VERSION:-0.4.5} +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 @@ -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" @@ -64,10 +64,10 @@ 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 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/desktop/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.info b/desktop/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.info index 7856a82726..0d5e2e9576 100644 --- a/desktop/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.info +++ b/desktop/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-smartbookmark-plugin" -VERSION="0.4.5" +VERSION="0.5.1" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-smartbookmark-plugin/0.4/xfce4-smartbookmark-plugin-0.4.5.tar.bz2" -MD5SUM="820422dfc5c212689b2908e1ff09c548" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-smartbookmark-plugin/0.5/xfce4-smartbookmark-plugin-0.5.1.tar.bz2" +MD5SUM="f1c97ac62dd9054e8f2b01568fef3ba6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-timer-plugin/xfce4-timer-plugin.SlackBuild b/desktop/xfce4-timer-plugin/xfce4-timer-plugin.SlackBuild index cda24ce93d..e7eb6ee47c 100644 --- a/desktop/xfce4-timer-plugin/xfce4-timer-plugin.SlackBuild +++ b/desktop/xfce4-timer-plugin/xfce4-timer-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-timer-plugin -VERSION=${VERSION:-1.6.0} +VERSION=${VERSION:-1.7.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" diff --git a/desktop/xfce4-timer-plugin/xfce4-timer-plugin.info b/desktop/xfce4-timer-plugin/xfce4-timer-plugin.info index efe2c606c0..67d05fa124 100644 --- a/desktop/xfce4-timer-plugin/xfce4-timer-plugin.info +++ b/desktop/xfce4-timer-plugin/xfce4-timer-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-timer-plugin" -VERSION="1.6.0" +VERSION="1.7.1" HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-timer-plugin" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.6/xfce4-timer-plugin-1.6.0.tar.bz2" -MD5SUM="3be2a4ccfb2af20441b1d25c2cea5f28" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.7/xfce4-timer-plugin-1.7.1.tar.bz2" +MD5SUM="e0df5b6be30993719d084fc4f78a6218" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-verve-plugin/xfce4-verve-plugin.SlackBuild b/desktop/xfce4-verve-plugin/xfce4-verve-plugin.SlackBuild index 23de9de23e..55ef568a6c 100644 --- a/desktop/xfce4-verve-plugin/xfce4-verve-plugin.SlackBuild +++ b/desktop/xfce4-verve-plugin/xfce4-verve-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-verve-plugin -VERSION=${VERSION:-1.0.1} +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 @@ -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" @@ -64,10 +64,10 @@ 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 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/desktop/xfce4-verve-plugin/xfce4-verve-plugin.info b/desktop/xfce4-verve-plugin/xfce4-verve-plugin.info index e42181f5a7..cf915319a4 100644 --- a/desktop/xfce4-verve-plugin/xfce4-verve-plugin.info +++ b/desktop/xfce4-verve-plugin/xfce4-verve-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-verve-plugin" -VERSION="1.0.1" +VERSION="2.0.0" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/1.0/xfce4-verve-plugin-1.0.1.tar.bz2" -MD5SUM="b5dbe88b2bea2c35785961d68fe446e4" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/2.0/xfce4-verve-plugin-2.0.0.tar.bz2" +MD5SUM="94429b1be9d66ba9b31e4aafb726a8c7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.info b/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.info index dd1a239415..a1e321ac1c 100644 --- a/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.info +++ b/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.info @@ -5,6 +5,6 @@ DOWNLOAD="https://git.xfce.org/apps/xfce4-volumed-pulse/snapshot/xfce4-volumed-p MD5SUM="017b42c2de12ce74f1f7833c6edbd082" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="keybinder" MAINTAINER="Dominik Drobek" EMAIL="dominik.drobek@o2.pl" diff --git a/desktop/xfce4-whiskermenu-plugin/README b/desktop/xfce4-whiskermenu-plugin/README deleted file mode 100644 index 60c50d72a1..0000000000 --- a/desktop/xfce4-whiskermenu-plugin/README +++ /dev/null @@ -1,6 +0,0 @@ -Whisker Menu is an alternate application launcher for Xfce. When -you open it you are shown a list of applications you have marked as -favorites. You can browse through all of your installed applications by -clicking on the category buttons on the side. Top level categories make -browsing fast, and simple to switch between. Additionally, Whisker Menu -keeps a list of the last ten applications that you've launched from it. diff --git a/desktop/xfce4-whiskermenu-plugin/doinst.sh b/desktop/xfce4-whiskermenu-plugin/doinst.sh deleted file mode 100644 index 65c7e2eeb9..0000000000 --- a/desktop/xfce4-whiskermenu-plugin/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/desktop/xfce4-whiskermenu-plugin/slack-desc b/desktop/xfce4-whiskermenu-plugin/slack-desc deleted file mode 100644 index bcc509e16d..0000000000 --- a/desktop/xfce4-whiskermenu-plugin/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------------------------------------------------------| -xfce4-whiskermenu-plugin: xfce4-whiskermenu-plugin (alternate application launcher for Xfce) -xfce4-whiskermenu-plugin: -xfce4-whiskermenu-plugin: Whisker Menu is an alternate application launcher for Xfce. When you -xfce4-whiskermenu-plugin: open it you are shown a list of applications you have marked as -xfce4-whiskermenu-plugin: favorites. You can browse through all of your installed applications -xfce4-whiskermenu-plugin: by clicking on the category buttons on the side. Top level categories -xfce4-whiskermenu-plugin: make browsing fast, and simple to switch between. Additionally, -xfce4-whiskermenu-plugin: Whisker Menu keeps a list of the last ten applications -xfce4-whiskermenu-plugin: that you've launched from it. -xfce4-whiskermenu-plugin: -xfce4-whiskermenu-plugin: https://gottcode.org/xfce4-whiskermenu-plugin diff --git a/desktop/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild b/desktop/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild deleted file mode 100644 index 199ff5540e..0000000000 --- a/desktop/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -# Slackware build script for xfce4-whiskermenu-plugin - -# Copyright 2013-2015 Scott Parker Vancouver, BC, Canada -# 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=xfce4-whiskermenu-plugin -VERSION=${VERSION:-1.7.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/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -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 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_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ - -DCMAKE_INSTALL_MANDIR=/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 - -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 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/desktop/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.info b/desktop/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.info deleted file mode 100644 index 71191589e2..0000000000 --- a/desktop/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="xfce4-whiskermenu-plugin" -VERSION="1.7.5" -HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/1.7/xfce4-whiskermenu-plugin-1.7.5.tar.bz2" -MD5SUM="39e2e853be97788fe1a052cec882b27c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Scott Parker" -EMAIL="scottp.sk8@gmail.com" diff --git a/desktop/xfce4-windowck-plugin/README b/desktop/xfce4-windowck-plugin/README index d7b07f06b4..ad4fec8698 100644 --- a/desktop/xfce4-windowck-plugin/README +++ b/desktop/xfce4-windowck-plugin/README @@ -3,5 +3,3 @@ maximized window title and window buttons on the xfce4-panel. After upgrading to version 0.4.0 you may need to make some changes to the plugin settings to retain previous look and feel. - -Note- python3 is a build time dependency. diff --git a/desktop/xfce4-windowck-plugin/xfce4-windowck-plugin.SlackBuild b/desktop/xfce4-windowck-plugin/xfce4-windowck-plugin.SlackBuild index 8eadcd687d..9948d68888 100644 --- a/desktop/xfce4-windowck-plugin/xfce4-windowck-plugin.SlackBuild +++ b/desktop/xfce4-windowck-plugin/xfce4-windowck-plugin.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for xfce4-windowck-plugin # Generated using mkslack (dawoodfall.net/slackbuilds/noversion/mkslack) -# Copyright 2015-2019 Aaditya Bagga +# Copyright 2015-2021 Aaditya Bagga # 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=xfce4-windowck-plugin -VERSION=${VERSION:-0.4.6} +VERSION=${VERSION:-0.4.10} 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/v${VERSION}.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/desktop/xfce4-windowck-plugin/xfce4-windowck-plugin.info b/desktop/xfce4-windowck-plugin/xfce4-windowck-plugin.info index 16449f2e53..20809a91ce 100644 --- a/desktop/xfce4-windowck-plugin/xfce4-windowck-plugin.info +++ b/desktop/xfce4-windowck-plugin/xfce4-windowck-plugin.info @@ -1,10 +1,10 @@ PRGNAM="xfce4-windowck-plugin" -VERSION="0.4.6" +VERSION="0.4.10" HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-windowck-plugin" -DOWNLOAD="https://github.com/cedl38/xfce4-windowck-plugin/archive/v0.4.6.tar.gz" -MD5SUM="a9d711a5ea0d3e7947e1fb4d4724e481" +DOWNLOAD="https://github.com/invidian/xfce4-windowck-plugin/archive/v0.4.10/xfce4-windowck-plugin-0.4.10.tar.gz" +MD5SUM="c295921595c4bfa4e296b5ecee658491" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3" +REQUIRES="" MAINTAINER="Aaditya Bagga" EMAIL="aaditya_gnulinux@zoho.com" diff --git a/desktop/xfce4-xkb-plugin/slack-desc b/desktop/xfce4-xkb-plugin/slack-desc index 4d81b41794..683b1bf608 100644 --- a/desktop/xfce4-xkb-plugin/slack-desc +++ b/desktop/xfce4-xkb-plugin/slack-desc @@ -11,7 +11,7 @@ xfce4-xkb-plugin: xfce4-xkb-plugin: The xkb plugin can be used to show the current keyboard layout and/or xfce4-xkb-plugin: to select a layout from those defined in the /etc/X11/xorg.conf file. xfce4-xkb-plugin: -xfce4-xkb-plugin: +xfce4-xkb-plugin: homepage: https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin xfce4-xkb-plugin: xfce4-xkb-plugin: xfce4-xkb-plugin: diff --git a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild index 2017ec1079..a9f5c48ff1 100644 --- a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild +++ b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-xkb-plugin -VERSION=${VERSION:-0.7.1} +VERSION=${VERSION:-0.8.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" @@ -64,10 +64,10 @@ 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 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info index ac5d28ffc2..203275a67b 100644 --- a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info +++ b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-xkb-plugin" -VERSION="0.7.1" -HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.7/xfce4-xkb-plugin-0.7.1.tar.bz2" -MD5SUM="2f68e0d53baf68ecc1a7165ad33c26a9" +VERSION="0.8.1" +HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.8/xfce4-xkb-plugin-0.8.1.tar.bz2" +MD5SUM="72530bf59d7cd902326469e5a7a9892b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-xmms-plugin/README b/desktop/xfce4-xmms-plugin/README deleted file mode 100644 index a1502aa8d8..0000000000 --- a/desktop/xfce4-xmms-plugin/README +++ /dev/null @@ -1,2 +0,0 @@ -The xfce4-xmms-plugin lets the user control the XMMS, -Beep, or Audacious players from the Xfce panel. diff --git a/desktop/xfce4-xmms-plugin/slack-desc b/desktop/xfce4-xmms-plugin/slack-desc deleted file mode 100644 index f8c01836a0..0000000000 --- a/desktop/xfce4-xmms-plugin/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------------------------------------------------------| -xfce4-xmms-plugin: xfce4-xmms-plugin (XMMS xfce panel plugin) -xfce4-xmms-plugin: -xfce4-xmms-plugin: This panel plugin lets the user control XMMS, Beep, -xfce4-xmms-plugin: or Audacious music players from the Xfce panel. -xfce4-xmms-plugin: -xfce4-xmms-plugin: -xfce4-xmms-plugin: -xfce4-xmms-plugin: -xfce4-xmms-plugin: -xfce4-xmms-plugin: -xfce4-xmms-plugin: diff --git a/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.SlackBuild b/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.SlackBuild deleted file mode 100644 index c49235dd50..0000000000 --- a/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.SlackBuild +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh - -# Slackware build script for xfce4-xmms-plugin - -# (C) 2007 Michael Wagner -# 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=xfce4-xmms-plugin -VERSION=${VERSION:-0.5.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" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/xfce \ - --disable-static \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -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 -chmod 644 $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/xfce4-xmms-plugin/xfce4-xmms-plugin.info b/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.info deleted file mode 100644 index bd3d766c65..0000000000 --- a/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="xfce4-xmms-plugin" -VERSION="0.5.3" -HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-xmms-plugin" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-xmms-plugin/0.5/xfce4-xmms-plugin-0.5.3.tar.bz2" -MD5SUM="e0dcd5a0471bd9885a65626f078eaaeb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libxfcegui4" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" diff --git a/desktop/yad/README b/desktop/yad/README index d8cbddb7e6..934b1583dd 100644 --- a/desktop/yad/README +++ b/desktop/yad/README @@ -4,7 +4,4 @@ Yad is a fork of Zenity with many improvements, including custom buttons, additional dialogs and a pop-up menu in the notification area. -The optional dependency webkitgtk enables the html widget. - -By default this is built against gtk+2: if you want to use it -with gtk+3 pass the script the parameter GTK=3 +Optional dependencies: gtksourceview3 and webkit2gtk. diff --git a/desktop/yad/doinst.sh b/desktop/yad/doinst.sh index 19400050fd..d6d225b6df 100644 --- a/desktop/yad/doinst.sh +++ b/desktop/yad/doinst.sh @@ -4,3 +4,8 @@ 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/desktop/yad/slack-desc b/desktop/yad/slack-desc index 07875fb003..edf960164a 100644 --- a/desktop/yad/slack-desc +++ b/desktop/yad/slack-desc @@ -11,9 +11,9 @@ yad: yad: Yad (yet another dialog) is a fork of Zenity with many improvements, yad: including custom buttons, additional dialogs and a pop-up menu in yad: the notification area. -yad: yad: There were two main reasons for this fork. The first was to remove yad: dependencies on deprecated libraries like libglade and gnome-canvas. yad: The second was the slow pace of Zenity development including many yad: unimplemented enhancement suggestions in the GNOME Bugzilla. yad: +yad: homepage: https://github.com/v1cont/yad/ diff --git a/desktop/yad/yad.SlackBuild b/desktop/yad/yad.SlackBuild index 0b08f08e7a..2fbe6bd2a9 100644 --- a/desktop/yad/yad.SlackBuild +++ b/desktop/yad/yad.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for yad # Copyright 2010-2014 Charles -# Copyright 2015-2018 Matteo Bernardini , Pisa, Italy +# Copyright 2015-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=yad -VERSION=${VERSION:-0.40.0} +VERSION=${VERSION:-7.3} 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..3724eb5749 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="7.3" +HOMEPAGE="https://github.com/v1cont/yad/" +DOWNLOAD="https://github.com/v1cont/yad/releases/download/v7.3/yad-7.3.tar.xz" +MD5SUM="75883db190160e613709239049fe777a" 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(key, obj); ++ entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); + entry->next = this->buckets[i]; + this->buckets[i] = entry; + 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..734499bb12 100644 --- a/development/acpica/acpica.SlackBuild +++ b/development/acpica/acpica.SlackBuild @@ -74,7 +74,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; cd generate/unix - CFLAGS="$SLKCFLAGS" \ + CFLAGS="$SLKCFLAGS -fcommon -Wno-error=format-overflow -Wno-error=stringop-truncation" \ CXXFLAGS="$SLKCFLAGS" \ make BITS=$BITS 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 + #include + #include +-#include +-#include + + #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 - - #include -+#include - #include - #include - #include -@@ -28,7 +29,7 @@ +@@ -30,7 +30,7 @@ #include #include @@ -19,63 +52,53 @@ index 7025f283c..66fad6564 100644 #include #include -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 - #include - #include - #include -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 -+#include +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 + #include + #include +-#include + #include + #include +-#include + #include + #include - 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 - #include - #include -+#include +@@ -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 - #include -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 - #include - #include -+#include +- const std::string mke2fs_path = exec_dir + "/mke2fs"; ++ const std::string mke2fs_path = exec_dir + "/mke2fs.android"; + std::vector 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 -+#include - #include - #include - #include +-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 --#include -+#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 - #include - #include --#include -+#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/autoconf-archive/README b/development/autoconf-archive/README deleted file mode 100644 index e9857f8ddf..0000000000 --- a/development/autoconf-archive/README +++ /dev/null @@ -1,15 +0,0 @@ -The GNU Autoconf Archive is a collection of more than 500 macros for -GNU Autoconf that have been contributed as free software by friendly -supporters of the cause from all over the Internet. Every single one of -those macros can be re-used without imposing any restrictions whatsoever -on the licensing of the generated configure script. In particular, it is -possible to use all those macros in configure scripts that are meant for -non-free software. This policy is unusual for a Free Software Foundation -project. The FSF firmly believes that software ought to be free, and -software licenses like the GPL are specifically designed to ensure that -derivative work based on free software must be free as well. In case of -Autoconf, however, an exception has been made, because Autoconf is at -such a pivotal position in the software development tool chain that the -benefits from having this tool available as widely as possible outweigh -the disadvantage that some authors may choose to use it, too, for -proprietary software. diff --git a/development/autoconf-archive/autoconf-archive.SlackBuild b/development/autoconf-archive/autoconf-archive.SlackBuild deleted file mode 100644 index e4149fee6d..0000000000 --- a/development/autoconf-archive/autoconf-archive.SlackBuild +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -# Slackware build script for autoconf-archive - -# Copyright 2018-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=autoconf-archive -VERSION=${VERSION:-2019.01.06} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -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 -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 {} \; - -autoreconf -fi - -./configure \ - --prefix=/usr \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -# Files conflict with versions in development/gnome-common and these files are -# not needed by games/nestopia which requires autoconf-archive. -rm -f $PKG/usr/share/aclocal/ax_check_enable_debug.m4 \ - $PKG/usr/share/aclocal/ax_code_coverage.m4 - -rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/*.info* - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ChangeLog INSTALL NEWS 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/autoconf-archive/autoconf-archive.info b/development/autoconf-archive/autoconf-archive.info deleted file mode 100644 index cfda18cc22..0000000000 --- a/development/autoconf-archive/autoconf-archive.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="autoconf-archive" -VERSION="2019.01.06" -HOMEPAGE="https://www.gnu.org/software/autoconf-archive/" -DOWNLOAD="https://ftpmirror.gnu.org/autoconf-archive/autoconf-archive-2019.01.06.tar.xz" -MD5SUM="d46413c8b00a125b1529bae385bbec55" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Hunter Sezen" -EMAIL="orbea@riseup.net" diff --git a/development/autoconf-archive/slack-desc b/development/autoconf-archive/slack-desc deleted file mode 100644 index 5264c36ece..0000000000 --- a/development/autoconf-archive/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------------------------------------------------------| -autoconf-archive: autoconf-archive (GNU Autoconf macros) -autoconf-archive: -autoconf-archive: The GNU Autoconf Archive is a collection of more than 500 macros for -autoconf-archive: GNU Autoconf that have been contributed as free software by friendly -autoconf-archive: supporters of the cause from all over the Internet. -autoconf-archive: -autoconf-archive: Homepage: https://www.gnu.org/software/autoconf-archive/ -autoconf-archive: -autoconf-archive: -autoconf-archive: -autoconf-archive: 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/autogen.info b/development/autogen/autogen.info index 99955206bf..49da49c53f 100644 --- a/development/autogen/autogen.info +++ b/development/autogen/autogen.info @@ -5,6 +5,6 @@ DOWNLOAD="https://ftp.gnu.org/gnu/autogen/rel5.18.14/autogen-5.18.14.tar.xz" MD5SUM="c4d9a1641cb1bad4a3cc4108de6d867a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="guile2.2" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" 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..7ddcd1e961 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.35.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 @@ -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,13 +50,13 @@ 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 +patch -p1 < $CWD/avr-size.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -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..c1dcf84093 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.35.1" 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.35.1.tar.bz2" +MD5SUM="9203e5ca6243c8501f679dd6407df820" 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..ae78228b0a 100644 --- a/development/avr-binutils/avr-size.patch +++ b/development/avr-binutils/avr-size.patch @@ -1,53 +1,18 @@ -AVR specific only --------------------------------------------------------------------------------- ---- 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 @@ - #include "getopt.h" - #include "bucomm.h" - --#ifndef BSD_DEFAULT --#define BSD_DEFAULT 1 -+typedef enum -+{ -+ format_sysv = 0, -+ format_bsd = 1, -+ format_avr = 2, -+} format_type_t; -+ -+ -+/* Set the default format. */ -+#define FORMAT_DEFAULT_SYSV 0 -+#define FORMAT_DEFAULT_BSD 1 -+#define FORMAT_DEFAULT_AVR 0 -+ -+#if FORMAT_DEFAULT_SYSV -+ #define FORMAT_DEFAULT format_sysv -+ #define FORMAT_NAME "sysv" -+#elif FORMAT_DEFAULT_BSD -+ #define FORMAT_DEFAULT format_bsd -+ #define FORMAT_NAME "berkeley" -+#elif FORMAT_DEFAULT_AVR -+ #define FORMAT_DEFAULT format_avr -+ #define FORMAT_NAME "avr" - #endif - -+ - /* Program options. */ - - static enum -@@ -47,9 +68,8 @@ static enum - } - radix = decimal; - --/* 0 means use AT&T-style output. */ --static int berkeley_format = BSD_DEFAULT; - -+format_type_t format = FORMAT_DEFAULT; - 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; +diff --git a/binutils/size.c b/binutils/size.c +index 3697087714..f99d45a6bf 100644 +--- a/binutils/size.c ++++ b/binutils/size.c +@@ -51,7 +51,8 @@ enum output_format + { + FORMAT_BERKLEY, + FORMAT_SYSV, +- FORMAT_GNU ++ FORMAT_GNU, ++ FORMAT_AVR + }; + static enum output_format selected_output_format = + #if BSD_DEFAULT +@@ -74,6 +75,246 @@ static bfd_size_type total_textsize; /* Program exit status. */ static int return_code = 0; @@ -63,12 +28,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 +51,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,38 +259,25 @@ AVR specific only static char *target = NULL; /* Forward declarations. */ -@@ -78,7 +240,8 @@ usage (FILE *stream, int status) +@@ -89,7 +330,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\ -- -A|-B --format={sysv|berkeley} Select output style (default is %s)\n\ -+ -A|-B|-C --format={sysv|berkeley|avr} Select output style (default is %s)\n\ +- -A|-B|-G --format={sysv|berkeley|gnu} Select output style (default is %s)\n\ ++ -A|-B|-G|-C --format={sysv|berkeley|gnu|avr} Select output style (default is %s)\n\ + --mcu= MCU name for AVR format only\n\ -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) - -h --help Display this information\n\ - -v --version Display the program's version\n\ - \n"), --#if BSD_DEFAULT -- "berkeley" --#else -- "sysv" --#endif -+FORMAT_NAME - ); - list_supported_targets (program_name, stream); - if (REPORT_BUGS_TO[0] && status == 0) -@@ -102,6 +261,7 @@ usage (FILE *stream, int status) +@@ -113,6 +355,7 @@ usage (FILE *stream, int status) #define OPTION_FORMAT (200) #define OPTION_RADIX (OPTION_FORMAT + 1) #define OPTION_TARGET (OPTION_RADIX + 1) -+#define OPTION_MCU (OPTION_TARGET + 1) ++#define OPTION_MCU (OPTION_TARGET + 1) static struct option long_options[] = { -@@ -109,6 +269,7 @@ static struct option long_options[] = +@@ -120,6 +363,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,34 +285,26 @@ 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) - bfd_init (); +@@ -153,7 +397,7 @@ main (int argc, char **argv) + fatal (_("fatal error: libbfd ABI mismatch")); set_default_bfd_target (); -- while ((c = getopt_long (argc, argv, "ABHhVvdfotx", long_options, -+ while ((c = getopt_long (argc, argv, "ABCHhVvdfotx", long_options, +- while ((c = getopt_long (argc, argv, "ABGHhVvdfotx", long_options, ++ while ((c = getopt_long (argc, argv, "ABCGHhVvdfotx", long_options, (int *) 0)) != EOF) switch (c) { -@@ -149,11 +310,15 @@ main (int argc, char **argv) - { - case 'B': - case 'b': -- berkeley_format = 1; -+ format = format_bsd; +@@ -172,12 +416,20 @@ main (int argc, char **argv) + case 'g': + selected_output_format = FORMAT_GNU; break; - case 'S': - case 's': -- berkeley_format = 0; -+ format = format_sysv; -+ break; + case 'A': + case 'a': -+ format = format_avr; - break; ++ selected_output_format = FORMAT_AVR; ++ break; default: non_fatal (_("invalid argument to --format: %s"), optarg); -@@ -161,6 +326,10 @@ main (int argc, char **argv) + usage (stderr, 1); } break; @@ -282,37 +315,20 @@ AVR specific only case OPTION_TARGET: target = optarg; break; -@@ -189,11 +358,14 @@ main (int argc, char **argv) - break; - - case 'A': -- berkeley_format = 0; -+ format = format_sysv; - break; - case 'B': -- berkeley_format = 1; -+ format = format_bsd; +@@ -214,6 +466,9 @@ main (int argc, char **argv) + case 'G': + selected_output_format = FORMAT_GNU; break; + case 'C': -+ format = format_avr; ++ selected_output_format = FORMAT_AVR; + break; case 'v': case 'V': show_version = 1; -@@ -239,7 +411,7 @@ main (int argc, char **argv) - for (; optind < argc;) - display_file (argv[optind++]); - -- if (show_totals && berkeley_format) -+ if (show_totals && format == format_bsd) - { - bfd_size_type total = total_textsize + total_datasize + total_bsssize; - -@@ -600,13 +772,117 @@ print_sysv_format (bfd *file) +@@ -656,6 +911,98 @@ print_sysv_format (bfd *file) printf ("\n\n"); } -+ +static avr_device_t * +avr_find_device (void) +{ @@ -331,8 +347,6 @@ AVR specific only + return (NULL); +} + -+ -+ +static void +print_avr_format (bfd *file) +{ @@ -340,13 +354,13 @@ AVR specific only + int flashmax = 0; + 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; ++ asection *section; ++ 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,26 +372,26 @@ 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 (section); + if ((section = bfd_get_section_by_name (file, ".text")) != NULL) -+ text_size = bfd_section_size (file, section); ++ my_textsize = bfd_section_size (section); + if ((section = bfd_get_section_by_name (file, ".bss")) != NULL) -+ bss_size = bfd_section_size (file, section); ++ my_bsssize = bfd_section_size (section); + if ((section = bfd_get_section_by_name (file, ".bootloader")) != NULL) -+ bootloader_size = bfd_section_size (file, section); ++ bootloadersize = bfd_section_size (section); + if ((section = bfd_get_section_by_name (file, ".noinit")) != NULL) -+ noinit_size = bfd_section_size (file, section); ++ noinitsize = bfd_section_size (section); + if ((section = bfd_get_section_by_name (file, ".eeprom")) != NULL) -+ eeprom_size = 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; -+ ++ eepromsize = bfd_section_size (section); ++ ++ 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" + "Device: %s\n\n", avr_name); -+ ++ + /* Text size */ + printf ("Program:%8ld bytes", text); + if (flashmax > 0) @@ -385,7 +399,7 @@ AVR specific only + printf (" (%2.1f%% Full)", ((float)text / flashmax) * 100); + } + printf ("\n(.text + .data + .bootloader)\n\n"); -+ ++ + /* Data size */ + printf ("Data: %8ld bytes", data); + if (rammax > 0) @@ -393,10 +407,10 @@ AVR specific only + printf (" (%2.1f%% Full)", ((float)data / rammax) * 100); + } + printf ("\n(.data + .bss + .noinit)\n\n"); -+ ++ + /* EEPROM size */ -+ if (eeprom > 0) -+ { ++ if (eeprom > 0) ++ { + printf ("EEPROM: %8ld bytes", eeprom); + if (eeprommax > 0) + { @@ -410,23 +424,12 @@ AVR specific only static void print_sizes (bfd *file) { - if (show_common) +@@ -663,6 +1010,8 @@ print_sizes (bfd *file) calculate_common_size (file); -- if (berkeley_format) -- print_berkeley_format (file); -- else -- print_sysv_format (file); -+ switch (format) -+ { -+ case format_sysv: -+ print_sysv_format (file); -+ break; -+ case format_bsd: -+ print_berkeley_format (file); -+ break; -+ case format_avr: -+ default: -+ print_avr_format (file); -+ break; -+ } + if (selected_output_format == FORMAT_SYSV) + print_sysv_format (file); ++ else if (selected_output_format == FORMAT_AVR) ++ print_avr_format (file); + else + print_berkeley_or_gnu_format (file); } diff --git a/development/avr-gcc/avr-gcc.SlackBuild b/development/avr-gcc/avr-gcc.SlackBuild index a91986fe8c..4030549388 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:-10.2.0} +ISLVERSION=${ISLVERSION:-0.22} 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..4e2fe68d9d 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="10.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-10.2.0/gcc-10.2.0.tar.xz \ + http://isl.gforge.inria.fr/isl-0.22.tar.bz2" +MD5SUM="e9fd9b1789155ad09bcf3ae747596b50 \ + 4e6b2a1dd20b2ac011730a24580ff7a9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="avr-binutils" diff --git a/development/avr-gdb/avr-gdb.SlackBuild b/development/avr-gdb/avr-gdb.SlackBuild index 92d5be38b9..15ff70f92f 100644 --- a/development/avr-gdb/avr-gdb.SlackBuild +++ b/development/avr-gdb/avr-gdb.SlackBuild @@ -5,13 +5,13 @@ # Written by thorsten PRGNAM=avr-gdb -VERSION=${VERSION:-7.8.1} +VERSION=${VERSION:-10.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 @@ -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" @@ -64,7 +64,9 @@ CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \ --target=avr \ --disable-nls \ --enable-languages=c,c++ \ - --with-python=/usr/bin/python2 \ + --with-python=/usr/bin/python3 \ + --with-guile=guile-2.2 \ + --with-system-readline \ --with-system-gdbinit=/etc/gdb/gdbinit \ --program-prefix="avr-" \ --program-suffix="" \ @@ -80,7 +82,8 @@ 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* +( cd $PKG/usr/info + for i in *; do mv $i avr-$i; gzip -9 avr-$i; done ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION for file in COPYING* ChangeLog MAINTAINERS README*; do diff --git a/development/avr-gdb/avr-gdb.info b/development/avr-gdb/avr-gdb.info index 18c9d11808..0d517fb683 100644 --- a/development/avr-gdb/avr-gdb.info +++ b/development/avr-gdb/avr-gdb.info @@ -1,10 +1,10 @@ PRGNAM="avr-gdb" -VERSION="7.8.1" +VERSION="10.1" HOMEPAGE="http://www.gnu.org/software/gdb/" -DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gdb/gdb-7.8.1.tar.xz" -MD5SUM="8072be87a94be0936bc3b4b6941b0862" +DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gdb/gdb-10.1.tar.xz" +MD5SUM="1822a7dd45e7813f4408407eec1a6af1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="avr-gcc" +REQUIRES="avr-gcc guile2.2" MAINTAINER="Thorsten" EMAIL="thorsten.johannvorderbrueggen@t-online.de" 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 760d7f0b48..0000000000 --- a/development/brotli/README +++ /dev/null @@ -1,7 +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 -# 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 , Pisa, Italy +# Copyright 2013-2019 Matteo Bernardini , 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 -# 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., - -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/cmake-202x/README b/development/cmake-202x/README deleted file mode 100644 index 824be89155..0000000000 --- a/development/cmake-202x/README +++ /dev/null @@ -1,14 +0,0 @@ -cmake-202x (cross-platform, open-source make system) - -CMake is used to control the software process using simple platform -and compiler independent configuration files. CMake generates -native makefiles and workspaces that can be used in the -compiler environment of your choice. - -This version of cmake is much newer than the version included in -Slackware 14.2. It installs to /opt, so it won't conflict with the -OS-provided cmake package. - -See README_SBo.txt for directions on using this version of cmake with -your own SlackBuild scripts, or to develop/maintain software that -needs a newer cmake. diff --git a/development/cmake-202x/README_SBo.txt b/development/cmake-202x/README_SBo.txt deleted file mode 100644 index e1531c1172..0000000000 --- a/development/cmake-202x/README_SBo.txt +++ /dev/null @@ -1,35 +0,0 @@ -The main purpose for cmake-202x is to allow SlackBuild scripts to -build software that needs a cmake newer than the version that ships -with Slackware 14.2. - -If you're writing a new SlackBuild or updating an old one, and you're -using cmake.template, but you get an error complaining that CMake is -too old, here's how to use this: - -1. Change the "cmake" command in your SlackBuild to - /opt/cmake-202x/bin/cmake. In context, it will look like: - - mkdir -p build - cd build - export "PATH=/opt/cmake-202x/bin:$PATH" - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - ...etc, etc. - -2. Add cmake-202x to the REQUIRES in your .info file. - -That's it. Your SlackBuild shouldn't need any other changes. If you -want to look at a complete SlackBuild script that uses cmake-202x, -see academic/bibletime. - -Note: If you're using cmake interactively (developing software outside -the context of SlackBuild scripts), there are a couple of things you -might want to add to your .bash_profile to make things smoother: - - export PATH=/opt/cmake-202x/bin:$PATH - export MANPATH=/opt/cmake-202x/man:$MANPATH - -Then when you type "cmake", you'll get the new version. Also "man -cmake" will show the man page for the new version. You *don't* need -this stuff in a SlackBuild script! diff --git a/development/cmake-202x/cmake-202x.SlackBuild b/development/cmake-202x/cmake-202x.SlackBuild deleted file mode 100644 index fdc060f793..0000000000 --- a/development/cmake-202x/cmake-202x.SlackBuild +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/sh - -############################################################ -# NOTE: Remove this from the repo when 15.0 ships! # -# Also remove cmake-202x from REQUIRES in all .info files! # -############################################################ - -# Slackware build script for cmake-202x - -# Written by B. Watson (yalhcru@gmail.com) - -# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. - -# This build exists because the cmake in Slackware 14.2 is too old, -# and can't be upgraded. This installs cmake under /opt, where it -# won't conflict with anything. README explains how to use it in your -# SlackBuild. - -# cmake.manpages.tar.lz comes from Slackware, courtesy of Pat V. Since -# it's from -current (therefore subject to change), I mirrored the -# version I'm using on slackware.uk. - -# 20210306 bkw: updated for 3.19.6 (sync with -current). -# 20201108 bkw: updated for 3.18.4, put version number in manpages URL. - -PRGNAM=cmake-202x -SRCNAM=cmake -VERSION=${VERSION:-3.19.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.gz -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 {} \+ - -PREFIX=${PREFIX:-/opt/$PRGNAM} -PKGPREFIX=$PKG/$PREFIX - -# The --system-* and --no-system-* stuff is intended to use system -# versions of libraries that ship with core Slackware, and bundled -# (non-system) libs for everything that isn't in core, *even* if -# it's available on SBo. This will prevent SBo upgrades from randomly -# breaking things. - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./bootstrap \ - --system-curl \ - --system-expat \ - --no-system-jsoncpp \ - --system-zlib \ - --system-bzip2 \ - --system-liblzma \ - --no-system-nghttp2 \ - --no-system-zstd \ - --system-libarchive \ - --no-system-librhash \ - --no-system-libuv \ - --prefix=$PREFIX - -make -make install/strip DESTDIR=$PKG - -# To avoid a dependency on Sphinx (which has *26 dependencies* of its own), -# use Pat's prebuilt man pages. -MAN=$CWD/$SRCNAM.manpages.tar.lz -MANV=$CWD/$SRCNAM.manpages.$VERSION.tar.lz -[ -e "$MANV" ] && MAN="$MANV" - -tar xvf $MAN -mv usr/man $PKGPREFIX/man -gzip -9 $PKGPREFIX/man/man?/*.? - -# Nothing in the doc dir but licenses. Move it to where users expect -# to find it. -mkdir -p $PKG/usr/doc -mv $PKGPREFIX/doc/$SRCNAM-* $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKGPREFIX/doc - -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/README_SBo.txt > $PKG/usr/doc/$PRGNAM-$VERSION/README_SBo.txt - -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/cmake-202x/cmake-202x.info b/development/cmake-202x/cmake-202x.info deleted file mode 100644 index 46a74f7389..0000000000 --- a/development/cmake-202x/cmake-202x.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="cmake-202x" -VERSION="3.19.6" -HOMEPAGE="https://cmake.org/" -DOWNLOAD="https://github.com/Kitware/CMake/releases/download/v3.19.6/cmake-3.19.6.tar.gz \ - https://slackware.uk/~urchlay/src/cmake.manpages.3.19.6.tar.lz" -MD5SUM="aec448bdfb4436c7cde2066baf5fc66c \ - 3ecf5bbb544598bb20e9dca4c7d489e5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" diff --git a/development/cmake-202x/slack-desc b/development/cmake-202x/slack-desc deleted file mode 100644 index fe365b638b..0000000000 --- a/development/cmake-202x/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------------------------------------------------------| -cmake-202x: cmake-202x (cross-platform, open-source make system) -cmake-202x: -cmake-202x: CMake is used to control the software process using simple platform -cmake-202x: and compiler independent configuration files. CMake generates -cmake-202x: native makefiles and workspaces that can be used in the -cmake-202x: compiler environment of your choice. -cmake-202x: -cmake-202x: This version of cmake is much newer than the version included in -cmake-202x: Slackware 14.2. It installs to /opt, so it won't conflict with the -cmake-202x: OS-provided cmake package. -cmake-202x: 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..811fbb7c4e 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} @@ -56,11 +56,13 @@ else 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 +tar xvf $CWD/$PRGNAM-$VERSION.tar.lz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -70,7 +72,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; make clean -make CFLAGS="$SLKCFLAGS" PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} +make CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} make install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ 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 f782f52b93..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 , 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/elixir/elixir.SlackBuild b/development/elixir/elixir.SlackBuild index da19c9db2a..b766f23124 100644 --- a/development/elixir/elixir.SlackBuild +++ b/development/elixir/elixir.SlackBuild @@ -27,7 +27,7 @@ ## this SlackBuild. PRGNAM=elixir -VERSION=${VERSION:-1.9.0} +VERSION=${VERSION:-1.11.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -81,9 +81,9 @@ chown -R root:root $PKG/usr/lib${LIBDIRSUFFIX}/elixir chmod -R u+w,go+r-w,a-s $PKG/usr/lib${LIBDIRSUFFIX}/elixir mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -for file in CHANGELOG.md CODE_OF_CONDUCT.md ISSUE_TEMPLATE.md LICENSE \ - NOTICE README.md RELEASE.md VERSION ; do - cp $file $PKG/usr/doc/$PRGNAM-$VERSION +for file in CHANGELOG.md CODE_OF_CONDUCT.md LICENSE \ + NOTICE README.md RELEASE.md SECURITY.md VERSION ; do + cp $file $PKG/usr/doc/$PRGNAM-$VERSION done cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/elixir/elixir.info b/development/elixir/elixir.info index db08f46b14..9fa0a45f3b 100644 --- a/development/elixir/elixir.info +++ b/development/elixir/elixir.info @@ -1,8 +1,8 @@ PRGNAM="elixir" -VERSION="1.9.0" +VERSION="1.11.3" HOMEPAGE="https://elixir-lang.org" -DOWNLOAD="https://github.com/elixir-lang/elixir/archive/v1.9.0/elixir-1.9.0.tar.gz" -MD5SUM="73b008e9bfa1cff1a8340505b36bcceb" +DOWNLOAD="https://github.com/elixir-lang/elixir/archive/v1.11.3/elixir-1.11.3.tar.gz" +MD5SUM="0319a8428c647cdbc373312a5c25fb5e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="erlang-otp" diff --git a/development/erlang-otp/erlang-otp.SlackBuild b/development/erlang-otp/erlang-otp.SlackBuild index bb1978409f..66b675e2e7 100644 --- a/development/erlang-otp/erlang-otp.SlackBuild +++ b/development/erlang-otp/erlang-otp.SlackBuild @@ -21,7 +21,7 @@ # of README in upstream PRGNAM=erlang-otp -VERSION=${VERSION:-22.0} +VERSION=${VERSION:-23.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/erlang-otp/erlang-otp.info b/development/erlang-otp/erlang-otp.info index 5290d8fab4..86bd348978 100644 --- a/development/erlang-otp/erlang-otp.info +++ b/development/erlang-otp/erlang-otp.info @@ -1,10 +1,10 @@ PRGNAM="erlang-otp" -VERSION="22.0" +VERSION="23.2" HOMEPAGE="http://www.erlang.org" -DOWNLOAD="http://www.erlang.org/download/otp_src_22.0.tar.gz \ - http://www.erlang.org/download/otp_doc_man_22.0.tar.gz" -MD5SUM="9842663e49f48e967c44b7574423f9e9 \ - 7136c499d44e99313a06109458a6d793" +DOWNLOAD="http://www.erlang.org/download/otp_src_23.2.tar.gz \ + http://www.erlang.org/download/otp_doc_man_23.2.tar.gz" +MD5SUM="e315f59eb9e420a0e469c09649f4303f \ + cfef029c3d4d6acf2cc04f8589002ecd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/extra-cmake-modules/README b/development/extra-cmake-modules/README deleted file mode 100644 index 02464a57ba..0000000000 --- a/development/extra-cmake-modules/README +++ /dev/null @@ -1,6 +0,0 @@ -CMake extra modules (extra cmake modules for compiling KDE Frameworks) - -This package contains additional cmake modules required for compiling -KDE Frameworks 5. - -Sphinx is an optional dependency to build the modules documentation. diff --git a/development/extra-cmake-modules/extra-cmake-modules.SlackBuild b/development/extra-cmake-modules/extra-cmake-modules.SlackBuild deleted file mode 100644 index 89815ccc56..0000000000 --- a/development/extra-cmake-modules/extra-cmake-modules.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -# Slackware build script for extra-cmake-modules -# Copyright 2014, 2015 Eric Hameleers, Eindhoven, NL -# Copyright 2014 Patrick J. Volkerding, Sebeka, Minnesota, 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. -# -# Adapted by Fellype do Nascimento - fellype(at)gmail.com - -PRGNAM=extra-cmake-modules -VERSION=${VERSION:-5.51.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 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DDOC_INSTALL_DIR=/usr/doc/$PRGNAM-$VERSION \ - -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 - -if [ $(which sphinx-build 2>/dev/null) ]; 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-CMAKE-SCRIPTS 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/development/extra-cmake-modules/extra-cmake-modules.info b/development/extra-cmake-modules/extra-cmake-modules.info deleted file mode 100644 index 42220ec3df..0000000000 --- a/development/extra-cmake-modules/extra-cmake-modules.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="extra-cmake-modules" -VERSION="5.51.0" -HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git" -DOWNLOAD="https://github.com/KDE/extra-cmake-modules/archive/v5.51.0/extra-cmake-modules-5.51.0.tar.gz" -MD5SUM="9801d0bca6cc3ae9cbdcfe2eb02b9e94" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Fellype do Nascimento" -EMAIL="fellype(at)gmail.com" diff --git a/development/extra-cmake-modules/slack-desc b/development/extra-cmake-modules/slack-desc deleted file mode 100644 index b03f1de920..0000000000 --- a/development/extra-cmake-modules/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------------------------------------------------------| -extra-cmake-modules: extra-cmake-modules (CMake extra modules) -extra-cmake-modules: -extra-cmake-modules: This package contains additional cmake modules required for -extra-cmake-modules: compiling KDE Frameworks 5. -extra-cmake-modules: -extra-cmake-modules: -extra-cmake-modules: -extra-cmake-modules: -extra-cmake-modules: -extra-cmake-modules: -extra-cmake-modules: 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 + + * 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(¤t_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 + + * 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 + + * 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 + Dan Rosenberg + + * 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 + + * 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 for OpenJDK. +# Modified 2017, 2018 by Eric Hameleers 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 + 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 +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 +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 +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 +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 +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 +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 +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 + + * 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 + + * 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 + + 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 + + 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 +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 + + * 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 + + * 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 + + 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 + + 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 +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 + + * 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 + + * 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 + + * 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 + + * 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 + + * 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 + + * 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 +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 + + * 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 + + * 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 + + * 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 + + * 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 + + * 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 + + * 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 +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 + + * 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 + + * 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 +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 + + * 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 + + * 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 +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 + + * 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 + + * 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 +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 + + * 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 + + * 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 + #endif + #include +-#include + #include + #include + #include +@@ -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 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/README b/development/glade/README deleted file mode 100644 index 5706603919..0000000000 --- a/development/glade/README +++ /dev/null @@ -1,12 +0,0 @@ -Glade (GTK+3 User Interface Builder) - -Glade is a RAD tool to enable quick & easy development of user -interfaces for the Gtk+ toolkit and the GNOME desktop environment. -The user interfaces designed in Glade are stored in XML format, -enabling easy integration with external tools. - -This version of Glade (Glade-3) is a complete rewrite of the original -Glade codebase. - -Please note that this version is different than glade3 provided by -Slackware, which is glade3-3.8.3 for GTK+2; this package is for GTK+3. diff --git a/development/glade/doinst.sh b/development/glade/doinst.sh deleted file mode 100644 index 19400050fd..0000000000 --- a/development/glade/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/development/glade/glade.SlackBuild b/development/glade/glade.SlackBuild deleted file mode 100644 index 1741b2a9cb..0000000000 --- a/development/glade/glade.SlackBuild +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh - -# Slackware build script for glade - -# Copyright 2013 Bart van der Hall -# 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=glade -VERSION=${VERSION:-3.18.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.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 AUTHORS COPYING* INSTALL NEWS README* 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: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PRGNAM}-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -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/glade/glade.info b/development/glade/glade.info deleted file mode 100644 index fff72106e7..0000000000 --- a/development/glade/glade.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="glade" -VERSION="3.18.3" -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_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Bart van der Hall" -EMAIL="bart@omgwtfroflol.com" diff --git a/development/glade/slack-desc b/development/glade/slack-desc deleted file mode 100644 index ceaf2099c9..0000000000 --- a/development/glade/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------------------------------------------------------| -glade: glade (GTK+ User Interface Builder) -glade: -glade: Glade is a RAD tool to enable quick & easy development of user -glade: interfaces for the Gtk+ toolkit and the GNOME desktop environment. -glade: The user interfaces designed in Glade are stored in XML format, -glade: enabling easy integration with external tools. -glade: -glade: This version of Glade (Glade-3) is a complete rewrite of the original -glade: Glade codebase. -glade: -glade: 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 +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 + +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(©_impl::handle_enable, this, _1)); ++ boost::bind(©_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(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 + #include + #include +-#include //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/gnustep-base/gnustep-base.SlackBuild b/development/gnustep-base/gnustep-base.SlackBuild index e94f944f05..a8c5115451 100644 --- a/development/gnustep-base/gnustep-base.SlackBuild +++ b/development/gnustep-base/gnustep-base.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gnustep-base -VERSION=${VERSION:-1.25.1} +VERSION=${VERSION:-1.27.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -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/icu68.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/development/gnustep-base/gnustep-base.info b/development/gnustep-base/gnustep-base.info index 7858c5c43c..2025df0b15 100644 --- a/development/gnustep-base/gnustep-base.info +++ b/development/gnustep-base/gnustep-base.info @@ -1,8 +1,8 @@ PRGNAM="gnustep-base" -VERSION="1.25.1" +VERSION="1.27.0" HOMEPAGE="http://www.gnustep.org" -DOWNLOAD="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.25.1.tar.gz" -MD5SUM="757130f80a31e9ee30d8c2b83b0c226a" +DOWNLOAD="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.27.0.tar.gz" +MD5SUM="6f1876a867d1862267a562d4cbb9ede3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gnustep-make" diff --git a/development/gnustep-base/icu68.patch b/development/gnustep-base/icu68.patch new file mode 100644 index 0000000000..2374d8e249 --- /dev/null +++ b/development/gnustep-base/icu68.patch @@ -0,0 +1,31 @@ +From 06fa7792a51cb970e5d010a393cb88eb127830d7 Mon Sep 17 00:00:00 2001 +From: Frederik Seiffert +Date: Thu, 12 Nov 2020 17:18:09 +0100 +Subject: [PATCH] Fix compilation with ICU 68. + +--- + Source/GSICUString.h | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/Source/GSICUString.h b/Source/GSICUString.h +index a82447a51..15c21491d 100644 +--- a/Source/GSICUString.h ++++ b/Source/GSICUString.h +@@ -2,6 +2,17 @@ + #import + #include + ++/* ++ * Define TRUE/FALSE to be used with UBool parameters, as these are no longer ++ * defined in ICU as of ICU 68. ++ */ ++#ifndef TRUE ++#define TRUE 1 ++#endif ++#ifndef FALSE ++#define FALSE 0 ++#endif ++ + /** + * Initialises a UText structure with an NSString. If txt is NULL, then this + * allocates a new structure on the heap, otherwise it fills in the existing diff --git a/development/gnustep-make/gnustep-make.SlackBuild b/development/gnustep-make/gnustep-make.SlackBuild index 480187bc01..11263dd05a 100644 --- a/development/gnustep-make/gnustep-make.SlackBuild +++ b/development/gnustep-make/gnustep-make.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gnustep-make -VERSION=${VERSION:-2.7.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.8.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/development/gnustep-make/gnustep-make.info b/development/gnustep-make/gnustep-make.info index 192054bdc9..0ac041de84 100644 --- a/development/gnustep-make/gnustep-make.info +++ b/development/gnustep-make/gnustep-make.info @@ -1,8 +1,8 @@ PRGNAM="gnustep-make" -VERSION="2.7.0" +VERSION="2.8.0" HOMEPAGE="http://www.gnustep.org" -DOWNLOAD="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.7.0.tar.gz" -MD5SUM="bd3981da51667df1d011f807895db65d" +DOWNLOAD="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.8.0.tar.gz" +MD5SUM="90f96edf0fa536c32e9155e48698317b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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 deleted file mode 100644 index 87a9fcefdf..0000000000 --- a/development/gsoap/gsoap-libtool.patch +++ /dev/null @@ -1,136 +0,0 @@ -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 -@@ -16,8 +16,7 @@ - AM_PROG_LEX - AC_PROG_YACC - AC_PROG_CPP --AC_PROG_RANLIB --#AM_PROG_LIBTOOL -+AM_PROG_LIBTOOL - AC_PROG_LN_S - AC_PROG_AWK - AC_PROG_INSTALL -@@ -236,16 +235,16 @@ - WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" - SAMPLE_INCLUDES= - SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" -- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" -+ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" - 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" - 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 @@ - 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) -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 -@@ -34,20 +34,30 @@ - dom_cpp.cpp: dom.cpp - $(LN_S) -f $(srcdir)/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_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp --libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(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_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp --libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(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_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 -+SOVERSION = 0 -+ -+libgsoap_la_SOURCES = stdsoap2.c dom.c -+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(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_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_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_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_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_LDFLAGS = -version-info $(SOVERSION) -+libgsoapssl___la_LIBADD = -lssl -lcrypto -lz - - BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES) - -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 -@@ -13,13 +13,13 @@ - SOAP_C_CORE=soapC.c - SOAP_C_CLIENT=soapClient.c $(SOAP_C_CORE) - SOAP_C_SERVER=soapServer.c $(SOAP_C_CORE) --SOAP_C_LIB=$(top_builddir)/gsoap/libgsoap.a --SOAP_C_LIB_CK=$(top_builddir)/gsoap/libgsoapck.a --SOAP_C_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl.a -+SOAP_C_LIB=$(top_builddir)/gsoap/libgsoap.la -+SOAP_C_LIB_CK=$(top_builddir)/gsoap/libgsoapck.la -+SOAP_C_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl.la - - SOAP_CPP_CORE=soapC.cpp - SOAP_CPP_CLIENT=soapClient.cpp $(SOAP_CPP_CORE) - SOAP_CPP_SERVER=soapServer.cpp $(SOAP_CPP_CORE) --SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a --SOAP_CPP_LIB_CK=$(top_builddir)/gsoap/libgsoapck++.a --SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.a -+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la -+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 -@@ -14,7 +14,7 @@ - WSDLINPUT=$(srcdir)/examples.wsdl - SOAPHEADER=$(srcdir)/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 - - $(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 -@@ -14,7 +14,7 @@ - WSDLINPUT=$(srcdir)/address.xsd - SOAPHEADER=$(srcdir)/address.h - SOAP_CPP_SRC=addressC.cpp --SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a -+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la - - $(SOAP_CPP_SRC) : $(WSDLINPUT) - $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) diff --git a/development/gsoap/gsoap.SlackBuild b/development/gsoap/gsoap.SlackBuild index a92cd16d6a..badaad965d 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,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gsoap -VERSION=${VERSION:-2.8.46} +VERSION=${VERSION:-2.8.111} 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,8 +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 {} \; +# Patches from Gentoo +# Fix Pre-ISO headers +patch -p1 -i $CWD/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch # Build shared libraries -patch -p1 -i $CWD/gsoap-libtool.patch +patch -p1 -i $CWD/patches/gsoap-2.8.91-shared_libs.patch autoreconf -vif @@ -82,9 +85,10 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --disable-static \ + --disable-xlocale \ --build=$ARCH-slackware-linux -make -j1 +make make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/development/gsoap/gsoap.info b/development/gsoap/gsoap.info index 1f3e52d4cd..edaf16692e 100644 --- a/development/gsoap/gsoap.info +++ b/development/gsoap/gsoap.info @@ -1,8 +1,8 @@ PRGNAM="gsoap" -VERSION="2.8.46" +VERSION="2.8.111" HOMEPAGE="http://gsoap2.sourceforge.net/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/gsoap_2.8.46.zip" -MD5SUM="e7ff6c940730371dcb90079ca56a8551" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/gsoap_2.8.111.zip" +MD5SUM="dc579d96d8a331a42a845e2541aae763" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/gsoap/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch b/development/gsoap/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch new file mode 100644 index 0000000000..673deb17c3 --- /dev/null +++ b/development/gsoap/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch @@ -0,0 +1,12 @@ +--- gsoap-2.7/gsoap/Makefile.am 2008-01-27 15:02:36.000000000 -0600 ++++ gsoap-2.7mf/gsoap/Makefile.am 2008-01-28 10:24:26.000000000 -0600 +@@ -12,6 +12,9 @@ CLEANFILES=soapcpp2 stdsoap2_cpp.cpp std + AM_CXXFLAGS=$(SOAPCPP2_DEBUG) -D$(platform) + AM_CFLAGS=$(SOAPCPP2_DEBUG) -D$(platform) + ++# Install all soapcpp2 and wsdl2h files into /usr/share/gsoap ++nobase_pkgdata_DATA = import/* plugin/* WS/* custom/* extras/* ++ + ## we cannot build stdsoap2.o from 2 different sources (stdsoap2.cpp and stdsoap2.c), so we need an intermediate target: + stdsoap2_ck.c: stdsoap2.cpp + $(LN_S) $(srcdir)/stdsoap2.cpp stdsoap2_ck.c diff --git a/development/gsoap/patches/gsoap-2.8.91-shared_libs.patch b/development/gsoap/patches/gsoap-2.8.91-shared_libs.patch new file mode 100644 index 0000000000..1fcdeeb698 --- /dev/null +++ b/development/gsoap/patches/gsoap-2.8.91-shared_libs.patch @@ -0,0 +1,142 @@ +--- gsoap-2.8/configure.ac ++++ gsoap-2.8/configure.ac +@@ -17,7 +17,7 @@ + AC_PROG_YACC + AC_PROG_CPP + AC_PROG_RANLIB +-#AM_PROG_LIBTOOL ++AM_PROG_LIBTOOL + AC_PROG_LN_S + AC_PROG_AWK + AC_PROG_INSTALL +@@ -307,15 +307,17 @@ + WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" + SAMPLE_INCLUDES= + SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" +- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" + else + AC_MSG_RESULT(no) + WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" + # compile with wsdl2h when OPENSSL is available +- 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_STATIC_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" + fi + if test -n "$ZLIB"; then + WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}" +@@ -334,7 +336,8 @@ + WSDL2H_EXTRA_FLAGS= + SAMPLE_SSL_LIBS= + SAMPLE_INCLUDES= +- WSDL2H_SOAP_CPP_LIB="libgsoap++.a" ++ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a" ++ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" + fi + AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes") + AC_SUBST(WITH_OPENSSL) +@@ -342,7 +345,8 @@ + AC_SUBST(WSDL2H_EXTRA_LIBS) + AC_SUBST(SAMPLE_INCLUDES) + AC_SUBST(SAMPLE_SSL_LIBS) +-AC_SUBST(WSDL2H_SOAP_CPP_LIB) ++AC_SUBST(WSDL2H_SOAP_CPP_SHARED_LIB) ++AC_SUBST(WSDL2H_SOAP_CPP_STATIC_LIB) + + # enable the compile of the samples + AC_ARG_ENABLE(samples, +--- gsoap-2.8/gsoap/Makefile.am ++++ gsoap-2.8/gsoap/Makefile.am +@@ -49,6 +49,29 @@ + libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp + libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES + ++lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la ++SOVERSION = 0 ++libgsoap_la_SOURCES = stdsoap2.c dom.c ++libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(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_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_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_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_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_LDFLAGS = -version-info $(SOVERSION) ++libgsoapssl___la_LIBADD = -lssl -lcrypto -lz ++ + BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp + + include_HEADERS = stdsoap2.h +--- gsoap-2.8/gsoap/samples/autotest/Makefile.am ++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am +@@ -14,7 +14,7 @@ + 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_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a + + $(SOAP_CPP_SRC) : $(WSDLINPUT) + $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) +@@ -40,6 +40,6 @@ + autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform) + autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS) + autotest_SOURCES=$(SOAP_CPP_SRC) soapTester.cpp duration.cpp long_time.cpp struct_tm.cpp struct_tm_date.cpp +-autotest_LDADD=$(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS) ++autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS) + + CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap +--- gsoap-2.8/gsoap/samples/databinding/Makefile.am ++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am +@@ -14,7 +14,7 @@ + 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_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a + + $(SOAP_CPP_SRC) : $(WSDLINPUT) + $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) +@@ -28,6 +28,6 @@ + address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform) + address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS) + address_SOURCES=$(SOAP_CPP_SRC) address.cpp +-address_LDADD=$(SOAP_CPP_LIB) ++address_LDADD=$(SOAP_CPP_SHARED_LIB) + + CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap +--- gsoap-2.8/gsoap/wsdl/Makefile.am ++++ gsoap-2.8/gsoap/wsdl/Makefile.am +@@ -10,7 +10,7 @@ + AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin + AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin + SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT) +-SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB) ++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB) + SOAP_CPP_SRC=wsdlC.cpp + SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h + SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import +@@ -29,7 +29,7 @@ + wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_INCLUDE_XLOCALE) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH) + wsdl2h_CPPFLAGS=$(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform) + wsdl2h_SOURCES=wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC) +-wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS) ++wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS) + if WITH_OPENSSL + wsdl2h_SOURCES+=$(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c + wsdl2h_LDADD+=-lpthread diff --git a/development/gtest/gtest.SlackBuild b/development/gtest/gtest.SlackBuild index 6e94355747..e00b9f413f 100644 --- a/development/gtest/gtest.SlackBuild +++ b/development/gtest/gtest.SlackBuild @@ -72,12 +72,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 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done + mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_BUILD_TYPE=Release .. @@ -87,18 +90,24 @@ cd .. mkdir -p $PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/include/$PRGNAM/internal/custom \ $PKG/usr/include/gmock/internal/custom -#install -m 0644 build/googlemock/*.so $PKG/usr/lib$LIBDIRSUFFIX install -m 0644 googlemock/include/gmock/*.h $PKG/usr/include/gmock install -m 0644 googlemock/include/gmock/internal/*.h $PKG/usr/include/gmock/internal/ install -m 0644 googlemock/include/gmock/internal/custom/*.h \ $PKG/usr/include/gmock/internal/custom -#install -m 0644 build/googlemock/$PRGNAM/*.so $PKG/usr/lib$LIBDIRSUFFIX install -m 0644 googletest/include/$PRGNAM/*.h $PKG/usr/include/$PRGNAM/ install -m 0644 googletest/include/$PRGNAM/internal/*.h $PKG/usr/include/$PRGNAM/internal/ install -m 0644 googletest/include/$PRGNAM/internal/custom/*.h \ $PKG/usr/include/$PRGNAM/internal/custom +# install the libs and the pkgconfig files! +install -m 0644 build/lib/*.so $PKG/usr/lib$LIBDIRSUFFIX +mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig +for i in gmock gmock_main gtest gtest_main ; do + sed "s| -lpthread||g" build/googletest/generated/${i}.pc \ + > $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/${i}.pc +done + mkdir -p $PKG/usr/src cp -R googlemock $PKG/usr/src cp -R googletest /$PKG/usr/src diff --git a/development/gtest/patches/gtest-PR2491-Fix-gnu-install-dirs-pkg-config.patch b/development/gtest/patches/gtest-PR2491-Fix-gnu-install-dirs-pkg-config.patch new file mode 100644 index 0000000000..0e72fad799 --- /dev/null +++ b/development/gtest/patches/gtest-PR2491-Fix-gnu-install-dirs-pkg-config.patch @@ -0,0 +1,166 @@ +From 5126ff48d9ac54828d1947d1423a5ef2a8efee3b Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Sat, 5 Oct 2019 15:58:45 +0200 +Subject: [PATCH 1/2] Revert "Use pcfiledir for prefix in pkgconfig file" + +The change makes implicit assumptions on the layout of the install +tree, which is going to break in many ways. + +The correct solution is to use the `PKG_CONFIG_SYSROOT_DIR` variable +to inject the cross-compiled sysroot into `-I` and `-L` paths. +--- + googlemock/cmake/gmock.pc.in | 5 ++--- + googlemock/cmake/gmock_main.pc.in | 5 ++--- + googletest/cmake/gtest.pc.in | 5 ++--- + googletest/cmake/gtest_main.pc.in | 5 ++--- + 4 files changed, 8 insertions(+), 12 deletions(-) + +diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in +index 08e045474..2ef0fbca1 100644 +--- a/googlemock/cmake/gmock.pc.in ++++ b/googlemock/cmake/gmock.pc.in +@@ -1,6 +1,5 @@ +-prefix=${pcfiledir}/../.. +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: gmock + Description: GoogleMock (without main() function) +diff --git a/googlemock/cmake/gmock_main.pc.in b/googlemock/cmake/gmock_main.pc.in +index b22fe6148..04658fe2e 100644 +--- a/googlemock/cmake/gmock_main.pc.in ++++ b/googlemock/cmake/gmock_main.pc.in +@@ -1,6 +1,5 @@ +-prefix=${pcfiledir}/../.. +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: gmock_main + Description: GoogleMock (with main() function) +diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in +index 9aae29e26..e7967ad56 100644 +--- a/googletest/cmake/gtest.pc.in ++++ b/googletest/cmake/gtest.pc.in +@@ -1,6 +1,5 @@ +-prefix=${pcfiledir}/../.. +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: gtest + Description: GoogleTest (without main() function) +diff --git a/googletest/cmake/gtest_main.pc.in b/googletest/cmake/gtest_main.pc.in +index 915f2973a..fe25d9c73 100644 +--- a/googletest/cmake/gtest_main.pc.in ++++ b/googletest/cmake/gtest_main.pc.in +@@ -1,6 +1,5 @@ +-prefix=${pcfiledir}/../.. +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: gtest_main + Description: GoogleTest (with main() function) + +From b96832a44b4994cafc824f200d69232d79f30d81 Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Sat, 5 Oct 2019 15:58:48 +0200 +Subject: [PATCH 2/2] Add documentation for pkg-config in cross-compilation + settings + +--- + googletest/docs/pkgconfig.md | 78 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 78 insertions(+) + +diff --git a/googletest/docs/pkgconfig.md b/googletest/docs/pkgconfig.md +index 6dc067388..d5f361448 100644 +--- a/googletest/docs/pkgconfig.md ++++ b/googletest/docs/pkgconfig.md +@@ -139,3 +139,81 @@ export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig + ``` + + pkg-config will also try to look in `PKG_CONFIG_PATH` to find `gtest_main.pc`. ++ ++### Using pkg-config in a cross-compilation setting ++ ++Pkg-config can be used in a cross-compilation setting too. To do this, let's ++assume the final prefix of the cross-compiled installation will be `/usr`, ++and your sysroot is `/home/MYUSER/sysroot`. Configure and install GTest using ++ ++``` ++mkdir build && cmake -DCMAKE_INSTALL_PREFIX=/usr .. ++``` ++ ++Install into the sysroot using `DESTDIR`: ++ ++``` ++make -j install DESTDIR=/home/MYUSER/sysroot ++``` ++ ++Before we continue, it is recommended to **always** define the following two ++variables for pkg-config in a cross-compilation setting: ++ ++``` ++export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=yes ++export PKG_CONFIG_ALLOW_SYSTEM_LIBS=yes ++``` ++ ++otherwise `pkg-config` will filter `-I` and `-L` flags against standard ++prefixes such as `/usr` (see https://bugs.freedesktop.org/show_bug.cgi?id=28264#c3 ++for reasons why this stripping needs to occur usually). ++ ++If you look at the generated pkg-config file, it will look something like ++ ++``` ++libdir=/usr/lib64 ++includedir=/usr/include ++ ++Name: gtest ++Description: GoogleTest (without main() function) ++Version: 1.10.0 ++URL: https://github.com/google/googletest ++Libs: -L${libdir} -lgtest -lpthread ++Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1 -lpthread ++``` ++ ++Notice that the sysroot is not included in `libdir` and `includedir`! If you ++try to run `pkg-config` with the correct ++`PKG_CONFIG_LIBDIR=/home/MYUSER/sysroot/usr/lib64/pkgconfig` against this `.pc` ++file, you will get ++ ++``` ++$ pkg-config --cflags gtest ++-DGTEST_HAS_PTHREAD=1 -lpthread -I/usr/include ++$ pkg-config --libs gtest ++-L/usr/lib64 -lgtest -lpthread ++``` ++ ++which is obviously wrong and points to the `CBUILD` and not `CHOST` root. ++In order to use this in a cross-compilation setting, we need to tell ++pkg-config to inject the actual sysroot into `-I` and `-L` variables. Let us ++now tell pkg-config about the actual sysroot ++ ++``` ++export PKG_CONFIG_DIR= ++export PKG_CONFIG_SYSROOT_DIR=/home/MYUSER/sysroot ++export PKG_CONFIG_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}/usr/lib64/pkgconfig ++``` ++ ++and running `pkg-config` again we get ++ ++``` ++$ pkg-config --cflags gtest ++-DGTEST_HAS_PTHREAD=1 -lpthread -I/home/MYUSER/sysroot/usr/include ++$ pkg-config --libs gtest ++-L/home/MYUSER/sysroot/usr/lib64 -lgtest -lpthread ++``` ++ ++which contains the correct sysroot now. For a more comprehensive guide to ++also including `${CHOST}` in build system calls, see the excellent tutorial ++by Diego Elio Pettenò: https://autotools.io/pkgconfig/cross-compiling.html diff --git a/development/gtest/patches/gtest-PR2556-pkg-config-Remove-pthread-link-flag-from-Cflags.patch b/development/gtest/patches/gtest-PR2556-pkg-config-Remove-pthread-link-flag-from-Cflags.patch new file mode 100644 index 0000000000..80f9ce7353 --- /dev/null +++ b/development/gtest/patches/gtest-PR2556-pkg-config-Remove-pthread-link-flag-from-Cflags.patch @@ -0,0 +1,61 @@ +From 6caa879a42d97f1b02ecc90c77fc486220251fa1 Mon Sep 17 00:00:00 2001 +From: Martin Erik Werner +Date: Sat, 19 Oct 2019 19:37:16 +0200 +Subject: [PATCH] pkg-config: Remove pthread link flag from Cflags + +Remove the threads link library variable references from the pkg-config +Cflags: field, removing -lpthread(s) from the compile flags. + +"-l*" linker flags should only be part of the Libs: section and should +not be part of the Cflags: section in pkg-config files. + +This was first suggested in +https://github.com/google/googletest/pull/2006 and further discussed in +https://github.com/google/googletest/pull/2483 . +--- + googlemock/cmake/gmock.pc.in | 2 +- + googlemock/cmake/gmock_main.pc.in | 2 +- + googletest/cmake/gtest.pc.in | 2 +- + googletest/cmake/gtest_main.pc.in | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in +index 08e045474..99eb3e178 100644 +--- a/googlemock/cmake/gmock.pc.in ++++ b/googlemock/cmake/gmock.pc.in +@@ -8,4 +8,4 @@ Version: @PROJECT_VERSION@ + URL: https://github.com/google/googletest + Requires: gtest + Libs: -L${libdir} -lgmock @CMAKE_THREAD_LIBS_INIT@ +-Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ ++Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ +diff --git a/googlemock/cmake/gmock_main.pc.in b/googlemock/cmake/gmock_main.pc.in +index b22fe6148..3186f8edc 100644 +--- a/googlemock/cmake/gmock_main.pc.in ++++ b/googlemock/cmake/gmock_main.pc.in +@@ -8,4 +8,4 @@ Version: @PROJECT_VERSION@ + URL: https://github.com/google/googletest + Requires: gmock + Libs: -L${libdir} -lgmock_main @CMAKE_THREAD_LIBS_INIT@ +-Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ ++Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ +diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in +index 9aae29e26..49d70c9bb 100644 +--- a/googletest/cmake/gtest.pc.in ++++ b/googletest/cmake/gtest.pc.in +@@ -7,4 +7,4 @@ Description: GoogleTest (without main() function) + Version: @PROJECT_VERSION@ + URL: https://github.com/google/googletest + Libs: -L${libdir} -lgtest @CMAKE_THREAD_LIBS_INIT@ +-Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ ++Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ +diff --git a/googletest/cmake/gtest_main.pc.in b/googletest/cmake/gtest_main.pc.in +index 915f2973a..e0d81a8d6 100644 +--- a/googletest/cmake/gtest_main.pc.in ++++ b/googletest/cmake/gtest_main.pc.in +@@ -8,4 +8,4 @@ Version: @PROJECT_VERSION@ + URL: https://github.com/google/googletest + Requires: gtest + Libs: -L${libdir} -lgtest_main @CMAKE_THREAD_LIBS_INIT@ +-Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ ++Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ diff --git a/development/gtkdialog/gtkdialog-0.8.3-fno-common.patch b/development/gtkdialog/gtkdialog-0.8.3-fno-common.patch new file mode 100644 index 0000000000..86fa6a9700 --- /dev/null +++ b/development/gtkdialog/gtkdialog-0.8.3-fno-common.patch @@ -0,0 +1,51 @@ +--- a/src/gtkdialog.h ++++ b/src/gtkdialog.h +@@ -40,24 +40,24 @@ + #define GTKD_FUNCTION_SIGNALS_BLOCK (function_signals_block++) + #define GTKD_FUNCTION_SIGNALS_UNBLOCK (function_signals_block--) + #define GTKD_FUNCTION_SIGNALS_RESET (function_signals_block = FALSE) +-gint function_signals_block; ++extern gint function_signals_block; + + /* Thunor: Used to control/override the widget packing expand and fill + * states at the project level */ +-gint project_space_expand; +-gint project_space_fill; ++extern gint project_space_expand; ++extern gint project_space_fill; + + /* The most recently created radiobutton widget (used for grouping) */ +-GtkWidget *lastradiowidget; ++extern GtkWidget *lastradiowidget; + + /* An accumulated list of menu accelerator groups to be added to the window */ +-GList *accel_groups; ++extern GList *accel_groups; + + /* A list of widgets to hide and to show */ +-GList *widget_hide_list, *widget_show_list; ++extern GList *widget_hide_list, *widget_show_list; + + /* An auto-incremented unique id for each window created */ +-gint window_id; ++extern gint window_id; + + void reset_program_source(void); + //Redundant: gint set_program_source(gchar *name); +--- a/src/gtkdialog.c ++++ b/src/gtkdialog.c +@@ -82,6 +82,14 @@ + gint geometry_x = 0; + gint geometry_y = 0; + ++gint function_signals_block; ++gint project_space_expand; ++gint project_space_fill; ++GtkWidget *lastradiowidget; ++GList *accel_groups; ++GList *widget_hide_list, *widget_show_list; ++gint window_id; ++ + static gboolean + get_geometry(const char *argument) + { diff --git a/development/gtkdialog/gtkdialog.SlackBuild b/development/gtkdialog/gtkdialog.SlackBuild index 55594102ae..383cd5b865 100644 --- a/development/gtkdialog/gtkdialog.SlackBuild +++ b/development/gtkdialog/gtkdialog.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 Gentoo! +patch -p1 < $CWD/gtkdialog-0.8.3-fno-common.patch + CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \ ./configure --prefix=/usr --infodir=/usr/info make 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..83b8fa7343 --- /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 , 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/$PRGNAM.SlackBuild "{}" \; +find $PKG/usr/share -name "*.scm" -exec touch -r $CWD/$PRGNAM.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 them so that they will not overwrite Slackware's files from the 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 +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 d95ce6adf9..0000000000 --- a/development/icecream/README +++ /dev/null @@ -1,14 +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 -# --------------------------------------------------------------------------- - -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 -# --------------------------------------------------------------------------- - -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/kakoune/kakoune.SlackBuild b/development/kakoune/kakoune.SlackBuild index 6edc590cfb..bac09e0e2f 100644 --- a/development/kakoune/kakoune.SlackBuild +++ b/development/kakoune/kakoune.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for kakoune -# Copyright 2018-2019 Leonardo Citrolo, Italy +# Copyright 2018-2020 Leonardo Citrolo, 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=kakoune -VERSION=${VERSION:-2019.01.20} +VERSION=${VERSION:-2020.09.01} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/kakoune/kakoune.info b/development/kakoune/kakoune.info index e146ed344d..7cc2c31aa0 100644 --- a/development/kakoune/kakoune.info +++ b/development/kakoune/kakoune.info @@ -1,8 +1,8 @@ PRGNAM="kakoune" -VERSION="2019.01.20" +VERSION="2020.09.01" HOMEPAGE="https://kakoune.org/" -DOWNLOAD="https://github.com/mawww/kakoune/releases/download/v2019.01.20/kakoune-2019.01.20.tar.bz2" -MD5SUM="1871776ce495694de2133bd3d43dcf2f" +DOWNLOAD="https://github.com/mawww/kakoune/releases/download/v2020.09.01/kakoune-2020.09.01.tar.bz2" +MD5SUM="94b608ded6b5caa211d1d37c6bef4051" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/kicad/boost-1.61.patch b/development/kicad/boost-1.61.patch deleted file mode 100644 index 3ca8711b9f..0000000000 --- a/development/kicad/boost-1.61.patch +++ /dev/null @@ -1,347 +0,0 @@ ---- a/common/tool/tool_manager.cpp -+++ b/common/tool/tool_manager.cpp -@@ -532,11 +532,11 @@ - if( st->cofunc ) - st->Push(); - -+ st->cofunc = new COROUTINE( tr.second ); -+ - // as the state changes, the transition table has to be set up again - st->transitions.clear(); - -- st->cofunc = new COROUTINE( tr.second ); -- - // got match? Run the handler. - st->cofunc->Call( aEvent ); - ---- a/include/tool/coroutine.h -+++ b/include/tool/coroutine.h -@@ -27,10 +28,15 @@ - - #include - --#include - #include -+#include - --#include "delegate.h" -+#if BOOST_VERSION <= 106000 -+#include -+#else -+#include -+#include -+#endif - - /** - * Class COROUNTINE. -@@ -53,13 +59,12 @@ - * See coroutine_example.cpp for sample code. - */ - --template -+template - class COROUTINE - { - public: - COROUTINE() : -- m_saved( NULL ), m_self( NULL ), m_stack( NULL ), m_stackSize( c_defaultStackSize ), -- m_running( false ) -+ COROUTINE( nullptr ) - { - } - -@@ -69,8 +74,7 @@ - */ - template - COROUTINE( T* object, ReturnType(T::* ptr)( ArgType ) ) : -- m_func( object, ptr ), m_self( NULL ), m_saved( NULL ), m_stack( NULL ), -- m_stackSize( c_defaultStackSize ), m_running( false ) -+ COROUTINE( std::bind( ptr, object, std::placeholders::_1 ) ) - { - } - -@@ -78,9 +82,15 @@ - * Constructor - * Creates a coroutine from a delegate object - */ -- COROUTINE( DELEGATE aEntry ) : -- m_func( aEntry ), m_saved( NULL ), m_self( NULL ), m_stack( NULL ), -- m_stackSize( c_defaultStackSize ), m_running( false ) -+ COROUTINE( std::function aEntry ) : -+ m_func( std::move( aEntry ) ), -+ m_running( false ), -+#if BOOST_VERSION <= 106000 -+ m_stack( nullptr ), -+ m_stackSize( c_defaultStackSize ), -+#endif -+ m_caller( nullptr ), -+ m_callee( nullptr ) - { - // Avoid not initialized members, and make static analysers quiet - m_args = 0; -@@ -89,18 +99,26 @@ - - ~COROUTINE() - { -- if( m_saved ) -- delete m_saved; -- - #if BOOST_VERSION >= 105600 -- if( m_self ) -- delete m_self; -+ delete m_callee; - #endif - -+#if BOOST_VERSION <= 106000 -+ delete m_caller; -+ - if( m_stack ) - free( m_stack ); -+#endif - } - -+private: -+#if BOOST_VERSION <= 106000 -+ using context_type = boost::context::fcontext_t; -+#else -+ using context_type = boost::context::execution_context; -+#endif -+ -+public: - /** - * Function Yield() - * -@@ -110,7 +128,12 @@ - */ - void Yield() - { -- jump( m_self, m_saved, 0 ); -+#if BOOST_VERSION <= 106000 -+ jump( m_callee, m_caller, false ); -+#else -+ auto result = (*m_caller)( this ); -+ *m_caller = std::move( std::get<0>( result ) ); -+#endif - } - - /** -@@ -122,7 +145,11 @@ - void Yield( ReturnType& aRetVal ) - { - m_retVal = aRetVal; -- jump( m_self, m_saved, 0 ); -+#if BOOST_VERSION <= 106000 -+ jump( m_callee, m_caller, false ); -+#else -+ m_caller( this ); -+#endif - } - - /** -@@ -130,9 +157,9 @@ - * - * Defines the entry point for the coroutine, if not set in the constructor. - */ -- void SetEntry( DELEGATE aEntry ) -+ void SetEntry( std::function aEntry ) - { -- m_func = aEntry; -+ m_func = std::move( aEntry ); - } - - /* Function Call() -@@ -143,6 +170,10 @@ - */ - bool Call( ArgType aArgs ) - { -+ assert( m_callee == NULL ); -+ assert( m_caller == NULL ); -+ -+#if BOOST_VERSION <= 106000 - // fixme: Clean up stack stuff. Add a guard - m_stack = malloc( c_defaultStackSize ); - -@@ -151,22 +182,32 @@ - - // correct the stack size - m_stackSize -= ( (size_t) m_stack + m_stackSize - (size_t) sp ); -- -- assert( m_self == NULL ); -- assert( m_saved == NULL ); -+#endif - - m_args = &aArgs; --#if BOOST_VERSION >= 105600 -- m_self = new boost::context::fcontext_t(); -- *m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub ); -+ -+#if BOOST_VERSION < 105600 -+ m_callee = boost::context::make_fcontext( sp, m_stackSize, callerStub ); -+#elif BOOST_VERSION <= 106000 -+ m_callee = new context_type( boost::context::make_fcontext( sp, m_stackSize, callerStub ) ); - #else -- m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub ); -+ m_callee = new context_type( std::allocator_arg_t(), -+ boost::context::protected_fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub ); -+#endif -+ -+#if BOOST_VERSION <= 106000 -+ m_caller = new context_type(); - #endif -- m_saved = new boost::context::fcontext_t(); - - m_running = true; -+ - // off we go! -- jump( m_saved, m_self, reinterpret_cast( this ) ); -+#if BOOST_VERSION <= 106000 -+ jump( m_caller, m_callee, reinterpret_cast( this ) ); -+#else -+ auto result = (*m_callee)( this ); -+ *m_callee = std::move( std::get<0>( result ) ); -+#endif - return m_running; - } - -@@ -179,7 +220,12 @@ - */ - bool Resume() - { -- jump( m_saved, m_self, 0 ); -+#if BOOST_VERSION <= 106000 -+ jump( m_caller, m_callee, false ); -+#else -+ auto result = (*m_callee)( this ); -+ *m_callee = std::move( std::get<0>( result ) ); -+#endif - - return m_running; - } -@@ -208,61 +254,66 @@ - static const int c_defaultStackSize = 2000000; // fixme: make configurable - - /* real entry point of the coroutine */ -+#if BOOST_VERSION <= 106000 - static void callerStub( intptr_t aData ) -+#else -+ static context_type callerStub( context_type caller, COROUTINE* cor ) -+#endif - { - // get pointer to self -+#if BOOST_VERSION <= 106000 - COROUTINE* cor = reinterpret_cast*>( aData ); -+#else -+ cor->m_caller = &caller; -+#endif - - // call the coroutine method -- cor->m_retVal = cor->m_func( *cor->m_args ); -+ cor->m_retVal = cor->m_func( *( cor->m_args ) ); - cor->m_running = false; - - // go back to wherever we came from. -- jump( cor->m_self, cor->m_saved, 0 ); // reinterpret_cast( this )); -+#if BOOST_VERSION <= 106000 -+ jump( cor->m_callee, cor->m_caller, 0 ); -+#else -+ return caller; -+#endif - } - - ///> Wrapper for jump_fcontext to assure compatibility between different boost versions -- static inline intptr_t jump(boost::context::fcontext_t* aOld, boost::context::fcontext_t* aNew, -+#if BOOST_VERSION <= 106000 -+ static inline intptr_t jump( context_type* aOld, context_type* aNew, - intptr_t aP, bool aPreserveFPU = true ) - { --#if BOOST_VERSION >= 105600 -- return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU ); --#else -+#if BOOST_VERSION < 105600 - return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU ); -+#else -+ return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU ); - #endif - } -+#endif - -- template -- struct strip_ref -- { -- typedef T result; -- }; -+ std::function m_func; - -- template -- struct strip_ref -- { -- typedef T result; -- }; -+ bool m_running; - -- DELEGATE m_func; -+#if BOOST_VERSION <= 106000 -+ ///< coroutine stack -+ void* m_stack; -+ -+ size_t m_stackSize; -+#endif - - ///< pointer to coroutine entry arguments. Stripped of references - ///< to avoid compiler errors. -- typename strip_ref::result* m_args; -+ typename std::remove_reference::type* m_args; -+ - ReturnType m_retVal; - - ///< saved caller context -- boost::context::fcontext_t* m_saved; -+ context_type* m_caller; - - ///< saved coroutine context -- boost::context::fcontext_t* m_self; -- -- ///< coroutine stack -- void* m_stack; -- -- size_t m_stackSize; -- -- bool m_running; -+ context_type* m_callee; - }; - - #endif ---- a/include/tool/tool_base.h -+++ b/include/tool/tool_base.h -@@ -31,7 +32,7 @@ - #include - #include - --#include -+#include - - class EDA_ITEM; - class TOOL_MANAGER; -@@ -53,7 +54,9 @@ - - /// Unique identifier for tools - typedef int TOOL_ID; --typedef DELEGATE TOOL_STATE_FUNC; -+ -+using TOOL_STATE_FUNC = std::function; -+ - - /** - * Class TOOL_BASE ---- a/include/tool/tool_interactive.h -+++ b/include/tool/tool_interactive.h -@@ -113,7 +114,7 @@ - void TOOL_INTERACTIVE::Go( int (T::* aStateFunc)( const TOOL_EVENT& ), - const TOOL_EVENT_LIST& aConditions ) - { -- TOOL_STATE_FUNC sptr( static_cast( this ), aStateFunc ); -+ TOOL_STATE_FUNC sptr = std::bind( aStateFunc, static_cast( this ), std::placeholders::_1 ); - - goInternal( sptr, aConditions ); - } - diff --git a/development/kicad/kicad.SlackBuild b/development/kicad/kicad.SlackBuild index b2942d5e3f..ec6ee15487 100644 --- a/development/kicad/kicad.SlackBuild +++ b/development/kicad/kicad.SlackBuild @@ -26,7 +26,7 @@ # Revision date: 2019/Jun/02 PRGNAM=kicad -VERSION=${VERSION:-5.1.5} +VERSION=${VERSION:-5.1.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -63,7 +63,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.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -72,14 +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 {} \; -# KiCad 4.0.5 cannot be compiled with boost 1.61 and higher since the latter requires C++11. -# If you insist to use boost 1.61 and higher, you can apply this patch manually and compile -# with a C++11 capable compiler and its appropriate compiler switches. -#patch -p1 --verbose < $CWD/boost-1.61.patch - -# KiCad 5.1.2 patch: -patch -p1 --verbose < $CWD/kicad_boost_hdr.patch - # Additional notes: # # - wxWidgets and wxPython use different toolkits (gtk2 vs (gtk2-unicode)). It diff --git a/development/kicad/kicad.info b/development/kicad/kicad.info index db640050a1..cf8692c708 100644 --- a/development/kicad/kicad.info +++ b/development/kicad/kicad.info @@ -1,8 +1,8 @@ PRGNAM="kicad" -VERSION="5.1.5" +VERSION="5.1.9" HOMEPAGE="http://kicad-pcb.org" -DOWNLOAD="https://launchpad.net/kicad/5.0/5.1.5/+download/kicad-5.1.5.tar.xz" -MD5SUM="58e884272563e4636c9b83c275eea637" +DOWNLOAD="https://gitlab.com/kicad/code/kicad/-/archive/5.1.9/kicad-5.1.9.tar.gz" +MD5SUM="b2c2f141b1a6342977b1192702b8d26d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxPython3 ngspice OpenCASCADE glm" diff --git a/development/kicad/kicad_boost_hdr.patch b/development/kicad/kicad_boost_hdr.patch deleted file mode 100644 index 10469b2210..0000000000 --- a/development/kicad/kicad_boost_hdr.patch +++ /dev/null @@ -1,14 +0,0 @@ -Add missing "boost/version.hpp" before version checking macro - -diff --git a/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h b/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h -index 08ae0b949..72314d56a 100644 ---- a/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h -+++ b/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h -@@ -24,6 +24,7 @@ - #ifndef UNIT_TEST_UTILS__H - #define UNIT_TEST_UTILS__H - -+#include - #include - #include - 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 + "\n" { NEW_LINE(); } + . { ; } + + %% + +-#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 +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 b1dcde3e1b..0000000000 --- a/development/meson/meson.SlackBuild +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh - -# Slackware build script for meson - -# Copyright 2017-2021 Jeremy Hansen -# 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.57.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 3e5dddd794..0000000000 --- a/development/meson/meson.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="meson" -VERSION="0.57.1" -HOMEPAGE="http://mesonbuild.com" -DOWNLOAD="https://github.com/mesonbuild/meson/releases/download/0.57.1/meson-0.57.1.tar.gz" -MD5SUM="fbd744560351491892478a36a1586815" -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 -# 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%%%" $PKG/usr/include/mozjs-45/mozilla/MathAlgorithms.h -#sed -i "s%%%" $PKG/usr/include/mozjs-45/js/Value.h -#sed -i "/#include /d" $PKG/usr/include/mozjs-45/js/Utility.h -#sed -i "/#include /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 6f1c62d7da..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 c86f4064e3..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.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 {} \; - -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 dcc1d0d2aa..0000000000 --- a/development/ninja/ninja.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ninja" -VERSION="1.10.2" -HOMEPAGE="https://ninja-build.org/" -DOWNLOAD="https://github.com/ninja-build/ninja/archive/v1.10.2/ninja-1.10.2.tar.gz" -MD5SUM="639f75bc2e3b19ab893eaf2c810d4eb4" -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/numpy3/numpy3.SlackBuild b/development/numpy3/numpy3.SlackBuild index 0cb85bd141..f8c8b0a98c 100644 --- a/development/numpy3/numpy3.SlackBuild +++ b/development/numpy3/numpy3.SlackBuild @@ -27,7 +27,7 @@ PRGNAM=numpy3 SRCNAM=numpy -VERSION=${VERSION:-1.14.3} +VERSION=${VERSION:-1.19.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/numpy3/numpy3.info b/development/numpy3/numpy3.info index c7a9753041..cc0d18db70 100644 --- a/development/numpy3/numpy3.info +++ b/development/numpy3/numpy3.info @@ -1,8 +1,8 @@ PRGNAM="numpy3" -VERSION="1.14.3" +VERSION="1.19.3" HOMEPAGE="http://www.numpy.org/" -DOWNLOAD="https://github.com/numpy/numpy/releases/download/v1.14.3/numpy-1.14.3.tar.gz" -MD5SUM="7c3c806ae27196c92d2fb3fbd4991e81" +DOWNLOAD="https://github.com/numpy/numpy/releases/download/v1.19.3/numpy-1.19.3.tar.gz" +MD5SUM="b2d13ca1b8ff89a9289174a86b835165" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" diff --git a/development/nvi/README b/development/nvi/README deleted file mode 100644 index 899221cc55..0000000000 --- a/development/nvi/README +++ /dev/null @@ -1,7 +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 , Pisa, Italy +# Copyright 2016-2019 Matteo Bernardini , 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 +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 + ++#if BUILDING_GCC_MAJOR >= 6 ++ ++// If we include 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 ++# define SAFE_CTYPE_H ++# include ++# undef SAFE_CTYPE_H ++# include ++ ++typedef unsigned int source_location; // ++typedef source_location location_t; // ++ ++#else // GCC < 6 ++ + #if BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 8 + # include // CHAR_BIT + # include +@@ -33,6 +51,9 @@ extern "C" + + typedef unsigned int source_location; // + typedef source_location location_t; // +-} ++ ++} // 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 + ++#if BUILDING_GCC_MAJOR >= 6 ++# include // 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 map_type; ++ typedef std::map 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 (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 +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 + +-#if BUILDING_GCC_MAJOR >= 6 +-# include // 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 // 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 , 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 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 ac56703e5a..11a90ad0e3 100644 --- a/development/perf/perf.SlackBuild +++ b/development/perf/perf.SlackBuild @@ -29,7 +29,7 @@ PRGNAM=perf # This VERSION is actually a dummy. Use KERNEL to set the version. -VERSION=${VERSION:-4.4.227} +VERSION=${VERSION:-5.10.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/perf/perf.info b/development/perf/perf.info index 014af45032..480ec17673 100644 --- a/development/perf/perf.info +++ b/development/perf/perf.info @@ -1,5 +1,5 @@ PRGNAM="perf" -VERSION="4.4.227" +VERSION="5.10.13" HOMEPAGE="https://perf.wiki.kernel.org/index.php/Main_Page" DOWNLOAD="https://slackware.uk/~urchlay/src/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/281f93b29190c67c86c4403b96efdbac957a0162.patch b/development/poedit/281f93b29190c67c86c4403b96efdbac957a0162.patch new file mode 100644 index 0000000000..c8f1f5c4d3 --- /dev/null +++ b/development/poedit/281f93b29190c67c86c4403b96efdbac957a0162.patch @@ -0,0 +1,25 @@ +From 281f93b29190c67c86c4403b96efdbac957a0162 Mon Sep 17 00:00:00 2001 +From: rezso +Date: Sun, 15 Nov 2020 00:11:49 +0100 +Subject: [PATCH] Add missing include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix ' concurrency.h:606:10: error: ‘atomic_bool’ in namespace ‘std’ does not name a type; did you mean ‘atomic_load’? ' build error. +--- + src/concurrency.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/concurrency.h b/src/concurrency.h +index df806f1eae..ceca909e9a 100644 +--- a/src/concurrency.h ++++ b/src/concurrency.h +@@ -67,6 +67,7 @@ + #endif + #endif + ++#include + #include + #include + diff --git a/development/poedit/README b/development/poedit/README index 490dd860d9..e80f585a6d 100644 --- a/development/poedit/README +++ b/development/poedit/README @@ -3,5 +3,6 @@ Poedit is cross-platform gettext catalogs (.po files) editor. It aims to provide more convenient approach to editing catalogs than launching vi and editing the file by hand. -NOTE: poedit 2.0 will require newer boost (1.60+), so it works only in --current. +Optional dependency: +- cpprestsdk for crowd integration +- cld2 (better language autodetection and non-English source languages) diff --git a/development/poedit/poedit.SlackBuild b/development/poedit/poedit.SlackBuild index 2319aba3bb..b3ef29d73e 100644 --- a/development/poedit/poedit.SlackBuild +++ b/development/poedit/poedit.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for poedit # Copyright 2008 Niklas "Nille" Åkerström -# Copyright 2014-2017 Willy Sudiarto Raharjo +# Copyright 2014-2020 Willy Sudiarto Raharjo # 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=poedit -VERSION=${VERSION:-1.8.12} +VERSION=${VERSION:-2.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,7 +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 --verbose -p1 < $CWD/setvalue.diff +patch -p1 < $CWD/281f93b29190c67c86c4403b96efdbac957a0162.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/development/poedit/poedit.info b/development/poedit/poedit.info index b8391a4535..bbab80c00e 100644 --- a/development/poedit/poedit.info +++ b/development/poedit/poedit.info @@ -1,8 +1,8 @@ PRGNAM="poedit" -VERSION="1.8.12" +VERSION="2.4.2" 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.4.2-oss/poedit-2.4.2.tar.gz" +MD5SUM="8753577710b0d5e217cbc92d4e482549" 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/qt-creator/qt-creator.SlackBuild b/development/qt-creator/qt-creator.SlackBuild index 32a65255dc..26638d4438 100644 --- a/development/qt-creator/qt-creator.SlackBuild +++ b/development/qt-creator/qt-creator.SlackBuild @@ -27,7 +27,7 @@ # VERSION=4.2.0_rc1 or VERSION=4.2.0_beta1 (note the underscore). PRGNAM=qt-creator -VERSION=${VERSION:-4.12.3} +VERSION=${VERSION:-4.13.3} SRCVER=$(echo $VERSION | tr _ -) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/qt-creator/qt-creator.info b/development/qt-creator/qt-creator.info index f0d73d1dae..2821c5a588 100644 --- a/development/qt-creator/qt-creator.info +++ b/development/qt-creator/qt-creator.info @@ -1,8 +1,8 @@ PRGNAM="qt-creator" -VERSION="4.12.3" +VERSION="4.13.3" HOMEPAGE="https://wiki.qt.io/Qt_Creator" -DOWNLOAD="https://download.qt.io/official_releases/qtcreator/4.12/4.12.3/qt-creator-opensource-src-4.12.3.tar.gz" -MD5SUM="7ee294ef4316875a355c43f62918e13f" +DOWNLOAD="https://download.qt.io/official_releases/qtcreator/4.13/4.13.3/qt-creator-opensource-src-4.13.3.tar.gz" +MD5SUM="e9a2b50fd11b0b0b6756b49c35ce414c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qbs" 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 , 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/sassc/README b/development/sassc/README deleted file mode 100644 index bb030967a8..0000000000 --- a/development/sassc/README +++ /dev/null @@ -1,12 +0,0 @@ -SassC is a wrapper around libsass (http://github.com/sass/libsass) used -to generate a useful command-line application that can be installed and -packaged for several operating systems. - -Sass is a CSS pre-processor language to add on exciting, new, awesome -features to CSS. Sass was the first language of its kind and by far the -most mature and up to date codebase. - -Sass was originally concieved of by the co-creator of this library, -Hampton Catlin (@hcatlin). Most of the language has been the result of -years of work by Natalie Weizenbaum (@nex3) and Chris Eppstein -(@chriseppstein). diff --git a/development/sassc/sassc.SlackBuild b/development/sassc/sassc.SlackBuild deleted file mode 100644 index 99fd39e0cc..0000000000 --- a/development/sassc/sassc.SlackBuild +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -# Slackware build script for sassc -# -# Yth | Pont-en-Royans, France | yth@ythogtha.org -# -# 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=sassc -VERSION=${VERSION:-3.6.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} - -DOCS="Readme.md LICENSE" - -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 {} \; - -autoreconf -i - -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-shared=yes \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -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/development/sassc/sassc.info b/development/sassc/sassc.info deleted file mode 100644 index 05cddacb84..0000000000 --- a/development/sassc/sassc.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sassc" -VERSION="3.6.1" -HOMEPAGE="http://sass-lang.com/libsass" -DOWNLOAD="https://github.com/sass/sassc/archive/3.6.1/sassc-3.6.1.tar.gz" -MD5SUM="dd675920c7151e50e2d2ac14f0fb222a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libsass" -MAINTAINER="Yth - Arnaud" -EMAIL="yth@ythogtha.org" diff --git a/development/sassc/slack-desc b/development/sassc/slack-desc deleted file mode 100644 index 6bc862118f..0000000000 --- a/development/sassc/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------------------------------------------------------| -sassc: sassc (C/C++ port of the Sass CSS precompiler) -sassc: -sassc: SassC is a wrapper around libsass (http://github.com/sass/libsass) -sassc: used to generate a useful command-line application that can be -sassc: installed and packaged for several operating systems. -sassc: -sassc: Sass is a CSS pre-processor language to add on exciting, new, awesome -sassc: features to CSS. Sass was the first language of its kind and by far -sassc: the most mature and up to date codebase. -sassc: -sassc: http://sass-lang.com diff --git a/development/spice-protocol/spice-protocol.SlackBuild b/development/spice-protocol/spice-protocol.SlackBuild index 1f7aa817c5..0cddd052cf 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 , 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.3} 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 @@ -41,7 +42,7 @@ 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 . find -L . \ @@ -50,11 +51,26 @@ 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 {} \; -./configure \ - --prefix=/usr - -make -make install DESTDIR=$PKG +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/development/spice-protocol/spice-protocol.info b/development/spice-protocol/spice-protocol.info index 5dcc44acff..0f24d0fd55 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.3" 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.3.tar.xz" +MD5SUM="950e08044497ca9cf64e368cb3ceb395" 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/tidy-html5/README b/development/tidy-html5/README deleted file mode 100644 index 813fe61ba2..0000000000 --- a/development/tidy-html5/README +++ /dev/null @@ -1,3 +0,0 @@ -Tidy is a console application for Mac OS X, Linux, Windows, UNIX, and -more. It corrects and cleans up HTML and XML documents by fixing markup -errors and upgrading legacy code to modern standards. diff --git a/development/tidy-html5/slack-desc b/development/tidy-html5/slack-desc deleted file mode 100644 index 9740f263b5..0000000000 --- a/development/tidy-html5/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------------------------------------------------------| -tidy-html5: tidy-html5 (correct and clean up HTML and XML documents) -tidy-html5: -tidy-html5: Tidy is a console application for Mac OS X, Linux, Windows, -tidy-html5: UNIX, and more. It corrects and cleans up HTML and XML -tidy-html5: documents by fixing markup errors and upgrading legacy code to -tidy-html5: modern standards. -tidy-html5: -tidy-html5: HTML Tidy was created by the W3C's own Dave Raggett back in -tidy-html5: the dawn of the Internet age. His original Internet page is -tidy-html5: still available and gives a sense of the early history: Clean -tidy-html5: up your Web pages with HTML TIDY. diff --git a/development/tidy-html5/tidy-html5.SlackBuild b/development/tidy-html5/tidy-html5.SlackBuild deleted file mode 100644 index 1daf3b912c..0000000000 --- a/development/tidy-html5/tidy-html5.SlackBuild +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh - -# Slackware build script for tidy-html5 - -# Copyright 2017 Alan Aversa -# 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=tidy-html5 -VERSION=${VERSION:-5.7.28} -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 \ - -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 - -# Avoid overwriting kdewebdev's tidy -mv $PKG/usr/bin/tidy $PKG/usr/bin/tidy5 - -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 || 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/development/tidy-html5/tidy-html5.info b/development/tidy-html5/tidy-html5.info deleted file mode 100644 index d42fefd32e..0000000000 --- a/development/tidy-html5/tidy-html5.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="tidy-html5" -VERSION="5.7.28" -HOMEPAGE="http://www.html-tidy.org/" -DOWNLOAD="https://github.com/htacg/tidy-html5/archive/5.7.28/tidy-html5-5.7.28.tar.gz" -MD5SUM="2a572befbf3610de6719506c338efabb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Alan Aversa" -EMAIL="aveNOrsa@email.ariSPAMzona.edu (remove NO and SPAM)" diff --git a/development/tora/README b/development/tora/README index e5777babe8..adf276ef8c 100644 --- a/development/tora/README +++ b/development/tora/README @@ -5,3 +5,5 @@ any target that can be accessed 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 -# 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 -# 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/games/0ad-data/0ad-data.SlackBuild b/games/0ad-data/0ad-data.SlackBuild index ab69ec266e..213af0eaba 100644 --- a/games/0ad-data/0ad-data.SlackBuild +++ b/games/0ad-data/0ad-data.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=0ad-data DATANAM=0ad -VERSION=${VERSION:-0.0.23b} +VERSION=${VERSION:-0.0.24b} RELEASE=${RELEASE:-alpha} ARCH=noarch BUILD=${BUILD:-1} diff --git a/games/0ad-data/0ad-data.info b/games/0ad-data/0ad-data.info index 1a3dd341a6..a3103e41c1 100644 --- a/games/0ad-data/0ad-data.info +++ b/games/0ad-data/0ad-data.info @@ -1,8 +1,8 @@ PRGNAM="0ad-data" -VERSION="0.0.23b" +VERSION="0.0.24b" HOMEPAGE="https://play0ad.com/" -DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.23b-alpha-unix-data.tar.xz" -MD5SUM="4eee6b207892552cd3e0a408b15c191d" +DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.24b-alpha-unix-data.tar.xz" +MD5SUM="69db2a228f1802a2e8f360bed4d21036" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild index 514f61c116..d8ff784b1b 100644 --- a/games/0ad/0ad.SlackBuild +++ b/games/0ad/0ad.SlackBuild @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=0ad -VERSION=${VERSION:-0.0.23b} +VERSION=${VERSION:-0.0.24b} RELEASE=${RELEASE:-alpha} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} @@ -72,30 +72,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 {} \; +unset CPPFLAGS + export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS -fpermissive" -# and yes, it's really necessary to set CPPFLAGS like this :( -export CPPFLAGS="$SLKCFLAGS -fpermissive" +export CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" export LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" +export SDL2_CONFIG="/usr/bin/sdl2-config" -# Fix boost names -sed -i 's/-mt//g' build/premake/extern_libs4.lua +# Fix boost names, include paths and remove isystem +sed -i 's|-mt||g' build/premake/extern_libs5.lua || exit 1 +sed -i 's|/usr/local/include|/usr/include|' build/premake/{extern_libs5.lua,premake5.lua} || exit 1 +sed -i 's|-isystem |-I|' build/premake/premake5/{src/tools/gcc.lua,tests/tools/test_gcc.lua} || exit 1 + +sed -i '/third_party/a #include ' source/ps/CLogger.h || exit 1 +sed -i '/ps\/Profiler2/a #include ' source/ps/Profiler2GPU.cpp || exit 1 #allow for ATLAS to be yes. [ "x$ATLAS" = "xyes" ]&& ATLAS="enable" # build/workspaces/update-workspaces.sh # have a root check, let's disable it. patch -p1 < $CWD/disable-root-check.patch -#apply a segfault fixing patch -#sourced from https://code.wildfiregames.com/file/data/nryu3qhun4v6uroyiqoc/PHID-FILE-osgvknec7zmfuja5xqq4/D1852.diff -patch -p2 < $CWD/D1852.diff + +echo "patch -p1 < $CWD/rust-1.50.0.patch" >> libraries/source/spidermonkey/patch.sh build/workspaces/update-workspaces.sh \ + --without-pch \ --bindir=/usr/games \ --datadir=/usr/share/games/0ad \ --libdir=/usr/lib${LIBDIRSUFFIX}/0ad \ --${ATLAS:-disable}-atlas +sed -i 's|-isystem |-I|g' build/workspaces/gcc/*.make || exit 1 + make CONFIG=Release -C build/workspaces/gcc mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/0ad diff --git a/games/0ad/0ad.info b/games/0ad/0ad.info index 848b05848e..ec46e6bed0 100644 --- a/games/0ad/0ad.info +++ b/games/0ad/0ad.info @@ -1,10 +1,10 @@ PRGNAM="0ad" -VERSION="0.0.23b" +VERSION="0.0.24b" HOMEPAGE="https://play0ad.com/" -DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.23b-alpha-unix-build.tar.xz" -MD5SUM="4fa111410ea55de7a013406ac1013668" +DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.24b-alpha-unix-build.tar.xz" +MD5SUM="c9d34029fe95d515a5284508cc1d646c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="0ad-data OpenAL enet gloox miniupnpc SDL2 libsodium" +REQUIRES="0ad-data enet fmt gloox miniupnpc" MAINTAINER="Tim Dickson" EMAIL="dickson.tim@googlemail.com" diff --git a/games/0ad/D1852.diff b/games/0ad/D1852.diff deleted file mode 100644 index 131c8210a0..0000000000 --- a/games/0ad/D1852.diff +++ /dev/null @@ -1,213 +0,0 @@ -Index: ps/trunk/source/ps/Replay.cpp -=================================================================== ---- ps/trunk/source/ps/Replay.cpp -+++ ps/trunk/source/ps/Replay.cpp -@@ -1,4 +1,4 @@ --/* Copyright (C) 2018 Wildfire Games. -+/* Copyright (C) 2019 Wildfire Games. - * This file is part of 0 A.D. - * - * 0 A.D. is free software: you can redistribute it and/or modify -@@ -72,7 +72,7 @@ - JS::RootedValue mods(cx, Mod::GetLoadedModsWithVersions(m_ScriptInterface)); - m_ScriptInterface.SetProperty(attribs, "mods", mods); - -- m_Directory = createDateIndexSubdirectory(VisualReplay::GetDirectoryName()); -+ m_Directory = createDateIndexSubdirectory(VisualReplay::GetDirectoryPath()); - debug_printf("Writing replay to %s\n", m_Directory.string8().c_str()); - - m_Stream = new std::ofstream(OsString(m_Directory / L"commands.txt").c_str(), std::ofstream::out | std::ofstream::trunc); -Index: ps/trunk/source/ps/VisualReplay.h -=================================================================== ---- ps/trunk/source/ps/VisualReplay.h -+++ ps/trunk/source/ps/VisualReplay.h -@@ -1,4 +1,4 @@ --/* Copyright (C) 2017 Wildfire Games. -+/* Copyright (C) 2019 Wildfire Games. - * This file is part of 0 A.D. - * - * 0 A.D. is free software: you can redistribute it and/or modify -@@ -29,12 +29,20 @@ - { - - /** -- * Returns the path to the sim-log directory (that contains the directories with the replay files. -- * -- * @param scriptInterface - the ScriptInterface in which to create the return data. -- * @return OsPath the absolute file path -+ * Returns the absolute path to the sim-log directory (that contains the directories with the replay files. -+ */ -+OsPath GetDirectoryPath(); -+ -+/** -+ * Returns the absolute path to the replay cache file. -+ */ -+OsPath GetCacheFilePath(); -+ -+/** -+ * Returns the absolute path to the temporary replay cache file used to -+ * always have a valid cache file in place even if bad things happen. - */ --OsPath GetDirectoryName(); -+OsPath GetTempCacheFilePath(); - - /** - * Replays the commands.txt file in the given subdirectory visually. -Index: ps/trunk/source/ps/VisualReplay.cpp -=================================================================== ---- ps/trunk/source/ps/VisualReplay.cpp -+++ ps/trunk/source/ps/VisualReplay.cpp -@@ -40,13 +40,19 @@ - */ - const u8 minimumReplayDuration = 3; - --static const OsPath tempCacheFileName = VisualReplay::GetDirectoryName() / L"replayCache_temp.json"; --static const OsPath cacheFileName = VisualReplay::GetDirectoryName() / L"replayCache.json"; -+OsPath VisualReplay::GetDirectoryPath() -+{ -+ return Paths(g_args).UserData() / "replays" / engine_version; -+} -+ -+OsPath VisualReplay::GetCacheFilePath() -+{ -+ return GetDirectoryPath() / L"replayCache.json"; -+} - --OsPath VisualReplay::GetDirectoryName() -+OsPath VisualReplay::GetTempCacheFilePath() - { -- const Paths paths(g_args); -- return OsPath(paths.UserData() / "replays" / engine_version); -+ return GetDirectoryPath() / L"replayCache_temp.json"; - } - - bool VisualReplay::StartVisualReplay(const OsPath& directory) -@@ -55,7 +61,7 @@ - ENSURE(!g_NetClient); - ENSURE(!g_Game); - -- const OsPath replayFile = VisualReplay::GetDirectoryName() / directory / L"commands.txt"; -+ const OsPath replayFile = VisualReplay::GetDirectoryPath() / directory / L"commands.txt"; - - if (!FileExists(replayFile)) - return false; -@@ -69,10 +75,10 @@ - JSContext* cx = scriptInterface.GetContext(); - JSAutoRequest rq(cx); - -- if (!FileExists(cacheFileName)) -+ if (!FileExists(GetCacheFilePath())) - return false; - -- std::ifstream cacheStream(OsString(cacheFileName).c_str()); -+ std::ifstream cacheStream(OsString(GetCacheFilePath()).c_str()); - CStr cacheStr((std::istreambuf_iterator(cacheStream)), std::istreambuf_iterator()); - cacheStream.close(); - -@@ -85,7 +91,7 @@ - } - - LOGWARNING("The replay cache file is corrupted, it will be deleted"); -- wunlink(cacheFileName); -+ wunlink(GetCacheFilePath()); - return false; - } - -@@ -95,12 +101,12 @@ - JSAutoRequest rq(cx); - - JS::RootedValue replaysRooted(cx, JS::ObjectValue(*replays)); -- std::ofstream cacheStream(OsString(tempCacheFileName).c_str(), std::ofstream::out | std::ofstream::trunc); -+ std::ofstream cacheStream(OsString(GetTempCacheFilePath()).c_str(), std::ofstream::out | std::ofstream::trunc); - cacheStream << scriptInterface.StringifyJSON(&replaysRooted); - cacheStream.close(); - -- wunlink(cacheFileName); -- if (wrename(tempCacheFileName, cacheFileName)) -+ wunlink(GetCacheFilePath()); -+ if (wrename(GetTempCacheFilePath(), GetCacheFilePath())) - LOGERROR("Could not store the replay cache"); - } - -@@ -139,7 +145,7 @@ - JS::RootedObject replays(cx, JS_NewArrayObject(cx, 0)); - DirectoryNames directories; - -- if (GetDirectoryEntries(GetDirectoryName(), nullptr, &directories) != INFO::OK) -+ if (GetDirectoryEntries(GetDirectoryPath(), nullptr, &directories) != INFO::OK) - return replays; - - bool newReplays = false; -@@ -155,7 +161,7 @@ - // Don't return, because we want to save our progress - break; - -- const OsPath replayFile = GetDirectoryName() / directory / L"commands.txt"; -+ const OsPath replayFile = GetDirectoryPath() / directory / L"commands.txt"; - - bool isNew = true; - replayCacheMap::iterator it = fileList.find(directory); -@@ -325,7 +331,7 @@ - JS::Value VisualReplay::LoadReplayData(const ScriptInterface& scriptInterface, const OsPath& directory) - { - // The directory argument must not be constant, otherwise concatenating will fail -- const OsPath replayFile = GetDirectoryName() / directory / L"commands.txt"; -+ const OsPath replayFile = GetDirectoryPath() / directory / L"commands.txt"; - - if (!FileExists(replayFile)) - return JS::NullValue(); -@@ -407,7 +413,7 @@ - if (replayDirectory.empty()) - return false; - -- const OsPath directory = GetDirectoryName() / replayDirectory; -+ const OsPath directory = GetDirectoryPath() / replayDirectory; - return DirectoryExists(directory) && DeleteDirectory(directory) == INFO::OK; - } - -@@ -420,7 +426,7 @@ - pCxPrivate->pScriptInterface->Eval("({})", &attribs); - - // Return empty object if file doesn't exist -- const OsPath replayFile = GetDirectoryName() / directoryName / L"commands.txt"; -+ const OsPath replayFile = GetDirectoryPath() / directoryName / L"commands.txt"; - if (!FileExists(replayFile)) - return attribs; - -@@ -483,7 +489,7 @@ - - bool VisualReplay::HasReplayMetadata(const OsPath& directoryName) - { -- const OsPath filePath(GetDirectoryName() / directoryName / L"metadata.json"); -+ const OsPath filePath(GetDirectoryPath() / directoryName / L"metadata.json"); - - if (!FileExists(filePath)) - return false; -@@ -503,7 +509,7 @@ - JSAutoRequest rq(cx); - JS::RootedValue metadata(cx); - -- std::ifstream* stream = new std::ifstream(OsString(GetDirectoryName() / directoryName / L"metadata.json").c_str()); -+ std::ifstream* stream = new std::ifstream(OsString(GetDirectoryPath() / directoryName / L"metadata.json").c_str()); - ENSURE(stream->good()); - CStr line; - std::getline(*stream, line); -Index: ps/trunk/source/ps/scripting/JSInterface_VisualReplay.cpp -=================================================================== ---- ps/trunk/source/ps/scripting/JSInterface_VisualReplay.cpp -+++ ps/trunk/source/ps/scripting/JSInterface_VisualReplay.cpp -@@ -1,4 +1,4 @@ --/* Copyright (C) 2018 Wildfire Games. -+/* Copyright (C) 2019 Wildfire Games. - * This file is part of 0 A.D. - * - * 0 A.D. is free software: you can redistribute it and/or modify -@@ -61,7 +61,7 @@ - - CStrW JSI_VisualReplay::GetReplayDirectoryName(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const CStrW& directoryName) - { -- return wstring_from_utf8(OsPath(VisualReplay::GetDirectoryName() / directoryName).string8()); -+ return wstring_from_utf8(OsPath(VisualReplay::GetDirectoryPath() / directoryName).string8()); - } - - void JSI_VisualReplay::RegisterScriptFunctions(const ScriptInterface& scriptInterface) diff --git a/games/0ad/rust-1.50.0.patch b/games/0ad/rust-1.50.0.patch new file mode 100644 index 0000000000..1652884065 --- /dev/null +++ b/games/0ad/rust-1.50.0.patch @@ -0,0 +1,40 @@ +diff -Naur mozjs-78.6.0.orig/.cargo/config.in mozjs-78.6.0/.cargo/config.in +--- mozjs-78.6.0.orig/.cargo/config.in 2020-11-28 17:33:01.000000000 +0100 ++++ mozjs-78.6.0/.cargo/config.in 2021-02-26 08:45:50.995837000 +0100 +@@ -3,9 +3,9 @@ + # Please do not edit. + + [source."https://github.com/shravanrn/nix/"] +-branch = "r0.13.1" + git = "https://github.com/shravanrn/nix/" + replace-with = "vendored-sources" ++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e" + + [source."https://github.com/mozilla/rkv"] + git = "https://github.com/mozilla/rkv" +diff -Naur mozjs-78.6.0.orig/Cargo.lock mozjs-78.6.0/Cargo.lock +--- mozjs-78.6.0.orig/Cargo.lock 2020-11-28 17:33:01.000000000 +0100 ++++ mozjs-78.6.0/Cargo.lock 2021-02-26 08:47:06.265837000 +0100 +@@ -3200,7 +3200,7 @@ + [[package]] + name = "nix" + version = "0.13.1" +-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e" ++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e" + dependencies = [ + "bitflags", + "cc", +diff -Naur mozjs-78.6.0.orig/Cargo.toml mozjs-78.6.0/Cargo.toml +--- mozjs-78.6.0.orig/Cargo.toml 2020-11-28 17:34:26.000000000 +0100 ++++ mozjs-78.6.0/Cargo.toml 2021-02-26 08:48:06.663837000 +0100 +@@ -60,8 +60,8 @@ + [patch.crates-io] + packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" } + rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" } +-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } +-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" } ++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } ++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4" } + # failure's backtrace feature might break our builds, see bug 1608157. + failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } + failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } diff --git a/games/RetroArch/RetroArch.SlackBuild b/games/RetroArch/RetroArch.SlackBuild index 256833c35a..e7d842eeef 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 +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 +- +-#ifdef __GNUC__ +- #undef gamma + #endif + + #include +@@ -19,6 +11,7 @@ + #include + #include + #include ++#include + #ifdef __GNUC__ + #include + #include +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)r)g)g)b)b)r)r)g)g)b)b)r)g)b)r)g)b) 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 +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 + #include +-#include ++#include + +-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_set; ++typedef std::unordered_set 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 -+#include - #include - #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/games/etlegacy-from-source/doinst.sh b/games/etlegacy-from-source/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/games/etlegacy-from-source/doinst.sh @@ -0,0 +1,3 @@ +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/games/etlegacy-from-source/etlegacy-from-source.SlackBuild b/games/etlegacy-from-source/etlegacy-from-source.SlackBuild new file mode 100644 index 0000000000..a5ebca6e9e --- /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 , 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:-20201029_886f0ef} +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..901378e2a2 --- /dev/null +++ b/games/etlegacy-from-source/etlegacy-from-source.info @@ -0,0 +1,16 @@ +PRGNAM="etlegacy" +VERSION="20201029_886f0ef" +HOMEPAGE="http://www.etlegacy.com" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/etlegacy-20201029_886f0ef.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="e3104a3206e1d1ae0f02466e31df3bca \ + 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 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + 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/compilefix.diff b/games/freeorion/compilefix.diff deleted file mode 100644 index c4c207a520..0000000000 --- a/games/freeorion/compilefix.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur freeorion-0.4.8/parse/ConditionParser.h freeorion-0.4.8.patched/parse/ConditionParser.h ---- freeorion-0.4.8/parse/ConditionParser.h 2018-08-23 05:41:14.000000000 -0400 -+++ freeorion-0.4.8.patched/parse/ConditionParser.h 2021-02-17 04:34:17.063751926 -0500 -@@ -1,6 +1,7 @@ - #ifndef _ConditionParser_h_ - #define _ConditionParser_h_ - -+#include "../universe/ValueRef.h" - #include "Lexer.h" - #include "ParseImpl.h" - #include "ValueRefParser.h" -diff -Naur freeorion-0.4.8/server/ServerApp.cpp freeorion-0.4.8.patched/server/ServerApp.cpp ---- freeorion-0.4.8/server/ServerApp.cpp 2018-08-23 05:41:14.000000000 -0400 -+++ freeorion-0.4.8.patched/server/ServerApp.cpp 2021-02-17 16:33:47.472827568 -0500 -@@ -1715,7 +1715,7 @@ - // make a link to new connection - m_player_empire_ids[player_connection->PlayerID()] = empire.first; - -- const OrderSet dummy; -+ OrderSet dummy; - const OrderSet& orders = orders_it->second ? *orders_it->second : dummy; - - auto player_info_map = GetPlayerInfoMap(); -diff -Naur freeorion-0.4.8/universe/Universe.h freeorion-0.4.8.patched/universe/Universe.h ---- freeorion-0.4.8/universe/Universe.h 2018-08-23 05:41:14.000000000 -0400 -+++ freeorion-0.4.8.patched/universe/Universe.h 2021-02-17 04:03:51.908917840 -0500 -@@ -3,7 +3,8 @@ - - - #include "EnumsFwd.h" --#include "ValueRefFwd.h" -+#include "ValueRef.h" -+#include "Condition.h" - #include "ObjectMap.h" - #include "UniverseObject.h" - #include "../util/Pending.h" diff --git a/games/freeorion/freeorion.SlackBuild b/games/freeorion/freeorion.SlackBuild index 550b76c64c..114e98bdc8 100644 --- a/games/freeorion/freeorion.SlackBuild +++ b/games/freeorion/freeorion.SlackBuild @@ -27,8 +27,8 @@ # along. PRGNAM=freeorion -VERSION=${VERSION:-0.4.8} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.4.10.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -77,8 +77,6 @@ find -L . \ export CC=/usr/bin/clang export CXX=/usr/bin/clang++ -patch -p1 < $CWD/compilefix.diff - mkdir -p build cd build cmake \ diff --git a/games/freeorion/freeorion.info b/games/freeorion/freeorion.info index 6796385b79..304d107f60 100644 --- a/games/freeorion/freeorion.info +++ b/games/freeorion/freeorion.info @@ -1,8 +1,8 @@ PRGNAM="freeorion" -VERSION="0.4.8" +VERSION="0.4.10.1" HOMEPAGE="http://www.freeorion.org" -DOWNLOAD="https://github.com/freeorion/freeorion/archive/v0.4.8/freeorion-0.4.8.tar.gz" -MD5SUM="df605a8b6c4de264f2319610dea99dbe" +DOWNLOAD="https://github.com/freeorion/freeorion/archive/v0.4.10.1/freeorion-0.4.10.1.tar.gz" +MD5SUM="6c1f5a2508bb60a6503709b355246488" 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 +# 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/img2xterm/img2xterm.SlackBuild b/games/img2xterm/img2xterm.SlackBuild index 21345282bd..0726604b35 100644 --- a/games/img2xterm/img2xterm.SlackBuild +++ b/games/img2xterm/img2xterm.SlackBuild @@ -50,6 +50,9 @@ 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 {} \+ +# Fix an header path for imagemagick >= 7.x +sed -i "s|wand/MagickWand|MagickWand/MagickWand|" img2xterm.c + # Hardcoded stuffs. The LN line turns the absolute symlinks into # relative, so we don't end up with links to $PKG. sed -i \ diff --git a/games/knights/README b/games/knights/README deleted file mode 100644 index e133dba217..0000000000 --- a/games/knights/README +++ /dev/null @@ -1,6 +0,0 @@ -knights (a simple chess board for KDE 4) - -Knights is a rewrite of the KDE3 Knights. You can play against computer -engines that support the XBoard protocol (like GnuChess), against -another player at the same computer, or on the Free Internet Chess -Server. It has automatic rule checking and some nice animations. diff --git a/games/knights/doinst.sh b/games/knights/doinst.sh deleted file mode 100644 index aea0f894eb..0000000000 --- a/games/knights/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/games/knights/knights.SlackBuild b/games/knights/knights.SlackBuild deleted file mode 100644 index d4a1f1c9f8..0000000000 --- a/games/knights/knights.SlackBuild +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh - -# Slackware build script for knights - -# Copyright 2011, 2012 Chris Abela, Malta -# Copyright 2014 Ryan P.C. McQuen, , WA -# Now maintained by B. Watson (yalhcru@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 IMPLIE -# 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. - -# 20170810 bkw: -# - install HTML docs in /usr/doc, not /usr/share/doc -# - fix README and slack-desc typos -# - remove long-dead homepage link from slack-desc -# - BUILD=3 - -# 20170309 bkw: -# - take over maintenance -# - i486 => i586 -# - binary in /usr/games -# - BUILD=2 - -PRGNAM=knights -VERSION=${VERSION:-2.5.0} -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 {} \; - -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 \ - -DBIN_INSTALL_DIR=/usr/games \ - -DCMAKE_BUILD_TYPE=Release .. - make VERBOSE=1 - make install/strip DESTDIR=$PKG -cd .. - -# 20170309 bkw: I thought about doing this: -#chmod 644 $PKG/usr/share/applications/kde4/$PRGNAM.desktop -# ...but most of the existing files there from other packages are +x, -# not sure if KDE cares about the permissions but I'll leave it as-is. - -# 20170810 bkw: don't install to /usr/share/doc -mv $PKG/usr/share/doc $PKG/usr/doc - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a DESIGN 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/knights/knights.info b/games/knights/knights.info deleted file mode 100644 index b21e7877fa..0000000000 --- a/games/knights/knights.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="knights" -VERSION="2.5.0" -HOMEPAGE="http://opendesktop.org/content/show.php?content=122046" -DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/knights/knights-2.5.0.tar.bz2" -MD5SUM="58237998aeee8b6414f6e6f92d070395" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" diff --git a/games/knights/slack-desc b/games/knights/slack-desc deleted file mode 100644 index b2c120b2d3..0000000000 --- a/games/knights/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------------------------------------------------------| -knights: knights (a simple chess board for KDE 4) -knights: -knights: Knights is a rewrite of the KDE3 Knights. You can play against -knights: computer engines that support the XBoard protocol (like GnuChess), -knights: against another player at the same computer, or on the Free Internet -knights: Chess Server. It has automatic rule checking and some nice animations. -knights: -knights: -knights: -knights: -knights: 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 +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 +--- + 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 - #include --#include - #include - - #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 - #endif - #include --#include - #include - - #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/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 +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 + #include ++#include + + #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/patches/pokerth-1.1.2-boost-1.70-websocket-fix1.patch b/games/pokerth/patches/pokerth-1.1.2-boost-1.70-websocket-fix1.patch new file mode 100644 index 0000000000..cfdcf9b7da --- /dev/null +++ b/games/pokerth/patches/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::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::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 { + return socket::make_error_code(socket::error::invalid_state); + } + +- m_socket = lib::make_shared( +- 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 { + if (!m_context) { + return socket::make_error_code(socket::error::invalid_tls_context); + } +- m_socket = lib::make_shared( +- _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/patches/pokerth-1.1.2-boost-1.70-websocket-fix2.patch b/games/pokerth/patches/pokerth-1.1.2-boost-1.70-websocket-fix2.patch new file mode 100644 index 0000000000..64faab9d37 --- /dev/null +++ b/games/pokerth/patches/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::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::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::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/patches/pokerth-1.1.2-boost-1.73-placeholders.patch b/games/pokerth/patches/pokerth-1.1.2-boost-1.73-placeholders.patch new file mode 100644 index 0000000000..8044977c10 --- /dev/null +++ b/games/pokerth/patches/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..72b320f642 100644 --- a/games/pokerth/pokerth.SlackBuild +++ b/games/pokerth/pokerth.SlackBuild @@ -1,7 +1,8 @@ #!/bin/sh -# Slackware build script for "pokerth". +# Slackware build script for pokerth. +# Copyright 2020 Matteo Bernardini # Copyright 2009-2015 Marcel Saegebarth # Copyright 2012 Laurent Nardou # All rights reserved. @@ -26,14 +27,13 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pokerth -SRCNAM=PokerTH -VERSION=${VERSION:-1.1.1} +VERSION=${VERSION:-20200721_a333185} 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" @@ -61,11 +61,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 +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 \ @@ -73,18 +73,22 @@ 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 +( cd src/third_party/websocketpp + patch -p1 < $CWD/patches/pokerth-1.1.2-boost-1.70-websocket-fix1.patch + patch -p1 < $CWD/patches/pokerth-1.1.2-boost-1.70-websocket-fix2.patch ) +patch -p1 < $CWD/patches/pokerth-1.1.2-boost-1.73-placeholders.patch -qmake pokerth.pro +qmake-qt5 QMAKE_CFLAGS_ISYSTEM= -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-qt5 CONFIG+="client" QMAKE_CFLAGS_ISYSTEM= -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..c0e9c26cbc 100644 --- a/games/pokerth/pokerth.info +++ b/games/pokerth/pokerth.info @@ -1,10 +1,10 @@ PRGNAM="pokerth" -VERSION="1.1.1" +VERSION="20200721_a333185" HOMEPAGE="https://www.pokerth.net" -DOWNLOAD="https://downloads.sourceforge.net/pokerth/PokerTH-1.1.1-src.tar.bz2" -MD5SUM="a7f76f95782099f966e5f2b6809f502a" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/pokerth-20200721_a333185.tar.xz" +MD5SUM="b96da9a09589dd45e7cf576c7190bdb1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libgsasl libircclient tinyxml protobuf" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" 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 +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/qmc2/qmc2-qt5.15.patch b/games/qmc2/qmc2-qt5.15.patch new file mode 100644 index 0000000000..f2d8556c9c --- /dev/null +++ b/games/qmc2/qmc2-qt5.15.patch @@ -0,0 +1,10 @@ +--- qmc2/softwareimagewidget.cpp.orig 2020-07-08 07:27:41.029961948 +0000 ++++ qmc2/softwareimagewidget.cpp 2020-07-08 07:27:54.640148563 +0000 +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + #include "softwarelist.h" + #include "softwaresnapshot.h" diff --git a/games/qmc2/qmc2-types.patch b/games/qmc2/qmc2-types.patch new file mode 100644 index 0000000000..e5f960f8ce --- /dev/null +++ b/games/qmc2/qmc2-types.patch @@ -0,0 +1,952 @@ +diff --git a/lzma/7zArcIn.c b/lzma/7zArcIn.c +index 59ef8499b..323a3155f 100644 +--- a/lzma/7zArcIn.c ++++ b/lzma/7zArcIn.c +@@ -534,14 +534,14 @@ SRes SzGetNextFolderItem(CSzFolder *f, CSzData *sd) + f->NumPackStreams = numPackStreams; + + for (i = 0; i < numInStreams; i++) +- streamUsed[i] = False; ++ streamUsed[i] = false; + + if (numBonds != 0) + { + Byte coderUsed[SZ_NUM_CODERS_IN_FOLDER_MAX]; + + for (i = 0; i < numCoders; i++) +- coderUsed[i] = False; ++ coderUsed[i] = false; + + for (i = 0; i < numBonds; i++) + { +@@ -550,12 +550,12 @@ SRes SzGetNextFolderItem(CSzFolder *f, CSzData *sd) + RINOK(SzReadNumber32(sd, &bp->InIndex)); + if (bp->InIndex >= numInStreams || streamUsed[bp->InIndex]) + return SZ_ERROR_ARCHIVE; +- streamUsed[bp->InIndex] = True; ++ streamUsed[bp->InIndex] = true; + + RINOK(SzReadNumber32(sd, &bp->OutIndex)); + if (bp->OutIndex >= numCoders || coderUsed[bp->OutIndex]) + return SZ_ERROR_ARCHIVE; +- coderUsed[bp->OutIndex] = True; ++ coderUsed[bp->OutIndex] = true; + } + + for (i = 0; i < numCoders; i++) +@@ -585,7 +585,7 @@ SRes SzGetNextFolderItem(CSzFolder *f, CSzData *sd) + RINOK(SzReadNumber32(sd, &index)); + if (index >= numInStreams || streamUsed[index]) + return SZ_ERROR_ARCHIVE; +- streamUsed[index] = True; ++ streamUsed[index] = true; + f->PackStreams[i] = index; + } + } +@@ -740,9 +740,9 @@ static SRes ReadUnpackInfo(CSzAr *p, + return SZ_ERROR_UNSUPPORTED; + + for (i = 0; i < numInStreams; i++) +- streamUsed[i] = False; ++ streamUsed[i] = false; + for (i = 0; i < numCoders; i++) +- coderUsed[i] = False; ++ coderUsed[i] = false; + + for (i = 0; i < numBonds; i++) + { +@@ -751,12 +751,12 @@ static SRes ReadUnpackInfo(CSzAr *p, + RINOK(SzReadNumber32(&sd, &index)); + if (index >= numInStreams || streamUsed[index]) + return SZ_ERROR_ARCHIVE; +- streamUsed[index] = True; ++ streamUsed[index] = true; + + RINOK(SzReadNumber32(&sd, &index)); + if (index >= numCoders || coderUsed[index]) + return SZ_ERROR_ARCHIVE; +- coderUsed[index] = True; ++ coderUsed[index] = true; + } + + numPackStreams = numInStreams - numBonds; +@@ -768,7 +768,7 @@ static SRes ReadUnpackInfo(CSzAr *p, + RINOK(SzReadNumber32(&sd, &index)); + if (index >= numInStreams || streamUsed[index]) + return SZ_ERROR_ARCHIVE; +- streamUsed[index] = True; ++ streamUsed[index] = true; + } + + for (i = 0; i < numCoders; i++) +@@ -1750,7 +1750,7 @@ UInt16 *SzArEx_GetFullNameUtf16_Back(const CSzArEx *p, size_t fileIndex, UInt16 + *(--dest) = 0; + return dest; + } +- needSlash = False; ++ needSlash = false; + for (;;) + { + UInt32_7z parent = (UInt32_7z)(Int32)-1; +@@ -1758,7 +1758,7 @@ UInt16 *SzArEx_GetFullNameUtf16_Back(const CSzArEx *p, size_t fileIndex, UInt16 + SzArEx_GetFileNameUtf16(p, fileIndex, dest - curLen); + if (needSlash) + *(dest - 1) = '/'; +- needSlash = True; ++ needSlash = true; + dest -= curLen; + + if SzBitWithVals_Check(&p->Parents, fileIndex) +diff --git a/lzma/7zDec.c b/lzma/7zDec.c +index 0fa265294..3a2242db4 100644 +--- a/lzma/7zDec.c ++++ b/lzma/7zDec.c +@@ -66,7 +66,7 @@ static Byte ReadByte(void *pp) + if (size != 0) + return *p->cur++;; + } +- p->extra = True; ++ p->extra = true; + return 0; + } + +@@ -80,7 +80,7 @@ static SRes SzDecodePpmd(const Byte *props, unsigned propsSize, UInt64 inSize, I + s.p.Read = ReadByte; + s.inStream = inStream; + s.begin = s.end = s.cur = NULL; +- s.extra = False; ++ s.extra = false; + s.res = SZ_OK; + s.processed = 0; + +@@ -281,9 +281,9 @@ static Bool_7z IS_MAIN_METHOD(UInt32_7z m) + #ifdef _7ZIP_PPMD_SUPPPORT + case k_PPMD: + #endif +- return True; ++ return true; + } +- return False; ++ return false; + } + + static Bool_7z IS_SUPPORTED_CODER(const CSzCoderInfo *c) +diff --git a/lzma/7zTypes.h b/lzma/7zTypes.h +index 4a0576ca7..ebf6cc80c 100644 +--- a/lzma/7zTypes.h ++++ b/lzma/7zTypes.h +@@ -93,10 +93,8 @@ typedef UInt32_7z SizeT; + typedef size_t SizeT; + #endif + +-typedef int Bool_7z; +-#define True 1 +-#define False 0 +- ++#include ++typedef bool Bool_7z; + + #ifdef _WIN32 + #define MY_STD_CALL __stdcall +diff --git a/lzma/Bcj2Enc.c b/lzma/Bcj2Enc.c +index a7b084623..4282a2e9b 100644 +--- a/lzma/Bcj2Enc.c ++++ b/lzma/Bcj2Enc.c +@@ -64,7 +64,7 @@ static Bool_7z MY_FAST_CALL RangeEnc_ShiftLow(CBcj2Enc *p) + { + p->state = BCJ2_STREAM_RC; + p->bufs[BCJ2_STREAM_RC] = buf; +- return True; ++ return true; + } + *buf++ = (Byte)(p->cache + (Byte)(p->low >> 32)); + p->cache = 0xFF; +@@ -75,7 +75,7 @@ static Bool_7z MY_FAST_CALL RangeEnc_ShiftLow(CBcj2Enc *p) + } + p->cacheSize++; + p->low = (UInt32_7z)p->low << 8; +- return False; ++ return false; + } + + static void Bcj2Enc_Encode_2(CBcj2Enc *p) +@@ -172,14 +172,14 @@ static void Bcj2Enc_Encode_2(CBcj2Enc *p) + p->ip += (UInt32_7z)num + 1; + src++; + +- needConvert = False; ++ needConvert = false; + + if ((SizeT)(p->srcLim - src) >= 4) + { + UInt32_7z relatVal = GetUi32(src); + if ((p->fileSize == 0 || (UInt32_7z)(p->ip + 4 + relatVal - p->fileIp) < p->fileSize) + && ((relatVal + p->relatLimit) >> 1) < p->relatLimit) +- needConvert = True; ++ needConvert = true; + } + + { +diff --git a/lzma/CpuArch.c b/lzma/CpuArch.c +index dc4dbdc25..43e300838 100644 +--- a/lzma/CpuArch.c ++++ b/lzma/CpuArch.c +@@ -50,7 +50,7 @@ static UInt32_7z CheckFlag(UInt32_7z flag) + #endif + return flag; + } +-#define CHECK_CPUID_IS_SUPPORTED if (CheckFlag(1 << 18) == 0 || CheckFlag(1 << 21) == 0) return False; ++#define CHECK_CPUID_IS_SUPPORTED if (CheckFlag(1 << 18) == 0 || CheckFlag(1 << 21) == 0) return false; + #else + #define CHECK_CPUID_IS_SUPPORTED + #endif +@@ -120,7 +120,7 @@ Bool_7z x86cpuid_CheckAndRead(Cx86cpuid *p) + CHECK_CPUID_IS_SUPPORTED + MyCPUID(0, &p->maxFunc, &p->vendor[0], &p->vendor[2], &p->vendor[1]); + MyCPUID(1, &p->ver, &p->b, &p->c, &p->d); +- return True; ++ return true; + } + + static const UInt32_7z kVendors[][3] = +@@ -150,7 +150,7 @@ Bool_7z CPU_Is_InOrder() + int firm; + UInt32_7z family, model; + if (!x86cpuid_CheckAndRead(&p)) +- return True; ++ return true; + + family = x86cpuid_GetFamily(p.ver); + model = x86cpuid_GetModel(p.ver); +@@ -170,7 +170,7 @@ Bool_7z CPU_Is_InOrder() + case CPU_FIRM_AMD: return (family < 5 || (family == 5 && (model < 6 || model == 0xA))); + case CPU_FIRM_VIA: return (family < 6 || (family == 6 && model < 0xF)); + } +- return True; ++ return true; + } + + #if !defined(MY_CPU_AMD64) && defined(_WIN32) +@@ -180,10 +180,10 @@ static Bool_7z CPU_Sys_Is_SSE_Supported() + OSVERSIONINFO vi; + vi.dwOSVersionInfoSize = sizeof(vi); + if (!GetVersionEx(&vi)) +- return False; ++ return false; + return (vi.dwMajorVersion >= 5); + } +-#define CHECK_SYS_SSE_SUPPORT if (!CPU_Sys_Is_SSE_Supported()) return False; ++#define CHECK_SYS_SSE_SUPPORT if (!CPU_Sys_Is_SSE_Supported()) return false; + #else + #define CHECK_SYS_SSE_SUPPORT + #endif +@@ -193,7 +193,7 @@ Bool_7z CPU_Is_Aes_Supported() + Cx86cpuid p; + CHECK_SYS_SSE_SUPPORT + if (!x86cpuid_CheckAndRead(&p)) +- return False; ++ return false; + return (p.c >> 25) & 1; + } + +diff --git a/lzma/LzFind.c b/lzma/LzFind.c +index 0f9a7bc41..c2417042a 100644 +--- a/lzma/LzFind.c ++++ b/lzma/LzFind.c +@@ -314,7 +314,7 @@ void MatchFinder_Init_2(CMatchFinder *p, int readData) + + void MatchFinder_Init(CMatchFinder *p) + { +- MatchFinder_Init_2(p, True); ++ MatchFinder_Init_2(p, true); + } + + static UInt32_7z MatchFinder_GetSubValue(CMatchFinder *p) +diff --git a/lzma/LzFindMt.c b/lzma/LzFindMt.c +index 3c2cdaf9c..ee1e2acc6 100644 +--- a/lzma/LzFindMt.c ++++ b/lzma/LzFindMt.c +@@ -9,9 +9,9 @@ + + static void MtSync_Construct(CMtSync *p) + { +- p->wasCreated = False; +- p->csWasInitialized = False; +- p->csWasEntered = False; ++ p->wasCreated = false; ++ p->csWasInitialized = false; ++ p->csWasEntered = false; + Thread_Construct(&p->thread); + Event_Construct(&p->canStart); + Event_Construct(&p->wasStarted); +@@ -25,9 +25,9 @@ static void MtSync_GetNextBlock(CMtSync *p) + if (p->needStart) + { + p->numProcessedBlocks = 1; +- p->needStart = False; +- p->stopWriting = False; +- p->exit = False; ++ p->needStart = false; ++ p->stopWriting = false; ++ p->exit = false; + Event_Reset(&p->wasStarted); + Event_Reset(&p->wasStopped); + +@@ -37,13 +37,13 @@ static void MtSync_GetNextBlock(CMtSync *p) + else + { + CriticalSection_Leave(&p->cs); +- p->csWasEntered = False; ++ p->csWasEntered = false; + p->numProcessedBlocks++; + Semaphore_Release1(&p->freeSemaphore); + } + Semaphore_Wait(&p->filledSemaphore); + CriticalSection_Enter(&p->cs); +- p->csWasEntered = True; ++ p->csWasEntered = true; + } + + /* MtSync_StopWriting must be called if Writing was started */ +@@ -53,11 +53,11 @@ static void MtSync_StopWriting(CMtSync *p) + UInt32_7z myNumBlocks = p->numProcessedBlocks; + if (!Thread_WasCreated(&p->thread) || p->needStart) + return; +- p->stopWriting = True; ++ p->stopWriting = true; + if (p->csWasEntered) + { + CriticalSection_Leave(&p->cs); +- p->csWasEntered = False; ++ p->csWasEntered = false; + } + Semaphore_Release1(&p->freeSemaphore); + +@@ -68,7 +68,7 @@ static void MtSync_StopWriting(CMtSync *p) + Semaphore_Wait(&p->filledSemaphore); + Semaphore_Release1(&p->freeSemaphore); + } +- p->needStart = True; ++ p->needStart = true; + } + + static void MtSync_Destruct(CMtSync *p) +@@ -76,7 +76,7 @@ static void MtSync_Destruct(CMtSync *p) + if (Thread_WasCreated(&p->thread)) + { + MtSync_StopWriting(p); +- p->exit = True; ++ p->exit = true; + if (p->needStart) + Event_Set(&p->canStart); + Thread_Wait(&p->thread); +@@ -85,7 +85,7 @@ static void MtSync_Destruct(CMtSync *p) + if (p->csWasInitialized) + { + CriticalSection_Delete(&p->cs); +- p->csWasInitialized = False; ++ p->csWasInitialized = false; + } + + Event_Close(&p->canStart); +@@ -94,7 +94,7 @@ static void MtSync_Destruct(CMtSync *p) + Semaphore_Close(&p->freeSemaphore); + Semaphore_Close(&p->filledSemaphore); + +- p->wasCreated = False; ++ p->wasCreated = false; + } + + #define RINOK_THREAD(x) { if ((x) != 0) return SZ_ERROR_THREAD; } +@@ -105,7 +105,7 @@ static SRes MtSync_Create2(CMtSync *p, THREAD_FUNC_TYPE startAddress, void *obj, + return SZ_OK; + + RINOK_THREAD(CriticalSection_Init(&p->cs)); +- p->csWasInitialized = True; ++ p->csWasInitialized = true; + + RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->canStart)); + RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->wasStarted)); +@@ -114,10 +114,10 @@ static SRes MtSync_Create2(CMtSync *p, THREAD_FUNC_TYPE startAddress, void *obj, + RINOK_THREAD(Semaphore_Create(&p->freeSemaphore, numBlocks, numBlocks)); + RINOK_THREAD(Semaphore_Create(&p->filledSemaphore, 0, numBlocks)); + +- p->needStart = True; ++ p->needStart = true; + + RINOK_THREAD(Thread_Create(&p->thread, startAddress, obj)); +- p->wasCreated = True; ++ p->wasCreated = true; + return SZ_OK; + } + +@@ -129,7 +129,7 @@ static SRes MtSync_Create(CMtSync *p, THREAD_FUNC_TYPE startAddress, void *obj, + return res; + } + +-void MtSync_Init(CMtSync *p) { p->needStart = True; } ++void MtSync_Init(CMtSync *p) { p->needStart = true; } + + #define kMtMaxValForNormalize 0xFFFFFFFF + +@@ -391,7 +391,7 @@ static void BtFillBlock(CMatchFinderMt *p, UInt32_7z globalBlockIndex) + if (!sync->needStart) + { + CriticalSection_Enter(&sync->cs); +- sync->csWasEntered = True; ++ sync->csWasEntered = true; + } + + BtGetMatches(p, p->btBuf + (globalBlockIndex & kMtBtNumBlocksMask) * kMtBtBlockSize); +@@ -406,7 +406,7 @@ static void BtFillBlock(CMatchFinderMt *p, UInt32_7z globalBlockIndex) + if (!sync->needStart) + { + CriticalSection_Leave(&sync->cs); +- sync->csWasEntered = False; ++ sync->csWasEntered = false; + } + } + +@@ -503,7 +503,7 @@ void MatchFinderMt_Init(CMatchFinderMt *p) + p->hashBufPos = p->hashBufPosLimit = 0; + + /* Init without data reading. We don't want to read data in this thread */ +- MatchFinder_Init_2(mf, False); ++ MatchFinder_Init_2(mf, false); + + p->pointerToCurPos = Inline_MatchFinder_GetPointerToCurrentPos(mf); + p->btNumAvailBytes = 0; +diff --git a/lzma/Lzma2Dec.c b/lzma/Lzma2Dec.c +index 354b85c40..43bf57c8d 100644 +--- a/lzma/Lzma2Dec.c ++++ b/lzma/Lzma2Dec.c +@@ -91,9 +91,9 @@ SRes Lzma2Dec_Allocate(CLzma2Dec *p, Byte prop, ISzAlloc *alloc) + void Lzma2Dec_Init(CLzma2Dec *p) + { + p->state = LZMA2_STATE_CONTROL; +- p->needInitDic = True; +- p->needInitState = True; +- p->needInitProp = True; ++ p->needInitDic = true; ++ p->needInitState = true; ++ p->needInitProp = true; + LzmaDec_Init(&p->decoder); + } + +@@ -151,7 +151,7 @@ static ELzma2State Lzma2Dec_UpdateState(CLzma2Dec *p, Byte b) + return LZMA2_STATE_ERROR; + p->decoder.prop.lc = lc; + p->decoder.prop.lp = lp; +- p->needInitProp = False; ++ p->needInitProp = false; + return LZMA2_STATE_DATA; + } + } +@@ -230,14 +230,14 @@ SRes Lzma2Dec_DecodeToDic(CLzma2Dec *p, SizeT dicLimit, + { + Bool_7z initDic = (p->control == LZMA2_CONTROL_COPY_RESET_DIC); + if (initDic) +- p->needInitProp = p->needInitState = True; ++ p->needInitProp = p->needInitState = true; + else if (p->needInitDic) + { + p->state = LZMA2_STATE_ERROR; + return SZ_ERROR_DATA; + } +- p->needInitDic = False; +- LzmaDec_InitDicAndState(&p->decoder, initDic, False); ++ p->needInitDic = false; ++ LzmaDec_InitDicAndState(&p->decoder, initDic, false); + } + + if (srcSizeCur > destSizeCur) +@@ -273,8 +273,8 @@ SRes Lzma2Dec_DecodeToDic(CLzma2Dec *p, SizeT dicLimit, + } + + LzmaDec_InitDicAndState(&p->decoder, initDic, initState); +- p->needInitDic = False; +- p->needInitState = False; ++ p->needInitDic = false; ++ p->needInitState = false; + p->state = LZMA2_STATE_DATA_CONT; + } + +diff --git a/lzma/Lzma2Enc.c b/lzma/Lzma2Enc.c +index 23f541f21..16fbb0d3c 100644 +--- a/lzma/Lzma2Enc.c ++++ b/lzma/Lzma2Enc.c +@@ -54,8 +54,8 @@ static SRes Lzma2EncInt_Init(CLzma2EncInt *p, const CLzma2EncProps *props) + RINOK(LzmaEnc_WriteProperties(p->enc, propsEncoded, &propsSize)); + p->srcPos = 0; + p->props = propsEncoded[0]; +- p->needInitState = True; +- p->needInitProp = True; ++ p->needInitState = true; ++ p->needInitProp = true; + return SZ_OK; + } + +@@ -102,7 +102,7 @@ static SRes Lzma2EncInt_EncodeSubblock(CLzma2EncInt *p, Byte *outBuf, + if (res != SZ_ERROR_OUTPUT_EOF) + return res; + res = SZ_OK; +- useCopyBlock = True; ++ useCopyBlock = true; + } + + if (useCopyBlock) +@@ -132,7 +132,7 @@ static SRes Lzma2EncInt_EncodeSubblock(CLzma2EncInt *p, Byte *outBuf, + } + else + *packSizeRes = destPos; +- /* needInitState = True; */ ++ /* needInitState = true; */ + } + + LzmaEnc_RestoreState(p->enc); +@@ -156,8 +156,8 @@ static SRes Lzma2EncInt_EncodeSubblock(CLzma2EncInt *p, Byte *outBuf, + if (p->needInitProp) + outBuf[destPos++] = p->props; + +- p->needInitProp = False; +- p->needInitState = False; ++ p->needInitProp = false; ++ p->needInitState = false; + destPos += packSize; + p->srcPos += unpackSize; + +diff --git a/lzma/Lzma86Enc.c b/lzma/Lzma86Enc.c +index e35950179..20f7c4ab1 100644 +--- a/lzma/Lzma86Enc.c ++++ b/lzma/Lzma86Enc.c +@@ -56,7 +56,7 @@ int Lzma86_Encode(Byte *dest, size_t *destLen, const Byte *src, size_t srcLen, + + { + size_t minSize = 0; +- Bool_7z bestIsFiltered = False; ++ Bool_7z bestIsFiltered = false; + + /* passes for SZ_FILTER_AUTO: + 0 - BCJ + LZMA +@@ -75,7 +75,7 @@ int Lzma86_Encode(Byte *dest, size_t *destLen, const Byte *src, size_t srcLen, + if (curModeIsFiltered && !bestIsFiltered) + break; + if (useFilter && i == 0) +- curModeIsFiltered = True; ++ curModeIsFiltered = true; + + curRes = LzmaEncode(dest + LZMA86_HEADER_SIZE, &outSizeProcessed, + curModeIsFiltered ? filteredStream : src, srcLen, +diff --git a/lzma/LzmaDec.c b/lzma/LzmaDec.c +index 867e3f6c9..412e2fa94 100644 +--- a/lzma/LzmaDec.c ++++ b/lzma/LzmaDec.c +@@ -785,7 +785,7 @@ void LzmaDec_InitDicAndState(CLzmaDec *p, Bool_7z initDic, Bool_7z initState) + void LzmaDec_Init(CLzmaDec *p) + { + p->dicPos = 0; +- LzmaDec_InitDicAndState(p, True, True); ++ LzmaDec_InitDicAndState(p, true, true); + } + + static void LzmaDec_InitStateReal(CLzmaDec *p) +diff --git a/lzma/LzmaEnc.c b/lzma/LzmaEnc.c +index d4409f7f0..79a7ee944 100644 +--- a/lzma/LzmaEnc.c ++++ b/lzma/LzmaEnc.c +@@ -904,8 +904,8 @@ static UInt32_7z ReadMatchDistances(CLzmaEnc *p, UInt32_7z *numDistancePairsRes) + } + + +-#define MakeAsChar(p) (p)->backPrev = (UInt32_7z)(-1); (p)->prev1IsChar = False; +-#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False; ++#define MakeAsChar(p) (p)->backPrev = (UInt32_7z)(-1); (p)->prev1IsChar = false; ++#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = false; + #define IsShortRep(p) ((p)->backPrev == 0) + + static UInt32_7z GetRepLen1Price(CLzmaEnc *p, UInt32_7z state, UInt32_7z posState) +@@ -956,7 +956,7 @@ static UInt32_7z Backward(CLzmaEnc *p, UInt32_7z *backRes, UInt32_7z cur) + p->opt[posMem].posPrev = posMem - 1; + if (p->opt[cur].prev2) + { +- p->opt[posMem - 1].prev1IsChar = False; ++ p->opt[posMem - 1].prev1IsChar = false; + p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2; + p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2; + } +@@ -1123,7 +1123,7 @@ static UInt32_7z GetOptimum(CLzmaEnc *p, UInt32_7z position, UInt32_7z *backRes) + opt->price = curAndLenPrice; + opt->posPrev = 0; + opt->backPrev = i; +- opt->prev1IsChar = False; ++ opt->prev1IsChar = false; + } + } + while (--repLen >= 2); +@@ -1158,7 +1158,7 @@ static UInt32_7z GetOptimum(CLzmaEnc *p, UInt32_7z position, UInt32_7z *backRes) + opt->price = curAndLenPrice; + opt->posPrev = 0; + opt->backPrev = distance + LZMA_NUM_REPS; +- opt->prev1IsChar = False; ++ opt->prev1IsChar = false; + } + if (len == matches[offs]) + { +@@ -1276,7 +1276,7 @@ static UInt32_7z GetOptimum(CLzmaEnc *p, UInt32_7z position, UInt32_7z *backRes) + curOpt->backs[3] = reps[3]; + + curPrice = curOpt->price; +- nextIsChar = False; ++ nextIsChar = false; + data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; + curByte = *data; + matchByte = *(data - (reps[0] + 1)); +@@ -1299,7 +1299,7 @@ static UInt32_7z GetOptimum(CLzmaEnc *p, UInt32_7z position, UInt32_7z *backRes) + nextOpt->price = curAnd1Price; + nextOpt->posPrev = cur; + MakeAsChar(nextOpt); +- nextIsChar = True; ++ nextIsChar = true; + } + + matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]); +@@ -1313,7 +1313,7 @@ static UInt32_7z GetOptimum(CLzmaEnc *p, UInt32_7z position, UInt32_7z *backRes) + nextOpt->price = shortRepPrice; + nextOpt->posPrev = cur; + MakeAsShortRep(nextOpt); +- nextIsChar = True; ++ nextIsChar = true; + } + } + numAvailFull = p->numAvail; +@@ -1360,8 +1360,8 @@ static UInt32_7z GetOptimum(CLzmaEnc *p, UInt32_7z position, UInt32_7z *backRes) + opt->price = curAndLenPrice; + opt->posPrev = cur + 1; + opt->backPrev = 0; +- opt->prev1IsChar = True; +- opt->prev2 = False; ++ opt->prev1IsChar = true; ++ opt->prev2 = false; + } + } + } +@@ -1392,7 +1392,7 @@ static UInt32_7z GetOptimum(CLzmaEnc *p, UInt32_7z position, UInt32_7z *backRes) + opt->price = curAndLenPrice; + opt->posPrev = cur; + opt->backPrev = repIndex; +- opt->prev1IsChar = False; ++ opt->prev1IsChar = false; + } + } + while (--lenTest >= 2); +@@ -1439,8 +1439,8 @@ static UInt32_7z GetOptimum(CLzmaEnc *p, UInt32_7z position, UInt32_7z *backRes) + opt->price = curAndLenPrice; + opt->posPrev = cur + lenTest + 1; + opt->backPrev = 0; +- opt->prev1IsChar = True; +- opt->prev2 = True; ++ opt->prev1IsChar = true; ++ opt->prev2 = true; + opt->posPrev2 = cur; + opt->backPrev2 = repIndex; + } +@@ -1487,7 +1487,7 @@ static UInt32_7z GetOptimum(CLzmaEnc *p, UInt32_7z position, UInt32_7z *backRes) + opt->price = curAndLenPrice; + opt->posPrev = cur; + opt->backPrev = curBack + LZMA_NUM_REPS; +- opt->prev1IsChar = False; ++ opt->prev1IsChar = false; + } + } + +@@ -1530,8 +1530,8 @@ static UInt32_7z GetOptimum(CLzmaEnc *p, UInt32_7z position, UInt32_7z *backRes) + opt->price = curAndLenPrice2; + opt->posPrev = cur + lenTest + 1; + opt->backPrev = 0; +- opt->prev1IsChar = True; +- opt->prev2 = True; ++ opt->prev1IsChar = true; ++ opt->prev2 = true; + opt->posPrev2 = cur; + opt->backPrev2 = curBack + LZMA_NUM_REPS; + } +@@ -1681,14 +1681,14 @@ static SRes CheckErrors(CLzmaEnc *p) + if (p->matchFinderBase.result != SZ_OK) + p->result = SZ_ERROR_READ; + if (p->result != SZ_OK) +- p->finished = True; ++ p->finished = true; + return p->result; + } + + static SRes Flush(CLzmaEnc *p, UInt32_7z nowPos) + { + /* ReleaseMFStream(); */ +- p->finished = True; ++ p->finished = true; + if (p->writeEndMark) + WriteEndMarker(p, nowPos & p->pbMask); + RangeEnc_FlushData(&p->rc); +@@ -2092,7 +2092,7 @@ static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32_7z keepWindowSize, ISzAlloc + break; + p->distTableSize = i * 2; + +- p->finished = False; ++ p->finished = false; + p->result = SZ_OK; + RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig)); + LzmaEnc_Init(p); +@@ -2164,7 +2164,7 @@ static size_t MyWrite(void *pp, const void *data, size_t size) + if (p->rem < size) + { + size = p->rem; +- p->overflow = True; ++ p->overflow = true; + } + memcpy(p->data, data, size); + p->rem -= size; +@@ -2198,10 +2198,10 @@ SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool_7z reInit, + outStream.funcTable.Write = MyWrite; + outStream.data = dest; + outStream.rem = *destLen; +- outStream.overflow = False; ++ outStream.overflow = false; + +- p->writeEndMark = False; +- p->finished = False; ++ p->writeEndMark = false; ++ p->finished = false; + p->result = SZ_OK; + + if (reInit) +@@ -2211,7 +2211,7 @@ SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool_7z reInit, + RangeEnc_Init(&p->rc); + p->rc.outStream = &outStream.funcTable; + +- res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize); ++ res = LzmaEnc_CodeOneBlock(p, true, desiredPackSize, *unpackSize); + + *unpackSize = (UInt32_7z)(p->nowPos64 - nowPos64); + *destLen -= outStream.rem; +@@ -2234,7 +2234,7 @@ static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress) + + for (;;) + { +- res = LzmaEnc_CodeOneBlock(p, False, 0, 0); ++ res = LzmaEnc_CodeOneBlock(p, false, 0, 0); + if (res != SZ_OK || p->finished) + break; + if (progress) +@@ -2307,7 +2307,7 @@ SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte + outStream.funcTable.Write = MyWrite; + outStream.data = dest; + outStream.rem = *destLen; +- outStream.overflow = False; ++ outStream.overflow = false; + + p->writeEndMark = writeEndMark; + p->rc.outStream = &outStream.funcTable; +diff --git a/lzma/MtCoder.c b/lzma/MtCoder.c +index 5db0f4cb4..ab06fb7dd 100644 +--- a/lzma/MtCoder.c ++++ b/lzma/MtCoder.c +@@ -156,8 +156,8 @@ static SRes CMtThread_Prepare(CMtThread *p) + MY_BUF_ALLOC(p->inBuf, p->inBufSize, p->mtCoder->blockSize) + MY_BUF_ALLOC(p->outBuf, p->outBufSize, p->mtCoder->destBlockSize) + +- p->stopReading = False; +- p->stopWriting = False; ++ p->stopReading = false; ++ p->stopWriting = false; + RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->canRead)); + RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->canWrite)); + +@@ -187,7 +187,7 @@ static SRes FullRead(ISeqInStream *stream, Byte *data, size_t *processedSize) + static SRes MtThread_Process(CMtThread *p, Bool_7z *stop) + { + CMtThread *next; +- *stop = True; ++ *stop = true; + if (Event_Wait(&p->canRead) != 0) + return SZ_ERROR_THREAD; + +@@ -195,7 +195,7 @@ static SRes MtThread_Process(CMtThread *p, Bool_7z *stop) + + if (p->stopReading) + { +- next->stopReading = True; ++ next->stopReading = true; + return Event_Set(&next->canRead) == 0 ? SZ_OK : SZ_ERROR_THREAD; + } + +@@ -235,8 +235,8 @@ static THREAD_FUNC_RET_TYPE THREAD_FUNC_CALL_TYPE ThreadFunc(void *pp) + { + MtCoder_SetError(p->mtCoder, res); + MtProgress_SetError(&p->mtCoder->mtProgress, res); +- next->stopReading = True; +- next->stopWriting = True; ++ next->stopReading = true; ++ next->stopWriting = true; + Event_Set(&next->canRead); + Event_Set(&next->canWrite); + return res; +@@ -309,7 +309,7 @@ SRes MtCoder_Code(CMtCoder *p) + if (LoopThread_StartSubThread(&t->thread) != SZ_OK) + { + res = SZ_ERROR_THREAD; +- p->threads[0].stopReading = True; ++ p->threads[0].stopReading = true; + break; + } + } +diff --git a/lzma/Ppmd7.c b/lzma/Ppmd7.c +index a61e5300e..6821ae868 100644 +--- a/lzma/Ppmd7.c ++++ b/lzma/Ppmd7.c +@@ -111,10 +111,10 @@ Bool_7z Ppmd7_Alloc(CPpmd7 *p, UInt32_7z size, ISzAlloc *alloc) + + UNIT_SIZE + #endif + )) == 0) +- return False; ++ return false; + p->Size = size; + } +- return True; ++ return true; + } + + static void InsertNode(CPpmd7 *p, void *node, unsigned indx) +@@ -458,7 +458,7 @@ static void UpdateModel(CPpmd7 *p) + + if (p->OrderFall == 0) + { +- p->MinContext = p->MaxContext = CreateSuccessors(p, True); ++ p->MinContext = p->MaxContext = CreateSuccessors(p, true); + if (p->MinContext == 0) + { + RestartModel(p); +@@ -480,7 +480,7 @@ static void UpdateModel(CPpmd7 *p) + { + if (fSuccessor <= successor) + { +- CTX_PTR cs = CreateSuccessors(p, False); ++ CTX_PTR cs = CreateSuccessors(p, false); + if (cs == NULL) + { + RestartModel(p); +diff --git a/lzma/Ppmd7Dec.c b/lzma/Ppmd7Dec.c +index 6b2e0b81c..f653f41ed 100644 +--- a/lzma/Ppmd7Dec.c ++++ b/lzma/Ppmd7Dec.c +@@ -14,7 +14,7 @@ Bool_7z Ppmd7z_RangeDec_Init(CPpmd7z_RangeDec *p) + p->Code = 0; + p->Range = 0xFFFFFFFF; + if (p->Stream->Read((void *)p->Stream) != 0) +- return False; ++ return false; + for (i = 0; i < 4; i++) + p->Code = (p->Code << 8) | p->Stream->Read((void *)p->Stream); + return (p->Code < 0xFFFFFFFF); +diff --git a/lzma/XzDec.c b/lzma/XzDec.c +index 3dc8b4983..8e99f51a1 100644 +--- a/lzma/XzDec.c ++++ b/lzma/XzDec.c +@@ -393,7 +393,7 @@ SRes MixCoder_Code(CMixCoder *p, Byte *dest, SizeT *destLen, + { + SizeT destLenOrig = *destLen; + SizeT srcLenOrig = *srcLen; +- Bool_7z allFinished = True; ++ Bool_7z allFinished = true; + *destLen = 0; + *srcLen = 0; + *status = CODER_STATUS_NOT_FINISHED; +@@ -410,7 +410,7 @@ SRes MixCoder_Code(CMixCoder *p, Byte *dest, SizeT *destLen, + + for (;;) + { +- Bool_7z processed = False; ++ Bool_7z processed = false; + unsigned i; + /* + if (p->numCoders == 1 && *destLen == destLenOrig && finishMode == LZMA_FINISH_ANY) +@@ -456,7 +456,7 @@ SRes MixCoder_Code(CMixCoder *p, Byte *dest, SizeT *destLen, + res = coder->Code(coder->p, destCur, &destLenCur, srcCur, &srcLenCur, srcFinishedCur, finishMode, &encodingWasFinished); + + if (!encodingWasFinished) +- allFinished = False; ++ allFinished = false; + + if (i == 0) + { +@@ -484,7 +484,7 @@ SRes MixCoder_Code(CMixCoder *p, Byte *dest, SizeT *destLen, + return res; + + if (destLenCur != 0 || srcLenCur != 0) +- processed = True; ++ processed = true; + } + if (!processed) + break; +@@ -573,7 +573,7 @@ SRes XzBlock_Parse(CXzBlock *p, const Byte *header) + SRes XzDec_Init(CMixCoder *p, const CXzBlock *block) + { + unsigned i; +- Bool_7z needReInit = True; ++ Bool_7z needReInit = true; + unsigned numFilters = XzBlock_GetNumFilters(block); + + if (numFilters == p->numCoders) +@@ -650,7 +650,7 @@ SRes XzUnpacker_Code(CXzUnpacker *p, Byte *dest, SizeT *destLen, + return SZ_OK; + } + +- res = MixCoder_Code(&p->decoder, dest, &destLen2, src, &srcLen2, False, finishMode, status); ++ res = MixCoder_Code(&p->decoder, dest, &destLen2, src, &srcLen2, false, finishMode, status); + XzCheck_Update(&p->check, dest, destLen2); + + (*srcLen) += srcLen2; +diff --git a/lzma/XzEnc.c b/lzma/XzEnc.c +index 5ba898f8a..8f6242a25 100644 +--- a/lzma/XzEnc.c ++++ b/lzma/XzEnc.c +@@ -313,10 +313,10 @@ static SRes SbEncInStream_Read(void *pp, void *data, size_t *size) + p->enc.readPos += processed; + if (processed == 0) + { +- p->enc.readWasFinished = True; +- p->enc.isFinalFinished = True; ++ p->enc.readWasFinished = true; ++ p->enc.isFinalFinished = true; + } +- p->enc.needRead = False; ++ p->enc.needRead = false; + } + + *size = sizeOriginal; +@@ -402,7 +402,7 @@ void XzFilterProps_Init(CXzFilterProps *p) + p->id = 0; + p->delta = 0; + p->ip = 0; +- p->ipDefined = False; ++ p->ipDefined = false; + } + + +diff --git a/lzma/XzIn.c b/lzma/XzIn.c +index 59aceb18a..22314b4cc 100644 +--- a/lzma/XzIn.c ++++ b/lzma/XzIn.c +@@ -32,11 +32,11 @@ SRes XzBlock_ReadHeader(CXzBlock *p, ISeqInStream *inStream, Bool_7z *isIndex, U + if (headerSize == 0) + { + *headerSizeRes = 1; +- *isIndex = True; ++ *isIndex = true; + return SZ_OK; + } + +- *isIndex = False; ++ *isIndex = false; + *headerSizeRes = headerSize; + RINOK(SeqInStream_Read(inStream, header + 1, headerSize - 1)); + return XzBlock_Parse(p, header); diff --git a/games/qmc2/qmc2.SlackBuild b/games/qmc2/qmc2.SlackBuild index 72c2e64051..42ac1cde0a 100644 --- a/games/qmc2/qmc2.SlackBuild +++ b/games/qmc2/qmc2.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/qmc2-qt5.15.patch +patch --binary -p1 < $CWD/qmc2-types.patch + CXX_FLAGS="$SLKCFLAGS" LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ make EMU=MESS PREFIX=/usr PRETTY=0 MACHINE=$ARCH make install EMU=MESS PREFIX=/usr DESTDIR=$PKG 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/games/quakespasm/doinst.sh b/games/quakespasm/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/games/quakespasm/doinst.sh @@ -0,0 +1,3 @@ +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/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 , 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 +Date: Sun, 22 May 2016 10:29:27 -0700 +Subject: [PATCH] Theoretical compile fix for gcc 4 series. + +Adds 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 + + #include ++#include + #include + #include + #include 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/roccat-tools/roccat-tools.SlackBuild b/games/roccat-tools/roccat-tools.SlackBuild index 56530c5407..9dd0fbd809 100644 --- a/games/roccat-tools/roccat-tools.SlackBuild +++ b/games/roccat-tools/roccat-tools.SlackBuild @@ -105,7 +105,7 @@ LUA="-DWITH_LUA='$LUAVERSION'" mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -isystem /usr/include/harfbuzz" \ -DCMAKE_INSTALL_PREFIX=/usr \ $HW \ $LUA \ diff --git a/games/scummvm/scummvm.SlackBuild b/games/scummvm/scummvm.SlackBuild index c0a8a400f7..45d0bc1a4c 100644 --- a/games/scummvm/scummvm.SlackBuild +++ b/games/scummvm/scummvm.SlackBuild @@ -76,9 +76,12 @@ find -L . \ # git commit 68758a87. patch -p1 < $CWD/fix-fluidsynth2-build.diff +# avoid linking breakage on i?86 +if [[ $ARCH == i?86 ]]; then linker=bfd; else linker=gold; fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="-fuse-ld=gold" \ +LDFLAGS="-fuse-ld=$linker" \ ./configure \ --prefix=/usr \ --bindir=/usr/games \ 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 +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 ++ + 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 +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 ++// 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 diff --git a/games/supertuxkart/supertuxkart.SlackBuild b/games/supertuxkart/supertuxkart.SlackBuild index 47fd592558..91241b3ecd 100644 --- a/games/supertuxkart/supertuxkart.SlackBuild +++ b/games/supertuxkart/supertuxkart.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 {} \; +# 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/trackballs.info b/games/trackballs/trackballs.info index 85727281de..02cafdef1e 100644 --- a/games/trackballs/trackballs.info +++ b/games/trackballs/trackballs.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/trackballs/trackballs/archive/v1.3.2/trackballs-1.3 MD5SUM="85b128afca8b55d8e7ae02c21fa0427e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="SDL2_mixer SDL2_image SDL2_ttf" +REQUIRES="SDL2_mixer SDL2_image SDL2_ttf guile2.2" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" 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/ + # /usr/lib//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()` calls. It handles the +``REQUIRED``, ``QUIET`` and version-related arguments of ``find_package``. +It also sets the ``_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( + (DEFAULT_MSG|) + ... + ) + + find_package_handle_standard_args( + [FOUND_VAR ] + [REQUIRED_VARS ...] + [VERSION_VAR ] + [HANDLE_COMPONENTS] + [CONFIG_MODE] + [NAME_MISMATCHED] + [REASON_FAILURE_MESSAGE ] + [FAIL_MESSAGE ] + ) + + The ``_FOUND`` variable will be set to ``TRUE`` if all + the variables ``...`` 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|)`` + 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 `` + Obsolete. Specifies either ``_FOUND`` or + ``_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 ...`` + 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 `` + 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 ``_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( NO_MODULE)``. This implies + a ``VERSION_VAR`` value of ``_VERSION``. The command + will automatically check whether the package configuration file + was found. + + ``REASON_FAILURE_MESSAGE `` + Specify a custom message of the reason for the failure which will be + appended to the default generated message. + + ``FAIL_MESSAGE `` + Specify a custom failure message instead of using the default + generated message. Not recommended. + + ``NAME_MISMATCHED`` + Indicate that the ```` 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 ````. On repeated CMake runs, +the same message will not be printed again. + +.. note:: + + If ```` 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) + # _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 _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( "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 . + +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_2 b/games/vegastrike/patches/patch-0.5.1.r1_2 index 7780674c0c..8f6d622177 100644 --- a/games/vegastrike/patches/patch-0.5.1.r1_2 +++ b/games/vegastrike/patches/patch-0.5.1.r1_2 @@ -1,6 +1,6 @@ -diff -ruN ./CMakeLists.txt ../c/CMakeLists.txt +diff -ruN ./CMakeLists.txt ../b/CMakeLists.txt --- ./CMakeLists.txt 2012-03-26 02:50:49.000000000 +0200 -+++ ../c/CMakeLists.txt 2020-09-03 16:25:55.870086658 +0200 ++++ ../b/CMakeLists.txt 2020-09-02 22:37:20.707393347 +0200 @@ -10,7 +10,7 @@ project (vsUTCS) @@ -10,7 +10,56 @@ diff -ruN ./CMakeLists.txt ../c/CMakeLists.txt include_directories(${vsUTCS_SOURCE_DIR}/src ${vsUTCS_SOURCE_DIR}/src/cmd -@@ -828,33 +828,33 @@ +@@ -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 @@ -68,7 +117,7 @@ diff -ruN ./CMakeLists.txt ../c/CMakeLists.txt IF(NOT BEOS) FIND_LIBRARY(UTIL_LIB util) -@@ -977,12 +977,12 @@ +@@ -977,12 +1005,12 @@ HAVE_AVFORMAT_H HAVE_AVCODEC_H HAVE_AVIO_H @@ -86,9 +135,9 @@ diff -ruN ./CMakeLists.txt ../c/CMakeLists.txt 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 +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 -+++ ../c/objconv/basemaker/base_maker_texture.cpp 2020-09-03 16:25:55.871086646 +0200 ++++ ../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 @@ -102,9 +151,9 @@ diff -ruN ./objconv/basemaker/base_maker_texture.cpp ../c/objconv/basemaker/base } #define strip_16 true -diff -ruN ./objconv/mesher/to_OgreMesh.cpp ../c/objconv/mesher/to_OgreMesh.cpp +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 -+++ ../c/objconv/mesher/to_OgreMesh.cpp 2020-09-03 16:25:55.872086633 +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( @@ -187,9 +236,9 @@ diff -ruN ./objconv/mesher/to_OgreMesh.cpp ../c/objconv/mesher/to_OgreMesh.cpp void DoneMeshes( void *outputcontext ) { -diff -ruN ./objconv/mesher/to_OgreMesh.h ../c/objconv/mesher/to_OgreMesh.h +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 -+++ ../c/objconv/mesher/to_OgreMesh.h 2020-09-03 16:25:55.873086621 +0200 ++++ ../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. @@ -199,9 +248,9 @@ diff -ruN ./objconv/mesher/to_OgreMesh.h ../c/objconv/mesher/to_OgreMesh.h 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 +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 -+++ ../c/setup/src/c/setup.cpp 2020-09-03 16:25:55.873086621 +0200 ++++ ../b/setup/src/c/setup.cpp 2020-09-02 15:08:07.764351504 +0200 @@ -110,10 +110,22 @@ return 1; } @@ -250,9 +299,9 @@ diff -ruN ./setup/src/c/setup.cpp ../c/setup/src/c/setup.cpp //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 +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 -+++ ../c/setup/src/include/central.cpp 2020-09-03 17:45:35.786329482 +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; @@ -271,9 +320,9 @@ diff -ruN ./setup/src/include/central.cpp ../c/setup/src/include/central.cpp } struct catagory *GetCatStruct(char *name) { -diff -ruN ./src/cmd/music.cpp ../c/src/cmd/music.cpp +diff -ruN ./src/cmd/music.cpp ../b/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 ++++ ../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; @@ -285,9 +334,9 @@ diff -ruN ./src/cmd/music.cpp ../c/src/cmd/music.cpp } if (me->freeWav && docacheme) { me->freeWav = false; -diff -ruN ./src/cmd/unit.cpp ../c/src/cmd/unit.cpp +diff -ruN ./src/cmd/unit.cpp ../b/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 ++++ ../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() ) @@ -311,9 +360,9 @@ diff -ruN ./src/cmd/unit.cpp ../c/src/cmd/unit.cpp } template < class UnitType >GameUnit< UnitType >::~GameUnit() -diff -ruN ./src/cmd/unit_collide.h ../c/src/cmd/unit_collide.h +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 -+++ ../c/src/cmd/unit_collide.h 2020-09-03 17:34:09.178913256 +0200 ++++ ../b/src/cmd/unit_collide.h 2020-09-02 21:27:47.524565312 +0200 @@ -94,9 +94,9 @@ { if ( !hugeobjects.empty() ) @@ -326,9 +375,30 @@ diff -ruN ./src/cmd/unit_collide.h ../c/src/cmd/unit_collide.h hb.clear(); acc_huge.clear(); act_huge.clear(); -diff -ruN ./src/cmd/unit_generic.cpp ../c/src/cmd/unit_generic.cpp +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 -+++ ../c/src/cmd/unit_generic.cpp 2020-09-03 16:25:55.879086546 +0200 ++++ ../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"; @@ -423,9 +493,9 @@ diff -ruN ./src/cmd/unit_generic.cpp ../c/src/cmd/unit_generic.cpp if (tmpammo > mounts[jmod].ammo) { cancompletefully = true; if (touchme) -diff -ruN ./src/cmd/unit_jump.h ../c/src/cmd/unit_jump.h +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 -+++ ../c/src/cmd/unit_jump.h 2020-09-03 16:25:55.880086533 +0200 ++++ ../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) @@ -435,9 +505,21 @@ diff -ruN ./src/cmd/unit_jump.h ../c/src/cmd/unit_jump.h *( 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 +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 -+++ ../c/src/gfx/cockpit_xml.cpp 2020-09-03 16:30:00.313030701 +0200 ++++ ../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]) { @@ -447,9 +529,9 @@ diff -ruN ./src/gfx/cockpit_xml.cpp ../c/src/gfx/cockpit_xml.cpp } break; case UnitImages< void >::SHIELD4: -diff -ruN ./src/gfx/quadsquare.cpp ../c/src/gfx/quadsquare.cpp +diff -ruN ./src/gfx/quadsquare.cpp ../b/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 ++++ ../b/src/gfx/quadsquare.cpp 2020-09-02 15:08:07.767351467 +0200 @@ -13,9 +13,9 @@ #include #include @@ -461,9 +543,9 @@ diff -ruN ./src/gfx/quadsquare.cpp ../c/src/gfx/quadsquare.cpp using std::vector; unsigned int*quadsquare::VertexAllocated; -diff -ruN ./src/gui/text_area.cpp ../c/src/gui/text_area.cpp +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 -+++ ../c/src/gui/text_area.cpp 2020-09-03 17:46:51.883378138 +0200 ++++ ../b/src/gui/text_area.cpp 2020-09-03 00:05:06.687559535 +0200 @@ -32,6 +32,8 @@ * }; */ @@ -482,9 +564,9 @@ diff -ruN ./src/gui/text_area.cpp ../c/src/gui/text_area.cpp if (type == 1) return search->name; else return search->description; -diff -ruN ./src/networking/lowlevel/packetmem.cpp ../c/src/networking/lowlevel/packetmem.cpp +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 -+++ ../c/src/networking/lowlevel/packetmem.cpp 2020-09-03 16:25:55.881086521 +0200 ++++ ../b/src/networking/lowlevel/packetmem.cpp 2020-09-02 15:08:07.768351454 +0200 @@ -102,7 +102,7 @@ } else @@ -494,9 +576,21 @@ diff -ruN ./src/networking/lowlevel/packetmem.cpp ../c/src/networking/lowlevel/p _len = 0; } } -diff -ruN ./src/pk3.cpp ../c/src/pk3.cpp +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 -+++ ../c/src/pk3.cpp 2020-09-03 16:31:12.819124250 +0200 ++++ ../b/src/pk3.cpp 2020-09-02 23:06:42.933362491 +0200 @@ -356,7 +356,7 @@ } //if the file isn't in the archive @@ -506,9 +600,59 @@ diff -ruN ./src/pk3.cpp ../c/src/pk3.cpp int flength = GetFileLen( index ); buffer = new char[flength]; -diff -ruN ./src/vsfilesystem.cpp ../c/src/vsfilesystem.cpp +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 + #include ++#include + + 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 -+++ ../c/src/vsfilesystem.cpp 2020-09-03 16:25:55.882086508 +0200 ++++ ../b/src/vsfilesystem.cpp 2020-09-02 16:02:24.060642199 +0200 @@ -460,13 +460,15 @@ int vs_fprintf( FILE *fp, const char *format, ... ) diff --git a/games/vegastrike/vegastrike.SlackBuild b/games/vegastrike/vegastrike.SlackBuild index 77f7eebd21..4842fca4e9 100644 --- a/games/vegastrike/vegastrike.SlackBuild +++ b/games/vegastrike/vegastrike.SlackBuild @@ -84,6 +84,8 @@ tar xvf $CWD/$PRGSRCNAME$PRGSRCSUF cd $PRGSRCNAME +cp "$CWD/cmake"/*.cmake . + declare patchdir="$CWD/patches" patch -p0 < "$patchdir/patch-${VERSION}_$BUILD" @@ -113,6 +115,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& 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(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 - #include - #include -+#include - - #include - - diff --git a/games/widelands/widelands.SlackBuild b/games/widelands/widelands.SlackBuild index 793f7a1215..bf77422829 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:-build21} 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-source.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 \ @@ -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 \ @@ -87,7 +84,7 @@ cd build1 cd .. mkdir -p $PKG/usr/bin -mv $PKG/usr/{widelands,wl_map_object_info,wl_render_richtext,wl_map_info} $PKG/usr/bin +mv $PKG/usr/{widelands,wl_map_object_info,wl_map_info,wl_create_spritesheet} $PKG/usr/bin mkdir -p $PKG/usr/share/applications install -m 0644 $CWD/widelands.desktop \ @@ -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..75ea359732 100644 --- a/games/widelands/widelands.info +++ b/games/widelands/widelands.info @@ -1,8 +1,8 @@ PRGNAM="widelands" -VERSION="build19" +VERSION="build21" HOMEPAGE="http://www.widelands.org" -DOWNLOAD="https://launchpad.net/widelands/build19/build19/+download/widelands-build19-src.tar.bz2" -MD5SUM="0ef7ccf021b8001056739f755500366d" +DOWNLOAD="https://launchpad.net/widelands/build21/build21/+download/widelands-build21-source.tar.gz" +MD5SUM="2933da247b2009f5608e92624d606851" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="SDL2_image SDL2_mixer SDL2_net SDL2_ttf lua" 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 +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 ++ + #include + #include + #include +@@ -25,7 +27,6 @@ + + #include + #include +-#include + #include + + #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 + +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(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/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild index d57f2e6a58..4bd645336e 100644 --- a/gis/qgis/qgis.SlackBuild +++ b/gis/qgis/qgis.SlackBuild @@ -76,7 +76,7 @@ else WITHGRASS="" fi -sed -i 's|${SIP_BINARY_PATH}|/usr/bin/python3-sip|' cmake/SIPMacros.cmake +sed -i 's|${SIP_BINARY_PATH}|/usr/bin/sip3|' cmake/SIPMacros.cmake mkdir -p build cd build @@ -92,13 +92,18 @@ cd build -DWITH_QWTPOLAR=TRUE \ -DWITH_CUSTOM_WIDGETS=FALSE \ -DBINDINGS_GLOBAL_INSTALL=TRUE \ - -DQWT_INCLUDE_DIR=/usr/include/qt5/qwt \ + -DQWT_INCLUDE_DIR=/usr/include/qwt \ -DQSCINTILLA_INCLUDE_DIR=/usr/include/qt5 \ -DENABLE_TESTS=FALSE \ -DWITH_3D=TRUE \ -Wno-dev \ $WITHGRASS + # Workaround a cmake bug (?) + sed -i "s/\\$\\$\\$\\$/\$\$/" \ + src/core/CMakeFiles/qgis_core.dir/build.make \ + src/core/CMakeFiles/qgis_core_autogen.dir/build.make || exit 1 + make install DESTDIR=$PKG cd - diff --git a/gis/qgis/qgis.info b/gis/qgis/qgis.info index 52171778d3..d9c398b086 100644 --- a/gis/qgis/qgis.info +++ b/gis/qgis/qgis.info @@ -5,6 +5,6 @@ DOWNLOAD="https://qgis.org/downloads/qgis-3.18.0.tar.bz2" MD5SUM="b8e5d03d48e9c8e84858823c3d74b3c4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="cmake-202x postgis libspatialite libspatialindex numpy3 qt5-webkit qwt-qt5 QScintilla-qt5 qtkeychain qca-qt5 protobuf3 python3-PyYAML python-requests Pygments OWSLib psycopg2 Jinja2 zstd" +REQUIRES="cmake-202x postgis libspatialite libspatialindex numpy3 qt5-webkit qwt QScintilla-qt5 qtkeychain qca-qt5 protobuf3 python3-PyYAML python-requests Pygments OWSLib psycopg2 Jinja2 zstd" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild index 4d8d8cb152..312dda055c 100644 --- a/graphics/Blender/Blender.SlackBuild +++ b/graphics/Blender/Blender.SlackBuild @@ -127,6 +127,7 @@ cd build -DCMAKE_BUILD_TYPE=Release \ $cuda \ $embree \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="-lboost_locale" make make install DESTDIR=$PKG diff --git a/graphics/FreeCAD/FreeCAD.SlackBuild b/graphics/FreeCAD/FreeCAD.SlackBuild index 2efa262ff0..63c8c07832 100644 --- a/graphics/FreeCAD/FreeCAD.SlackBuild +++ b/graphics/FreeCAD/FreeCAD.SlackBuild @@ -25,8 +25,7 @@ # Maintained by David Spencer PRGNAM=FreeCAD -VERSION=${VERSION:-0.17.13541} -COMMIT=${COMMIT:-9948ee4f1570df9216862a79705afb367b2c6ffb} +VERSION=${VERSION:-0.18.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,9 +61,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$COMMIT -tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz -cd $PRGNAM-$COMMIT +rm -rf $PRGNAM-$VERSION +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 \ @@ -72,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 fix boost header include according to https://github.com/FreeCAD/FreeCAD/commit/200c7c7e00d569ed9f00e06c9d9751a27fa67c2d#diff-b3a49ec758b2fdfb5ee0069b6c113f656133a89cabc0ae789398b41c3295aa57 +patch -p1 < $CWD/addBoostHeaders-200c7c7.patch + # SBo's OpenCASCADE 6.9.1 includes were in /opt/OpenCASCADE, but for 7.3.0 # the includes are in /usr/include/opencascade, so let's accept either :) if [ -d /usr/include/opencascade ]; then @@ -96,6 +98,7 @@ cd build -DOCC_LIBRARY:PATH=/usr/lib${LIBDIRSUFFIX} \ -DRESOURCEDIR=/opt/$PRGNAM/share/data \ -DBUILD_FEM=OFF \ + -DOCCT_CMAKE_FALLBACK=ON \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/graphics/FreeCAD/FreeCAD.info b/graphics/FreeCAD/FreeCAD.info index b9449797bc..6bca6eeea7 100644 --- a/graphics/FreeCAD/FreeCAD.info +++ b/graphics/FreeCAD/FreeCAD.info @@ -1,8 +1,8 @@ PRGNAM="FreeCAD" -VERSION="0.17.13541" +VERSION="0.18.4" HOMEPAGE="https://www.freecadweb.org/" -DOWNLOAD="https://github.com/FreeCAD/FreeCAD/archive/9948ee4/FreeCAD-9948ee4f1570df9216862a79705afb367b2c6ffb.tar.gz" -MD5SUM="1cc16667376a7c9d981319144b857e46" +DOWNLOAD="https://github.com/FreeCAD/FreeCAD/archive/0.18.4.tar.gz" +MD5SUM="fe797a27a8ee4fb2def4f95e8eadacdd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenCASCADE Pivy matplotlib pyside pyside-tools shiboken xerces-c" diff --git a/graphics/FreeCAD/addBoostHeaders-200c7c7.patch b/graphics/FreeCAD/addBoostHeaders-200c7c7.patch new file mode 100644 index 0000000000..3e607c4366 --- /dev/null +++ b/graphics/FreeCAD/addBoostHeaders-200c7c7.patch @@ -0,0 +1,34 @@ +From 200c7c7e00d569ed9f00e06c9d9751a27fa67c2d Mon Sep 17 00:00:00 2001 +From: wmayer +Date: Sun, 7 Jun 2020 17:21:37 +0200 +Subject: [PATCH] [skip ci] include missing boost header + +--- + src/Gui/DAGView/DAGView.cpp | 1 + + src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/Gui/DAGView/DAGView.cpp b/src/Gui/DAGView/DAGView.cpp +index c4820b35606..e0f11e0bfde 100644 +--- a/src/Gui/DAGView/DAGView.cpp ++++ b/src/Gui/DAGView/DAGView.cpp +@@ -22,6 +22,7 @@ + + #include "PreCompiled.h" + #ifndef _PreComp_ ++#include + #include + #include + #endif +diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp +index dd8161a90f1..e8bf2a629d3 100644 +--- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp ++++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp +@@ -24,6 +24,7 @@ + #include "PreCompiled.h" + + #ifndef _PreComp_ ++#include + #endif + + #include "ui_TaskSketcherGeneral.h" 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..6b6954a788 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.4.0} 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 \ @@ -78,6 +82,7 @@ cd build -DDONT_USE_INTERNAL_LUA=Off \ -DUSE_LIBSECRET=On \ -DBINARY_PACKAGE_BUILD=1 \ + -DDONT_USE_INTERNAL_LUA=0 \ -DCMAKE_BUILD_TYPE=Release .. VERBOSE=1 make make install DESTDIR=$PKG diff --git a/graphics/darktable/darktable.info b/graphics/darktable/darktable.info index e53831c9ec..5e0ffc4eb7 100644 --- a/graphics/darktable/darktable.info +++ b/graphics/darktable/darktable.info @@ -1,10 +1,10 @@ PRGNAM="darktable" -VERSION="2.4.4" +VERSION="3.4.0" 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.4.0/darktable-3.4.0.tar.xz" +MD5SUM="e360fbf37eb256ce8c31c2181e5197c2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="json-glib lensfun pugixml" +REQUIRES="gmic json-glib lensfun pugixml" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" diff --git a/graphics/digikam/README b/graphics/digikam/README deleted file mode 100644 index a002764d17..0000000000 --- a/graphics/digikam/README +++ /dev/null @@ -1,14 +0,0 @@ -digiKam is a simple digital photo management application for KDE, -which makes importing and organizing digital photos a "snap". The -photos can be organized in albums which can be sorted chronologically, -by directory layout or by custom collections. An easy to use interface -is provided that enables you to connect to your camera and preview, -download and/or delete your images. - -enblend-enfuse, hugin, sqlite2, and libdc1394 are optional dependencies. - -NOTES: -- digikam now ships with its own internal version of kipi-plugins. -- please remove previous version before building the current version. -- Make sure qt5 is not installed before building opencv or else digiKam - will segfault. diff --git a/graphics/digikam/digikam.SlackBuild b/graphics/digikam/digikam.SlackBuild deleted file mode 100644 index dd492bcb28..0000000000 --- a/graphics/digikam/digikam.SlackBuild +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh - -# Slackware build script for digiKam - -# Copyright 2007-2011 Frank Caraballo -# Copyright 2013-2019 Willy Sudiarto Raharjo -# 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=digikam -VERSION=${VERSION:-4.14.0} -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" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -else - SLKCFLAGS="-O2" -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 {} \; - -cd core -# patch for lensfun 0.3.2 -patch -p1 < $CWD/lensfun-0.3.2.patch - -# workaround for flex-2.6.0 -sed -e '/fno-tree-pre/d' -i CMakeLists.txt -cd .. - -patch -p0 < $CWD/libpgf.patch - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=$(kde4-config --libsuffix) \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE" \ - -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON \ - -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \ - -DDIGIKAMSC_COMPILE_LIBKFACE=ON \ - -DDIGIKAMSC_COMPILE_DOC=OFF \ - -DCMAKE_CXX_FLAGS:STRING="$(/usr/bin/Magick++-config --libs)" \ - -DENABLE_OPENCV3=ON \ - -DCMAKE_C_COMPILER=clang \ - -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 - -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 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/graphics/digikam/digikam.info b/graphics/digikam/digikam.info deleted file mode 100644 index 3e6158f3c8..0000000000 --- a/graphics/digikam/digikam.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="digikam" -VERSION="4.14.0" -HOMEPAGE="https://www.digikam.org/" -DOWNLOAD="https://download.kde.org/Attic/digikam/digikam-4.14.0.tar.bz2" -MD5SUM="8fd3cb0a822e8c2d4102e8adc00c082f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="liblqr lensfun ffmpeg libpgf libkvkontakte libkface libkgeomap4" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/graphics/digikam/doinst.sh b/graphics/digikam/doinst.sh deleted file mode 100644 index 7ffea19638..0000000000 --- a/graphics/digikam/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/kde4 >/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/graphics/digikam/lensfun-0.3.2.patch b/graphics/digikam/lensfun-0.3.2.patch deleted file mode 100644 index 37776f6e31..0000000000 --- a/graphics/digikam/lensfun-0.3.2.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Gilles Caulier -Date: Mon, 14 Dec 2015 21:41:55 +0000 -Subject: fix compilation with Lensfun 0.3.2 -X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=0f159981176faa6da701f112bfe557b79804d468 ---- -fix compilation with Lensfun 0.3.2 -It still compatible with older lensfun releases. -BUGS: 356672 -FIXED-IN: 5.0.0 ---- - - ---- a/libs/dimg/filters/lens/lensfuniface.h -+++ b/libs/dimg/filters/lens/lensfuniface.h -@@ -24,10 +24,7 @@ - - // Lib LensFun includes - --extern "C" --{ - #include --} - - // Local includes - - diff --git a/graphics/digikam/libpgf.patch b/graphics/digikam/libpgf.patch deleted file mode 100644 index 5d2e7498bb..0000000000 --- a/graphics/digikam/libpgf.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- core/libs/dimg/loaders/pgfloader.cpp.orig 2019-03-17 16:52:40.102888509 +0700 -+++ core/libs/dimg/loaders/pgfloader.cpp 2019-03-17 16:52:51.404020146 +0700 -@@ -442,14 +442,6 @@ - } - } - --#ifdef PGFCodecVersionID --# if PGFCodecVersionID < 0x061142 -- header.background.rgbtBlue = 0; -- header.background.rgbtGreen = 0; -- header.background.rgbtRed = 0; --# endif --#endif -- - pgf.SetHeader(header); - - // NOTE: see bug #273765 : Loading PGF thumbs with OpenMP support through a separated thread do not work properlly with libppgf 6.11.24 ---- core/libs/threadimageio/pgfutils.cpp.orig 2019-03-17 17:07:35.586244318 +0700 -+++ core/libs/threadimageio/pgfutils.cpp 2019-03-17 17:07:47.110376670 +0700 -@@ -262,13 +262,6 @@ - header.mode = ImageModeRGBA; - header.usedBitsPerChannel = 0; // Auto - --#ifdef PGFCodecVersionID --# if PGFCodecVersionID < 0x061142 -- header.background.rgbtBlue = 0; -- header.background.rgbtGreen = 0; -- header.background.rgbtRed = 0; --# endif --#endif - pgfImg.SetHeader(header); - - // NOTE: see bug #273765 : Loading PGF thumbs with OpenMP support through a separated thread do not work properlly with libppgf 6.11.24 diff --git a/graphics/digikam/slack-desc b/graphics/digikam/slack-desc deleted file mode 100644 index cf90391876..0000000000 --- a/graphics/digikam/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------------------------------------------------------| -digikam: digikam (KDE Photo Management Application) -digikam: -digikam: digiKam is a simple digital photo management application for KDE, -digikam: which makes importing and organizing digital photos a "snap". The -digikam: photos can be organized in albums which can be sorted chronologically, -digikam: by directory layout or by custom collections. An easy to use interface -digikam: is provided that enables you to connect to your camera and preview, -digikam: download and/or delete your images. -digikam: -digikam: Homepage: http://www.digikam.org/ -digikam: 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 $/a #include ' src/minimizer.h + CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/exact-image/Provide-gif-quantization-for-giflib-5.2.patch b/graphics/exact-image/Provide-gif-quantization-for-giflib-5.2.patch new file mode 100644 index 0000000000..9f9210abf5 --- /dev/null +++ b/graphics/exact-image/Provide-gif-quantization-for-giflib-5.2.patch @@ -0,0 +1,384 @@ +From: Sven Eckelmann +Date: Sat, 31 Aug 2019 14:13:11 +0200 +Subject: Provide gif quantization for giflib >= 5.2 + +Bug-Debian: https://bugs.debian.org/939031 + +diff -Naur exact-image-1.0.2.orig/codecs/Makefile exact-image-1.0.2/codecs/Makefile +--- exact-image-1.0.2.orig/codecs/Makefile 2016-06-18 21:49:25.000000000 +0200 ++++ exact-image-1.0.2/codecs/Makefile 2020-12-11 15:30:44.374504000 +0100 +@@ -21,7 +21,7 @@ + ifeq "$(WITHLIBGIF)" "1" + LDFLAGS += -lgif + else +-NOT_SRCS += gif.cc ++NOT_SRCS += gif.cc gif_quantization.c + endif + + ifeq "$(WITHJASPER)" "1" +diff -Naur exact-image-1.0.2.orig/codecs/gif.cc exact-image-1.0.2/codecs/gif.cc +--- exact-image-1.0.2.orig/codecs/gif.cc 2017-07-21 16:19:01.000000000 +0200 ++++ exact-image-1.0.2/codecs/gif.cc 2020-12-11 15:34:55.340504000 +0100 +@@ -160,6 +160,17 @@ + return true; + } + ++extern "C" int ++eiGifQuantizeBuffer(unsigned int Width, ++ unsigned int Height, ++ int *ColorMapSize, ++ GifByteType * RedInput, ++ GifByteType * GreenInput, ++ GifByteType * BlueInput, ++ GifByteType * OutputBuffer, ++ GifColorType * OutputColorMap); ++ ++ + bool GIFCodec::writeImage (std::ostream* stream, Image& image, int quality, + const std::string& compress) + { +@@ -203,8 +214,7 @@ + *bptr++ = b; + } + +- +- if (GifQuantizeBuffer(image.w, image.h, &ColorMapSize, ++ if (eiGifQuantizeBuffer(image.w, image.h, &ColorMapSize, + RedBuffer, GreenBuffer, BlueBuffer, + OutputBuffer, OutputColorMap->Colors) == GIF_ERROR) { + return false; +diff -Naur exact-image-1.0.2.orig/codecs/gif_quantization.c exact-image-1.0.2/codecs/gif_quantization.c +--- exact-image-1.0.2.orig/codecs/gif_quantization.c 1970-01-01 01:00:00.000000000 +0100 ++++ exact-image-1.0.2/codecs/gif_quantization.c 2020-12-11 15:30:19.181504000 +0100 +@@ -0,0 +1,331 @@ ++/***************************************************************************** ++ ++ quantize.c - quantize a high resolution image into lower one ++ ++ Based on: "Color Image Quantization for frame buffer Display", by ++ Paul Heckbert SIGGRAPH 1982 page 297-307. ++ ++ This doesn't really belong in the core library, was undocumented, ++ and was removed in 4.2. Then it turned out some client apps were ++ actually using it, so it was restored in 5.0. ++ ++SPDX-License-Identifier: MIT ++ ++******************************************************************************/ ++ ++#include ++#include ++#include "gif_lib.h" ++ ++#define ABS(x) ((x) > 0 ? (x) : (-(x))) ++ ++#define COLOR_ARRAY_SIZE 32768 ++#define BITS_PER_PRIM_COLOR 5 ++#define MAX_PRIM_COLOR 0x1f ++ ++static int SortRGBAxis; ++ ++typedef struct QuantizedColorType { ++ GifByteType RGB[3]; ++ GifByteType NewColorIndex; ++ long Count; ++ struct QuantizedColorType *Pnext; ++} QuantizedColorType; ++ ++typedef struct NewColorMapType { ++ GifByteType RGBMin[3], RGBWidth[3]; ++ unsigned int NumEntries; /* # of QuantizedColorType in linked list below */ ++ unsigned long Count; /* Total number of pixels in all the entries */ ++ QuantizedColorType *QuantizedColors; ++} NewColorMapType; ++ ++static int SubdivColorMap(NewColorMapType * NewColorSubdiv, ++ unsigned int ColorMapSize, ++ unsigned int *NewColorMapSize); ++static int SortCmpRtn(const void *Entry1, const void *Entry2); ++ ++/****************************************************************************** ++ Quantize high resolution image into lower one. Input image consists of a ++ 2D array for each of the RGB colors with size Width by Height. There is no ++ Color map for the input. Output is a quantized image with 2D array of ++ indexes into the output color map. ++ Note input image can be 24 bits at the most (8 for red/green/blue) and ++ the output has 256 colors at the most (256 entries in the color map.). ++ ColorMapSize specifies size of color map up to 256 and will be updated to ++ real size before returning. ++ Also non of the parameter are allocated by this routine. ++ This function returns GIF_OK if successful, GIF_ERROR otherwise. ++******************************************************************************/ ++int ++eiGifQuantizeBuffer(unsigned int Width, ++ unsigned int Height, ++ int *ColorMapSize, ++ GifByteType * RedInput, ++ GifByteType * GreenInput, ++ GifByteType * BlueInput, ++ GifByteType * OutputBuffer, ++ GifColorType * OutputColorMap) { ++ ++ unsigned int Index, NumOfEntries; ++ int i, j, MaxRGBError[3]; ++ unsigned int NewColorMapSize; ++ long Red, Green, Blue; ++ NewColorMapType NewColorSubdiv[256]; ++ QuantizedColorType *ColorArrayEntries, *QuantizedColor; ++ ++ ColorArrayEntries = (QuantizedColorType *)malloc( ++ sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE); ++ if (ColorArrayEntries == NULL) { ++ return GIF_ERROR; ++ } ++ ++ for (i = 0; i < COLOR_ARRAY_SIZE; i++) { ++ ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR); ++ ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) & ++ MAX_PRIM_COLOR; ++ ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR; ++ ColorArrayEntries[i].Count = 0; ++ } ++ ++ /* Sample the colors and their distribution: */ ++ for (i = 0; i < (int)(Width * Height); i++) { ++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ (2 * BITS_PER_PRIM_COLOR)) + ++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ BITS_PER_PRIM_COLOR) + ++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); ++ ColorArrayEntries[Index].Count++; ++ } ++ ++ /* Put all the colors in the first entry of the color map, and call the ++ * recursive subdivision process. */ ++ for (i = 0; i < 256; i++) { ++ NewColorSubdiv[i].QuantizedColors = NULL; ++ NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0; ++ for (j = 0; j < 3; j++) { ++ NewColorSubdiv[i].RGBMin[j] = 0; ++ NewColorSubdiv[i].RGBWidth[j] = 255; ++ } ++ } ++ ++ /* Find the non empty entries in the color table and chain them: */ ++ for (i = 0; i < COLOR_ARRAY_SIZE; i++) ++ if (ColorArrayEntries[i].Count > 0) ++ break; ++ QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i]; ++ NumOfEntries = 1; ++ while (++i < COLOR_ARRAY_SIZE) ++ if (ColorArrayEntries[i].Count > 0) { ++ QuantizedColor->Pnext = &ColorArrayEntries[i]; ++ QuantizedColor = &ColorArrayEntries[i]; ++ NumOfEntries++; ++ } ++ QuantizedColor->Pnext = NULL; ++ ++ NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */ ++ NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */ ++ NewColorMapSize = 1; ++ if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) != ++ GIF_OK) { ++ free((char *)ColorArrayEntries); ++ return GIF_ERROR; ++ } ++ if (NewColorMapSize < *ColorMapSize) { ++ /* And clear rest of color map: */ ++ for (i = NewColorMapSize; i < *ColorMapSize; i++) ++ OutputColorMap[i].Red = OutputColorMap[i].Green = ++ OutputColorMap[i].Blue = 0; ++ } ++ ++ /* Average the colors in each entry to be the color to be used in the ++ * output color map, and plug it into the output color map itself. */ ++ for (i = 0; i < NewColorMapSize; i++) { ++ if ((j = NewColorSubdiv[i].NumEntries) > 0) { ++ QuantizedColor = NewColorSubdiv[i].QuantizedColors; ++ Red = Green = Blue = 0; ++ while (QuantizedColor) { ++ QuantizedColor->NewColorIndex = i; ++ Red += QuantizedColor->RGB[0]; ++ Green += QuantizedColor->RGB[1]; ++ Blue += QuantizedColor->RGB[2]; ++ QuantizedColor = QuantizedColor->Pnext; ++ } ++ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j; ++ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j; ++ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j; ++ } ++ } ++ ++ /* Finally scan the input buffer again and put the mapped index in the ++ * output buffer. */ ++ MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0; ++ for (i = 0; i < (int)(Width * Height); i++) { ++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ (2 * BITS_PER_PRIM_COLOR)) + ++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ BITS_PER_PRIM_COLOR) + ++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); ++ Index = ColorArrayEntries[Index].NewColorIndex; ++ OutputBuffer[i] = Index; ++ if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i])) ++ MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]); ++ if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i])) ++ MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]); ++ if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i])) ++ MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]); ++ } ++ ++#ifdef DEBUG ++ fprintf(stderr, ++ "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n", ++ MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]); ++#endif /* DEBUG */ ++ ++ free((char *)ColorArrayEntries); ++ ++ *ColorMapSize = NewColorMapSize; ++ ++ return GIF_OK; ++} ++ ++/****************************************************************************** ++ Routine to subdivide the RGB space recursively using median cut in each ++ axes alternatingly until ColorMapSize different cubes exists. ++ The biggest cube in one dimension is subdivide unless it has only one entry. ++ Returns GIF_ERROR if failed, otherwise GIF_OK. ++*******************************************************************************/ ++static int ++SubdivColorMap(NewColorMapType * NewColorSubdiv, ++ unsigned int ColorMapSize, ++ unsigned int *NewColorMapSize) { ++ ++ unsigned int i, j, Index = 0; ++ QuantizedColorType *QuantizedColor, **SortArray; ++ ++ while (ColorMapSize > *NewColorMapSize) { ++ /* Find candidate for subdivision: */ ++ long Sum, Count; ++ int MaxSize = -1; ++ unsigned int NumEntries, MinColor, MaxColor; ++ for (i = 0; i < *NewColorMapSize; i++) { ++ for (j = 0; j < 3; j++) { ++ if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) && ++ (NewColorSubdiv[i].NumEntries > 1)) { ++ MaxSize = NewColorSubdiv[i].RGBWidth[j]; ++ Index = i; ++ SortRGBAxis = j; ++ } ++ } ++ } ++ ++ if (MaxSize == -1) ++ return GIF_OK; ++ ++ /* Split the entry Index into two along the axis SortRGBAxis: */ ++ ++ /* Sort all elements in that entry along the given axis and split at ++ * the median. */ ++ SortArray = (QuantizedColorType **)malloc( ++ sizeof(QuantizedColorType *) * ++ NewColorSubdiv[Index].NumEntries); ++ if (SortArray == NULL) ++ return GIF_ERROR; ++ for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors; ++ j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL; ++ j++, QuantizedColor = QuantizedColor->Pnext) ++ SortArray[j] = QuantizedColor; ++ ++ /* ++ * Because qsort isn't stable, this can produce differing ++ * results for the order of tuples depending on platform ++ * details of how qsort() is implemented. ++ * ++ * We mitigate this problem by sorting on all three axes rather ++ * than only the one specied by SortRGBAxis; that way the instability ++ * can only become an issue if there are multiple color indices ++ * referring to identical RGB tuples. Older versions of this ++ * sorted on only the one axis. ++ */ ++ qsort(SortArray, NewColorSubdiv[Index].NumEntries, ++ sizeof(QuantizedColorType *), SortCmpRtn); ++ ++ /* Relink the sorted list into one: */ ++ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++) ++ SortArray[j]->Pnext = SortArray[j + 1]; ++ SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL; ++ NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0]; ++ free((char *)SortArray); ++ ++ /* Now simply add the Counts until we have half of the Count: */ ++ Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count; ++ NumEntries = 1; ++ Count = QuantizedColor->Count; ++ while (QuantizedColor->Pnext != NULL && ++ (Sum -= QuantizedColor->Pnext->Count) >= 0 && ++ QuantizedColor->Pnext->Pnext != NULL) { ++ QuantizedColor = QuantizedColor->Pnext; ++ NumEntries++; ++ Count += QuantizedColor->Count; ++ } ++ /* Save the values of the last color of the first half, and first ++ * of the second half so we can update the Bounding Boxes later. ++ * Also as the colors are quantized and the BBoxes are full 0..255, ++ * they need to be rescaled. ++ */ ++ MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */ ++ /* coverity[var_deref_op] */ ++ MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */ ++ MaxColor <<= (8 - BITS_PER_PRIM_COLOR); ++ MinColor <<= (8 - BITS_PER_PRIM_COLOR); ++ ++ /* Partition right here: */ ++ NewColorSubdiv[*NewColorMapSize].QuantizedColors = ++ QuantizedColor->Pnext; ++ QuantizedColor->Pnext = NULL; ++ NewColorSubdiv[*NewColorMapSize].Count = Count; ++ NewColorSubdiv[Index].Count -= Count; ++ NewColorSubdiv[*NewColorMapSize].NumEntries = ++ NewColorSubdiv[Index].NumEntries - NumEntries; ++ NewColorSubdiv[Index].NumEntries = NumEntries; ++ for (j = 0; j < 3; j++) { ++ NewColorSubdiv[*NewColorMapSize].RGBMin[j] = ++ NewColorSubdiv[Index].RGBMin[j]; ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[j] = ++ NewColorSubdiv[Index].RGBWidth[j]; ++ } ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] = ++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] + ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor; ++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor; ++ ++ NewColorSubdiv[Index].RGBWidth[SortRGBAxis] = ++ MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis]; ++ ++ (*NewColorMapSize)++; ++ } ++ ++ return GIF_OK; ++} ++ ++/**************************************************************************** ++ Routine called by qsort to compare two entries. ++*****************************************************************************/ ++ ++static int ++SortCmpRtn(const void *Entry1, ++ const void *Entry2) { ++ QuantizedColorType *entry1 = (*((QuantizedColorType **) Entry1)); ++ QuantizedColorType *entry2 = (*((QuantizedColorType **) Entry2)); ++ ++ /* sort on all axes of the color space! */ ++ int hash1 = entry1->RGB[SortRGBAxis] * 256 * 256 ++ + entry1->RGB[(SortRGBAxis+1) % 3] * 256 ++ + entry1->RGB[(SortRGBAxis+2) % 3]; ++ int hash2 = entry2->RGB[SortRGBAxis] * 256 * 256 ++ + entry2->RGB[(SortRGBAxis+1) % 3] * 256 ++ + entry2->RGB[(SortRGBAxis+2) % 3]; ++ ++ return hash1 - hash2; ++} ++ ++/* end */ diff --git a/graphics/exact-image/exact-image.SlackBuild b/graphics/exact-image/exact-image.SlackBuild index bc64a31f5b..673ec8456f 100644 --- a/graphics/exact-image/exact-image.SlackBuild +++ b/graphics/exact-image/exact-image.SlackBuild @@ -74,6 +74,7 @@ eval $(perl -V:vendorlib) sed "s,@vendorlib@,$vendorlib,g" $CWD/fixup-perl_paths.diff | patch -p1 --verbose patch -p1 < $CWD/c98.patch +patch -p1 < $CWD/Provide-gif-quantization-for-giflib-5.2.patch ./configure \ --bindir=/usr/bin \ diff --git a/graphics/fim/fim.SlackBuild b/graphics/fim/fim.SlackBuild index c2ae121b29..1416014e31 100644 --- a/graphics/fim/fim.SlackBuild +++ b/graphics/fim/fim.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=fim -VERSION=${VERSION:-0.5_rc1} +VERSION=${VERSION:-0.6_trunk} SRCVER=$(echo $VERSION | tr _ -) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,6 +71,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 {} \; +# Workaround for gcc 10 (hanks garron@AUR) +sed -i -e 's/#define FIM_WANT_BACKGROUND_LOAD.*//' src/fim.h +sed -i -e 's/void exit/FIM_NORETURN void exit/' src/CommandConsole.h +sed -i -e 's/°//g' src/fim.cpp + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -82,14 +87,11 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ --disable-debug \ - --with-default-consolefont=/usr/share/kbd/consolefonts/LatGrkCyr-8x16.psfu.gz \ + --enable-hardcoded-font \ + --enable-sdl \ + --enable-unicode \ --build=$ARCH-slackware-linux -# Fix build with bison-3 -sed -i \ - -e '/^fim_LDADD = /s/ \$(LEXLIB)//' \ - src/Makefile - make -j1 make install DESTDIR=$PKG diff --git a/graphics/fim/fim.info b/graphics/fim/fim.info index c2c082121b..25e19a7188 100644 --- a/graphics/fim/fim.info +++ b/graphics/fim/fim.info @@ -1,8 +1,8 @@ PRGNAM="fim" -VERSION="0.5_rc1" +VERSION="0.6_trunk" HOMEPAGE="http://www.nongnu.org/fbi-improved/" -DOWNLOAD="http://download.savannah.gnu.org/releases/fbi-improved/fim-0.5-rc1.tar.gz" -MD5SUM="03d4dd36c894c1d319b5d5ca7a82dfb3" +DOWNLOAD="http://download.savannah.nongnu.org/releases/fbi-improved/fim-0.6-trunk.tar.gz" +MD5SUM="96492d5c53f806ebdf6d624e73360bdd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/gimagereader/gimagereader.SlackBuild b/graphics/gimagereader/gimagereader.SlackBuild index 34b703f8c6..8cf3197e8d 100644 --- a/graphics/gimagereader/gimagereader.SlackBuild +++ b/graphics/gimagereader/gimagereader.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gimagereader -VERSION=${VERSION:-3.2.3} +VERSION=${VERSION:-20201201_2d32618} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,16 +70,18 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Path where manual will be installed -sed -i 's,"share/doc/gimagereader","doc/'$PRGNAM-$VERSION'",' CMakeLists.txt +sed -i 's,"share/doc/gimagereader","doc/'$PRGNAM-$VERSION'",' CMakeLists.txt || exit 1 -# Interface type: qt4/qt5/gtk +sed -i "s|QuaZip-Qt5-1\.0|QuaZip-Qt5-1.1|" CMakeLists.txt || exit 1 + +# Interface type: qt5/gtk mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DINTERFACE_TYPE=qt4 \ + -DINTERFACE_TYPE=qt5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG @@ -89,7 +91,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 NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING 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/graphics/gimagereader/gimagereader.info b/graphics/gimagereader/gimagereader.info index 8694e7743e..20803afacf 100644 --- a/graphics/gimagereader/gimagereader.info +++ b/graphics/gimagereader/gimagereader.info @@ -1,8 +1,8 @@ PRGNAM="gimagereader" -VERSION="3.2.3" +VERSION="20201201_2d32618" HOMEPAGE="https://github.com/manisandro/gImageReader/" -DOWNLOAD="https://github.com/manisandro/gImageReader/releases/download/v3.2.3/gimagereader-3.2.3.tar.xz" -MD5SUM="f4af1b531812a4a3c7fa5a7d49436acd" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/gimagereader-20201201_2d32618.tar.xz" +MD5SUM="56b696dff8ae247fa55b1cc4f91cdd52" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="tesseract qtspell podofo" 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/glslang/README b/graphics/glslang/README deleted file mode 100644 index d61381b370..0000000000 --- a/graphics/glslang/README +++ /dev/null @@ -1,5 +0,0 @@ -Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, -and a SPIR-V generator. - -If SPIRV-Tools is not installed a package will be created where illegal -SPIRV may be generated for HLSL. diff --git a/graphics/glslang/SPIRV-Tools-shared.patch b/graphics/glslang/SPIRV-Tools-shared.patch deleted file mode 100644 index 34cb8ad9bc..0000000000 --- a/graphics/glslang/SPIRV-Tools-shared.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 1504af077935a0bfd1b1b59f77d8b1cd89f913b5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= -Date: Mon, 10 Dec 2018 13:05:15 +0100 -Subject: [PATCH] CMake: Allow linking against system-installed SPIRV-Tools - -Fixes #1585. ---- - CMakeLists.txt | 7 ++++++- - SPIRV/CMakeLists.txt | 21 +++++++++++++-------- - 2 files changed, 19 insertions(+), 9 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ada2b8fb9..22243f491 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -320,7 +320,12 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External) - add_subdirectory(External) - endif() - --if(NOT TARGET SPIRV-Tools-opt) -+find_package(PkgConfig) -+if(PkgConfig_FOUND) -+ pkg_check_modules(SPIRV-Tools SPIRV-Tools) -+endif() -+# Former would be system-installed, later is from External -+if(NOT SPIRV-Tools_FOUND AND NOT TARGET SPIRV-Tools-opt) - set(ENABLE_OPT OFF) - endif() - -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index d699daddb..28beb47bb 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -91,14 +91,19 @@ if(WIN32 AND BUILD_SHARED_LIBS) - endif() - - if(ENABLE_OPT) -- target_include_directories(SPIRV -- PRIVATE ${spirv-tools_SOURCE_DIR}/include -- PRIVATE ${spirv-tools_SOURCE_DIR}/source -- ) -- target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) -- target_include_directories(SPIRV PUBLIC -- $ -- $) -+ if(SPIRV-Tools_FOUND) -+ target_include_directories(SPIRV PUBLIC ${SPIRV-Tools_INCLUDEDIR}) -+ target_link_libraries(SPIRV glslang ${SPIRV-Tools_LIBRARIES}) -+ else() -+ target_include_directories(SPIRV -+ PRIVATE ${spirv-tools_SOURCE_DIR}/include -+ PRIVATE ${spirv-tools_SOURCE_DIR}/source -+ ) -+ target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) -+ target_include_directories(SPIRV PUBLIC -+ $ -+ $) -+ endif() - else() - target_link_libraries(SPIRV PRIVATE MachineIndependent) - endif(ENABLE_OPT) diff --git a/graphics/glslang/glslang.SlackBuild b/graphics/glslang/glslang.SlackBuild deleted file mode 100644 index db38ad19a9..0000000000 --- a/graphics/glslang/glslang.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -# Slackware build script for glslang - -# Copyright 2020-2021 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=glslang -VERSION=${VERSION:-11.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 -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 {} \; - -# CMake: Allow linking against system-installed SPIRV-Tools -# https://github.com/KhronosGroup/glslang/issues/1585 -# https://github.com/KhronosGroup/glslang/pull/1621 -patch -p1 < $CWD/SPIRV-Tools-shared.patch - -mkdir -p build -cd build - cmake \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DBUILD_EXTERNAL=OFF \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_SKIP_RPATH=TRUE \ - -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 CHANGES.md CODE_OF_CONDUCT.md LICENSE.txt README-spirv-remap.txt \ - 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/graphics/glslang/glslang.info b/graphics/glslang/glslang.info deleted file mode 100644 index 2fd87c7139..0000000000 --- a/graphics/glslang/glslang.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="glslang" -VERSION="11.1.0" -HOMEPAGE="https://github.com/KhronosGroup/glslang" -DOWNLOAD="https://github.com/KhronosGroup/glslang/archive/11.1.0/glslang-11.1.0.tar.gz" -MD5SUM="1688a1e36945d72df960b859ede55078" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="SPIRV-Tools" -MAINTAINER="Hunter Sezen" -EMAIL="orbea@riseup.net" diff --git a/graphics/glslang/slack-desc b/graphics/glslang/slack-desc deleted file mode 100644 index 0693d091db..0000000000 --- a/graphics/glslang/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------------------------------------------------------| -glslang: glslang (GLSL/ESSL front end, HLSL front end SPIR-V generator) -glslang: -glslang: Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, -glslang: and a SPIR-V generator. -glslang: -glslang: Homepage: https://github.com/KhronosGroup/glslang -glslang: -glslang: -glslang: -glslang: -glslang: diff --git a/graphics/gmic/gmic.SlackBuild b/graphics/gmic/gmic.SlackBuild index 5c54c3b4d7..ccc1ca09b8 100644 --- a/graphics/gmic/gmic.SlackBuild +++ b/graphics/gmic/gmic.SlackBuild @@ -21,8 +21,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gmic -VERSION=${VERSION:-2.7.5} -COMMUNITYVERSION=${COMMUNITYVERSION:-5a9aefc05e9585c1198c1d68f4b47ee32ff68ae2} +VERSION=${VERSION:-2.9.4} +COMMUNITYVERSION=${COMMUNITYVERSION:-6e9a20ef40e1db99c9b761853ad493ee7439e1b7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -46,7 +46,7 @@ elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O0 -march=i686 -mtune=i686 -fno-fast-math" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O3 -fPIC" + SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O0 -fno-fast-math" @@ -78,16 +78,11 @@ sed -i -e "s|LIB = lib|LIB = lib$LIBDIRSUFFIX|g" \ -e "s|/etc/bash_completion.d|/usr/share/bash-completion/completions|g" \ -e "s|pkg-config opencv|pkg-config opencv4|" \ -e "s|qmake|qmake-qt5|g" \ - src/Makefile + src/Makefile || exit 1 sed -i -e "s|-Ofast|-O2 -fno-fast-math --std=c++11|g" \ - gmic-qt/gmic_qt.pro + gmic-qt/gmic_qt.pro || exit 1 -# fix build with openCV 4.x -cd zart -patch -p1 -i $CWD/zart-opencv4.patch -cd - - -make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} OPT_CFLAGS="$SLKCFLAGS " -j1 +make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} OPT_CFLAGS="$SLKCFLAGS " cd gmic-qt qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=none diff --git a/graphics/gmic/gmic.info b/graphics/gmic/gmic.info index 3d609c7b98..99ae716a5b 100644 --- a/graphics/gmic/gmic.info +++ b/graphics/gmic/gmic.info @@ -1,10 +1,10 @@ PRGNAM="gmic" -VERSION="2.7.5" +VERSION="2.9.4" HOMEPAGE="https://gmic.eu" -DOWNLOAD="https://gmic.eu/files/source/gmic_2.7.5.tar.gz \ - https://github.com/dtschump/gmic-community/archive/5a9aefc05e9585c1198c1d68f4b47ee32ff68ae2.zip" -MD5SUM="d1c9baba2726b8ce8421804c91406a34 \ - a54fa39b205e6dd712f42a2f3c1f45ae" +DOWNLOAD="https://gmic.eu/files/source/gmic_2.9.4.tar.gz \ + https://github.com/dtschump/gmic-community/archive/6e9a20ef40e1db99c9b761853ad493ee7439e1b7.zip" +MD5SUM="e0d396ab6406c9baeb4929c1dd6a0d6a \ + 75f88fa1423f253714e84905a05f37da" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5 opencv" diff --git a/graphics/gmic/zart-opencv4.patch b/graphics/gmic/zart-opencv4.patch deleted file mode 100644 index 6396db571a..0000000000 --- a/graphics/gmic/zart-opencv4.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/include/VideoFileSource.h b/include/VideoFileSource.h -index 0fda14e..8c15178 100644 ---- a/include/VideoFileSource.h -+++ b/include/VideoFileSource.h -@@ -50,5 +50,7 @@ - #include - #include -+#include -+#include - #include "ImageSource.h" - - class VideoFileSource : public ImageSource { -diff --git a/include/WebcamSource.h b/include/WebcamSource.h -index 8c1911a..9194385 100644 ---- a/include/WebcamSource.h -+++ b/include/WebcamSource.h -@@ -53,6 +53,8 @@ - #include - #include - #include -+#include -+#include - #include "ImageSource.h" - - class QSplashScreen; -diff --git a/zart.pro b/zart.pro -index d98a192..ddb2d3b 100644 ---- a/zart.pro -+++ b/zart.pro -@@ -19,7 +19,7 @@ - CONFIG += warn_on - QT_CONFIG -= no-pkg-config - CONFIG += link_pkgconfig --PKGCONFIG += opencv fftw3 zlib -+PKGCONFIG += opencv4 fftw3 zlib - # LIBS += -lfftw3_threads - DEFINES += cimg_use_fftw3 cimg_use_zlib - -diff --git a/src/ImageConverter.cpp b/src/ImageConverter.cpp ---- a/src/ImageConverter.cpp -+++ b/src/ImageConverter.cpp -@@ -70,7 +70,7 @@ - - cv::Mat tmp(in->cols, in->rows, in->depth()); - -- cvtColor(*in, tmp, (in->channels() == 1) ? CV_GRAY2RGB : CV_BGR2RGB); -+ cvtColor(*in, tmp, (in->channels() == 1) ? cv::COLOR_GRAY2RGB : cv::COLOR_BGR2RGB); - - const unsigned int w3 = 3 * tmp.cols; - unsigned char * src = reinterpret_cast(tmp.ptr()); -@@ -106,7 +106,7 @@ - dst += step; - } - } -- cvtColor(**out, **out, CV_BGR2RGB); -+ cvtColor(**out, **out, cv::COLOR_BGR2RGB); - } - - void ImageConverter::convert(const cimg_library::CImg & in, QImage * out) 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/graphene/README b/graphics/graphene/README deleted file mode 100644 index 08152a6c50..0000000000 --- a/graphics/graphene/README +++ /dev/null @@ -1,22 +0,0 @@ -When creating graphic libraries you most likely end up dealing with -points and rectangles. If you're particularly unlucky, you may end -up dealing with affine matrices and 2D transformations. If you're -writing a graphic library with 3D transformations, though, you are -going to hit the jackpot: 4x4 matrices, projections, transformations, -vectors, and quaternions. - -Most of this stuff exists, in various forms, in other libraries, -but it has the major drawback of coming along with the rest of those -libraries, which may or may not be what you want. Those libraries -are also available in various languages, as long as those languages -are C++; again, it may or may not be something you want. - -For this reason, I decided to write the thinnest, smallest possible -layer needed to write a canvas library; given its relative size, and -the propensity for graphics libraries to have a pun in their name, -I decided to call it Graphene. - -This library provides types and their relative API; it does not deal -with windowing system surfaces, drawing, scene graphs, or input. You're -supposed to do that yourself, in your own canvas implementation, -which is the whole point of writing the library in the first place. diff --git a/graphics/graphene/graphene.SlackBuild b/graphics/graphene/graphene.SlackBuild deleted file mode 100644 index 7b0bfa773d..0000000000 --- a/graphics/graphene/graphene.SlackBuild +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh - -# Slackware build script for graphene - -# 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=graphene -VERSION=${VERSION:-1.10.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 -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 {} \; - -if [ "${DEBUG:=0}" != 0 ]; then - NDEBUG=false - RELEASE=debug - SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0/')" -else - NDEBUG=true - RELEASE=plain -fi - -# Don't create the __pycache__ directory. -export PYTHONDONTWRITEBYTECODE=1 - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -meson \ - --prefix=/usr \ - --libdir=lib${LIBDIRSUFFIX} \ - -Dinstalled_tests=false \ - -Dstrip=$NDEBUG \ - -Db_ndebug=$NDEBUG \ - -Dbuildtype=$RELEASE \ - build - -"${NINJA:=ninja}" -C build -DESTDIR=$PKG "$NINJA" -C build install - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE.txt 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/graphics/graphene/graphene.info b/graphics/graphene/graphene.info deleted file mode 100644 index fcc80acf74..0000000000 --- a/graphics/graphene/graphene.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="graphene" -VERSION="1.10.2" -HOMEPAGE="https://ebassi.github.io/graphene/" -DOWNLOAD="https://github.com/ebassi/graphene/releases/download/1.10.2/graphene-1.10.2.tar.xz" -MD5SUM="a2c26c4f44a02ca053e0e9afb63cc94c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="meson" -MAINTAINER="Hunter Sezen" -EMAIL="orbea@riseup.net" diff --git a/graphics/graphene/slack-desc b/graphics/graphene/slack-desc deleted file mode 100644 index 2815360bf5..0000000000 --- a/graphics/graphene/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------------------------------------------------------| -graphene: graphene (graphic data types layer) -graphene: -graphene: A thin layer of graphic data types. -graphene: -graphene: Homepage: https://ebassi.github.io/graphene/ -graphene: -graphene: -graphene: -graphene: -graphene: -graphene: diff --git a/graphics/graphite2/README b/graphics/graphite2/README deleted file mode 100644 index 03a0e630a8..0000000000 --- a/graphics/graphite2/README +++ /dev/null @@ -1,10 +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. - -python3 is an optional dependency. diff --git a/graphics/graphite2/graphite2.SlackBuild b/graphics/graphite2/graphite2.SlackBuild deleted file mode 100644 index c047c832bf..0000000000 --- a/graphics/graphite2/graphite2.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# Slackware build script for graphite2 - -# Copyright 2015-2018, 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=graphite2 -VERSION=${VERSION:-1.3.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 -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_SKIP_RPATH=TRUE \ - -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 3402fcc300..0000000000 --- a/graphics/graphite2/graphite2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="graphite2" -VERSION="1.3.14" -HOMEPAGE="http://graphite.sil.org/" -DOWNLOAD="https://github.com/silnrsi/graphite/releases/download/1.3.14/graphite2-1.3.14.tgz" -MD5SUM="1bccb985a7da01092bfb53bb5041e836" -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..61391c1df2 100644 --- a/graphics/inkscape/README +++ b/graphics/inkscape/README @@ -7,5 +7,3 @@ 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). diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild index 4471bf3c1b..d79da1cfd1 100644 --- a/graphics/inkscape/inkscape.SlackBuild +++ b/graphics/inkscape/inkscape.SlackBuild @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=inkscape -VERSION=${VERSION:-0.92.4} +VERSION=${VERSION:-1.0.2} +EXTRAVER=${EXTRAVER:-2021-01-15_e86c870879} 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 +rm -rf ${PRGNAM}-${VERSION}_${EXTRAVER} tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION +cd ${PRGNAM}-${VERSION}_${EXTRAVER} chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,31 +70,49 @@ 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 +# 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 + +# Fix man page location: +sed -i CMakeScripts/Pod2man.cmake -e "s/SHARE_INSTALL/CMAKE_INSTALL_PREFIX/g" + +mkdir -p build +cd build + # imagemagick >= 7.x is unsupported yet, so use GraphicsMagick + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DINKSCAPE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + -DBUILD_SHARED_LIBS=ON \ + -DWITH_DBUS=ON \ + -DWITH_GRAPHICS_MAGICK=ON \ + -DWITH_IMAGE_MAGICK=OFF \ + .. + 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 -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..9e0d9b3bb9 100644 --- a/graphics/inkscape/inkscape.info +++ b/graphics/inkscape/inkscape.info @@ -1,10 +1,10 @@ PRGNAM="inkscape" -VERSION="0.92.4" +VERSION="1.0.2" HOMEPAGE="http://www.inkscape.org/" -DOWNLOAD="https://inkscape.org/gallery/item/13330/inkscape-0.92.4.tar.bz2" -MD5SUM="ac30f6d5747fd9c620c00dad500f414f" +DOWNLOAD="https://inkscape.org/gallery/item/23820/inkscape-1.0.2.tar.xz" +MD5SUM="ec90e0c1e4c7e3dba8f46b16c73462b3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="lxml numpy" +REQUIRES="GraphicsMagick gdl dos2unix double-conversion libcdr lxml numpy potrace pstoedit scour" 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 +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 + 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 + #include ++#include + #include + #include + #include 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/kphotoalbum/kphotoalbum.SlackBuild b/graphics/kphotoalbum/kphotoalbum.SlackBuild index ff0c67222a..baf39a00b2 100644 --- a/graphics/kphotoalbum/kphotoalbum.SlackBuild +++ b/graphics/kphotoalbum/kphotoalbum.SlackBuild @@ -4,13 +4,13 @@ # By default the demo pictures and movie are packaged. PRGNAM=kphotoalbum -VERSION=${VERSION:-4.7.1} +VERSION=${VERSION:-5.7.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 @@ -25,8 +25,8 @@ OUTPUT=${OUTPUT:-/tmp} # set DEMO to no to omit them. DEMO=${DEMO:-yes} -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" @@ -56,13 +56,12 @@ find -L . \ mkdir build && cd build cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DKDE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ -DLIB_INSTALL_DIR:PATH=/usr/lib${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_PREFIX=/usr \ .. - make -j1 + make make install DESTDIR=$PKG cd - @@ -71,7 +70,7 @@ if [ "$DEMO" = "no" ]; then fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING ChangeLog tips README \ +cp -a COPYING ChangeLog tips README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/graphics/kphotoalbum/kphotoalbum.info b/graphics/kphotoalbum/kphotoalbum.info index bd8364de7e..a096855d90 100644 --- a/graphics/kphotoalbum/kphotoalbum.info +++ b/graphics/kphotoalbum/kphotoalbum.info @@ -1,8 +1,8 @@ PRGNAM="kphotoalbum" -VERSION="4.7.1" +VERSION="5.7.0" HOMEPAGE="http://kphotoalbum.org" -DOWNLOAD="http://download.kde.org/stable/kphotoalbum/4.7.1/src/kphotoalbum-4.7.1.tar.xz" -MD5SUM="6994263a53780e1f5d40cc197db8f10b" +DOWNLOAD="https://download.kde.org/stable/kphotoalbum/5.7.0/kphotoalbum-5.7.0.tar.xz" +MD5SUM="c52404d5edd89b53d0201a736584df1e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/kuickshow/README b/graphics/kuickshow/README index ba6aa9daba..af4cb52b89 100644 --- a/graphics/kuickshow/README +++ b/graphics/kuickshow/README @@ -1,6 +1,6 @@ -KuickShow displays images using all the available space, without being wasted -in bars or menus. It also has a smart automatic zooming that scales images -according to its size. You can use the integrated file browser to choose -images, or navigate through a folder with the mousewheel or the keyboard. It -also has fullscreen view and slideshow, and supports a wide range of image -formats. +KuickShow displays images using all the available space, without being +wasted in bars or menus. It also has a smart automatic zooming that +scales images according to its size. You can use the integrated file +browser to choose images, or navigate through a folder with the +mousewheel or the keyboard. It also has fullscreen view and slideshow, +and supports a wide range of image formats. diff --git a/graphics/kuickshow/kuickshow.SlackBuild b/graphics/kuickshow/kuickshow.SlackBuild index 6a82e2deba..13d0aac83b 100644 --- a/graphics/kuickshow/kuickshow.SlackBuild +++ b/graphics/kuickshow/kuickshow.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for KuickShow -# Copyright 2013, David Melik, Spokane, WA, USA +# Copyright 2013-2020, SlackBuilds.org Project, David Melik, Spokane, WA, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Written by David Melik - PRGNAM=kuickshow -VERSION=${VERSION:-0.9.1} +VERSION=${VERSION:-0.10.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,7 +60,7 @@ 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.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -78,6 +76,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DKDE_INSTALL_DOCBUNDLEDIR=/usr/doc/HTML \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG @@ -86,6 +85,13 @@ 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 ChangeLog TODO BUGS COPYING README 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 cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/graphics/kuickshow/kuickshow.info b/graphics/kuickshow/kuickshow.info index 3fa2738bfe..d3fc55a98c 100644 --- a/graphics/kuickshow/kuickshow.info +++ b/graphics/kuickshow/kuickshow.info @@ -1,8 +1,8 @@ PRGNAM="kuickshow" -VERSION="0.9.1" +VERSION="0.10.1" HOMEPAGE="https://userbase.kde.org/KuickShow" -DOWNLOAD="http://hosti.leonde.de/~gis/kuickshow-0.9.1.tar.bz2" -MD5SUM="6866128ee3ef3d0dde809cd5b23d2472" +DOWNLOAD="https://github.com/KDE/kuickshow/archive/v0.10.1/kuickshow-0.10.1.tar.gz" +MD5SUM="9a62b261885c202434719526b5bf7df4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="imlib" diff --git a/graphics/mcomix/README b/graphics/mcomix/README deleted file mode 100644 index 0bb478ae18..0000000000 --- a/graphics/mcomix/README +++ /dev/null @@ -1,20 +0,0 @@ -mcomix (comic book viewer) - -MComix is a user-friendly, customizable image viewer. It is specifically -designed to handle comic books, but also serves as a generic viewer. It -reads images in ZIP, RAR, 7Zip or tar archives as well as plain image files. It -is written in Python and uses GTK+ through the PyGTK bindings. - -MComix is a fork of the Comix project, and aims to add bug fixes and stability -improvements after Comix development came to a halt in late 2009. - -OPTIONAL DEPENDENCIES: -You also need either the "unrar" or the "rar" program installed if you wish -to read RAR (.cbr) archives. - -Alternatively, MComix can be built over the optional dependency libunrar -from Rarlab. - -To read 7Zip archives, you need to have the "7z" program installed. Likewise, -"lha" is needed to open LHA/LZA archives. Note that "7z" can be used as -substitute for both "unrar" and "lha". diff --git a/graphics/mcomix/doinst.sh b/graphics/mcomix/doinst.sh deleted file mode 100644 index aea0f894eb..0000000000 --- a/graphics/mcomix/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/graphics/mcomix/mcomix.SlackBuild b/graphics/mcomix/mcomix.SlackBuild deleted file mode 100644 index 03a72c7275..0000000000 --- a/graphics/mcomix/mcomix.SlackBuild +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh - -# Slackware build script for mcomix - -# written by Joze Zobec - -# modified by B. Watson - -# 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=mcomix -VERSION=${VERSION:-1.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.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 {} \; - -mkdir -p $PKG/usr - -python setup.py install --single-version-externally-managed \ - --root=$PKG \ - --prefix=/usr \ - --record mcomix-files.txt - -# man page already gzipped, nice -mv $PKG/usr/share/man $PKG/usr/man - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README PKG-INFO 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 -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/mcomix/mcomix.info b/graphics/mcomix/mcomix.info deleted file mode 100644 index 235888c5d2..0000000000 --- a/graphics/mcomix/mcomix.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mcomix" -VERSION="1.2.1" -HOMEPAGE="http://mcomix.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/project/mcomix/MComix-1.2.1/mcomix-1.2.1.tar.bz2" -MD5SUM="1d05ed7596bd670e5b3a97896e6d4d47" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" diff --git a/graphics/mcomix/slack-desc b/graphics/mcomix/slack-desc deleted file mode 100644 index f13a70e456..0000000000 --- a/graphics/mcomix/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------------------------------------------------------| -mcomix: mcomix (comic book viewer) -mcomix: -mcomix: MComix is a user-friendly, customizable image viewer. It is -mcomix: specifically designed to handle comic books, but also serves as a -mcomix: generic viewer. It reads images in ZIP, RAR, 7Zip or tar archives as -mcomix: well as plain image files. It is written in Python and uses GTK+ -mcomix: through the PyGTK bindings. -mcomix: -mcomix: Homepage: mcomix.sourceforge.net -mcomix: -mcomix: 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..423f012b3d 100644 --- a/graphics/nomacs/nomacs.SlackBuild +++ b/graphics/nomacs/nomacs.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for nomacs -# Copyright 2013-2018 Matteo Bernardini , Pisa, Italy +# Copyright 2013-2020 Matteo Bernardini , Pisa, Italy # 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=nomacs -VERSION=${VERSION:-3.14.2} -PVERSION=${PVERSION:-3.14} +VERSION=${VERSION:-3.17.2206} +PVERSION=${PVERSION:-3.16} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,8 +55,6 @@ else LIBDIRSUFFIX="" fi -DOCS="Readme/COPYRIGHT Readme/LICENSE* Readme/README" - set -e rm -rf $PKG @@ -66,6 +64,7 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION/ImageLounge tar xvf $CWD/$PRGNAM-plugins-$PVERSION.tar.?z +rm -fR plugins mv $PRGNAM-plugins-$PVERSION plugins cd .. chown -R root:root . @@ -75,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 {} \; +zcat $CWD/nomacs-$VERSION-quazip-1.0.0.patch.gz | patch -p1 || exit 1 + cd ImageLounge # Fix man pages and plugins installation path @@ -90,6 +91,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DENABLE_QUAZIP=1 \ -DUSE_SYSTEM_QUAZIP=1 \ + -DENABLE_TRANSLATIONS=1 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG @@ -102,7 +104,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 $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a license $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/graphics/nomacs/nomacs.info b/graphics/nomacs/nomacs.info index 94fb09717d..ff720bc129 100644 --- a/graphics/nomacs/nomacs.info +++ b/graphics/nomacs/nomacs.info @@ -1,12 +1,14 @@ PRGNAM="nomacs" -VERSION="3.14.2" +VERSION="3.17.2206" HOMEPAGE="http://www.nomacs.org" -DOWNLOAD="https://github.com/nomacs/nomacs/archive/3.14.2/nomacs-3.14.2.tar.gz \ - https://github.com/nomacs/nomacs-plugins/archive/3.14/nomacs-plugins-3.14.tar.gz" -MD5SUM="65bd50be8f611305850d3c071adcfcc3 \ - 52eff2a14ff70e2f439f7f2119d80895" +DOWNLOAD="https://github.com/nomacs/nomacs/archive/3.17.2206/nomacs-3.17.2206.tar.gz \ + https://github.com/nomacs/nomacs-plugins/archive/3.16/nomacs-plugins-3.16.tar.gz \ + http://ponce.cc/slackware/sources/repo/nomacs-3.17.2206-quazip-1.0.0.patch.gz" +MD5SUM="26358fe1754dada245022331df3b0d35 \ + fe809775c82da4e55fb47a6e0d05b97a \ + 8c01a5917a49a30c10f0b78a576701d1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="lcov opencv quazip-qt5" +REQUIRES="lcov" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" 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/openscad/openscad.SlackBuild b/graphics/openscad/openscad.SlackBuild index b49eeb8acc..8554e46a1f 100644 --- a/graphics/openscad/openscad.SlackBuild +++ b/graphics/openscad/openscad.SlackBuild @@ -23,14 +23,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openscad -VERSION=${VERSION:-2015.03.3} -SRCVER=${SRCVER:-$(echo $VERSION | sed 's/\./-/2')} +VERSION=${VERSION:-2021.01} +#SRCVER=${SRCVER:-$(echo $VERSION | sed 's/\./-/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 @@ -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" @@ -60,9 +60,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$SRCVER -tar xvf $CWD/$PRGNAM-$SRCVER.src.tar.gz -cd $PRGNAM-$SRCVER +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.src.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 \) \ @@ -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 {} \; -qmake -recursive openscad.pro \ +qmake-qt5 -recursive openscad.pro \ PREFIX=/usr \ QMAKE_CFLAGS="$SLKCFLAGS" \ QMAKE_CXXFLAGS="$SLKCFLAGS" @@ -86,7 +86,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 README.md RELEASE_NOTES doc/*.pdf doc/TODO.txt \ + COPYING README.md RELEASE_NOTES.md doc/*.pdf doc/TODO.txt \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/graphics/openscad/openscad.info b/graphics/openscad/openscad.info index 1cbdbf06e5..753a847121 100644 --- a/graphics/openscad/openscad.info +++ b/graphics/openscad/openscad.info @@ -1,10 +1,10 @@ PRGNAM="openscad" -VERSION="2015.03.3" +VERSION="2021.01" HOMEPAGE="http://www.openscad.org/" -DOWNLOAD="http://files.openscad.org/openscad-2015.03-3.src.tar.gz" -MD5SUM="a498a218a247468eee140ccc44c73afa" +DOWNLOAD="https://files.openscad.org/openscad-2021.01.src.tar.gz" +MD5SUM="79f8e3a42bcfeeb3ddde9e5bc2311f76" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="CGAL OpenCSG" +REQUIRES="CGAL OpenCSG double-conversion" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" 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 ]*>|#include |' \ + 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/photoqt/c6fd41478e818f3a651d40f96cab3d790e1c09a4.diff b/graphics/photoqt/c6fd41478e818f3a651d40f96cab3d790e1c09a4.diff new file mode 100644 index 0000000000..0bae8ec0aa --- /dev/null +++ b/graphics/photoqt/c6fd41478e818f3a651d40f96cab3d790e1c09a4.diff @@ -0,0 +1,86 @@ +diff --git a/cplusplus/scripts/getanddostuff/manipulation.h b/cplusplus/scripts/getanddostuff/manipulation.h +index b3fa9b42ce5b1882ac0d9f915302866eb5b428ba..465d93727047d884ce967d9c3cdb7fdadca3dabd 100644 +--- a/cplusplus/scripts/getanddostuff/manipulation.h ++++ b/cplusplus/scripts/getanddostuff/manipulation.h +@@ -38,8 +38,7 @@ + #include "../../logger.h" + + #ifdef EXIV2 +-#include +-#include ++#include + #endif + + class GetAndDoStuffManipulation : public QObject { +diff --git a/cplusplus/scripts/getmetadata.cpp b/cplusplus/scripts/getmetadata.cpp +index deb89a25cbafe3dad306cec14d9ea412ea5b1f38..df92de6bba978ec6c6e0f2deb70f20cd4b4907c3 100644 +--- a/cplusplus/scripts/getmetadata.cpp ++++ b/cplusplus/scripts/getmetadata.cpp +@@ -203,7 +203,7 @@ QVariantMap GetMetaData::getExiv2(QString path) { + } + + } catch(Exiv2::Error &e) { +- LOG << CURDATE << "GetMetaData::getExiv2() Unable to read Exif metadata: " << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL; ++ LOG << CURDATE << "GetMetaData::getExiv2() Unable to read Exif metadata: " << e.what() << NL; + } + + // If GPS is set, compose into one string +@@ -246,7 +246,7 @@ QVariantMap GetMetaData::getExiv2(QString path) { + } + + } catch(Exiv2::Error &e) { +- LOG << CURDATE << "GetMetaData::getExiv2() ERROR reading IPTC metadata: " << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL; ++ LOG << CURDATE << "GetMetaData::getExiv2() ERROR reading IPTC metadata: " << e.what() << NL; + } + + QString city = returnMap["Iptc.Application2.City"].toString(); +diff --git a/cplusplus/scripts/getmetadata.h b/cplusplus/scripts/getmetadata.h +index e427cbc124732f46b4750552b47fa84adb24fba1..c5b991404171339b16815ee8184c6a39b1bd5203 100644 +--- a/cplusplus/scripts/getmetadata.h ++++ b/cplusplus/scripts/getmetadata.h +@@ -34,8 +34,7 @@ + #include "../logger.h" + + #ifdef EXIV2 +-#include +-#include ++#include + #endif + + class GetMetaData : public QObject { +diff --git a/cplusplus/scripts/managepeopletags.cpp b/cplusplus/scripts/managepeopletags.cpp +index 9b8c7503e5f03ba3c63932ebd8e3d2f17c457ef5..96baeb9e6d87e14011aa60c4444e75b2a3bb09b1 100644 +--- a/cplusplus/scripts/managepeopletags.cpp ++++ b/cplusplus/scripts/managepeopletags.cpp +@@ -98,7 +98,7 @@ QVariantList ManagePeopleTags::getFaceTags(QString path) { + + } catch(Exiv2::Error& e) { + LOG << CURDATE << "GetPeopleTag::getPeopleLocations() 2 - ERROR reading exiv data (caught exception): " +- << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL; ++ << e.what() << NL; + return ret; + } + +@@ -201,7 +201,7 @@ void ManagePeopleTags::setFaceTags(QString filename, QVariantList tags) { + + } catch(Exiv2::Error& e) { + LOG << CURDATE << "GetPeopleTag::setFaceTags() - ERROR reading exiv data (caught exception): " +- << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL; ++ << e.what() << NL; + return; + } + +diff --git a/cplusplus/scripts/managepeopletags.h b/cplusplus/scripts/managepeopletags.h +index 1908ba0adb2bb75c1f150cc69ea8e6bb91ed9647..59686cc1efd37ac2a949389b5be83fa25f4205f2 100644 +--- a/cplusplus/scripts/managepeopletags.h ++++ b/cplusplus/scripts/managepeopletags.h +@@ -29,8 +29,7 @@ + #include "../logger.h" + + #ifdef EXIV2 +-#include +-#include ++#include + #endif + + class ManagePeopleTags : public QObject { diff --git a/graphics/photoqt/photoqt.SlackBuild b/graphics/photoqt/photoqt.SlackBuild index 7463b80cff..e3962a5612 100644 --- a/graphics/photoqt/photoqt.SlackBuild +++ b/graphics/photoqt/photoqt.SlackBuild @@ -77,6 +77,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/c6fd41478e818f3a651d40f96cab3d790e1c09a4.diff + mkdir -p build cd build cmake \ 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/qrencode/README b/graphics/qrencode/README deleted file mode 100644 index 5b095d47c3..0000000000 --- a/graphics/qrencode/README +++ /dev/null @@ -1,4 +0,0 @@ -Libqrencode is a C library for encoding data in a QR Code symbol, a -kind of 2D symbology that can be scanned by handy terminals such as a -mobile phone with CCD. The capacity of QR Code is up to 7000 digits -or 4000 characters, and is highly robust. diff --git a/graphics/qrencode/qrencode.SlackBuild b/graphics/qrencode/qrencode.SlackBuild deleted file mode 100644 index 52fd2710fd..0000000000 --- a/graphics/qrencode/qrencode.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh -# -# SlackBuild Script for qrencode - -# Copyright 2012 Matthew "mfillpot" Fillpot -# Copyright 2018, 2020 Lenard Spencer, Orlando, Florida, 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=qrencode -VERSION=${VERSION:-4.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.?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 {} \; - -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 -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/qrencode/qrencode.info b/graphics/qrencode/qrencode.info deleted file mode 100644 index ecdb156112..0000000000 --- a/graphics/qrencode/qrencode.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="qrencode" -VERSION="4.1.1" -HOMEPAGE="https://fukuchi.org/works/qrencode/" -DOWNLOAD="https://fukuchi.org/works/qrencode/qrencode-4.1.1.tar.bz2" -MD5SUM="de7185bcab635a34730e1b73d4efa705" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Lenard Spencer" -EMAIL="lenardrspencer@gmail.com" diff --git a/graphics/qrencode/slack-desc b/graphics/qrencode/slack-desc deleted file mode 100644 index e266e06223..0000000000 --- a/graphics/qrencode/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------------------------------------------------------| -qrencode: qrencode (QR code generation library and application) -qrencode: -qrencode: Libqrencode is a C library for encoding data in a QR Code symbol, a -qrencode: kind of 2D symbology that can be scanned by handy terminals such as a -qrencode: mobile phone with CCD. The capacity of QR Code is up to 7000 digits -qrencode: or 4000 characters, and is highly robust. -qrencode: -qrencode: Interaction can be programmed or through the command line. -qrencode: -qrencode: Homepage: http://fukuchi.org/works/qrencode/ -qrencode: 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/ristretto/ristretto.SlackBuild b/graphics/ristretto/ristretto.SlackBuild index 29782fd1d4..9f39310db6 100644 --- a/graphics/ristretto/ristretto.SlackBuild +++ b/graphics/ristretto/ristretto.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ristretto -VERSION=${VERSION:-0.8.4} +VERSION=${VERSION:-0.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/graphics/ristretto/ristretto.info b/graphics/ristretto/ristretto.info index 1bef9673f0..c0c8ee0ef0 100644 --- a/graphics/ristretto/ristretto.info +++ b/graphics/ristretto/ristretto.info @@ -1,8 +1,8 @@ PRGNAM="ristretto" -VERSION="0.8.4" +VERSION="0.10.0" HOMEPAGE="https://docs.xfce.org/apps/ristretto/start" -DOWNLOAD="https://archive.xfce.org/src/apps/ristretto/0.8/ristretto-0.8.4.tar.bz2" -MD5SUM="0142c8b9c492cf447e563b00c6204359" +DOWNLOAD="https://archive.xfce.org/src/apps/ristretto/0.10/ristretto-0.10.0.tar.bz2" +MD5SUM="4249e14fba78728481d89ce61a8771fc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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:$/a #include ' 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/doinst.sh b/graphics/scantailor/doinst.sh deleted file mode 100644 index 65c7e2eeb9..0000000000 --- a/graphics/scantailor/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/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 - -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/screengrab/screengrab.SlackBuild b/graphics/screengrab/screengrab.SlackBuild index 33aedaac88..cf6c465bd4 100644 --- a/graphics/screengrab/screengrab.SlackBuild +++ b/graphics/screengrab/screengrab.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for screengrab -# Copyright 2013-2015 Matteo Bernardini , Pisa, Italy +# Copyright 2013-2020 Matteo Bernardini , 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=screengrab -VERSION=${VERSION:-1.2.1} +VERSION=${VERSION:-2.1.0} BUILD=${BUILD:-2} 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,9 +39,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -IS64BITS=0 -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,7 +48,6 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" - IS64BITS=1 else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -61,7 +59,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 . \ @@ -73,11 +71,8 @@ find -L . \ mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DIS64BITS=$IS64BITS \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG @@ -86,7 +81,7 @@ 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 -# move the docs in slackware standard location +# move the docs in Slackware standard location mkdir $PKG/usr/doc mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION rmdir $PKG/usr/share/doc diff --git a/graphics/screengrab/screengrab.info b/graphics/screengrab/screengrab.info index e65afe4eac..03f727edae 100644 --- a/graphics/screengrab/screengrab.info +++ b/graphics/screengrab/screengrab.info @@ -1,10 +1,10 @@ PRGNAM="screengrab" -VERSION="1.2.1" -HOMEPAGE="http://screengrab.doomer.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/screengrab-1.2.1.tar.gz" -MD5SUM="b233b108558c509419bd754ba1c2c318" +VERSION="2.1.0" +HOMEPAGE="https://github.com/lxqt/screengrab" +DOWNLOAD="https://github.com/lxqt/screengrab/releases/download/2.1.0/screengrab-2.1.0.tar.xz" +MD5SUM="fdde74326b8155f1e926f329c00ff86e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="libqtxdg" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" 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 +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/ufraw/patches/0001-Change-use-of-header-files.patch b/graphics/ufraw/patches/0001-Change-use-of-header-files.patch new file mode 100644 index 0000000000..64cf176726 --- /dev/null +++ b/graphics/ufraw/patches/0001-Change-use-of-header-files.patch @@ -0,0 +1,30 @@ +From a9fc8b39010640fd8e931e8d635160430ade57bc Mon Sep 17 00:00:00 2001 +From: Neil Mayhew +Date: Fri, 5 Jul 2019 13:08:18 -0600 +Subject: [PATCH 1/2] Change use of header files to follow best practices +Content-Type: text/plain; charset=utf-8 + +This also fixes build errors after recent changes to dependencies +--- + ufraw_exiv2.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/ufraw_exiv2.cc b/ufraw_exiv2.cc +index f03011b..9a6ec86 100644 +--- a/ufraw_exiv2.cc ++++ b/ufraw_exiv2.cc +@@ -15,9 +15,8 @@ + #include "ufraw.h" + + #ifdef HAVE_EXIV2 +-#include +-#include +-#include ++#include ++#include + #include + #include + +-- +2.22.0 + diff --git a/graphics/ufraw/patches/0002-Use-symbolic-error-code.patch b/graphics/ufraw/patches/0002-Use-symbolic-error-code.patch new file mode 100644 index 0000000000..1859ca702a --- /dev/null +++ b/graphics/ufraw/patches/0002-Use-symbolic-error-code.patch @@ -0,0 +1,26 @@ +From b85e03dd607fb697f69eb9afb044924f046f9eb3 Mon Sep 17 00:00:00 2001 +From: Neil Mayhew +Date: Fri, 5 Jul 2019 13:08:35 -0600 +Subject: [PATCH 2/2] Use symbolic error code +Content-Type: text/plain; charset=utf-8 + +--- + ufraw_exiv2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ufraw_exiv2.cc b/ufraw_exiv2.cc +index 9a6ec86..5958b3d 100644 +--- a/ufraw_exiv2.cc ++++ b/ufraw_exiv2.cc +@@ -66,7 +66,7 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf) + if (exifData.empty()) { + std::string error(uf->filename); + error += ": No Exif data found in the file"; +- throw Exiv2::Error(1, error); ++ throw Exiv2::Error(Exiv2::kerErrorMessage, error); + } + + /* List of tag names taken from exiv2's printSummary() in actions.cpp */ +-- +2.22.0 + diff --git a/graphics/ufraw/patches/0003-ufraw-0.22-fix_omp_definitions.patch b/graphics/ufraw/patches/0003-ufraw-0.22-fix_omp_definitions.patch new file mode 100644 index 0000000000..8b26ee3a3d --- /dev/null +++ b/graphics/ufraw/patches/0003-ufraw-0.22-fix_omp_definitions.patch @@ -0,0 +1,32 @@ +--- a/dcraw_api.cc 2015-06-16 04:58:38.000000000 +0100 ++++ b/dcraw_api.cc 2019-06-30 16:37:05.503409567 +0100 +@@ -689,3 +689,3 @@ + #pragma omp parallel for schedule(static) default(none) \ +- shared(h,dark,rgbWB) ++ firstprivate(black,pixels) shared(h,dark,rgbWB) + #endif +@@ -702,3 +702,3 @@ + #pragma omp parallel for schedule(static) default(none) \ +- shared(h,dark,rgbWB) ++ firstprivate(black,pixels) shared(h,dark,rgbWB) + #endif +--- a/dcraw_indi.c 2015-06-16 04:58:38.000000000 +0100 ++++ b/dcraw_indi.c 2019-06-30 17:03:59.692710441 +0100 +@@ -140,2 +140,3 @@ + default(none) \ ++ firstprivate(iheight,iwidth,noise,threshold) \ + shared(nc,image,size,noise) \ +@@ -145,2 +146,3 @@ + default(none) \ ++ firstprivate(iheight,iwidth,noise,threshold) \ + shared(nc,image,size) \ +@@ -416,2 +418,3 @@ + default(none) \ ++ firstprivate(colors,filters,height,width) \ + shared(image,code,prow,pcol,h) \ +@@ -502,3 +502,4 @@ + default(none) \ +- shared(image,dir,diff) \ ++ firstprivate(filters,height,width) \ ++ shared(image,dir,diff) \ + private(row,col,i,d,c,pix,guess) diff --git a/graphics/ufraw/ufraw.SlackBuild b/graphics/ufraw/ufraw.SlackBuild index 35408d8af8..8e8735b2c8 100644 --- a/graphics/ufraw/ufraw.SlackBuild +++ b/graphics/ufraw/ufraw.SlackBuild @@ -83,6 +83,10 @@ patch -p1 < $CWD/patches/05_fix_build_due_to_unsigned_char.patch patch -p1 < $CWD/patches/gcc7.patch patch -p1 < $CWD/patches/CVE-2015-8366.patch patch -p1 < $CWD/patches/no-gimp-remote.patch +# More patches suggested by Lockywolf on LQ +patch -p1 < $CWD/patches/0001-Change-use-of-header-files.patch +patch -p1 < $CWD/patches/0002-Use-symbolic-error-code.patch +patch -p1 < $CWD/patches/0003-ufraw-0.22-fix_omp_definitions.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/graphics/vulkan-sdk/README b/graphics/vulkan-sdk/README deleted file mode 100644 index 0796ec1f1a..0000000000 --- a/graphics/vulkan-sdk/README +++ /dev/null @@ -1,11 +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. - -qt5 is an optional dependency for vkconfig. - -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 86909bc79f..0000000000 --- a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild +++ /dev/null @@ -1,217 +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.162.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 - -# VulkanTools from LunarG doesn't support an external jsoncpp -JSONCPP_VERSION=${JSONCPP_VERSION:-1.8.0} - -chdir () { cd -- "$SRC/$1"; printf %s\\n '' "Building $1" ''; } - -cmake_build () { - mkdir -p build - cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DCMAKE_SKIP_RPATH=TRUE \ - -DCMAKE_BUILD_TYPE=Release \ - "${@:-}" .. - make - make install DESTDIR=$PKG -} - -copydocs () { - dir="$1" - mkdir -p -- "$PKG/usr/doc/$PRGNAM-$VERSION/$dir" - shift - for i do - cp -a -- "$dir-sdk-$VERSION/$i" "$PKG/usr/doc/$PRGNAM-$VERSION/$dir/" - done -} - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -mkdir $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -tar xvf $CWD/Vulkan-Loader-sdk-$VERSION.tar.gz -tar xvf $CWD/Vulkan-ValidationLayers-sdk-$VERSION.tar.gz -tar xvf $CWD/VulkanTools-sdk-$VERSION.tar.gz -tar xvf $CWD/gfxreconstruct-sdk-$VERSION.tar.gz - -( - cd VulkanTools-sdk-$VERSION/submodules - tar xvf $CWD/jsoncpp-$JSONCPP_VERSION.tar.gz - rm -rf jsoncpp - mv jsoncpp-$JSONCPP_VERSION jsoncpp -) - -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 {} \+ - -##################### -### vulkan-loader ### -##################### - -chdir Vulkan-Loader-sdk-$VERSION - -# 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 \ - -DBUILD_TESTS=OFF \ - -DBUILD_WSI_XCB_SUPPORT=ON \ - -DBUILD_WSI_XLIB_SUPPORT=ON \ - -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ - -DVULKAN_HEADERS_INSTALL_DIR=/usr - -############################### -### vulkan-validationlayers ### -############################### - -chdir Vulkan-ValidationLayers-sdk-$VERSION - -# Require an older cmake version. -sed -i 's/3.10.2/3.5.2/' CMakeLists.txt - -cmake_build \ - -DCMAKE_INSTALL_DATADIR=share \ - -DBUILD_LAYER_SUPPORT_FILES=ON \ - -DBUILD_TESTS=OFF \ - -DBUILD_WERROR=OFF \ - -DBUILD_WSI_XCB_SUPPORT=ON \ - -DBUILD_WSI_XLIB_SUPPORT=ON \ - -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ - -DGLSLANG_INSTALL_DIR=/usr \ - -DSPIRV_HEADERS_INSTALL_DIR=/usr \ - -DVULKAN_HEADERS_INSTALL_DIR=/usr - -################### -### vulkantools ### -################### - -chdir VulkanTools-sdk-$VERSION - -# Generate missing jsoncpp sources -( - cd submodules/jsoncpp - python3 ./amalgamate.py -) - -# Require an older cmake version. -find . -type f -name CMakeLists.txt | xargs grep -l '3\.10\.2' | - xargs sed -i 's/3.10.2/3.5.2/' - -cmake_build \ - -DBUILD_GMOCK=OFF \ - -DBUILD_WSI_XCB_SUPPORT=ON \ - -DBUILD_WSI_XLIB_SUPPORT=ON \ - -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ - -DINSTALL_GTEST=OFF \ - -DVULKAN_HEADERS_INSTALL_DIR=/usr \ - -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \ - -DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=$PKG/usr - -###################### -### gfxreconstruct ### -###################### - -chdir gfxreconstruct-sdk-$VERSION - -# Require an older cmake version. -sed -i 's/3.10.2/3.5.2/' CMakeLists.txt - -# cmake 3.5.2 does not have FILTER for the list command -sed -i '/generate_target_source_files(/d' cmake/CodeStyle.cmake - -cmake_build \ - -DBUILD_WERROR=OFF \ - -DVULKAN_HEADER=/usr/include/vulkan - -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 - -copydocs Vulkan-Loader CODE_OF_CONDUCT.md CONTRIBUTING.md GOVERNANCE.md \ - LICENSE.txt README.md -copydocs Vulkan-ValidationLayers CODE_OF_CONDUCT.md CONTRIBUTING.md \ - GOVERNANCE.md LAYER_CONFIGURATION.md LICENSE.txt README.md -copydocs VulkanTools CONTRIBUTING.md GOVERNANCE.md LICENSE.txt README.md -copydocs gfxreconstruct CONTRIBUTING.md LICENSE.txt LICENSE_ThirdParty.txt \ - README.md USAGE_android.md USAGE_desktop.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/graphics/vulkan-sdk/vulkan-sdk.info b/graphics/vulkan-sdk/vulkan-sdk.info deleted file mode 100644 index 879c8f7d73..0000000000 --- a/graphics/vulkan-sdk/vulkan-sdk.info +++ /dev/null @@ -1,18 +0,0 @@ -PRGNAM="vulkan-sdk" -VERSION="1.2.162.0" -HOMEPAGE="https://www.khronos.org/vulkan/" -DOWNLOAD="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.162.0/Vulkan-Loader-sdk-1.2.162.0.tar.gz \ - https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.162.0/Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz \ - https://github.com/LunarG/VulkanTools/archive/sdk-1.2.162.0/VulkanTools-sdk-1.2.162.0.tar.gz \ - https://github.com/LunarG/gfxreconstruct/archive/sdk-1.2.162.0/gfxreconstruct-sdk-1.2.162.0.tar.gz \ - https://github.com/open-source-parsers/jsoncpp/archive/1.8.0/jsoncpp-1.8.0.tar.gz" -MD5SUM="97de90f2b599979ea492a3ed92c025fb \ - 5c0c6daedacd2d535bb0cd41dcbd2995 \ - aa116fff3ef50d7c299bc168953eacec \ - 7d48f5d115f8baad2ed800769545f21a \ - 6d6cbd82b5fe4a9cbae4ffef01f9e9fc" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="Vulkan-Headers glslang" -MAINTAINER="Hunter Sezen" -EMAIL="orbea@riseup.net" 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 +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(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/haskell/ghc/4eebc8016f68719e1ccdf460754a97d1f4d6ef05.patch b/haskell/ghc/4eebc8016f68719e1ccdf460754a97d1f4d6ef05.patch deleted file mode 100644 index e330963792..0000000000 --- a/haskell/ghc/4eebc8016f68719e1ccdf460754a97d1f4d6ef05.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4eebc8016f68719e1ccdf460754a97d1f4d6ef05 Mon Sep 17 00:00:00 2001 -From: Ben Gamari -Date: Thu, 20 Sep 2018 08:27:37 -0400 -Subject: [PATCH] users-guide: Fix build with sphinx 1.8 - -It seems that both add_object_type and add_directive_to_domain both register a -directive. Previously sphinx didn't seem to mind this but as of Sphinx 1.8 it -crashes with an exception. ---- - docs/users_guide/flags.py | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/docs/users_guide/flags.py b/docs/users_guide/flags.py -index a70f7fef1e0..284b5e06cc1 100644 ---- a/docs/users_guide/flags.py -+++ b/docs/users_guide/flags.py -@@ -48,6 +48,8 @@ - from docutils.parsers.rst import Directive, directives - from sphinx import addnodes - from sphinx.domains.std import GenericObject -+from sphinx.domains import ObjType -+from sphinx.roles import XRefRole - from sphinx.errors import SphinxError - from utils import build_table_from_list - -@@ -599,14 +601,20 @@ def purge_flags(app, env, docname): - ### Initialization - - def setup(app): -+ # Yuck: We can't use app.add_object_type since we need to provide the -+ # Directive instance ourselves. -+ std_object_types = app.registry.domain_object_types.setdefault('std', {}) - - # Add ghc-flag directive, and override the class with our own -- app.add_object_type('ghc-flag', 'ghc-flag') - app.add_directive_to_domain('std', 'ghc-flag', Flag) -+ app.add_role_to_domain('std', 'ghc-flag', XRefRole()) -+ std_object_types['ghc-flag'] = ObjType('ghc-flag', 'ghc-flag') - - # Add extension directive, and override the class with our own -- app.add_object_type('extension', 'extension') - app.add_directive_to_domain('std', 'extension', LanguageExtension) -+ app.add_role_to_domain('std', 'extension', XRefRole()) -+ std_object_types['extension'] = ObjType('ghc-flag', 'ghc-flag') -+ - # NB: language-extension would be misinterpreted by sphinx, and produce - # lang="extensions" XML attributes - diff --git a/haskell/ghc/ghc.1 b/haskell/ghc/ghc.1 index aa378816a0..338cdc71ed 100644 --- a/haskell/ghc/ghc.1 +++ b/haskell/ghc/ghc.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GHC" "1" "May 20, 2018" "8.4.3" "Glasgow Haskell Compiler" +.TH "GHC" "1" "Feb 04, 2021" "8.10.4" "Glasgow Haskell Compiler" .SH NAME ghc \- the Glasgow Haskell Compiler . @@ -46,7 +46,7 @@ ghci [option|filename] .sp This manual page documents briefly the \fBghc\fP and \fBghci\fP commands. Note that \fBghci\fP is not yet available on all architectures. Extensive documentation is -available in various other formats including PDF and HTML; see below. +available in various other formats including \fI\%PDF\fP and \fI\%HTML\fP\&. .sp Each of GHC\(aqs command line options is classified as either \fIstatic\fP or \fIdynamic\fP\&. A static flag may only be specified on the command line, whereas a @@ -93,43 +93,43 @@ interface files for "way" ⟨way⟩; common ways are: .SH OPTIONS .TP .B Code generation -\fB\-dynamic\-too\fP \fB\-fasm\fP \fB\-fbyte\-code\fP \fB\-fllvm\fP \fB\-fno\-code\fP \fB\-fobject\-code\fP \fB\-fPIC\fP \fB\-fPIE\fP \fB\-fwrite\-interface\fP +\fB\-dynamic\-too\fP \fB\-fasm\fP \fB\-fllvm\fP \fB\-fbyte\-code\fP \fB\-fexternal\-dynamic\-refs\fP \fB\-fllvm\fP \fB\-fasm\fP \fB\-fno\-code\fP \fB\-fobject\-code\fP \fB\-fPIC\fP \fB\-fPIE\fP \fB\-fwrite\-interface\fP .TP .B Debugging the compiler -\fB\-dcmm\-lint\fP \fB\-dcore\-lint\fP \fB\-ddump\-asm\fP \fB\-ddump\-asm\-expanded\fP \fB\-ddump\-asm\-liveness\fP \fB\-ddump\-asm\-native\fP \fB\-ddump\-asm\-regalloc\fP \fB\-ddump\-asm\-regalloc\-stages\fP \fB\-ddump\-asm\-stats\fP \fB\-ddump\-bcos\fP \fB\-ddump\-cmm\fP \fB\-ddump\-cmm\-caf\fP \fB\-ddump\-cmm\-cbe\fP \fB\-ddump\-cmm\-cfg\fP \fB\-ddump\-cmm\-cps\fP \fB\-ddump\-cmm\-from\-stg\fP \fB\-ddump\-cmm\-info\fP \fB\-ddump\-cmm\-proc\fP \fB\-ddump\-cmm\-procmap\fP \fB\-ddump\-cmm\-raw\fP \fB\-ddump\-cmm\-sink\fP \fB\-ddump\-cmm\-sp\fP \fB\-ddump\-cmm\-split\fP \fB\-ddump\-cmm\-switch\fP \fB\-ddump\-cmm\-verbose\fP \fB\-ddump\-core\-stats\fP \fB\-ddump\-cse\fP \fB\-ddump\-deriv\fP \fB\-ddump\-ds\fP \fB\-ddump\-ec\-trace\fP \fB\-ddump\-foreign\fP \fB\-ddump\-if\-trace\fP \fB\-ddump\-inlinings\fP \fB\-ddump\-json\fP \fB\-ddump\-llvm\fP \fB\-ddump\-occur\-anal\fP \fB\-ddump\-opt\-cmm\fP \fB\-ddump\-parsed\fP \fB\-ddump\-parsed\-ast\fP \fB\-ddump\-prep\fP \fB\-ddump\-rn\fP \fB\-ddump\-rn\-ast\fP \fB\-ddump\-rn\-stats\fP \fB\-ddump\-rn\-trace\fP \fB\-ddump\-rule\-firings\fP \fB\-ddump\-rule\-rewrites\fP \fB\-ddump\-rules\fP \fB\-ddump\-simpl\fP \fB\-ddump\-simpl\-iterations\fP \fB\-ddump\-simpl\-stats\fP \fB\-ddump\-spec\fP \fB\-ddump\-splices\fP \fB\-ddump\-stg\fP \fB\-ddump\-str\-signatures\fP \fB\-ddump\-stranal\fP \fB\-ddump\-tc\fP \fB\-ddump\-tc\-ast\fP \fB\-ddump\-tc\-trace\fP \fB\-ddump\-timings\fP \fB\-ddump\-to\-file\fP \fB\-ddump\-types\fP \fB\-ddump\-vect\fP \fB\-ddump\-vt\-trace\fP \fB\-ddump\-worker\-wrapper\fP \fB\-dfaststring\-stats\fP \fB\-dinitial\-unique=⟨s⟩\fP \fB\-dno\-debug\-output\fP \fB\-dppr\-case\-as\-let\fP \fB\-dppr\-cols=⟨n⟩\fP \fB\-dppr\-debug\fP \fB\-dppr\-user\-length\fP \fB\-dshow\-passes\fP \fB\-dstg\-lint\fP \fB\-dsuppress\-all\fP \fB\-dsuppress\-coercions\fP \fB\-dsuppress\-idinfo\fP \fB\-dsuppress\-module\-prefixes\fP \fB\-dsuppress\-stg\-free\-vars\fP \fB\-dsuppress\-ticks\fP \fB\-dsuppress\-type\-applications\fP \fB\-dsuppress\-type\-signatures\fP \fB\-dsuppress\-unfoldings\fP \fB\-dsuppress\-uniques\fP \fB\-dsuppress\-var\-kinds\fP \fB\-dth\-dec\-file=⟨file⟩\fP \fB\-dunique\-increment=⟨i⟩\fP \fB\-dverbose\-core2core\fP \fB\-dverbose\-stg2stg\fP \fB\-falignment\-sanitisation\fP \fB\-fcatch\-bottoms\fP \fB\-fllvm\-fill\-undef\-with\-garbage\fP \fB\-g\fP \fB\-g⟨n⟩\fP +\fB\-dcmm\-lint\fP \fB\-dcore\-lint\fP \fB\-ddump\-asm\fP \fB\-ddump\-asm\-expanded\fP \fB\-ddump\-asm\-liveness\fP \fB\-ddump\-asm\-native\fP \fB\-ddump\-asm\-regalloc\fP \fB\-ddump\-asm\-regalloc\-stages\fP \fB\-ddump\-asm\-stats\fP \fB\-ddump\-bcos\fP \fB\-ddump\-cfg\-weights\fP \fB\-ddump\-cmm\fP \fB\-ddump\-cmm\-caf\fP \fB\-ddump\-cmm\-cbe\fP \fB\-ddump\-cmm\-cfg\fP \fB\-ddump\-cmm\-cps\fP \fB\-ddump\-cmm\-from\-stg\fP \fB\-ddump\-cmm\-info\fP \fB\-ddump\-cmm\-proc\fP \fB\-ddump\-cmm\-procmap\fP \fB\-ddump\-cmm\-raw\fP \fB\-ddump\-cmm\-sink\fP \fB\-ddump\-cmm\-sp\fP \fB\-ddump\-cmm\-split\fP \fB\-ddump\-cmm\-switch\fP \fB\-ddump\-cmm\-verbose\fP \fB\-ddump\-cmm\-verbose\-by\-proc\fP \fB\-ddump\-core\-stats\fP \fB\-ddump\-cse\fP \fB\-ddump\-deriv\fP \fB\-ddump\-ds\fP \fB\-ddump\-ds\-preopt\fP \fB\-ddump\-ec\-trace\fP \fB\-ddump\-file\-prefix=⟨str⟩\fP \fB\-ddump\-foreign\fP \fB\-ddump\-hpc\fP \fB\-ddump\-if\-trace\fP \fB\-ddump\-inlinings\fP \fB\-ddump\-json\fP \fB\-ddump\-llvm\fP \fB\-ddump\-mod\-map\fP \fB\-ddump\-occur\-anal\fP \fB\-ddump\-opt\-cmm\fP \fB\-ddump\-parsed\fP \fB\-ddump\-parsed\-ast\fP \fB\-ddump\-prep\fP \fB\-ddump\-rn\fP \fB\-ddump\-rn\-ast\fP \fB\-ddump\-rn\-stats\fP \fB\-ddump\-rn\-trace\fP \fB\-ddump\-rtti\fP \fB\-ddump\-rule\-firings\fP \fB\-ddump\-rule\-rewrites\fP \fB\-ddump\-rules\fP \fB\-ddump\-simpl\fP \fB\-ddump\-simpl\-iterations\fP \fB\-ddump\-simpl\-stats\fP \fB\-ddump\-spec\fP \fB\-ddump\-splices\fP \fB\-ddump\-stg\fP \fB\-ddump\-stg\-final\fP \fB\-ddump\-stg\-unarised\fP \fB\-ddump\-str\-signatures\fP \fB\-ddump\-stranal\fP \fB\-ddump\-tc\fP \fB\-ddump\-tc\-ast\fP \fB\-ddump\-tc\-trace\fP \fB\-ddump\-ticked\fP \fB\-ddump\-timings\fP \fB\-ddump\-to\-file\fP \fB\-ddump\-types\fP \fB\-ddump\-worker\-wrapper\fP \fB\-dfaststring\-stats\fP \fB\-dhex\-word\-literals\fP \fB\-dinitial\-unique=⟨s⟩\fP \fB\-dinline\-check=⟨str⟩\fP \fB\-dno\-debug\-output\fP \fB\-ddebug\-output\fP \fB\-dno\-typeable\-binds\fP \fB\-dppr\-case\-as\-let\fP \fB\-dppr\-cols=⟨n⟩\fP \fB\-dppr\-debug\fP \fB\-dppr\-user\-length\fP \fB\-drule\-check=⟨str⟩\fP \fB\-dshow\-passes\fP \fB\-dstg\-lint\fP \fB\-dsuppress\-all\fP \fB\-dsuppress\-coercions\fP \fB\-dsuppress\-idinfo\fP \fB\-dsuppress\-module\-prefixes\fP \fB\-dsuppress\-stg\-free\-vars\fP \fB\-dsuppress\-ticks\fP \fB\-dsuppress\-timestamps\fP \fB\-dsuppress\-type\-applications\fP \fB\-dsuppress\-type\-signatures\fP \fB\-dsuppress\-unfoldings\fP \fB\-dsuppress\-uniques\fP \fB\-dsuppress\-var\-kinds\fP \fB\-dth\-dec\-file\fP \fB\-dunique\-increment=⟨i⟩\fP \fB\-dverbose\-core2core\fP \fB\-dverbose\-stg2stg\fP \fB\-falignment\-sanitisation\fP \fB\-fcatch\-bottoms\fP \fB\-fllvm\-fill\-undef\-with\-garbage\fP \fB\-fproc\-alignment\fP \fB\-g\fP \fB\-g⟨n⟩\fP .TP .B C pre\-processor -\fB\-cpp\fP \fB\-D⟨symbol⟩[=⟨value⟩]\fP \fB\-I⟨dir⟩\fP \fB\-U⟨symbol⟩\fP +\fB\-cpp\fP \fB\-D⟨symbol⟩[=⟨value⟩]\fP \fB\-U⟨symbol⟩\fP \fB\-I⟨dir⟩\fP \fB\-U⟨symbol⟩\fP .TP .B Finding imports \fB\-i\fP \fB\-i⟨dir⟩[:⟨dir⟩]*\fP .TP .B Interactive mode -\fB\-fbreak\-on\-error\fP \fB\-fbreak\-on\-exception\fP \fB\-fghci\-hist\-size=⟨n⟩\fP \fB\-flocal\-ghci\-history\fP \fB\-fprint\-bind\-result\fP \fB\-fshow\-loaded\-modules\fP \fB\-ghci\-script\fP \fB\-ignore\-dot\-ghci\fP \fB\-interactive\-print ⟨expr⟩\fP +\fB\-fbreak\-on\-error\fP \fB\-fno\-break\-on\-error\fP \fB\-fbreak\-on\-exception\fP \fB\-fno\-break\-on\-exception\fP \fB\-fghci\-hist\-size=⟨n⟩\fP \fB\-fghci\-leak\-check\fP \fB\-fno\-ghci\-leak\-check\fP \fB\-flocal\-ghci\-history\fP \fB\-fno\-local\-ghci\-history\fP \fB\-fno\-it\fP \fB\-fno\-no\-it\fP \fB\-fprint\-bind\-result\fP \fB\-fno\-print\-bind\-result\fP \fB\-fprint\-evld\-with\-show\fP \fB\-fshow\-loaded\-modules\fP \fB\-ghci\-script\fP \fB\-ignore\-dot\-ghci\fP \fB\-interactive\-print ⟨name⟩\fP .TP .B Interface files \fB\-\-show\-iface ⟨file⟩\fP \fB\-ddump\-hi\fP \fB\-ddump\-hi\-diffs\fP \fB\-ddump\-minimal\-imports\fP .TP .B Keeping intermediate files -\fB\-keep\-hc\-file\fP \fB\-keep\-hc\-files\fP \fB\-keep\-hi\-files\fP \fB\-keep\-llvm\-file\fP \fB\-keep\-llvm\-files\fP \fB\-keep\-o\-files\fP \fB\-keep\-s\-file\fP \fB\-keep\-s\-files\fP \fB\-keep\-tmp\-files\fP +\fB\-keep\-hc\-file\fP \fB\-keep\-hc\-files\fP \fB\-keep\-hi\-files\fP \fB\-no\-keep\-hi\-files\fP \fB\-keep\-hscpp\-file\fP \fB\-keep\-hscpp\-files\fP \fB\-keep\-llvm\-file\fP \fB\-keep\-llvm\-files\fP \fB\-keep\-o\-files\fP \fB\-no\-keep\-o\-files\fP \fB\-keep\-s\-file\fP \fB\-keep\-s\-files\fP \fB\-keep\-tmp\-files\fP .TP .B Language options -\fB\-XAllowAmbiguousTypes\fP \fB\-XApplicativeDo\fP \fB\-XArrows\fP \fB\-XBangPatterns\fP \fB\-XBinaryLiterals\fP \fB\-XCApiFFI\fP \fB\-XConstrainedClassMethods\fP \fB\-XConstraintKinds\fP \fB\-XCPP\fP \fB\-XDataKinds\fP \fB\-XDatatypeContexts\fP \fB\-XDefaultSignatures\fP \fB\-XDeriveAnyClass\fP \fB\-XDeriveDataTypeable\fP \fB\-XDeriveFoldable\fP \fB\-XDeriveFunctor\fP \fB\-XDeriveGeneric\fP \fB\-XDeriveLift\fP \fB\-XDeriveTraversable\fP \fB\-XDerivingStrategies\fP \fB\-XDisambiguateRecordFields\fP \fB\-XDuplicateRecordFields\fP \fB\-XEmptyCase\fP \fB\-XEmptyDataDecls\fP \fB\-XEmptyDataDeriving\fP \fB\-XExistentialQuantification\fP \fB\-XExplicitForAll\fP \fB\-XExplicitNamespaces\fP \fB\-XExtendedDefaultRules\fP \fB\-XFlexibleContexts\fP \fB\-XFlexibleInstances\fP \fB\-XForeignFunctionInterface\fP \fB\-XFunctionalDependencies\fP \fB\-XGADTs\fP \fB\-XGADTSyntax\fP \fB\-XGeneralisedNewtypeDeriving\fP \fB\-XGeneralizedNewtypeDeriving\fP \fB\-XHexFloatLiterals\fP \fB\-XImplicitParams\fP \fB\-XImpredicativeTypes\fP \fB\-XIncoherentInstances\fP \fB\-XInstanceSigs\fP \fB\-XInterruptibleFFI\fP \fB\-XKindSignatures\fP \fB\-XLambdaCase\fP \fB\-XLiberalTypeSynonyms\fP \fB\-XMagicHash\fP \fB\-XMonadComprehensions\fP \fB\-XMonadFailDesugaring\fP \fB\-XMonoLocalBinds\fP \fB\-XMultiParamTypeClasses\fP \fB\-XMultiWayIf\fP \fB\-XNamedFieldPuns\fP \fB\-XNamedWildCards\fP \fB\-XNegativeLiterals\fP \fB\-XNoImplicitPrelude\fP \fB\-XNoMonomorphismRestriction\fP \fB\-XNoPatternGuards\fP \fB\-XNoTraditionalRecordSyntax\fP \fB\-XNPlusKPatterns\fP \fB\-XNullaryTypeClasses\fP \fB\-XNumDecimals\fP \fB\-XOverlappingInstances\fP \fB\-XOverloadedLabels\fP \fB\-XOverloadedLists\fP \fB\-XOverloadedStrings\fP \fB\-XPackageImports\fP \fB\-XParallelListComp\fP \fB\-XPartialTypeSignatures\fP \fB\-XPatternSynonyms\fP \fB\-XPolyKinds\fP \fB\-XPostfixOperators\fP \fB\-XQuasiQuotes\fP \fB\-XRank2Types\fP \fB\-XRankNTypes\fP \fB\-XRebindableSyntax\fP \fB\-XRecordWildCards\fP \fB\-XRecursiveDo\fP \fB\-XRoleAnnotations\fP \fB\-XSafe\fP \fB\-XScopedTypeVariables\fP \fB\-XStandaloneDeriving\fP \fB\-XStaticPointers\fP \fB\-XStrict\fP \fB\-XStrictData\fP \fB\-XTemplateHaskell\fP \fB\-XTemplateHaskellQuotes\fP \fB\-XTransformListComp\fP \fB\-XTrustworthy\fP \fB\-XTupleSections\fP \fB\-XTypeApplications\fP \fB\-XTypeFamilies\fP \fB\-XTypeFamilyDependencies\fP \fB\-XTypeInType\fP \fB\-XTypeOperators\fP \fB\-XTypeSynonymInstances\fP \fB\-XUnboxedSums\fP \fB\-XUnboxedTuples\fP \fB\-XUndecidableInstances\fP \fB\-XUndecidableSuperClasses\fP \fB\-XUnicodeSyntax\fP \fB\-XUnsafe\fP \fB\-XViewPatterns\fP +\fB\-fno\-safe\-haskell\fP \fB\-fsort\-by\-size\-hole\-fits\fP \fB\-fno\-sort\-by\-size\-hole\-fits\fP \fB\-fsort\-by\-subsumption\-hole\-fits\fP \fB\-fno\-sort\-by\-subsumption\-hole\-fits\fP \fB\-Winferred\-safe\-imports\fP \fB\-Wno\-inferred\-safe\-imports\fP \fB\-Wmissing\-safe\-haskell\-mode\fP \fB\-Wno\-missing\-safe\-haskell\-mode\fP \fB\-XAllowAmbiguousTypes\fP \fB\-XApplicativeDo\fP \fB\-XArrows\fP \fB\-XBangPatterns\fP \fB\-XBinaryLiterals\fP \fB\-XBlockArguments\fP \fB\-XCApiFFI\fP \fB\-XConstrainedClassMethods\fP \fB\-XConstraintKinds\fP \fB\-XCPP\fP \fB\-XCUSKs\fP \fB\-XDataKinds\fP \fB\-XDatatypeContexts\fP \fB\-XDefaultSignatures\fP \fB\-XDeriveAnyClass\fP \fB\-XDeriveDataTypeable\fP \fB\-XDeriveFoldable\fP \fB\-XDeriveFunctor\fP \fB\-XDeriveGeneric\fP \fB\-XDeriveLift\fP \fB\-XDeriveTraversable\fP \fB\-XDerivingStrategies\fP \fB\-XDerivingVia\fP \fB\-XDisambiguateRecordFields\fP \fB\-XDuplicateRecordFields\fP \fB\-XEmptyCase\fP \fB\-XEmptyDataDecls\fP \fB\-XEmptyDataDeriving\fP \fB\-XExistentialQuantification\fP \fB\-XExplicitForAll\fP \fB\-XExplicitNamespaces\fP \fB\-XExtendedDefaultRules\fP \fB\-XFlexibleContexts\fP \fB\-XFlexibleInstances\fP \fB\-XForeignFunctionInterface\fP \fB\-XFunctionalDependencies\fP \fB\-XGADTs\fP \fB\-XGADTSyntax\fP \fB\-XGeneralisedNewtypeDeriving\fP \fB\-XGeneralizedNewtypeDeriving\fP \fB\-XHaskell2010\fP \fB\-XHaskell98\fP \fB\-XHexFloatLiterals\fP \fB\-XImplicitParams\fP \fB\-XImportQualifiedPost\fP \fB\-XImpredicativeTypes\fP \fB\-XIncoherentInstances\fP \fB\-XInstanceSigs\fP \fB\-XInterruptibleFFI\fP \fB\-XKindSignatures\fP \fB\-XLambdaCase\fP \fB\-XLiberalTypeSynonyms\fP \fB\-XMagicHash\fP \fB\-XMonadComprehensions\fP \fB\-XMonadFailDesugaring\fP \fB\-XMonoLocalBinds\fP \fB\-XMultiParamTypeClasses\fP \fB\-XMultiWayIf\fP \fB\-XNamedFieldPuns\fP \fB\-XNamedWildCards\fP \fB\-XNegativeLiterals\fP \fB\-XNoImplicitPrelude\fP \fB\-XNoMonomorphismRestriction\fP \fB\-XNondecreasingIndentation\fP \fB\-XNoPatternGuards\fP \fB\-XNoTraditionalRecordSyntax\fP \fB\-XNPlusKPatterns\fP \fB\-XNullaryTypeClasses\fP \fB\-XNumDecimals\fP \fB\-XNumericUnderscores\fP \fB\-XOverlappingInstances\fP \fB\-XOverloadedLabels\fP \fB\-XOverloadedLists\fP \fB\-XOverloadedStrings\fP \fB\-XPackageImports\fP \fB\-XParallelListComp\fP \fB\-XPartialTypeSignatures\fP \fB\-XPatternSynonyms\fP \fB\-XPolyKinds\fP \fB\-XPostfixOperators\fP \fB\-XQuantifiedConstraints\fP \fB\-XQuasiQuotes\fP \fB\-XRank2Types\fP \fB\-XRankNTypes\fP \fB\-XRebindableSyntax\fP \fB\-XRecordWildCards\fP \fB\-XRecursiveDo\fP \fB\-XRoleAnnotations\fP \fB\-XSafe\fP \fB\-XScopedTypeVariables\fP \fB\-XStandaloneDeriving\fP \fB\-XStandaloneKindSignatures\fP \fB\-XStarIsType\fP \fB\-XStaticPointers\fP \fB\-XStrict\fP \fB\-XStrictData\fP \fB\-XTemplateHaskell\fP \fB\-XTemplateHaskellQuotes\fP \fB\-XTransformListComp\fP \fB\-XTrustworthy\fP \fB\-XTupleSections\fP \fB\-XTypeApplications\fP \fB\-XTypeFamilies\fP \fB\-XTypeFamilyDependencies\fP \fB\-XTypeInType\fP \fB\-XTypeOperators\fP \fB\-XTypeSynonymInstances\fP \fB\-XUnboxedSums\fP \fB\-XUnboxedTuples\fP \fB\-XUndecidableInstances\fP \fB\-XUndecidableSuperClasses\fP \fB\-XUnicodeSyntax\fP \fB\-XUnliftedFFITypes\fP \fB\-XUnliftedNewtypes\fP \fB\-XUnsafe\fP \fB\-XViewPatterns\fP .TP .B Linking options -\fB\-c\fP \fB\-debug\fP \fB\-dylib\-install\-name ⟨path⟩\fP \fB\-dynamic\fP \fB\-dynload\fP \fB\-eventlog\fP \fB\-fno\-embed\-manifest\fP \fB\-fno\-gen\-manifest\fP \fB\-fno\-shared\-implib\fP \fB\-framework ⟨name⟩\fP \fB\-framework\-path ⟨dir⟩\fP \fB\-fwhole\-archive\-hs\-libs\fP \fB\-L ⟨dir⟩\fP \fB\-l ⟨lib⟩\fP \fB\-main\-is ⟨thing⟩\fP \fB\-no\-hs\-main\fP \fB\-no\-rtsopts\-suggestions\fP \fB\-package ⟨name⟩\fP \fB\-pie\fP \fB\-rdynamic\fP \fB\-rtsopts[=⟨none|some|all⟩]\fP \fB\-shared\fP \fB\-split\-objs\fP \fB\-split\-sections\fP \fB\-static\fP \fB\-staticlib\fP \fB\-threaded\fP \fB\-with\-rtsopts=⟨opts⟩\fP +\fB\-c\fP \fB\-debug\fP \fB\-dylib\-install\-name ⟨path⟩\fP \fB\-dynamic\fP \fB\-dynload\fP \fB\-eventlog\fP \fB\-fno\-embed\-manifest\fP \fB\-fno\-gen\-manifest\fP \fB\-fno\-shared\-implib\fP \fB\-framework ⟨name⟩\fP \fB\-framework\-path ⟨dir⟩\fP \fB\-fwhole\-archive\-hs\-libs\fP \fB\-keep\-cafs\fP \fB\-L ⟨dir⟩\fP \fB\-l ⟨lib⟩\fP \fB\-main\-is ⟨thing⟩\fP \fB\-no\-hs\-main\fP \fB\-no\-rtsopts\-suggestions\fP \fB\-package ⟨name⟩\fP \fB\-pie\fP \fB\-rdynamic\fP \fB\-rtsopts[=⟨none|some|all|ignore|ignoreAll⟩]\fP \fB\-shared\fP \fB\-split\-sections\fP \fB\-static\fP \fB\-staticlib\fP \fB\-threaded\fP \fB\-with\-rtsopts=⟨opts⟩\fP .TP .B Miscellaneous options -\fB\-fexternal\-interpreter\fP \fB\-fglasgow\-exts\fP \fB\-ghcversion\-file ⟨path to ghcversion.h⟩\fP \fB\-H ⟨size⟩\fP \fB\-j[⟨n⟩]\fP +\fB\-fexternal\-interpreter\fP \fB\-fglasgow\-exts\fP \fB\-fno\-glasgow\-exts\fP \fB\-ghcversion\-file ⟨path to ghcversion.h⟩\fP \fB\-H ⟨size⟩\fP \fB\-j[⟨n⟩]\fP .TP .B Modes of operation \fB\-\-frontend ⟨module⟩\fP \fB\-\-help\fP \fB\-?\fP \fB\-\-info\fP \fB\-\-interactive\fP \fB\-\-make\fP \fB\-\-mk\-dll\fP \fB\-\-numeric\-version\fP \fB\-\-print\-libdir\fP \fB\-\-show\-iface ⟨file⟩\fP \fB\-\-show\-options\fP \fB\-\-supported\-extensions\fP \fB\-\-supported\-languages\fP \fB\-\-version\fP \fB\-V\fP \fB\-e ⟨expr⟩\fP \fB\-M\fP .TP .B Individual optimizations -\fB\-fcall\-arity\fP \fB\-fcase\-folding\fP \fB\-fcase\-merge\fP \fB\-fcmm\-elim\-common\-blocks\fP \fB\-fcmm\-sink\fP \fB\-fcpr\-anal\fP \fB\-fcross\-module\-specialise\fP \fB\-fcse\fP \fB\-fdicts\-cheap\fP \fB\-fdicts\-strict\fP \fB\-fdmd\-tx\-dict\-sel\fP \fB\-fdo\-eta\-reduction\fP \fB\-fdo\-lambda\-eta\-expansion\fP \fB\-feager\-blackholing\fP \fB\-fenable\-rewrite\-rules\fP \fB\-fexcess\-precision\fP \fB\-fexitification\fP \fB\-fexpose\-all\-unfoldings\fP \fB\-ffloat\-in\fP \fB\-ffull\-laziness\fP \fB\-ffun\-to\-thunk\fP \fB\-fignore\-asserts\fP \fB\-fignore\-interface\-pragmas\fP \fB\-flate\-dmd\-anal\fP \fB\-fliberate\-case\fP \fB\-fliberate\-case\-threshold=⟨n⟩\fP \fB\-fllvm\-pass\-vectors\-in\-regs\fP \fB\-floopification\fP \fB\-fmax\-inline\-alloc\-size=⟨n⟩\fP \fB\-fmax\-inline\-memcpy\-insns=⟨n⟩\fP \fB\-fmax\-inline\-memset\-insns=⟨n⟩\fP \fB\-fmax\-relevant\-binds=⟨n⟩\fP \fB\-fmax\-simplifier\-iterations=⟨n⟩\fP \fB\-fmax\-uncovered\-patterns=⟨n⟩\fP \fB\-fmax\-valid\-substitutions=⟨n⟩\fP \fB\-fmax\-worker\-args=⟨n⟩\fP \fB\-fno\-opt\-coercion\fP \fB\-fno\-pre\-inlining\fP \fB\-fno\-state\-hack\fP \fB\-fomit\-interface\-pragmas\fP \fB\-fomit\-yields\fP \fB\-foptimal\-applicative\-do\fP \fB\-fpedantic\-bottoms\fP \fB\-fregs\-graph\fP \fB\-fregs\-iterative\fP \fB\-fsimpl\-tick\-factor=⟨n⟩\fP \fB\-fsimplifier\-phases=⟨n⟩\fP \fB\-fsolve\-constant\-dicts\fP \fB\-fspec\-constr\fP \fB\-fspec\-constr\-count=⟨n⟩\fP \fB\-fspec\-constr\-keen\fP \fB\-fspec\-constr\-threshold=⟨n⟩\fP \fB\-fspecialise\fP \fB\-fspecialise\-aggressively\fP \fB\-fstatic\-argument\-transformation\fP \fB\-fstg\-cse\fP \fB\-fstrictness\fP \fB\-fstrictness\-before=⟨n⟩\fP \fB\-funbox\-small\-strict\-fields\fP \fB\-funbox\-strict\-fields\fP \fB\-funfolding\-creation\-threshold=⟨n⟩\fP \fB\-funfolding\-dict\-discount=⟨n⟩\fP \fB\-funfolding\-fun\-discount=⟨n⟩\fP \fB\-funfolding\-keeness\-factor=⟨n⟩\fP \fB\-funfolding\-use\-threshold=⟨n⟩\fP \fB\-fvectorisation\-avoidance\fP \fB\-fvectorise\fP +\fB\-fasm\-shortcutting\fP \fB\-fno\-asm\-shortcutting\fP \fB\-fbinary\-blob\-threshold=⟨n⟩\fP \fB\-fblock\-layout\-cfg\fP \fB\-fno\-block\-layout\-cfg\fP \fB\-fblock\-layout\-weightless\fP \fB\-fno\-block\-layout\-weightless\fP \fB\-fblock\-layout\-weights\fP \fB\-fcall\-arity\fP \fB\-fno\-call\-arity\fP \fB\-fcase\-folding\fP \fB\-fno\-case\-folding\fP \fB\-fcase\-merge\fP \fB\-fno\-case\-merge\fP \fB\-fcmm\-elim\-common\-blocks\fP \fB\-fno\-cmm\-elim\-common\-blocks\fP \fB\-fcmm\-sink\fP \fB\-fno\-cmm\-sink\fP \fB\-fcpr\-anal\fP \fB\-fno\-cpr\-anal\fP \fB\-fcross\-module\-specialise\fP \fB\-fno\-cross\-module\-specialise\fP \fB\-fcse\fP \fB\-fno\-cse\fP \fB\-fdicts\-cheap\fP \fB\-fno\-dicts\-cheap\fP \fB\-fdicts\-strict\fP \fB\-fno\-dicts\-strict\fP \fB\-fdmd\-tx\-dict\-sel\fP \fB\-fno\-dmd\-tx\-dict\-sel\fP \fB\-fdo\-eta\-reduction\fP \fB\-fno\-do\-eta\-reduction\fP \fB\-fdo\-lambda\-eta\-expansion\fP \fB\-fno\-do\-lambda\-eta\-expansion\fP \fB\-feager\-blackholing\fP \fB\-fenable\-rewrite\-rules\fP \fB\-fno\-enable\-rewrite\-rules\fP \fB\-fexcess\-precision\fP \fB\-fno\-excess\-precision\fP \fB\-fexitification\fP \fB\-fno\-exitification\fP \fB\-fexpose\-all\-unfoldings\fP \fB\-fno\-expose\-all\-unfoldings\fP \fB\-ffloat\-in\fP \fB\-fno\-float\-in\fP \fB\-ffull\-laziness\fP \fB\-fno\-full\-laziness\fP \fB\-ffun\-to\-thunk\fP \fB\-fno\-fun\-to\-thunk\fP \fB\-fignore\-asserts\fP \fB\-fno\-ignore\-asserts\fP \fB\-fignore\-interface\-pragmas\fP \fB\-fno\-ignore\-interface\-pragmas\fP \fB\-flate\-dmd\-anal\fP \fB\-fno\-late\-dmd\-anal\fP \fB\-flate\-specialise\fP \fB\-fno\-late\-specialise\fP \fB\-fliberate\-case\fP \fB\-fno\-liberate\-case\fP \fB\-fliberate\-case\-threshold=⟨n⟩\fP \fB\-fno\-liberate\-case\-threshold\fP \fB\-fllvm\-pass\-vectors\-in\-regs\fP \fB\-fno\-llvm\-pass\-vectors\-in\-regs\fP \fB\-floopification\fP \fB\-fno\-loopification\fP \fB\-fmax\-inline\-alloc\-size=⟨n⟩\fP \fB\-fmax\-inline\-memcpy\-insns=⟨n⟩\fP \fB\-fmax\-inline\-memset\-insns=⟨n⟩\fP \fB\-fmax\-simplifier\-iterations=⟨n⟩\fP \fB\-fmax\-uncovered\-patterns=⟨n⟩\fP \fB\-fmax\-worker\-args=⟨n⟩\fP \fB\-fno\-opt\-coercion\fP \fB\-fno\-pre\-inlining\fP \fB\-fno\-state\-hack\fP \fB\-fomit\-interface\-pragmas\fP \fB\-fno\-omit\-interface\-pragmas\fP \fB\-fomit\-yields\fP \fB\-fno\-omit\-yields\fP \fB\-foptimal\-applicative\-do\fP \fB\-fno\-optimal\-applicative\-do\fP \fB\-fpedantic\-bottoms\fP \fB\-fno\-pedantic\-bottoms\fP \fB\-fregs\-graph\fP \fB\-fno\-regs\-graph\fP \fB\-fregs\-iterative\fP \fB\-fno\-regs\-iterative\fP \fB\-fsimpl\-tick\-factor=⟨n⟩\fP \fB\-fsimplifier\-phases=⟨n⟩\fP \fB\-fsolve\-constant\-dicts\fP \fB\-fno\-solve\-constant\-dicts\fP \fB\-fspec\-constr\fP \fB\-fno\-spec\-constr\fP \fB\-fspec\-constr\-count=⟨n⟩\fP \fB\-fno\-spec\-constr\-count\fP \fB\-fspec\-constr\-keen\fP \fB\-fno\-spec\-constr\-keen\fP \fB\-fspec\-constr\-threshold=⟨n⟩\fP \fB\-fno\-spec\-constr\-threshold\fP \fB\-fspecialise\fP \fB\-fno\-specialise\fP \fB\-fspecialise\-aggressively\fP \fB\-fno\-specialise\-aggressively\fP \fB\-fstatic\-argument\-transformation\fP \fB\-fno\-static\-argument\-transformation\fP \fB\-fstg\-cse\fP \fB\-fno\-stg\-cse\fP \fB\-fstg\-lift\-lams\fP \fB\-fno\-stg\-lift\-lams\fP \fB\-fstg\-lift\-lams\-known\fP \fB\-fno\-stg\-lift\-lams\-known\fP \fB\-fstg\-lift\-lams\-non\-rec\-args\fP \fB\-fno\-stg\-lift\-lams\-non\-rec\-args\-any\fP \fB\-fstg\-lift\-lams\-rec\-args\fP \fB\-fno\-stg\-lift\-lams\-rec\-args\-any\fP \fB\-fstrictness\fP \fB\-fno\-strictness\fP \fB\-fstrictness\-before=⟨n⟩\fP \fB\-funbox\-small\-strict\-fields\fP \fB\-fno\-unbox\-small\-strict\-fields\fP \fB\-funbox\-strict\-fields\fP \fB\-fno\-unbox\-strict\-fields\fP \fB\-funfolding\-creation\-threshold=⟨n⟩\fP \fB\-funfolding\-dict\-discount=⟨n⟩\fP \fB\-funfolding\-fun\-discount=⟨n⟩\fP \fB\-funfolding\-keeness\-factor=⟨n⟩\fP \fB\-funfolding\-use\-threshold=⟨n⟩\fP \fB\-fworker\-wrapper\fP .TP .B Optimization levels -\fB\-O\fP \fB\-O1\fP \fB\-O0\fP \fB\-O2\fP \fB\-Odph\fP +\fB\-O\fP \fB\-O1\fP \fB\-O0\fP \fB\-O0\fP \fB\-O2\fP \fB\-O0\fP \fB\-O⟨n⟩\fP \fB\-O0\fP .TP .B Package options \fB\-clear\-package\-db\fP \fB\-distrust ⟨pkg⟩\fP \fB\-distrust\-all\-packages\fP \fB\-fpackage\-trust\fP \fB\-global\-package\-db\fP \fB\-hide\-all\-packages\fP \fB\-hide\-package ⟨pkg⟩\fP \fB\-ignore\-package ⟨pkg⟩\fP \fB\-no\-auto\-link\-packages\fP \fB\-no\-global\-package\-db\fP \fB\-no\-user\-package\-db\fP \fB\-package ⟨pkg⟩\fP \fB\-package\-db ⟨file⟩\fP \fB\-package\-env ⟨file⟩|⟨name⟩\fP \fB\-package\-id ⟨unit\-id⟩\fP \fB\-this\-unit\-id ⟨unit\-id⟩\fP \fB\-trust ⟨pkg⟩\fP \fB\-user\-package\-db\fP @@ -138,806 +138,910 @@ interface files for "way" ⟨way⟩; common ways are: \fB\-C\fP \fB\-c\fP \fB\-E\fP \fB\-F\fP \fB\-S\fP \fB\-x ⟨suffix⟩\fP .TP .B Overriding external programs -\fB\-pgma ⟨cmd⟩\fP \fB\-pgmc ⟨cmd⟩\fP \fB\-pgmdll ⟨cmd⟩\fP \fB\-pgmF ⟨cmd⟩\fP \fB\-pgmi ⟨cmd⟩\fP \fB\-pgmL ⟨cmd⟩\fP \fB\-pgml ⟨cmd⟩\fP \fB\-pgmlc ⟨cmd⟩\fP \fB\-pgmlibtool ⟨cmd⟩\fP \fB\-pgmlo ⟨cmd⟩\fP \fB\-pgmP ⟨cmd⟩\fP \fB\-pgms ⟨cmd⟩\fP \fB\-pgmwindres ⟨cmd⟩\fP +\fB\-pgma ⟨cmd⟩\fP \fB\-pgmc ⟨cmd⟩\fP \fB\-pgmdll ⟨cmd⟩\fP \fB\-pgmF ⟨cmd⟩\fP \fB\-pgmi ⟨cmd⟩\fP \fB\-pgminstall_name_tool ⟨cmd⟩\fP \fB\-pgmL ⟨cmd⟩\fP \fB\-pgml ⟨cmd⟩\fP \fB\-pgmlc ⟨cmd⟩\fP \fB\-pgmlibtool ⟨cmd⟩\fP \fB\-pgmlm ⟨cmd⟩\fP \fB\-pgmlo ⟨cmd⟩\fP \fB\-pgmotool ⟨cmd⟩\fP \fB\-pgmP ⟨cmd⟩\fP \fB\-pgms ⟨cmd⟩\fP \fB\-pgmwindres ⟨cmd⟩\fP .TP .B Phase\-specific options -\fB\-opta ⟨option⟩\fP \fB\-optc ⟨option⟩\fP \fB\-optdll ⟨option⟩\fP \fB\-optF ⟨option⟩\fP \fB\-opti ⟨option⟩\fP \fB\-optL ⟨option⟩\fP \fB\-optl ⟨option⟩\fP \fB\-optlc ⟨option⟩\fP \fB\-optlo ⟨option⟩\fP \fB\-optP ⟨option⟩\fP \fB\-optwindres ⟨option⟩\fP +\fB\-opta ⟨option⟩\fP \fB\-optc ⟨option⟩\fP \fB\-optcxx ⟨option⟩\fP \fB\-optdll ⟨option⟩\fP \fB\-optF ⟨option⟩\fP \fB\-opti ⟨option⟩\fP \fB\-optL ⟨option⟩\fP \fB\-optl ⟨option⟩\fP \fB\-optlc ⟨option⟩\fP \fB\-optlm ⟨option⟩\fP \fB\-optlo ⟨option⟩\fP \fB\-optP ⟨option⟩\fP \fB\-optwindres ⟨option⟩\fP \fB\-pgmc\-supports\-no\-pie\fP .TP .B Platform\-specific options -\fB\-msse2\fP \fB\-msse4.2\fP +\fB\-mbmi2\fP \fB\-msse2\fP \fB\-msse4.2\fP .TP .B Compiler plugins -\fB\-fplugin\-opt=⟨module⟩:⟨args⟩\fP \fB\-fplugin=⟨module⟩\fP \fB\-hide\-all\-plugin\-packages\fP \fB\-plugin\-package ⟨pkg⟩\fP \fB\-plugin\-package\-id ⟨pkg\-id⟩\fP +\fB\-fclear\-plugins\fP \fB\-fplugin\-opt=⟨module⟩:⟨args⟩\fP \fB\-fplugin\-trustworthy\fP \fB\-fplugin=⟨module⟩\fP \fB\-hide\-all\-plugin\-packages\fP \fB\-plugin\-package ⟨pkg⟩\fP \fB\-plugin\-package\-id ⟨pkg\-id⟩\fP .TP .B Profiling -\fB\-fno\-prof\-auto\fP \fB\-fno\-prof\-cafs\fP \fB\-fno\-prof\-count\-entries\fP \fB\-fprof\-auto\fP \fB\-fprof\-auto\-calls\fP \fB\-fprof\-auto\-exported\fP \fB\-fprof\-auto\-top\fP \fB\-fprof\-cafs\fP \fB\-prof\fP \fB\-ticky\fP +\fB\-fno\-prof\-auto\fP \fB\-fprof\-auto\fP \fB\-fno\-prof\-cafs\fP \fB\-fprof\-cafs\fP \fB\-fno\-prof\-count\-entries\fP \fB\-fprof\-count\-entries\fP \fB\-fprof\-auto\fP \fB\-fno\-prof\-auto\fP \fB\-fprof\-auto\-calls\fP \fB\-fno\-prof\-auto\-calls\fP \fB\-fprof\-auto\-exported\fP \fB\-fno\-prof\-auto\fP \fB\-fprof\-auto\-top\fP \fB\-fno\-prof\-auto\fP \fB\-fprof\-cafs\fP \fB\-fno\-prof\-cafs\fP \fB\-prof\fP \fB\-ticky\fP .TP .B Program coverage \fB\-fhpc\fP .TP .B Recompilation checking -\fB\-fforce\-recomp\fP \fB\-fignore\-hpc\-changes\fP \fB\-fignore\-optim\-changes\fP +\fB\-fforce\-recomp\fP \fB\-fno\-force\-recomp\fP \fB\-fignore\-hpc\-changes\fP \fB\-fno\-ignore\-hpc\-changes\fP \fB\-fignore\-optim\-changes\fP \fB\-fno\-ignore\-optim\-changes\fP .TP .B Redirecting output -\fB\-\-exclude\-module=⟨file⟩\fP \fB\-ddump\-mod\-cycles\fP \fB\-dep\-makefile ⟨file⟩\fP \fB\-dep\-suffix ⟨suffix⟩\fP \fB\-dumpdir ⟨dir⟩\fP \fB\-hcsuf ⟨suffix⟩\fP \fB\-hidir ⟨dir⟩\fP \fB\-hisuf ⟨suffix⟩\fP \fB\-include\-pkg\-deps\fP \fB\-o ⟨file⟩\fP \fB\-odir ⟨dir⟩\fP \fB\-ohi ⟨file⟩\fP \fB\-osuf ⟨suffix⟩\fP \fB\-outputdir ⟨dir⟩\fP \fB\-stubdir ⟨dir⟩\fP +\fB\-\-exclude\-module=⟨file⟩\fP \fB\-ddump\-mod\-cycles\fP \fB\-dep\-makefile ⟨file⟩\fP \fB\-dep\-suffix ⟨suffix⟩\fP \fB\-dumpdir ⟨dir⟩\fP \fB\-hcsuf ⟨suffix⟩\fP \fB\-hidir ⟨dir⟩\fP \fB\-hiedir ⟨dir⟩\fP \fB\-hiesuf ⟨suffix⟩\fP \fB\-hisuf ⟨suffix⟩\fP \fB\-include\-cpp\-deps\fP \fB\-include\-pkg\-deps\fP \fB\-o ⟨file⟩\fP \fB\-odir ⟨dir⟩\fP \fB\-ohi ⟨file⟩\fP \fB\-osuf ⟨suffix⟩\fP \fB\-outputdir ⟨dir⟩\fP \fB\-stubdir ⟨dir⟩\fP .TP .B Temporary files \fB\-tmpdir ⟨dir⟩\fP .TP .B Verbosity options -\fB\-fdiagnostics\-color=⟨always|auto|never⟩\fP \fB\-fdiagnostics\-show\-caret\fP \fB\-ferror\-spans\fP \fB\-fhide\-source\-paths\fP \fB\-fprint\-equality\-relations\fP \fB\-fprint\-expanded\-synonyms\fP \fB\-fprint\-explicit\-coercions\fP \fB\-fprint\-explicit\-foralls\fP \fB\-fprint\-explicit\-kinds\fP \fB\-fprint\-explicit\-runtime\-rep\fP \fB\-fprint\-explicit\-runtime\-reps\fP \fB\-fprint\-potential\-instances\fP \fB\-fprint\-typechecker\-elaboration\fP \fB\-fprint\-unicode\-syntax\fP \fB\-fshow\-hole\-constraints\fP \fB\-Rghc\-timing\fP \fB\-v\fP \fB\-v⟨n⟩\fP +\fB\-fabstract\-refinement\-hole\-fits\fP \fB\-fno\-abstract\-refinement\-hole\-fits\fP \fB\-fdefer\-diagnostics\fP \fB\-fdiagnostics\-color=⟨always|auto|never⟩\fP \fB\-fdiagnostics\-show\-caret\fP \fB\-fno\-diagnostics\-show\-caret\fP \fB\-ferror\-spans\fP \fB\-fhide\-source\-paths\fP \fB\-fkeep\-going\fP \fB\-fmax\-refinement\-hole\-fits=⟨n⟩\fP \fB\-fno\-max\-refinement\-hole\-fits\fP \fB\-fmax\-relevant\-binds=⟨n⟩\fP \fB\-fno\-max\-relevant\-binds\fP \fB\-fmax\-valid\-hole\-fits=⟨n⟩\fP \fB\-fno\-max\-valid\-hole\-fits\fP \fB\-fno\-show\-valid\-hole\-fits\fP \fB\-fno\-sort\-valid\-hole\-fits\fP \fB\-fsort\-valid\-hole\-fits\fP \fB\-fprint\-axiom\-incomps\fP \fB\-fno\-print\-axiom\-incomps\fP \fB\-fprint\-equality\-relations\fP \fB\-fno\-print\-equality\-relations\fP \fB\-fprint\-expanded\-synonyms\fP \fB\-fno\-print\-expanded\-synonyms\fP \fB\-fprint\-explicit\-coercions\fP \fB\-fno\-print\-explicit\-coercions\fP \fB\-fprint\-explicit\-foralls\fP \fB\-fno\-print\-explicit\-foralls\fP \fB\-fprint\-explicit\-kinds\fP \fB\-fno\-print\-explicit\-kinds\fP \fB\-fprint\-explicit\-runtime\-reps\fP \fB\-fno\-print\-explicit\-runtime\-reps\fP \fB\-fprint\-potential\-instances\fP \fB\-fno\-print\-potential\-instances\fP \fB\-fprint\-typechecker\-elaboration\fP \fB\-fno\-print\-typechecker\-elaboration\fP \fB\-fprint\-unicode\-syntax\fP \fB\-fno\-print\-unicode\-syntax\fP \fB\-frefinement\-level\-hole\-fits=⟨n⟩\fP \fB\-fno\-refinement\-level\-hole\-fits\fP \fB\-freverse\-errors\fP \fB\-fno\-reverse\-errors\fP \fB\-fshow\-docs\-of\-hole\-fits\fP \fB\-fno\-show\-docs\-of\-hole\-fits\fP \fB\-fshow\-hole\-constraints\fP \fB\-fshow\-hole\-matches\-of\-hole\-fits\fP \fB\-fno\-show\-hole\-matches\-of\-hole\-fits\fP \fB\-fshow\-provenance\-of\-hole\-fits\fP \fB\-fno\-show\-provenance\-of\-hole\-fits\fP \fB\-fshow\-type\-app\-of\-hole\-fits\fP \fB\-fno\-show\-type\-app\-of\-hole\-fits\fP \fB\-fshow\-type\-app\-vars\-of\-hole\-fits\fP \fB\-fno\-show\-type\-app\-vars\-of\-hole\-fits\fP \fB\-fshow\-type\-of\-hole\-fits\fP \fB\-fno\-type\-of\-hole\-fits\fP \fB\-funclutter\-valid\-hole\-fits\fP \fB\-Rghc\-timing\fP \fB\-v\fP \fB\-v⟨n⟩\fP .TP .B Warnings -\fB\-fdefer\-out\-of\-scope\-variables\fP \fB\-fdefer\-type\-errors\fP \fB\-fdefer\-typed\-holes\fP \fB\-fhelpful\-errors\fP \fB\-fmax\-pmcheck\-iterations=⟨n⟩\fP \fB\-fshow\-warning\-groups\fP \fB\-W\fP \fB\-w\fP \fB\-Wall\fP \fB\-Wall\-missed\-specialisations\fP \fB\-Wamp\fP \fB\-Wcompat\fP \fB\-Wcpp\-undef\fP \fB\-Wdeferred\-out\-of\-scope\-variables\fP \fB\-Wdeferred\-type\-errors\fP \fB\-Wdeprecated\-flags\fP \fB\-Wdeprecations\fP \fB\-Wdodgy\-exports\fP \fB\-Wdodgy\-foreign\-imports\fP \fB\-Wdodgy\-imports\fP \fB\-Wduplicate\-constraints\fP \fB\-Wduplicate\-exports\fP \fB\-Wempty\-enumerations\fP \fB\-Werror\fP \fB\-Weverything\fP \fB\-Whi\-shadowing\fP \fB\-Widentities\fP \fB\-Wimplicit\-prelude\fP \fB\-Wincomplete\-patterns\fP \fB\-Wincomplete\-record\-updates\fP \fB\-Wincomplete\-uni\-patterns\fP \fB\-Winline\-rule\-shadowing\fP \fB\-Wmissed\-specialisations\fP \fB\-Wmissing\-export\-lists\fP \fB\-Wmissing\-exported\-signatures\fP \fB\-Wmissing\-exported\-sigs\fP \fB\-Wmissing\-fields\fP \fB\-Wmissing\-home\-modules\fP \fB\-Wmissing\-import\-lists\fP \fB\-Wmissing\-local\-signatures\fP \fB\-Wmissing\-local\-sigs\fP \fB\-Wmissing\-methods\fP \fB\-Wmissing\-monadfail\-instances\fP \fB\-Wmissing\-pattern\-synonym\-signatures\fP \fB\-Wmissing\-signatures\fP \fB\-Wmonomorphism\-restriction\fP \fB\-Wname\-shadowing\fP \fB\-Wno\-compat\fP \fB\-Wnoncanonical\-monad\-instances\fP \fB\-Wnoncanonical\-monadfail\-instances\fP \fB\-Wnoncanonical\-monoid\-instances\fP \fB\-Worphans\fP \fB\-Woverflowed\-literals\fP \fB\-Woverlapping\-patterns\fP \fB\-Wpartial\-fields\fP \fB\-Wpartial\-type\-signatures\fP \fB\-Wredundant\-constraints\fP \fB\-Wsafe\fP \fB\-Wsemigroup\fP \fB\-Wsimplifiable\-class\-constraints\fP \fB\-Wtabs\fP \fB\-Wtrustworthy\-safe\fP \fB\-Wtype\-defaults\fP \fB\-Wtyped\-holes\fP \fB\-Wunbanged\-strict\-patterns\fP \fB\-Wunrecognised\-pragmas\fP \fB\-Wunrecognised\-warning\-flags\fP \fB\-Wunsafe\fP \fB\-Wunsupported\-calling\-conventions\fP \fB\-Wunsupported\-llvm\-version\fP \fB\-Wunticked\-promoted\-constructors\fP \fB\-Wunused\-binds\fP \fB\-Wunused\-do\-bind\fP \fB\-Wunused\-foralls\fP \fB\-Wunused\-imports\fP \fB\-Wunused\-local\-binds\fP \fB\-Wunused\-matches\fP \fB\-Wunused\-pattern\-binds\fP \fB\-Wunused\-top\-binds\fP \fB\-Wunused\-type\-patterns\fP \fB\-Wwarn\fP \fB\-Wwarnings\-deprecations\fP \fB\-Wwrong\-do\-bind\fP +\fB\-fdefer\-out\-of\-scope\-variables\fP \fB\-fno\-defer\-out\-of\-scope\-variables\fP \fB\-fdefer\-type\-errors\fP \fB\-fno\-defer\-type\-errors\fP \fB\-fdefer\-typed\-holes\fP \fB\-fno\-defer\-typed\-holes\fP \fB\-fenable\-th\-splice\-warnings\fP \fB\-fno\-enable\-th\-splices\fP \fB\-fhelpful\-errors\fP \fB\-fno\-helpful\-errors\fP \fB\-fmax\-pmcheck\-models=⟨n⟩\fP \fB\-fshow\-warning\-groups\fP \fB\-fno\-show\-warning\-groups\fP \fB\-fvia\-C\fP \fB\-W\fP \fB\-w\fP \fB\-w\fP \fB\-Wall\fP \fB\-w\fP \fB\-Wall\-missed\-specialisations\fP \fB\-Wno\-all\-missed\-specialisations\fP \fB\-Wcompat\fP \fB\-Wno\-compat\fP \fB\-Wcompat\-unqualified\-imports\fP \fB\-Wno\-compat\-unqualified\-imports\fP \fB\-Wcpp\-undef\fP \fB\-Wdeferred\-out\-of\-scope\-variables\fP \fB\-Wno\-deferred\-out\-of\-scope\-variables\fP \fB\-Wdeferred\-type\-errors\fP \fB\-Wno\-deferred\-type\-errors\fP \fB\-Wdeprecated\-flags\fP \fB\-Wno\-deprecated\-flags\fP \fB\-Wdeprecations\fP \fB\-Wno\-deprecations\fP \fB\-Wderiving\-defaults\fP \fB\-Wno\-deriving\-defaults\fP \fB\-Wdodgy\-exports\fP \fB\-Wno\-dodgy\-exports\fP \fB\-Wdodgy\-foreign\-imports\fP \fB\-Wno\-dodgy\-foreign\-import\fP \fB\-Wdodgy\-imports\fP \fB\-Wno\-dodgy\-imports\fP \fB\-Wduplicate\-constraints\fP \fB\-Wno\-duplicate\-constraints\fP \fB\-Wduplicate\-exports\fP \fB\-Wno\-duplicate\-exports\fP \fB\-Wempty\-enumerations\fP \fB\-Wno\-empty\-enumerations\fP \fB\-Werror\fP \fB\-Wwarn\fP \fB\-Weverything\fP \fB\-Whi\-shadowing\fP \fB\-Wno\-hi\-shadowing\fP \fB\-Widentities\fP \fB\-Wno\-identities\fP \fB\-Wimplicit\-kind\-vars\fP \fB\-Wno\-implicit\-kind\-vars\fP \fB\-Wimplicit\-prelude\fP \fB\-Wno\-implicit\-prelude\fP \fB\-Winaccessible\-code\fP \fB\-Wno\-inaccessible\-code\fP \fB\-Wincomplete\-patterns\fP \fB\-Wno\-incomplete\-patterns\fP \fB\-Wincomplete\-record\-updates\fP \fB\-Wno\-incomplete\-record\-updates\fP \fB\-Wincomplete\-uni\-patterns\fP \fB\-Wno\-incomplete\-uni\-patterns\fP \fB\-Winline\-rule\-shadowing\fP \fB\-Wno\-inline\-rule\-shadowing\fP \fB\-Wmissed\-extra\-shared\-lib\fP \fB\-Wno\-missed\-extra\-shared\-lib\fP \fB\-Wmissed\-specialisations\fP \fB\-Wno\-missed\-specialisations\fP \fB\-Wmissing\-deriving\-strategies\fP \fB\-Wno\-missing\-deriving\-strategies\fP \fB\-Wmissing\-export\-lists\fP \fB\-fnowarn\-missing\-export\-lists\fP \fB\-Wmissing\-exported\-signatures\fP \fB\-Wno\-missing\-exported\-signatures\fP \fB\-Wmissing\-exported\-sigs\fP \fB\-Wno\-missing\-exported\-sigs\fP \fB\-Wmissing\-fields\fP \fB\-Wno\-missing\-fields\fP \fB\-Wmissing\-home\-modules\fP \fB\-Wno\-missing\-home\-modules\fP \fB\-Wmissing\-import\-lists\fP \fB\-fnowarn\-missing\-import\-lists\fP \fB\-Wmissing\-local\-signatures\fP \fB\-Wno\-missing\-local\-signatures\fP \fB\-Wmissing\-local\-sigs\fP \fB\-Wno\-missing\-local\-sigs\fP \fB\-Wmissing\-methods\fP \fB\-Wno\-missing\-methods\fP \fB\-Wmissing\-monadfail\-instances\fP \fB\-Wno\-missing\-monadfail\-instances\fP \fB\-Wmissing\-pattern\-synonym\-signatures\fP \fB\-Wno\-missing\-pattern\-synonym\-signatures\fP \fB\-Wmissing\-signatures\fP \fB\-Wno\-missing\-signatures\fP \fB\-Wmonomorphism\-restriction\fP \fB\-Wno\-monomorphism\-restriction\fP \fB\-Wname\-shadowing\fP \fB\-Wno\-name\-shadowing\fP \fB\-Wno\-compat\fP \fB\-Wcompat\fP \fB\-Wnoncanonical\-monad\-instances\fP \fB\-Wno\-noncanonical\-monad\-instances\fP \fB\-Wnoncanonical\-monadfail\-instances\fP \fB\-Wno\-noncanonical\-monadfail\-instances\fP \fB\-Wnoncanonical\-monoid\-instances\fP \fB\-Wno\-noncanonical\-monoid\-instances\fP \fB\-Worphans\fP \fB\-Wno\-orphans\fP \fB\-Woverflowed\-literals\fP \fB\-Wno\-overflowed\-literals\fP \fB\-Woverlapping\-patterns\fP \fB\-Wno\-overlapping\-patterns\fP \fB\-Wpartial\-fields\fP \fB\-Wno\-partial\-fields\fP \fB\-Wpartial\-type\-signatures\fP \fB\-Wno\-partial\-type\-signatures\fP \fB\-Wredundant\-constraints\fP \fB\-Wno\-redundant\-constraints\fP \fB\-Wredundant\-record\-wildcards\fP \fB\-Wno\-redundant\-record\-wildcards\fP \fB\-Wsafe\fP \fB\-Wno\-safe\fP \fB\-Wsemigroup\fP \fB\-Wno\-semigroup\fP \fB\-Wsimplifiable\-class\-constraints\fP \fB\-Wno\-simplifiable\-class\-constraints\fP \fB\-Wspace\-after\-bang\fP \fB\-Wno\-missing\-space\-after\-bang\fP \fB\-Wstar\-binder\fP \fB\-Wno\-star\-binder\fP \fB\-Wstar\-is\-type\fP \fB\-Wno\-star\-is\-type\fP \fB\-Wtabs\fP \fB\-Wno\-tabs\fP \fB\-Wtrustworthy\-safe\fP \fB\-Wno\-safe\fP \fB\-Wtype\-defaults\fP \fB\-Wno\-type\-defaults\fP \fB\-Wtyped\-holes\fP \fB\-Wno\-typed\-holes\fP \fB\-Wunbanged\-strict\-patterns\fP \fB\-Wno\-unbanged\-strict\-patterns\fP \fB\-Wunrecognised\-pragmas\fP \fB\-Wno\-unrecognised\-pragmas\fP \fB\-Wunrecognised\-warning\-flags\fP \fB\-Wno\-unrecognised\-warning\-flags\fP \fB\-Wunsafe\fP \fB\-Wno\-unsafe\fP \fB\-Wunsupported\-calling\-conventions\fP \fB\-Wno\-unsupported\-calling\-conventions\fP \fB\-Wunsupported\-llvm\-version\fP \fB\-Wno\-monomorphism\-restriction\fP \fB\-Wunticked\-promoted\-constructors\fP \fB\-Wno\-unticked\-promoted\-constructors\fP \fB\-Wunused\-binds\fP \fB\-Wno\-unused\-binds\fP \fB\-Wunused\-do\-bind\fP \fB\-Wno\-unused\-do\-bind\fP \fB\-Wunused\-foralls\fP \fB\-Wno\-unused\-foralls\fP \fB\-Wunused\-imports\fP \fB\-Wno\-unused\-imports\fP \fB\-Wunused\-local\-binds\fP \fB\-Wno\-unused\-local\-binds\fP \fB\-Wunused\-matches\fP \fB\-Wno\-unused\-matches\fP \fB\-Wunused\-packages\fP \fB\-Wno\-unused\-packages\fP \fB\-Wunused\-pattern\-binds\fP \fB\-Wno\-unused\-pattern\-binds\fP \fB\-Wunused\-record\-wildcards\fP \fB\-Wno\-unused\-record\-wildcards\fP \fB\-Wunused\-top\-binds\fP \fB\-Wno\-unused\-top\-binds\fP \fB\-Wunused\-type\-patterns\fP \fB\-Wno\-unused\-type\-patterns\fP \fB\-Wwarn\fP \fB\-Werror\fP \fB\-Wwarnings\-deprecations\fP \fB\-Wno\-warnings\-deprecations\fP \fB\-Wwrong\-do\-bind\fP \fB\-Wno\-wrong\-do\-bind\fP .SS Code generation .INDENT 0.0 .TP -.B \fI\%\-dynamic\-too\fP +.B \fB\-dynamic\-too\fP Build dynamic object files \fIas well as\fP static object files during compilation .TP -.B \fI\%\-fasm\fP -Use the \fInative code generator\fP +.B \fB\-fasm\fP +Use the native code generator .TP -.B \fI\%\-fbyte\-code\fP +.B \fB\-fbyte\-code\fP Generate byte\-code .TP -.B \fI\%\-fllvm\fP -Compile using the \fILLVM code generator\fP +.B \fB\-fexternal\-dynamic\-refs\fP +Generate code for linking against dynamic libraries .TP -.B \fI\%\-fno\-code\fP +.B \fB\-fllvm\fP +Compile using the LLVM code generator +.TP +.B \fB\-fno\-code\fP Omit code generation .TP -.B \fI\%\-fobject\-code\fP +.B \fB\-fobject\-code\fP Generate object code .TP -.B \fI\%\-fPIC\fP +.B \fB\-fPIC\fP Generate position\-independent code (where available) .TP -.B \fI\%\-fPIE\fP +.B \fB\-fPIE\fP Generate code for a position\-independent executable (where available) .TP -.B \fI\%\-fwrite\-interface\fP +.B \fB\-fwrite\-interface\fP Always write interface files .UNINDENT .SS Debugging the compiler .INDENT 0.0 .TP -.B \fI\%\-dcmm\-lint\fP -C\-\- pass sanity checking +.B \fB\-dcmm\-lint\fP +C\-\e\- pass sanity checking .TP -.B \fI\%\-dcore\-lint\fP +.B \fB\-dcore\-lint\fP Turn on internal sanity checking .TP -.B \fI\%\-ddump\-asm\fP +.B \fB\-ddump\-asm\fP Dump final assembly .TP -.B \fI\%\-ddump\-asm\-expanded\fP +.B \fB\-ddump\-asm\-expanded\fP Dump the result of the synthetic instruction expansion pass. .TP -.B \fI\%\-ddump\-asm\-liveness\fP +.B \fB\-ddump\-asm\-liveness\fP Dump assembly augmented with register liveness .TP -.B \fI\%\-ddump\-asm\-native\fP +.B \fB\-ddump\-asm\-native\fP Dump initial assembly .TP -.B \fI\%\-ddump\-asm\-regalloc\fP +.B \fB\-ddump\-asm\-regalloc\fP Dump the result of register allocation .TP -.B \fI\%\-ddump\-asm\-regalloc\-stages\fP +.B \fB\-ddump\-asm\-regalloc\-stages\fP Dump the build/spill stages of the \fB\-fregs\-graph\fP register allocator. .TP -.B \fI\%\-ddump\-asm\-stats\fP +.B \fB\-ddump\-asm\-stats\fP Dump statistics from the register allocator. .TP -.B \fI\%\-ddump\-bcos\fP +.B \fB\-ddump\-bcos\fP Dump interpreter byte code .TP -.B \fI\%\-ddump\-cmm\fP -Dump the final C\-\- output +.B \fB\-ddump\-cfg\-weights\fP +Dump the assumed weights of the CFG. +.TP +.B \fB\-ddump\-cmm\fP +Dump the final C\-\e\- output .TP -.B \fI\%\-ddump\-cmm\-caf\fP -Dump the results of the C\-\- CAF analysis pass. +.B \fB\-ddump\-cmm\-caf\fP +Dump the results of the C\-\e\- CAF analysis pass. .TP -.B \fI\%\-ddump\-cmm\-cbe\fP +.B \fB\-ddump\-cmm\-cbe\fP Dump the results of common block elimination .TP -.B \fI\%\-ddump\-cmm\-cfg\fP -Dump the results of the C\-\- control flow optimisation pass. +.B \fB\-ddump\-cmm\-cfg\fP +Dump the results of the C\-\e\- control flow optimisation pass. .TP -.B \fI\%\-ddump\-cmm\-cps\fP +.B \fB\-ddump\-cmm\-cps\fP Dump the results of the CPS pass .TP -.B \fI\%\-ddump\-cmm\-from\-stg\fP -Dump STG\-to\-C\-\- output +.B \fB\-ddump\-cmm\-from\-stg\fP +Dump STG\-to\-C\-\e\- output .TP -.B \fI\%\-ddump\-cmm\-info\fP -Dump the results of the C\-\- info table augmentation pass. +.B \fB\-ddump\-cmm\-info\fP +Dump the results of the C\-\e\- info table augmentation pass. .TP -.B \fI\%\-ddump\-cmm\-proc\fP +.B \fB\-ddump\-cmm\-proc\fP Dump the results of proc\-point analysis .TP -.B \fI\%\-ddump\-cmm\-procmap\fP -Dump the results of the C\-\- proc\-point map pass. +.B \fB\-ddump\-cmm\-procmap\fP +Dump the results of the C\-\e\- proc\-point map pass. .TP -.B \fI\%\-ddump\-cmm\-raw\fP -Dump raw C\-\- +.B \fB\-ddump\-cmm\-raw\fP +Dump raw C\-\e\- .TP -.B \fI\%\-ddump\-cmm\-sink\fP -Dump the results of the C\-\- sinking pass. +.B \fB\-ddump\-cmm\-sink\fP +Dump the results of the C\-\e\- sinking pass. .TP -.B \fI\%\-ddump\-cmm\-sp\fP -Dump the results of the C\-\- stack layout pass. +.B \fB\-ddump\-cmm\-sp\fP +Dump the results of the C\-\e\- stack layout pass. .TP -.B \fI\%\-ddump\-cmm\-split\fP -Dump the results of the C\-\- proc\-point splitting pass. +.B \fB\-ddump\-cmm\-split\fP +Dump the results of the C\-\e\- proc\-point splitting pass. .TP -.B \fI\%\-ddump\-cmm\-switch\fP +.B \fB\-ddump\-cmm\-switch\fP Dump the results of switch lowering passes .TP -.B \fI\%\-ddump\-cmm\-verbose\fP -Show output from each C\-\- pipeline pass +.B \fB\-ddump\-cmm\-verbose\fP +Write output from main C\-\e\- pipeline passes to files .TP -.B \fI\%\-ddump\-core\-stats\fP +.B \fB\-ddump\-cmm\-verbose\-by\-proc\fP +Show output from main C\-\e\- pipeline passes (grouped by proc) +.TP +.B \fB\-ddump\-core\-stats\fP Print a one\-line summary of the size of the Core program at the end of the optimisation pipeline .TP -.B \fI\%\-ddump\-cse\fP +.B \fB\-ddump\-cse\fP Dump CSE output .TP -.B \fI\%\-ddump\-deriv\fP +.B \fB\-ddump\-deriv\fP Dump deriving output .TP -.B \fI\%\-ddump\-ds\fP -Dump desugarer output +.B \fB\-ddump\-ds\fP +Dump desugarer output. .TP -.B \fI\%\-ddump\-ec\-trace\fP +.B \fB\-ddump\-ec\-trace\fP Trace exhaustiveness checker .TP -.B \fI\%\-ddump\-foreign\fP +.B \fB\-ddump\-file\-prefix=⟨str⟩\fP +Set the prefix of the filenames used for debugging output. +.TP +.B \fB\-ddump\-foreign\fP Dump \fBforeign export\fP stubs .TP -.B \fI\%\-ddump\-if\-trace\fP +.B \fB\-ddump\-hpc\fP +An alias for \fB\-ddump\-ticked\fP\&. +.TP +.B \fB\-ddump\-if\-trace\fP Trace interface files .TP -.B \fI\%\-ddump\-inlinings\fP +.B \fB\-ddump\-inlinings\fP Dump inlining info .TP -.B \fI\%\-ddump\-json\fP +.B \fB\-ddump\-json\fP Dump error messages as JSON documents .TP -.B \fI\%\-ddump\-llvm\fP +.B \fB\-ddump\-llvm\fP Dump LLVM intermediate code. .TP -.B \fI\%\-ddump\-occur\-anal\fP +.B \fB\-ddump\-mod\-map\fP +Dump the state of the module mapping database. +.TP +.B \fB\-ddump\-occur\-anal\fP Dump occurrence analysis output .TP -.B \fI\%\-ddump\-opt\-cmm\fP -Dump the results of C\-\- to C\-\- optimising passes +.B \fB\-ddump\-opt\-cmm\fP +Dump the results of C\-\e\- to C\-\e\- optimising passes .TP -.B \fI\%\-ddump\-parsed\fP +.B \fB\-ddump\-parsed\fP Dump parse tree .TP -.B \fI\%\-ddump\-parsed\-ast\fP +.B \fB\-ddump\-parsed\-ast\fP Dump parser output as a syntax tree .TP -.B \fI\%\-ddump\-prep\fP +.B \fB\-ddump\-prep\fP Dump prepared core .TP -.B \fI\%\-ddump\-rn\fP +.B \fB\-ddump\-rn\fP Dump renamer output .TP -.B \fI\%\-ddump\-rn\-ast\fP +.B \fB\-ddump\-rn\-ast\fP Dump renamer output as a syntax tree .TP -.B \fI\%\-ddump\-rn\-stats\fP +.B \fB\-ddump\-rn\-stats\fP Renamer stats .TP -.B \fI\%\-ddump\-rn\-trace\fP +.B \fB\-ddump\-rn\-trace\fP Trace renamer .TP -.B \fI\%\-ddump\-rule\-firings\fP +.B \fB\-ddump\-rtti\fP +Trace runtime type inference +.TP +.B \fB\-ddump\-rule\-firings\fP Dump rule firing info .TP -.B \fI\%\-ddump\-rule\-rewrites\fP +.B \fB\-ddump\-rule\-rewrites\fP Dump detailed rule firing info .TP -.B \fI\%\-ddump\-rules\fP +.B \fB\-ddump\-rules\fP Dump rewrite rules .TP -.B \fI\%\-ddump\-simpl\fP +.B \fB\-ddump\-simpl\fP Dump final simplifier output .TP -.B \fI\%\-ddump\-simpl\-iterations\fP +.B \fB\-ddump\-simpl\-iterations\fP Dump output from each simplifier iteration .TP -.B \fI\%\-ddump\-simpl\-stats\fP +.B \fB\-ddump\-simpl\-stats\fP Dump simplifier stats .TP -.B \fI\%\-ddump\-spec\fP +.B \fB\-ddump\-spec\fP Dump specialiser output .TP -.B \fI\%\-ddump\-splices\fP +.B \fB\-ddump\-splices\fP Dump TH spliced expressions, and what they evaluate to .TP -.B \fI\%\-ddump\-stg\fP -Dump final STG +.B \fB\-ddump\-stg\fP +Show CoreToStg output .TP -.B \fI\%\-ddump\-str\-signatures\fP +.B \fB\-ddump\-stg\-final\fP +Show output of last STG pass. +.TP +.B \fB\-ddump\-stg\-unarised\fP +Show unarised STG +.TP +.B \fB\-ddump\-str\-signatures\fP Dump strictness signatures .TP -.B \fI\%\-ddump\-stranal\fP +.B \fB\-ddump\-stranal\fP Dump strictness analyser output .TP -.B \fI\%\-ddump\-tc\fP +.B \fB\-ddump\-tc\fP Dump typechecker output .TP -.B \fI\%\-ddump\-tc\-ast\fP +.B \fB\-ddump\-tc\-ast\fP Dump typechecker output as a syntax tree .TP -.B \fI\%\-ddump\-tc\-trace\fP +.B \fB\-ddump\-tc\-trace\fP Trace typechecker .TP -.B \fI\%\-ddump\-timings\fP +.B \fB\-ddump\-ticked\fP +Dump the code instrumented by HPC (hpc). +.TP +.B \fB\-ddump\-timings\fP Dump per\-pass timing and allocation statistics .TP -.B \fI\%\-ddump\-to\-file\fP +.B \fB\-ddump\-to\-file\fP Dump to files instead of stdout .TP -.B \fI\%\-ddump\-types\fP +.B \fB\-ddump\-types\fP Dump type signatures .TP -.B \fI\%\-ddump\-vect\fP -Dump vectoriser input and output -.TP -.B \fI\%\-ddump\-vt\-trace\fP -Trace vectoriser -.TP -.B \fI\%\-ddump\-worker\-wrapper\fP +.B \fB\-ddump\-worker\-wrapper\fP Dump worker\-wrapper output .TP -.B \fI\%\-dfaststring\-stats\fP +.B \fB\-dfaststring\-stats\fP Show statistics for fast string usage when finished .TP -.B \fI\%\-dinitial\-unique=⟨s⟩\fP +.B \fB\-dhex\-word\-literals\fP +Print values of type \fIWord#\fP in hexadecimal. +.TP +.B \fB\-dinitial\-unique=⟨s⟩\fP Start \fBUniqSupply\fP allocation from ⟨s⟩. .TP -.B \fI\%\-dno\-debug\-output\fP +.B \fB\-dinline\-check=⟨str⟩\fP +Dump information about inlining decisions +.TP +.B \fB\-dno\-debug\-output\fP Suppress unsolicited debugging output .TP -.B \fI\%\-dppr\-case\-as\-let\fP +.B \fB\-dno\-typeable\-binds\fP +Don\(aqt generate bindings for Typeable methods +.TP +.B \fB\-dppr\-case\-as\-let\fP Print single alternative case expressions as strict lets. .TP -.B \fI\%\-dppr\-cols=⟨n⟩\fP +.B \fB\-dppr\-cols=⟨n⟩\fP Set the width of debugging output. For example \fB\-dppr\-cols200\fP .TP -.B \fI\%\-dppr\-debug\fP +.B \fB\-dppr\-debug\fP Turn on debug printing (more verbose) .TP -.B \fI\%\-dppr\-user\-length\fP +.B \fB\-dppr\-user\-length\fP Set the depth for printing expressions in error msgs .TP -.B \fI\%\-dshow\-passes\fP +.B \fB\-drule\-check=⟨str⟩\fP +Dump information about potential rule application +.TP +.B \fB\-dshow\-passes\fP Print out each pass name as it happens .TP -.B \fI\%\-dstg\-lint\fP +.B \fB\-dstg\-lint\fP STG pass sanity checking .TP -.B \fI\%\-dsuppress\-all\fP -In core dumps, suppress everything (except for uniques) that is +.B \fB\-dsuppress\-all\fP +In dumps, suppress everything (except for uniques) that is suppressible. .TP -.B \fI\%\-dsuppress\-coercions\fP +.B \fB\-dsuppress\-coercions\fP Suppress the printing of coercions in Core dumps to make them shorter .TP -.B \fI\%\-dsuppress\-idinfo\fP +.B \fB\-dsuppress\-idinfo\fP Suppress extended information about identifiers where they are bound .TP -.B \fI\%\-dsuppress\-module\-prefixes\fP +.B \fB\-dsuppress\-module\-prefixes\fP Suppress the printing of module qualification prefixes .TP -.B \fI\%\-dsuppress\-stg\-free\-vars\fP +.B \fB\-dsuppress\-stg\-free\-vars\fP Suppress the printing of closure free variable lists in STG output .TP -.B \fI\%\-dsuppress\-ticks\fP +.B \fB\-dsuppress\-ticks\fP Suppress "ticks" in the pretty\-printer output. .TP -.B \fI\%\-dsuppress\-type\-applications\fP +.B \fB\-dsuppress\-timestamps\fP +Suppress timestamps in dumps +.TP +.B \fB\-dsuppress\-type\-applications\fP Suppress type applications .TP -.B \fI\%\-dsuppress\-type\-signatures\fP +.B \fB\-dsuppress\-type\-signatures\fP Suppress type signatures .TP -.B \fI\%\-dsuppress\-unfoldings\fP +.B \fB\-dsuppress\-unfoldings\fP Suppress the printing of the stable unfolding of a variable at its binding site .TP -.B \fI\%\-dsuppress\-uniques\fP +.B \fB\-dsuppress\-uniques\fP Suppress the printing of uniques in debug output (easier to use \fBdiff\fP) .TP -.B \fI\%\-dsuppress\-var\-kinds\fP +.B \fB\-dsuppress\-var\-kinds\fP Suppress the printing of variable kinds .TP -.B \fI\%\-dth\-dec\-file=⟨file⟩\fP -Show evaluated TH declarations in a .th.hs file +.B \fB\-dth\-dec\-file\fP +Dump evaluated TH declarations into \fI*.th.hs\fP files .TP -.B \fI\%\-dunique\-increment=⟨i⟩\fP +.B \fB\-dunique\-increment=⟨i⟩\fP Set the increment for the generated \fBUnique\fP\(aqs to ⟨i⟩. .TP -.B \fI\%\-dverbose\-core2core\fP +.B \fB\-dverbose\-core2core\fP Show output from each core\-to\-core pass .TP -.B \fI\%\-dverbose\-stg2stg\fP +.B \fB\-dverbose\-stg2stg\fP Show output from each STG\-to\-STG pass .TP -.B \fI\%\-falignment\-sanitisation\fP +.B \fB\-falignment\-sanitisation\fP Compile with alignment checks for all info table dereferences. .TP -.B \fI\%\-fcatch\-bottoms\fP +.B \fB\-fcatch\-bottoms\fP Insert \fBerror\fP expressions after bottoming expressions; useful when debugging the compiler. .TP -.B \fI\%\-fllvm\-fill\-undef\-with\-garbage\fP +.B \fB\-fllvm\-fill\-undef\-with\-garbage\fP Intruct LLVM to fill dead STG registers with garbage .TP -.B \fI\%\-g\fP +.B \fB\-fproc\-alignment\fP +Align functions at given boundary. +.TP +.B \fB\-g\fP Produce DWARF debug information in compiled object files. ⟨n⟩ can be 0, 1, or 2, with higher numbers producing richer -output. If ⟨n⟩ is omitted level 2 is assumed. +output. If ⟨n⟩ is omitted, level 2 is assumed. .UNINDENT .SS C pre\-processor .INDENT 0.0 .TP -.B \fI\%\-cpp\fP +.B \fB\-cpp\fP Run the C pre\-processor on Haskell source files .TP -.B \fI\%\-D⟨symbol⟩[=⟨value⟩]\fP +.B \fB\-D⟨symbol⟩[=⟨value⟩]\fP Define a symbol in the C pre\-processor .TP -.B \fI\%\-I⟨dir⟩\fP +.B \fB\-I⟨dir⟩\fP Add ⟨dir⟩ to the directory search list for \fB#include\fP files .TP -.B \fI\%\-U⟨symbol⟩\fP +.B \fB\-U⟨symbol⟩\fP Undefine a symbol in the C pre\-processor .UNINDENT .SS Finding imports .INDENT 0.0 .TP -.B \fI\%\-i\fP +.B \fB\-i\fP Empty the import directory list .TP -.B \fI\%\-i⟨dir⟩[:⟨dir⟩]*\fP +.B \fB\-i⟨dir⟩[:⟨dir⟩]*\fP add ⟨dir⟩, ⟨dir2⟩, etc. to import path .UNINDENT .SS Interactive mode .INDENT 0.0 .TP -.B \fI\%\-fbreak\-on\-error\fP -\fI\%Break on uncaught exceptions and errors\fP +.B \fB\-fbreak\-on\-error\fP +Break on uncaught exceptions and errors .TP -.B \fI\%\-fbreak\-on\-exception\fP -\fI\%Break on any exception thrown\fP +.B \fB\-fbreak\-on\-exception\fP +Break on any exception thrown .TP -.B \fI\%\-fghci\-hist\-size=⟨n⟩\fP +.B \fB\-fghci\-hist\-size=⟨n⟩\fP Set the number of entries GHCi keeps for \fB:history\fP\&. -See \fI\%The GHCi Debugger\fP\&. +See ghci\-debugger\&. .TP -.B \fI\%\-flocal\-ghci\-history\fP +.B \fB\-fghci\-leak\-check\fP +(Debugging only) check for space leaks when loading +new modules in GHCi. +.TP +.B \fB\-flocal\-ghci\-history\fP Use current directory for the GHCi command history file \fB\&.ghci\-history\fP\&. .TP -.B \fI\%\-fprint\-bind\-result\fP -\fI\%Turn on printing of binding results in GHCi\fP +.B \fB\-fno\-it\fP +No longer set the special variable \fBit\fP\&. +.TP +.B \fB\-fprint\-bind\-result\fP +Turn on printing of binding results in GHCi +.TP +.B \fB\-fprint\-evld\-with\-show\fP +Instruct \fB:print\fP to use \fBShow\fP instances where possible. .TP -.B \fI\%\-fshow\-loaded\-modules\fP +.B \fB\-fshow\-loaded\-modules\fP Show the names of modules that GHCi loaded after a -\fI\%:load\fP command. +\fB:load\fP command. .TP -.B \fI\%\-ghci\-script\fP +.B \fB\-ghci\-script\fP Read additional \fB\&.ghci\fP files .TP -.B \fI\%\-ignore\-dot\-ghci\fP +.B \fB\-ignore\-dot\-ghci\fP Disable reading of \fB\&.ghci\fP files .TP -.B \fI\%\-interactive\-print ⟨expr⟩\fP -\fI\%Select the function to use for printing evaluated -expressions in GHCi\fP +.B \fB\-interactive\-print ⟨name⟩\fP +Select the function to use for printing evaluated +expressions in GHCi .UNINDENT .SS Interface files .INDENT 0.0 .TP .B \fB\-\-show\-iface ⟨file⟩\fP -See \fImodes\fP\&. +See modes\&. .TP -.B \fI\%\-ddump\-hi\fP +.B \fB\-ddump\-hi\fP Dump the new interface to stdout .TP -.B \fI\%\-ddump\-hi\-diffs\fP +.B \fB\-ddump\-hi\-diffs\fP Show the differences vs. the old interface .TP -.B \fI\%\-ddump\-minimal\-imports\fP +.B \fB\-ddump\-minimal\-imports\fP Dump a minimal set of imports .UNINDENT .SS Keeping intermediate files .INDENT 0.0 .TP -.B \fI\%\-keep\-hc\-file\fP +.B \fB\-keep\-hc\-file\fP Retain intermediate \fB\&.hc\fP files. .TP -.B \fI\%\-keep\-hi\-files\fP +.B \fB\-keep\-hi\-files\fP Retain intermediate \fB\&.hi\fP files (the default). .TP -.B \fI\%\-keep\-llvm\-file\fP +.B \fB\-keep\-hscpp\-file\fP +Retain intermediate \fB\&.hscpp\fP files. +.TP +.B \fB\-keep\-llvm\-file\fP Retain intermediate LLVM \fB\&.ll\fP files. Implies \fB\-fllvm\fP\&. .TP -.B \fI\%\-keep\-o\-files\fP +.B \fB\-keep\-o\-files\fP Retain intermediate \fB\&.o\fP files (the default). .TP -.B \fI\%\-keep\-s\-file\fP +.B \fB\-keep\-s\-file\fP Retain intermediate \fB\&.s\fP files. .TP -.B \fI\%\-keep\-tmp\-files\fP +.B \fB\-keep\-tmp\-files\fP Retain all intermediate temporary files. .UNINDENT .SS Language options .INDENT 0.0 .TP -.B \fI\%\-XAllowAmbiguousTypes\fP +.B \fB\-fno\-safe\-haskell\fP +Disable Safe Haskell +.TP +.B \fB\-fsort\-by\-size\-hole\-fits\fP +Sort valid hole fits by size. +.TP +.B \fB\-fsort\-by\-subsumption\-hole\-fits\fP +Sort valid hole fits by subsumption. +.TP +.B \fB\-Winferred\-safe\-imports\fP +warn when an explicitly Safe Haskell module imports a Safe\-Inferred one +.TP +.B \fB\-Wmissing\-safe\-haskell\-mode\fP +warn when the Safe Haskell mode is not explicitly specified. +.TP +.B \fB\-XAllowAmbiguousTypes\fP Allow the user to write ambiguous types, and the type inference engine to infer them. .TP -.B \fI\%\-XApplicativeDo\fP +.B \fB\-XApplicativeDo\fP Enable Applicative do\-notation desugaring .TP -.B \fI\%\-XArrows\fP +.B \fB\-XArrows\fP Enable arrow notation extension .TP -.B \fI\%\-XBangPatterns\fP +.B \fB\-XBangPatterns\fP Enable bang patterns. .TP -.B \fI\%\-XBinaryLiterals\fP +.B \fB\-XBinaryLiterals\fP Enable support for binary literals. .TP -.B \fI\%\-XCApiFFI\fP +.B \fB\-XBlockArguments\fP +Allow \fBdo\fP blocks and other constructs as function arguments. +.TP +.B \fB\-XCApiFFI\fP Enable the CAPI calling convention. .TP -.B \fI\%\-XConstrainedClassMethods\fP +.B \fB\-XConstrainedClassMethods\fP Enable constrained class methods. .TP -.B \fI\%\-XConstraintKinds\fP +.B \fB\-XConstraintKinds\fP Enable a kind of constraints. .TP -.B \fI\%\-XCPP\fP +.B \fB\-XCPP\fP Enable the C preprocessor. .TP -.B \fI\%\-XDataKinds\fP +.B \fB\-XCUSKs\fP +Enable detection of complete user\-supplied kind signatures. +.TP +.B \fB\-XDataKinds\fP Enable datatype promotion. .TP -.B \fI\%\-XDatatypeContexts\fP +.B \fB\-XDatatypeContexts\fP Allow contexts on \fBdata\fP types. .TP -.B \fI\%\-XDefaultSignatures\fP +.B \fB\-XDefaultSignatures\fP Enable default signatures. .TP -.B \fI\%\-XDeriveAnyClass\fP +.B \fB\-XDeriveAnyClass\fP Enable deriving for any class. .TP -.B \fI\%\-XDeriveDataTypeable\fP -Enable deriving for the Data class. -Implied by \fBAutoDeriveTypeable\fP\&. +.B \fB\-XDeriveDataTypeable\fP +Enable deriving for the \fBData\fP class. +Implied by (deprecated) \fBAutoDeriveTypeable\fP\&. .TP -.B \fI\%\-XDeriveFoldable\fP +.B \fB\-XDeriveFoldable\fP Enable deriving for the Foldable class. -Implied by \fI\%DeriveTraversable\fP\&. +Implied by \fBDeriveTraversable\fP\&. .TP -.B \fI\%\-XDeriveFunctor\fP +.B \fB\-XDeriveFunctor\fP Enable deriving for the Functor class. -Implied by \fI\%DeriveTraversable\fP\&. +Implied by \fBDeriveTraversable\fP\&. .TP -.B \fI\%\-XDeriveGeneric\fP +.B \fB\-XDeriveGeneric\fP Enable deriving for the Generic class. .TP -.B \fI\%\-XDeriveLift\fP +.B \fB\-XDeriveLift\fP Enable deriving for the Lift class .TP -.B \fI\%\-XDeriveTraversable\fP +.B \fB\-XDeriveTraversable\fP Enable deriving for the Traversable class. -Implies \fI\%DeriveFunctor\fP and \fI\%DeriveFoldable\fP\&. +Implies \fBDeriveFunctor\fP and \fBDeriveFoldable\fP\&. .TP -.B \fI\%\-XDerivingStrategies\fP +.B \fB\-XDerivingStrategies\fP Enables deriving strategies. .TP -.B \fI\%\-XDisambiguateRecordFields\fP +.B \fB\-XDerivingVia\fP +Enable deriving instances \fBvia\fP types of the same runtime +representation. +Implies \fBDerivingStrategies\fP\&. +.TP +.B \fB\-XDisambiguateRecordFields\fP Enable record field disambiguation. -Implied by \fI\%RecordWildCards\fP\&. +Implied by \fBRecordWildCards\fP\&. .TP -.B \fI\%\-XDuplicateRecordFields\fP +.B \fB\-XDuplicateRecordFields\fP Allow definition of record types with identically\-named fields. .TP -.B \fI\%\-XEmptyCase\fP +.B \fB\-XEmptyCase\fP Allow empty case alternatives. .TP -.B \fI\%\-XEmptyDataDecls\fP +.B \fB\-XEmptyDataDecls\fP Allow definition of empty \fBdata\fP types. .TP -.B \fI\%\-XEmptyDataDeriving\fP +.B \fB\-XEmptyDataDeriving\fP Allow deriving instances of standard type classes for empty data types. .TP -.B \fI\%\-XExistentialQuantification\fP +.B \fB\-XExistentialQuantification\fP Enable liberalised type synonyms. .TP -.B \fI\%\-XExplicitForAll\fP +.B \fB\-XExplicitForAll\fP Enable explicit universal quantification. -Implied by \fI\%ScopedTypeVariables\fP, \fI\%LiberalTypeSynonyms\fP, -\fI\%RankNTypes\fP and \fI\%ExistentialQuantification\fP\&. +Implied by \fBScopedTypeVariables\fP, \fBLiberalTypeSynonyms\fP, +\fBRankNTypes\fP and \fBExistentialQuantification\fP\&. .TP -.B \fI\%\-XExplicitNamespaces\fP +.B \fB\-XExplicitNamespaces\fP Enable using the keyword \fBtype\fP to specify the namespace of -entries in imports and exports (\fI\%Explicit namespaces in import/export\fP). -Implied by \fI\%TypeOperators\fP and \fI\%TypeFamilies\fP\&. +entries in imports and exports (explicit\-namespaces). +Implied by \fBTypeOperators\fP and \fBTypeFamilies\fP\&. .TP -.B \fI\%\-XExtendedDefaultRules\fP +.B \fB\-XExtendedDefaultRules\fP Use GHCi\(aqs extended default rules in a normal module. .TP -.B \fI\%\-XFlexibleContexts\fP -Enable flexible contexts. Implied by -\fI\%ImplicitParams\fP\&. +.B \fB\-XFlexibleContexts\fP +Enable flexible contexts. .TP -.B \fI\%\-XFlexibleInstances\fP +.B \fB\-XFlexibleInstances\fP Enable flexible instances. -Implies \fI\%TypeSynonymInstances\fP\&. -Implied by \fI\%ImplicitParams\fP\&. +Implies \fBTypeSynonymInstances\fP\&. .TP -.B \fI\%\-XForeignFunctionInterface\fP +.B \fB\-XForeignFunctionInterface\fP Enable foreign function interface. .TP -.B \fI\%\-XFunctionalDependencies\fP +.B \fB\-XFunctionalDependencies\fP Enable functional dependencies. -Implies \fI\%MultiParamTypeClasses\fP\&. +Implies \fBMultiParamTypeClasses\fP\&. .TP -.B \fI\%\-XGADTs\fP +.B \fB\-XGADTs\fP Enable generalised algebraic data types. -Implies \fI\%GADTSyntax\fP and \fI\%MonoLocalBinds\fP\&. +Implies \fBGADTSyntax\fP and \fBMonoLocalBinds\fP\&. .TP -.B \fI\%\-XGADTSyntax\fP +.B \fB\-XGADTSyntax\fP Enable generalised algebraic data type syntax. .TP -.B \fI\%\-XGeneralisedNewtypeDeriving\fP +.B \fB\-XGeneralisedNewtypeDeriving\fP Enable newtype deriving. .TP -.B \fI\%\-XGeneralizedNewtypeDeriving\fP +.B \fB\-XGeneralizedNewtypeDeriving\fP Enable newtype deriving. .TP -.B \fI\%\-XHexFloatLiterals\fP -Enable support for \fI\%hexadecimal floating point literals\fP\&. +.B \fB\-XHaskell2010\fP +Use the Haskell 2010 language variant. +.TP +.B \fB\-XHaskell98\fP +Use the Haskell 2010 language variant. +.TP +.B \fB\-XHexFloatLiterals\fP +Enable support for hexadecimal floating point literals\&. .TP -.B \fI\%\-XImplicitParams\fP +.B \fB\-XImplicitParams\fP Enable Implicit Parameters. -Implies \fI\%FlexibleContexts\fP and \fI\%FlexibleInstances\fP\&. .TP -.B \fI\%\-XImpredicativeTypes\fP +.B \fB\-XImportQualifiedPost\fP +\fBImportQualifiedPost\fP allows the syntax \fBimport M qualified\fP +.TP +.B \fB\-XImpredicativeTypes\fP Enable impredicative types. -Implies \fI\%RankNTypes\fP\&. +Implies \fBRankNTypes\fP\&. .TP -.B \fI\%\-XIncoherentInstances\fP +.B \fB\-XIncoherentInstances\fP Enable incoherent instances. -Implies \fI\%OverlappingInstances\fP\&. +Implies \fBOverlappingInstances\fP\&. .TP -.B \fI\%\-XInstanceSigs\fP +.B \fB\-XInstanceSigs\fP Enable instance signatures. .TP -.B \fI\%\-XInterruptibleFFI\fP +.B \fB\-XInterruptibleFFI\fP Enable interruptible FFI. .TP -.B \fI\%\-XKindSignatures\fP +.B \fB\-XKindSignatures\fP Enable kind signatures. -Implied by \fI\%TypeFamilies\fP and \fI\%PolyKinds\fP\&. +Implied by \fBTypeFamilies\fP and \fBPolyKinds\fP\&. .TP -.B \fI\%\-XLambdaCase\fP +.B \fB\-XLambdaCase\fP Enable lambda\-case expressions. .TP -.B \fI\%\-XLiberalTypeSynonyms\fP +.B \fB\-XLiberalTypeSynonyms\fP Enable liberalised type synonyms. .TP -.B \fI\%\-XMagicHash\fP +.B \fB\-XMagicHash\fP Allow \fB#\fP as a postfix modifier on identifiers. .TP -.B \fI\%\-XMonadComprehensions\fP +.B \fB\-XMonadComprehensions\fP Enable monad comprehensions. .TP -.B \fI\%\-XMonadFailDesugaring\fP +.B \fB\-XMonadFailDesugaring\fP Enable monadfail desugaring. .TP -.B \fI\%\-XMonoLocalBinds\fP +.B \fB\-XMonoLocalBinds\fP Enable do not generalise local bindings. -Implied by \fI\%TypeFamilies\fP and \fI\%GADTs\fP\&. +Implied by \fBTypeFamilies\fP and \fBGADTs\fP\&. .TP -.B \fI\%\-XMultiParamTypeClasses\fP +.B \fB\-XMultiParamTypeClasses\fP Enable multi parameter type classes. -Implied by \fI\%FunctionalDependencies\fP\&. +Implied by \fBFunctionalDependencies\fP\&. .TP -.B \fI\%\-XMultiWayIf\fP +.B \fB\-XMultiWayIf\fP Enable multi\-way if\-expressions. .TP -.B \fI\%\-XNamedFieldPuns\fP +.B \fB\-XNamedFieldPuns\fP Enable record puns. .TP -.B \fI\%\-XNamedWildCards\fP +.B \fB\-XNamedWildCards\fP Enable named wildcards. .TP -.B \fI\%\-XNegativeLiterals\fP +.B \fB\-XNegativeLiterals\fP Enable support for negative literals. .TP -.B \fI\%\-XNoImplicitPrelude\fP +.B \fB\-XNoImplicitPrelude\fP Don\(aqt implicitly \fBimport Prelude\fP\&. -Implied by \fI\%RebindableSyntax\fP\&. +Implied by \fBRebindableSyntax\fP\&. .TP -.B \fI\%\-XNoMonomorphismRestriction\fP +.B \fB\-XNoMonomorphismRestriction\fP Disable the monomorphism restriction. .TP -.B \fI\%\-XNoPatternGuards\fP +.B \fB\-XNondecreasingIndentation\fP +Allow nested contexts to be at the same indentation level as +its enclosing context. +.TP +.B \fB\-XNoPatternGuards\fP Disable pattern guards. Implied by \fBHaskell98\fP\&. .TP -.B \fI\%\-XNoTraditionalRecordSyntax\fP +.B \fB\-XNoTraditionalRecordSyntax\fP Disable support for traditional record syntax (as supported by Haskell 98) \fBC {f = x}\fP .TP -.B \fI\%\-XNPlusKPatterns\fP +.B \fB\-XNPlusKPatterns\fP Enable support for \fBn+k\fP patterns. Implied by \fBHaskell98\fP\&. .TP -.B \fI\%\-XNullaryTypeClasses\fP +.B \fB\-XNullaryTypeClasses\fP Deprecated, does nothing. nullary (no parameter) type -classes are now enabled using \fI\%MultiParamTypeClasses\fP\&. +classes are now enabled using \fBMultiParamTypeClasses\fP\&. .TP -.B \fI\%\-XNumDecimals\fP +.B \fB\-XNumDecimals\fP Enable support for \(aqfractional\(aq integer literals. .TP -.B \fI\%\-XOverlappingInstances\fP +.B \fB\-XNumericUnderscores\fP +Enable support for numeric underscores\&. +.TP +.B \fB\-XOverlappingInstances\fP Enable overlapping instances. .TP -.B \fI\%\-XOverloadedLabels\fP +.B \fB\-XOverloadedLabels\fP Enable overloaded labels. .TP -.B \fI\%\-XOverloadedLists\fP +.B \fB\-XOverloadedLists\fP Enable overloaded lists. .TP -.B \fI\%\-XOverloadedStrings\fP +.B \fB\-XOverloadedStrings\fP Enable overloaded string literals. .TP -.B \fI\%\-XPackageImports\fP +.B \fB\-XPackageImports\fP Enable package\-qualified imports. .TP -.B \fI\%\-XParallelListComp\fP +.B \fB\-XParallelListComp\fP Enable parallel list comprehensions. -Implied by \fBParallelArrays\fP\&. .TP -.B \fI\%\-XPartialTypeSignatures\fP +.B \fB\-XPartialTypeSignatures\fP Enable partial type signatures. .TP -.B \fI\%\-XPatternSynonyms\fP +.B \fB\-XPatternSynonyms\fP Enable pattern synonyms. .TP -.B \fI\%\-XPolyKinds\fP +.B \fB\-XPolyKinds\fP Enable kind polymorphism. -Implies \fI\%KindSignatures\fP\&. +Implies \fBKindSignatures\fP\&. .TP -.B \fI\%\-XPostfixOperators\fP +.B \fB\-XPostfixOperators\fP Enable postfix operators. .TP -.B \fI\%\-XQuasiQuotes\fP +.B \fB\-XQuantifiedConstraints\fP +Allow \fBforall\fP quantifiers in constraints. +.TP +.B \fB\-XQuasiQuotes\fP Enable quasiquotation. .TP -.B \fI\%\-XRank2Types\fP +.B \fB\-XRank2Types\fP Enable rank\-2 types. -Synonym for \fI\%RankNTypes\fP\&. +Synonym for \fBRankNTypes\fP\&. .TP -.B \fI\%\-XRankNTypes\fP +.B \fB\-XRankNTypes\fP Enable rank\-N types. -Implied by \fI\%ImpredicativeTypes\fP\&. +Implied by \fBImpredicativeTypes\fP\&. .TP -.B \fI\%\-XRebindableSyntax\fP +.B \fB\-XRebindableSyntax\fP Employ rebindable syntax. -Implies \fI\%NoImplicitPrelude\fP\&. +Implies \fBNoImplicitPrelude\fP\&. .TP -.B \fI\%\-XRecordWildCards\fP +.B \fB\-XRecordWildCards\fP Enable record wildcards. -Implies \fI\%DisambiguateRecordFields\fP\&. +Implies \fBDisambiguateRecordFields\fP\&. .TP -.B \fI\%\-XRecursiveDo\fP +.B \fB\-XRecursiveDo\fP Enable recursive do (mdo) notation. .TP -.B \fI\%\-XRoleAnnotations\fP +.B \fB\-XRoleAnnotations\fP Enable role annotations. .TP -.B \fI\%\-XSafe\fP -Enable the \fI\%Safe Haskell\fP Safe mode. +.B \fB\-XSafe\fP +Enable the Safe Haskell Safe mode. .TP -.B \fI\%\-XScopedTypeVariables\fP +.B \fB\-XScopedTypeVariables\fP Enable lexically\-scoped type variables. .TP -.B \fI\%\-XStandaloneDeriving\fP +.B \fB\-XStandaloneDeriving\fP Enable standalone deriving. .TP -.B \fI\%\-XStaticPointers\fP +.B \fB\-XStandaloneKindSignatures\fP +Allow the use of standalone kind signatures. +.TP +.B \fB\-XStarIsType\fP +Treat \fB*\fP as \fBData.Kind.Type\fP\&. +.TP +.B \fB\-XStaticPointers\fP Enable static pointers. .TP -.B \fI\%\-XStrict\fP +.B \fB\-XStrict\fP Make bindings in the current module strict by default. .TP -.B \fI\%\-XStrictData\fP +.B \fB\-XStrictData\fP Enable default strict datatype fields. .TP -.B \fI\%\-XTemplateHaskell\fP +.B \fB\-XTemplateHaskell\fP Enable Template Haskell. .TP -.B \fI\%\-XTemplateHaskellQuotes\fP +.B \fB\-XTemplateHaskellQuotes\fP Enable quotation subset of -\fI\%Template Haskell\fP\&. +Template Haskell\&. .TP -.B \fI\%\-XTransformListComp\fP +.B \fB\-XTransformListComp\fP Enable generalised list comprehensions. .TP -.B \fI\%\-XTrustworthy\fP -Enable the \fI\%Safe Haskell\fP Trustworthy mode. +.B \fB\-XTrustworthy\fP +Enable the Safe Haskell Trustworthy mode. .TP -.B \fI\%\-XTupleSections\fP +.B \fB\-XTupleSections\fP Enable tuple sections. .TP -.B \fI\%\-XTypeApplications\fP -Enable type application syntax. +.B \fB\-XTypeApplications\fP +Enable type application syntax in terms and types. .TP -.B \fI\%\-XTypeFamilies\fP +.B \fB\-XTypeFamilies\fP Enable type families. -Implies \fI\%ExplicitNamespaces\fP, \fI\%KindSignatures\fP, -and \fI\%MonoLocalBinds\fP\&. +Implies \fBExplicitNamespaces\fP, \fBKindSignatures\fP, +and \fBMonoLocalBinds\fP\&. .TP -.B \fI\%\-XTypeFamilyDependencies\fP +.B \fB\-XTypeFamilyDependencies\fP Enable injective type families. -Implies \fI\%TypeFamilies\fP\&. +Implies \fBTypeFamilies\fP\&. .TP -.B \fI\%\-XTypeInType\fP -Allow kinds to be used as types, -including explicit kind variable quantification, higher\-rank -kinds, kind synonyms, and kind families. -Implies \fI\%DataKinds\fP, \fI\%KindSignatures\fP, -and \fI\%PolyKinds\fP\&. +.B \fB\-XTypeInType\fP +Deprecated. Enable kind polymorphism and datatype promotion. .TP -.B \fI\%\-XTypeOperators\fP +.B \fB\-XTypeOperators\fP Enable type operators. -Implies \fI\%ExplicitNamespaces\fP\&. +Implies \fBExplicitNamespaces\fP\&. .TP -.B \fI\%\-XTypeSynonymInstances\fP +.B \fB\-XTypeSynonymInstances\fP Enable type synonyms in instance heads. -Implied by \fI\%FlexibleInstances\fP\&. +Implied by \fBFlexibleInstances\fP\&. .TP -.B \fI\%\-XUnboxedSums\fP +.B \fB\-XUnboxedSums\fP Enable unboxed sums. .TP -.B \fI\%\-XUnboxedTuples\fP +.B \fB\-XUnboxedTuples\fP Enable the use of unboxed tuple syntax. .TP -.B \fI\%\-XUndecidableInstances\fP +.B \fB\-XUndecidableInstances\fP Enable undecidable instances. .TP -.B \fI\%\-XUndecidableSuperClasses\fP +.B \fB\-XUndecidableSuperClasses\fP Allow all superclass constraints, including those that may result in non\-termination of the typechecker. .TP -.B \fI\%\-XUnicodeSyntax\fP +.B \fB\-XUnicodeSyntax\fP Enable unicode syntax. .TP -.B \fI\%\-XUnsafe\fP -Enable \fI\%Safe Haskell\fP Unsafe mode. +.B \fB\-XUnliftedFFITypes\fP +Enable unlifted FFI types +.TP +.B \fB\-XUnliftedNewtypes\fP +Enable unlifted newtypes. .TP -.B \fI\%\-XViewPatterns\fP +.B \fB\-XUnsafe\fP +Enable Safe Haskell Unsafe mode. +.TP +.B \fB\-XViewPatterns\fP Enable view patterns. .UNINDENT .SS Linking options @@ -946,674 +1050,728 @@ Enable view patterns. .B \fB\-c\fP Stop after generating object (\fB\&.o\fP) file .TP -.B \fI\%\-debug\fP +.B \fB\-debug\fP Use the debugging runtime .TP -.B \fI\%\-dylib\-install\-name ⟨path⟩\fP +.B \fB\-dylib\-install\-name ⟨path⟩\fP Set the install name (via \fB\-install_name\fP passed to Apple\(aqs linker), specifying the full install path of the library file. Any libraries or executables that link with it later will pick up that path as their runtime search location for it. (Darwin/OS X only) .TP -.B \fI\%\-dynamic\fP +.B \fB\-dynamic\fP Build dynamically\-linked object files and executables .TP -.B \fI\%\-dynload\fP +.B \fB\-dynload\fP Selects one of a number of modes for finding shared libraries at runtime. .TP -.B \fI\%\-eventlog\fP +.B \fB\-eventlog\fP Enable runtime event tracing .TP -.B \fI\%\-fno\-embed\-manifest\fP +.B \fB\-fno\-embed\-manifest\fP Do not embed the manifest in the executable (Windows only) .TP -.B \fI\%\-fno\-gen\-manifest\fP +.B \fB\-fno\-gen\-manifest\fP Do not generate a manifest file (Windows only) .TP -.B \fI\%\-fno\-shared\-implib\fP +.B \fB\-fno\-shared\-implib\fP Don\(aqt generate an import library for a DLL (Windows only) .TP -.B \fI\%\-framework ⟨name⟩\fP +.B \fB\-framework ⟨name⟩\fP On Darwin/OS X/iOS only, link in the framework ⟨name⟩. This option corresponds to the \fB\-framework\fP option for Apple\(aqs Linker. .TP -.B \fI\%\-framework\-path ⟨dir⟩\fP +.B \fB\-framework\-path ⟨dir⟩\fP On Darwin/OS X/iOS only, add ⟨dir⟩ to the list of directories searched for frameworks. This option corresponds to the \fB\-F\fP option for Apple\(aqs Linker. .TP -.B \fI\%\-fwhole\-archive\-hs\-libs\fP +.B \fB\-fwhole\-archive\-hs\-libs\fP When linking a binary executable, this inserts the flag \fB\-Wl,\-\-whole\-archive\fP before any \fB\-l\fP flags for Haskell libraries, and \fB\-Wl,\-\-no\-whole\-archive\fP afterwards .TP -.B \fI\%\-L ⟨dir⟩\fP +.B \fB\-keep\-cafs\fP +Do not garbage\-collect CAFs (top\-level expressions) at runtime +.TP +.B \fB\-L ⟨dir⟩\fP Add ⟨dir⟩ to the list of directories searched for libraries .TP -.B \fI\%\-l ⟨lib⟩\fP +.B \fB\-l ⟨lib⟩\fP Link in library ⟨lib⟩ .TP -.B \fI\%\-main\-is ⟨thing⟩\fP +.B \fB\-main\-is ⟨thing⟩\fP Set main module and function .TP -.B \fI\%\-no\-hs\-main\fP +.B \fB\-no\-hs\-main\fP Don\(aqt assume this program contains \fBmain\fP .TP -.B \fI\%\-no\-rtsopts\-suggestions\fP +.B \fB\-no\-rtsopts\-suggestions\fP Don\(aqt print RTS suggestions about linking with -\fI\%\-rtsopts[=⟨none|some|all⟩]\fP\&. +\fB\-rtsopts[=⟨none|some|all|ignore|ignoreAll⟩]\fP\&. .TP -.B \fI\%\-package ⟨name⟩\fP +.B \fB\-package ⟨name⟩\fP Expose package ⟨pkg⟩ .TP -.B \fI\%\-pie\fP +.B \fB\-pie\fP Instruct the linker to produce a position\-independent executable. .TP -.B \fI\%\-rdynamic\fP +.B \fB\-rdynamic\fP This instructs the linker to add all symbols, not only used ones, to the dynamic symbol table. Currently Linux and Windows/MinGW32 only. This is equivalent to using \fB\-optl \-rdynamic\fP on Linux, and \fB\-optl \-export\-all\-symbols\fP on Windows. .TP -.B \fI\%\-rtsopts[=⟨none|some|all⟩]\fP +.B \fB\-rtsopts[=⟨none|some|all|ignore|ignoreAll⟩]\fP Control whether the RTS behaviour can be tweaked via command\-line flags and the \fBGHCRTS\fP environment variable. Using \fBnone\fP means no RTS flags can be given; \fBsome\fP means only a minimum -of safe options can be given (the default), and \fBall\fP (or no -argument at all) means that all RTS flags are permitted. -.TP -.B \fI\%\-shared\fP +of safe options can be given (the default); \fBall\fP (or no +argument at all) means that all RTS flags are permitted; \fBignore\fP +means RTS flags can be given, but are treated as regular arguments and +passed to the Haskell program as arguments; \fBignoreAll\fP is the same as +\fBignore\fP, but \fBGHCRTS\fP is also ignored. \fB\-rtsopts\fP does not +affect \fB\-with\-rtsopts\fP behavior; flags passed via \fB\-with\-rtsopts\fP +are used regardless of \fB\-rtsopts\fP\&. +.TP +.B \fB\-shared\fP Generate a shared library (as opposed to an executable) .TP -.B \fI\%\-split\-objs\fP -Split objects (for libraries) -.TP -.B \fI\%\-split\-sections\fP +.B \fB\-split\-sections\fP Split sections for link\-time dead\-code stripping .TP -.B \fI\%\-static\fP +.B \fB\-static\fP Use static Haskell libraries .TP -.B \fI\%\-staticlib\fP +.B \fB\-staticlib\fP Generate a standalone static library (as opposed to an executable). This is useful when cross compiling. The library together with all its dependencies ends up in in a single static library that can be linked against. .TP -.B \fI\%\-threaded\fP +.B \fB\-threaded\fP Use the threaded runtime .TP -.B \fI\%\-with\-rtsopts=⟨opts⟩\fP +.B \fB\-with\-rtsopts=⟨opts⟩\fP Set the default RTS options to ⟨opts⟩. .UNINDENT .SS Miscellaneous options .INDENT 0.0 .TP -.B \fI\%\-fexternal\-interpreter\fP +.B \fB\-fexternal\-interpreter\fP Run interpreted code in a separate process .TP -.B \fI\%\-fglasgow\-exts\fP +.B \fB\-fglasgow\-exts\fP Deprecated. Enable most language extensions; -see \fI\%Language options\fP for exactly which ones. +see options\-language for exactly which ones. .TP -.B \fI\%\-ghcversion\-file ⟨path to ghcversion.h⟩\fP +.B \fB\-ghcversion\-file ⟨path to ghcversion.h⟩\fP (GHC as a C compiler only) Use this \fBghcversion.h\fP file .TP -.B \fI\%\-H ⟨size⟩\fP +.B \fB\-H ⟨size⟩\fP Set the minimum size of the heap to ⟨size⟩ .TP -.B \fI\%\-j[⟨n⟩]\fP -When compiling with \fI\%\-\-make\fP, compile ⟨n⟩ modules +.B \fB\-j[⟨n⟩]\fP +When compiling with \fB\-\-make\fP, compile ⟨n⟩ modules in parallel. .UNINDENT .SS Modes of operation .INDENT 0.0 .TP -.B \fI\%\-\-frontend ⟨module⟩\fP +.B \fB\-\-frontend ⟨module⟩\fP run GHC with the given frontend plugin; see -\fIfrontend_plugins\fP for details. +frontend_plugins for details. .TP -.B \fI\%\-\-help\fP +.B \fB\-\-help\fP Display help .TP -.B \fI\%\-\-info\fP +.B \fB\-\-info\fP display information about the compiler .TP -.B \fI\%\-\-interactive\fP +.B \fB\-\-interactive\fP Interactive mode \- normally used by just running \fBghci\fP; -see \fIghci\fP for details. +see ghci for details. .TP -.B \fI\%\-\-make\fP +.B \fB\-\-make\fP Build a multi\-module Haskell program, automatically figuring out dependencies. Likely to be much easier, and faster, than using -\fBmake\fP; see \fI\%Using ghc \-\-make\fP for details. +\fBmake\fP; see make\-mode for details. .TP -.B \fI\%\-\-mk\-dll\fP +.B \fB\-\-mk\-dll\fP DLL\-creation mode (Windows only) .TP -.B \fI\%\-\-numeric\-version\fP +.B \fB\-\-numeric\-version\fP display GHC version (numeric only) .TP -.B \fI\%\-\-print\-libdir\fP +.B \fB\-\-print\-libdir\fP display GHC library directory .TP -.B \fI\%\-\-show\-iface ⟨file⟩\fP +.B \fB\-\-show\-iface ⟨file⟩\fP display the contents of an interface file. .TP -.B \fI\%\-\-show\-options\fP +.B \fB\-\-show\-options\fP display the supported command line options .TP -.B \fI\%\-\-supported\-extensions\fP +.B \fB\-\-supported\-extensions\fP display the supported language extensions .TP -.B \fI\%\-\-version\fP +.B \fB\-\-version\fP display GHC version .TP -.B \fI\%\-e ⟨expr⟩\fP -Evaluate \fBexpr\fP; see \fI\%Expression evaluation mode\fP for details. +.B \fB\-e ⟨expr⟩\fP +Evaluate \fBexpr\fP; see eval\-mode for details. .TP -.B \fI\%\-M\fP +.B \fB\-M\fP generate dependency information suitable for use in a -\fBMakefile\fP; see \fImakefile\-dependencies\fP for details. +\fBMakefile\fP; see makefile\-dependencies for details. .UNINDENT .SS Individual optimizations .INDENT 0.0 .TP -.B \fI\%\-fcall\-arity\fP -Enable call\-arity optimisation. Implied by \fI\%\-O\fP\&. +.B \fB\-fasm\-shortcutting\fP +Enable shortcutting on assembly. Implied by \fB\-O2\fP\&. +.TP +.B \fB\-fbinary\-blob\-threshold=⟨n⟩\fP +\fIdefault: 500K.\fP Tweak assembly generator for binary blobs. +.TP +.B \fB\-fblock\-layout\-cfg\fP +Use the new cfg based block layout algorithm. +.TP +.B \fB\-fblock\-layout\-weightless\fP +Ignore cfg weights for code layout. +.TP +.B \fB\-fblock\-layout\-weights\fP +Sets edge weights used by the new code layout algorithm. +.TP +.B \fB\-fcall\-arity\fP +Enable call\-arity optimisation. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-fcase\-folding\fP -Enable constant folding in case expressions. Implied by \fI\%\-O\fP\&. +.B \fB\-fcase\-folding\fP +Enable constant folding in case expressions. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-fcase\-merge\fP -Enable case\-merging. Implied by \fI\%\-O\fP\&. +.B \fB\-fcase\-merge\fP +Enable case\-merging. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-fcmm\-elim\-common\-blocks\fP -Enable Cmm common block elimination. Implied by \fI\%\-O\fP\&. +.B \fB\-fcmm\-elim\-common\-blocks\fP +Enable Cmm common block elimination. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-fcmm\-sink\fP -Enable Cmm sinking. Implied by \fI\%\-O\fP\&. +.B \fB\-fcmm\-sink\fP +Enable Cmm sinking. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-fcpr\-anal\fP -Turn on CPR analysis in the demand analyser. Implied by \fI\%\-O\fP\&. +.B \fB\-fcpr\-anal\fP +Turn on CPR analysis in the demand analyser. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-fcross\-module\-specialise\fP +.B \fB\-fcross\-module\-specialise\fP Turn on specialisation of overloaded functions imported from other modules. .TP -.B \fI\%\-fcse\fP -Enable common sub\-expression elimination. Implied by \fI\%\-O\fP\&. +.B \fB\-fcse\fP +Enable common sub\-expression elimination. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-fdicts\-cheap\fP +.B \fB\-fdicts\-cheap\fP Make dictionary\-valued expressions seem cheap to the optimiser. .TP -.B \fI\%\-fdicts\-strict\fP +.B \fB\-fdicts\-strict\fP Make dictionaries strict .TP -.B \fI\%\-fdmd\-tx\-dict\-sel\fP +.B \fB\-fdmd\-tx\-dict\-sel\fP Use a special demand transformer for dictionary selectors. Always enabled by default. .TP -.B \fI\%\-fdo\-eta\-reduction\fP -Enable eta\-reduction. Implied by \fI\%\-O\fP\&. +.B \fB\-fdo\-eta\-reduction\fP +Enable eta\-reduction. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-fdo\-lambda\-eta\-expansion\fP +.B \fB\-fdo\-lambda\-eta\-expansion\fP Enable lambda eta\-expansion. Always enabled by default. .TP -.B \fI\%\-feager\-blackholing\fP -Turn on \fIeager blackholing\fP +.B \fB\-feager\-blackholing\fP +Turn on eager blackholing .TP -.B \fI\%\-fenable\-rewrite\-rules\fP +.B \fB\-fenable\-rewrite\-rules\fP Switch on all rewrite rules (including rules generated by automatic specialisation of overloaded functions). Implied by \fB\-O\fP\&. .TP -.B \fI\%\-fexcess\-precision\fP +.B \fB\-fexcess\-precision\fP Enable excess intermediate precision .TP -.B \fI\%\-fexitification\fP -Enables exitification optimisation. Implied by \fI\%\-O\fP\&. +.B \fB\-fexitification\fP +Enables exitification optimisation. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-fexpose\-all\-unfoldings\fP +.B \fB\-fexpose\-all\-unfoldings\fP Expose all unfoldings, even for very large or recursive functions. .TP -.B \fI\%\-ffloat\-in\fP -Turn on the float\-in transformation. Implied by \fI\%\-O\fP\&. +.B \fB\-ffloat\-in\fP +Turn on the float\-in transformation. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-ffull\-laziness\fP +.B \fB\-ffull\-laziness\fP Turn on full laziness (floating bindings outwards). -Implied by \fI\%\-O\fP\&. +Implied by \fB\-O\fP\&. .TP -.B \fI\%\-ffun\-to\-thunk\fP +.B \fB\-ffun\-to\-thunk\fP Allow worker\-wrapper to convert a function closure into a thunk if the function does not use any of its arguments. Off by default. .TP -.B \fI\%\-fignore\-asserts\fP -Ignore assertions in the source. Implied by \fI\%\-O\fP\&. +.B \fB\-fignore\-asserts\fP +Ignore assertions in the source. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-fignore\-interface\-pragmas\fP -Ignore pragmas in interface files. Implied by \fI\%\-O0\fP only. +.B \fB\-fignore\-interface\-pragmas\fP +Ignore pragmas in interface files. Implied by \fB\-O0\fP only. .TP -.B \fI\%\-flate\-dmd\-anal\fP +.B \fB\-flate\-dmd\-anal\fP Run demand analysis again, at the end of the simplification pipeline .TP -.B \fI\%\-fliberate\-case\fP -Turn on the liberate\-case transformation. Implied by \fI\%\-O2\fP\&. +.B \fB\-flate\-specialise\fP +Run a late specialisation pass .TP -.B \fI\%\-fliberate\-case\-threshold=⟨n⟩\fP +.B \fB\-fliberate\-case\fP +Turn on the liberate\-case transformation. Implied by \fB\-O2\fP\&. +.TP +.B \fB\-fliberate\-case\-threshold=⟨n⟩\fP \fIdefault: 2000.\fP Set the size threshold for the liberate\-case transformation to ⟨n⟩ .TP -.B \fI\%\-fllvm\-pass\-vectors\-in\-regs\fP +.B \fB\-fllvm\-pass\-vectors\-in\-regs\fP Pass vector value in vector registers for function calls .TP -.B \fI\%\-floopification\fP +.B \fB\-floopification\fP Turn saturated self\-recursive tail\-calls into local jumps in the -generated assembly. Implied by \fI\%\-O\fP\&. +generated assembly. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-fmax\-inline\-alloc\-size=⟨n⟩\fP +.B \fB\-fmax\-inline\-alloc\-size=⟨n⟩\fP \fIdefault: 128.\fP Set the maximum size of inline array allocations to ⟨n⟩ bytes (default: 128). .TP -.B \fI\%\-fmax\-inline\-memcpy\-insns=⟨n⟩\fP +.B \fB\-fmax\-inline\-memcpy\-insns=⟨n⟩\fP \fIdefault: 32.\fP Inline \fBmemcpy\fP calls if they would generate no more than ⟨n⟩ pseudo instructions. .TP -.B \fI\%\-fmax\-inline\-memset\-insns=⟨n⟩\fP +.B \fB\-fmax\-inline\-memset\-insns=⟨n⟩\fP \fIdefault: 32.\fP Inline \fBmemset\fP calls if they would generate no more than ⟨n⟩ pseudo instructions .TP -.B \fI\%\-fmax\-relevant\-binds=⟨n⟩\fP -\fIdefault: 6.\fP Set the maximum number of bindings to display in -type error messages. -.TP -.B \fI\%\-fmax\-simplifier\-iterations=⟨n⟩\fP +.B \fB\-fmax\-simplifier\-iterations=⟨n⟩\fP \fIdefault: 4.\fP Set the max iterations for the simplifier. .TP -.B \fI\%\-fmax\-uncovered\-patterns=⟨n⟩\fP +.B \fB\-fmax\-uncovered\-patterns=⟨n⟩\fP \fIdefault: 4.\fP Set the maximum number of patterns to display in warnings about non\-exhaustive ones. .TP -.B \fI\%\-fmax\-valid\-substitutions=⟨n⟩\fP -\fIdefault: 6.\fP Set the maximum number of valid substitutions for -typed holes to display in type error messages. -.TP -.B \fI\%\-fmax\-worker\-args=⟨n⟩\fP +.B \fB\-fmax\-worker\-args=⟨n⟩\fP \fIdefault: 10.\fP If a worker has that many arguments, none will be unpacked anymore. .TP -.B \fI\%\-fno\-opt\-coercion\fP +.B \fB\-fno\-opt\-coercion\fP Turn off the coercion optimiser .TP -.B \fI\%\-fno\-pre\-inlining\fP +.B \fB\-fno\-pre\-inlining\fP Turn off pre\-inlining .TP -.B \fI\%\-fno\-state\-hack\fP +.B \fB\-fno\-state\-hack\fP Turn off the state hackwhereby any lambda with a real\-world state token as argument is considered to be single\-entry. Hence OK to inline things inside it. .TP -.B \fI\%\-fomit\-interface\-pragmas\fP -Don\(aqt generate interface pragmas. Implied by \fI\%\-O0\fP only. +.B \fB\-fomit\-interface\-pragmas\fP +Don\(aqt generate interface pragmas. Implied by \fB\-O0\fP only. .TP -.B \fI\%\-fomit\-yields\fP +.B \fB\-fomit\-yields\fP Omit heap checks when no allocation is being performed. .TP -.B \fI\%\-foptimal\-applicative\-do\fP +.B \fB\-foptimal\-applicative\-do\fP Use a slower but better algorithm for ApplicativeDo .TP -.B \fI\%\-fpedantic\-bottoms\fP +.B \fB\-fpedantic\-bottoms\fP Make GHC be more precise about its treatment of bottom (but see -also \fI\%\-fno\-state\-hack\fP). In particular, GHC will not +also \fB\-fno\-state\-hack\fP). In particular, GHC will not eta\-expand through a case expression. .TP -.B \fI\%\-fregs\-graph\fP +.B \fB\-fregs\-graph\fP Use the graph colouring register allocator for register -allocation in the native code generator. Implied by \fI\%\-O2\fP\&. +allocation in the native code generator. Implied by \fB\-O2\fP\&. .TP -.B \fI\%\-fregs\-iterative\fP +.B \fB\-fregs\-iterative\fP Use the iterative coalescing graph colouring register allocator in the native code generator. .TP -.B \fI\%\-fsimpl\-tick\-factor=⟨n⟩\fP +.B \fB\-fsimpl\-tick\-factor=⟨n⟩\fP \fIdefault: 100.\fP Set the percentage factor for simplifier ticks. .TP -.B \fI\%\-fsimplifier\-phases=⟨n⟩\fP +.B \fB\-fsimplifier\-phases=⟨n⟩\fP \fIdefault: 2.\fP Set the number of phases for the simplifier. -Ignored with \fI\%\-O0\fP\&. +Ignored with \fB\-O0\fP\&. .TP -.B \fI\%\-fsolve\-constant\-dicts\fP +.B \fB\-fsolve\-constant\-dicts\fP When solving constraints, try to eagerly solve super classes using available dictionaries. .TP -.B \fI\%\-fspec\-constr\fP -Turn on the SpecConstr transformation. Implied by \fI\%\-O2\fP\&. +.B \fB\-fspec\-constr\fP +Turn on the SpecConstr transformation. Implied by \fB\-O2\fP\&. .TP -.B \fI\%\-fspec\-constr\-count=⟨n⟩\fP +.B \fB\-fspec\-constr\-count=⟨n⟩\fP default: 3.* Set to ⟨n⟩ the maximum number of specialisations that will be created for any one function by the SpecConstr transformation. .TP -.B \fI\%\-fspec\-constr\-keen\fP +.B \fB\-fspec\-constr\-keen\fP Specialize a call with an explicit constructor argument, even if the argument is not scrutinised in the body of the function .TP -.B \fI\%\-fspec\-constr\-threshold=⟨n⟩\fP +.B \fB\-fspec\-constr\-threshold=⟨n⟩\fP \fIdefault: 2000.\fP Set the size threshold for the SpecConstr transformation to ⟨n⟩. .TP -.B \fI\%\-fspecialise\fP -Turn on specialisation of overloaded functions. Implied by \fI\%\-O\fP\&. +.B \fB\-fspecialise\fP +Turn on specialisation of overloaded functions. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-fspecialise\-aggressively\fP +.B \fB\-fspecialise\-aggressively\fP Turn on specialisation of overloaded functions regardless of size, if unfolding is available .TP -.B \fI\%\-fstatic\-argument\-transformation\fP +.B \fB\-fstatic\-argument\-transformation\fP Turn on the static argument transformation. .TP -.B \fI\%\-fstg\-cse\fP +.B \fB\-fstg\-cse\fP Enable common sub\-expression elimination on the STG intermediate language .TP -.B \fI\%\-fstrictness\fP +.B \fB\-fstg\-lift\-lams\fP +Enable late lambda lifting on the STG intermediate +language. Implied by \fB\-O2\fP\&. +.TP +.B \fB\-fstg\-lift\-lams\-known\fP +Allow turning known into unknown calls while performing +late lambda lifting. +.TP +.B \fB\-fstg\-lift\-lams\-non\-rec\-args\fP +Create top\-level non\-recursive functions with at most +parameters while performing late lambda lifting. +.TP +.B \fB\-fstg\-lift\-lams\-rec\-args\fP +Create top\-level recursive functions with at most +parameters while performing late lambda lifting. +.TP +.B \fB\-fstrictness\fP Turn on strictness analysis. -Implied by \fI\%\-O\fP\&. Implies \fB\-fworker\-wrapper\fP +Implied by \fB\-O\fP\&. Implies \fB\-fworker\-wrapper\fP .TP -.B \fI\%\-fstrictness\-before=⟨n⟩\fP +.B \fB\-fstrictness\-before=⟨n⟩\fP Run an additional strictness analysis before simplifier phase ⟨n⟩ .TP -.B \fI\%\-funbox\-small\-strict\-fields\fP +.B \fB\-funbox\-small\-strict\-fields\fP Flatten strict constructor fields with a pointer\-sized -representation. Implied by \fI\%\-O\fP\&. +representation. Implied by \fB\-O\fP\&. .TP -.B \fI\%\-funbox\-strict\-fields\fP +.B \fB\-funbox\-strict\-fields\fP Flatten strict constructor fields .TP -.B \fI\%\-funfolding\-creation\-threshold=⟨n⟩\fP +.B \fB\-funfolding\-creation\-threshold=⟨n⟩\fP \fIdefault: 750.\fP Tweak unfolding settings. .TP -.B \fI\%\-funfolding\-dict\-discount=⟨n⟩\fP +.B \fB\-funfolding\-dict\-discount=⟨n⟩\fP \fIdefault: 30.\fP Tweak unfolding settings. .TP -.B \fI\%\-funfolding\-fun\-discount=⟨n⟩\fP +.B \fB\-funfolding\-fun\-discount=⟨n⟩\fP \fIdefault: 60.\fP Tweak unfolding settings. .TP -.B \fI\%\-funfolding\-keeness\-factor=⟨n⟩\fP +.B \fB\-funfolding\-keeness\-factor=⟨n⟩\fP \fIdefault: 1.5.\fP Tweak unfolding settings. .TP -.B \fI\%\-funfolding\-use\-threshold=⟨n⟩\fP +.B \fB\-funfolding\-use\-threshold=⟨n⟩\fP \fIdefault: 60.\fP Tweak unfolding settings. .TP -.B \fI\%\-fvectorisation\-avoidance\fP -Enable vectorisation avoidance. Always enabled by default. -.TP -.B \fI\%\-fvectorise\fP -Enable vectorisation of nested data parallelism +.B \fB\-fworker\-wrapper\fP +Enable the worker\-wrapper transformation. .UNINDENT .SS Optimization levels .INDENT 0.0 .TP -.B \fI\%\-O\fP +.B \fB\-O\fP Enable level 1 optimisations .TP -.B \fI\%\-O0\fP +.B \fB\-O0\fP Disable optimisations (default) .TP -.B \fI\%\-O2\fP +.B \fB\-O2\fP Enable level 2 optimisations .TP -.B \fI\%\-Odph\fP -Enable level 2 optimisations, set -\fB\-fmax\-simplifier\-iterations=20\fP -and \fB\-fsimplifier\-phases=3\fP\&. +.B \fB\-O⟨n⟩\fP +Any \-On where n > 2 is the same as \-O2. .UNINDENT .SS Package options .INDENT 0.0 .TP -.B \fI\%\-clear\-package\-db\fP +.B \fB\-clear\-package\-db\fP Clear the package db stack. .TP -.B \fI\%\-distrust ⟨pkg⟩\fP +.B \fB\-distrust ⟨pkg⟩\fP Expose package ⟨pkg⟩ and set it to be distrusted. See -\fI\%Safe Haskell\fP\&. +safe\-haskell\&. .TP -.B \fI\%\-distrust\-all\-packages\fP -Distrust all packages by default. See \fI\%Safe Haskell\fP\&. +.B \fB\-distrust\-all\-packages\fP +Distrust all packages by default. See safe\-haskell\&. .TP -.B \fI\%\-fpackage\-trust\fP -Enable \fI\%Safe Haskell\fP trusted package +.B \fB\-fpackage\-trust\fP +Enable Safe Haskell trusted package requirement for trustworthy modules. .TP -.B \fI\%\-global\-package\-db\fP +.B \fB\-global\-package\-db\fP Add the global package db to the stack. .TP -.B \fI\%\-hide\-all\-packages\fP +.B \fB\-hide\-all\-packages\fP Hide all packages by default .TP -.B \fI\%\-hide\-package ⟨pkg⟩\fP +.B \fB\-hide\-package ⟨pkg⟩\fP Hide package ⟨pkg⟩ .TP -.B \fI\%\-ignore\-package ⟨pkg⟩\fP +.B \fB\-ignore\-package ⟨pkg⟩\fP Ignore package ⟨pkg⟩ .TP -.B \fI\%\-no\-auto\-link\-packages\fP +.B \fB\-no\-auto\-link\-packages\fP Don\(aqt automatically link in the base and rts packages. .TP -.B \fI\%\-no\-global\-package\-db\fP +.B \fB\-no\-global\-package\-db\fP Remove the global package db from the stack. .TP -.B \fI\%\-no\-user\-package\-db\fP +.B \fB\-no\-user\-package\-db\fP Remove the user\(aqs package db from the stack. .TP -.B \fI\%\-package ⟨pkg⟩\fP +.B \fB\-package ⟨pkg⟩\fP Expose package ⟨pkg⟩ .TP -.B \fI\%\-package\-db ⟨file⟩\fP +.B \fB\-package\-db ⟨file⟩\fP Add ⟨file⟩ to the package db stack. .TP -.B \fI\%\-package\-env ⟨file⟩|⟨name⟩\fP +.B \fB\-package\-env ⟨file⟩|⟨name⟩\fP Use the specified package environment. .TP -.B \fI\%\-package\-id ⟨unit\-id⟩\fP +.B \fB\-package\-id ⟨unit\-id⟩\fP Expose package by id ⟨unit\-id⟩ .TP -.B \fI\%\-this\-unit\-id ⟨unit\-id⟩\fP +.B \fB\-this\-unit\-id ⟨unit\-id⟩\fP Compile to be part of unit (i.e. package) ⟨unit\-id⟩ .TP -.B \fI\%\-trust ⟨pkg⟩\fP +.B \fB\-trust ⟨pkg⟩\fP Expose package ⟨pkg⟩ and set it to be trusted. See -\fI\%Safe Haskell\fP\&. +safe\-haskell\&. .TP -.B \fI\%\-user\-package\-db\fP +.B \fB\-user\-package\-db\fP Add the user\(aqs package db to the stack. .UNINDENT .SS Phases of compilation .INDENT 0.0 .TP -.B \fI\%\-C\fP +.B \fB\-C\fP Stop after generating C (\fB\&.hc\fP file) .TP -.B \fI\%\-c\fP +.B \fB\-c\fP Stop after generating object (\fB\&.o\fP) file .TP -.B \fI\%\-E\fP +.B \fB\-E\fP Stop after preprocessing (\fB\&.hspp\fP file) .TP -.B \fI\%\-F\fP -Enable the use of a \fI\%pre\-processor\fP -(set with \fI\%\-pgmF ⟨cmd⟩\fP) +.B \fB\-F\fP +Enable the use of a pre\-processor +(set with \fB\-pgmF ⟨cmd⟩\fP) .TP -.B \fI\%\-S\fP +.B \fB\-S\fP Stop after generating assembly (\fB\&.s\fP file) .TP -.B \fI\%\-x ⟨suffix⟩\fP +.B \fB\-x ⟨suffix⟩\fP Override default behaviour for source files .UNINDENT .SS Overriding external programs .INDENT 0.0 .TP -.B \fI\%\-pgma ⟨cmd⟩\fP +.B \fB\-pgma ⟨cmd⟩\fP Use ⟨cmd⟩ as the assembler .TP -.B \fI\%\-pgmc ⟨cmd⟩\fP +.B \fB\-pgmc ⟨cmd⟩\fP Use ⟨cmd⟩ as the C compiler .TP -.B \fI\%\-pgmdll ⟨cmd⟩\fP +.B \fB\-pgmdll ⟨cmd⟩\fP Use ⟨cmd⟩ as the DLL generator .TP -.B \fI\%\-pgmF ⟨cmd⟩\fP +.B \fB\-pgmF ⟨cmd⟩\fP Use ⟨cmd⟩ as the pre\-processor (with \fB\-F\fP only) .TP -.B \fI\%\-pgmi ⟨cmd⟩\fP +.B \fB\-pgmi ⟨cmd⟩\fP Use ⟨cmd⟩ as the external interpreter command. .TP -.B \fI\%\-pgmL ⟨cmd⟩\fP +.B \fB\-pgminstall_name_tool ⟨cmd⟩\fP +Use ⟨cmd⟩ as the program to inject \fBrunpath\fP into mach\-o dylibs on macOS +.TP +.B \fB\-pgmL ⟨cmd⟩\fP Use ⟨cmd⟩ as the literate pre\-processor .TP -.B \fI\%\-pgml ⟨cmd⟩\fP +.B \fB\-pgml ⟨cmd⟩\fP Use ⟨cmd⟩ as the linker .TP -.B \fI\%\-pgmlc ⟨cmd⟩\fP +.B \fB\-pgmlc ⟨cmd⟩\fP Use ⟨cmd⟩ as the LLVM compiler .TP -.B \fI\%\-pgmlibtool ⟨cmd⟩\fP +.B \fB\-pgmlibtool ⟨cmd⟩\fP Use ⟨cmd⟩ as the command for libtool (with \fB\-staticlib\fP only). .TP -.B \fI\%\-pgmlo ⟨cmd⟩\fP +.B \fB\-pgmlm ⟨cmd⟩\fP +Use ⟨cmd⟩ as the linker when merging object files +.TP +.B \fB\-pgmlo ⟨cmd⟩\fP Use ⟨cmd⟩ as the LLVM optimiser .TP -.B \fI\%\-pgmP ⟨cmd⟩\fP +.B \fB\-pgmotool ⟨cmd⟩\fP +Use ⟨cmd⟩ as the program to inspect mach\-o dylibs on macOS +.TP +.B \fB\-pgmP ⟨cmd⟩\fP Use ⟨cmd⟩ as the C pre\-processor (with \fB\-cpp\fP only) .TP -.B \fI\%\-pgms ⟨cmd⟩\fP +.B \fB\-pgms ⟨cmd⟩\fP Use ⟨cmd⟩ as the splitter .TP -.B \fI\%\-pgmwindres ⟨cmd⟩\fP +.B \fB\-pgmwindres ⟨cmd⟩\fP Use ⟨cmd⟩ as the program for embedding manifests on Windows. .UNINDENT .SS Phase\-specific options .INDENT 0.0 .TP -.B \fI\%\-opta ⟨option⟩\fP +.B \fB\-opta ⟨option⟩\fP pass ⟨option⟩ to the assembler .TP -.B \fI\%\-optc ⟨option⟩\fP +.B \fB\-optc ⟨option⟩\fP pass ⟨option⟩ to the C compiler .TP -.B \fI\%\-optdll ⟨option⟩\fP +.B \fB\-optcxx ⟨option⟩\fP +pass ⟨option⟩ to the C++ compiler +.TP +.B \fB\-optdll ⟨option⟩\fP pass ⟨option⟩ to the DLL generator .TP -.B \fI\%\-optF ⟨option⟩\fP +.B \fB\-optF ⟨option⟩\fP pass ⟨option⟩ to the custom pre\-processor .TP -.B \fI\%\-opti ⟨option⟩\fP +.B \fB\-opti ⟨option⟩\fP pass ⟨option⟩ to the interpreter sub\-process. .TP -.B \fI\%\-optL ⟨option⟩\fP +.B \fB\-optL ⟨option⟩\fP pass ⟨option⟩ to the literate pre\-processor .TP -.B \fI\%\-optl ⟨option⟩\fP +.B \fB\-optl ⟨option⟩\fP pass ⟨option⟩ to the linker .TP -.B \fI\%\-optlc ⟨option⟩\fP +.B \fB\-optlc ⟨option⟩\fP pass ⟨option⟩ to the LLVM compiler .TP -.B \fI\%\-optlo ⟨option⟩\fP +.B \fB\-optlm ⟨option⟩\fP +pass ⟨option⟩ to the linker when merging object files. +.TP +.B \fB\-optlo ⟨option⟩\fP pass ⟨option⟩ to the LLVM optimiser .TP -.B \fI\%\-optP ⟨option⟩\fP +.B \fB\-optP ⟨option⟩\fP pass ⟨option⟩ to cpp (with \fB\-cpp\fP only) .TP -.B \fI\%\-optwindres ⟨option⟩\fP +.B \fB\-optwindres ⟨option⟩\fP pass ⟨option⟩ to \fBwindres\fP\&. +.TP +.B \fB\-pgmc\-supports\-no\-pie\fP +Indicate that the C compiler supports \fB\-no\-pie\fP .UNINDENT .SS Platform\-specific options .INDENT 0.0 .TP -.B \fI\%\-msse2\fP +.B \fB\-mbmi2\fP +(x86 only) Use BMI2 for bit manipulation operations +.TP +.B \fB\-msse2\fP (x86 only) Use SSE2 for floating\-point operations .TP -.B \fI\%\-msse4.2\fP +.B \fB\-msse4.2\fP (x86 only) Use SSE4.2 for floating\-point operations .UNINDENT .SS Compiler plugins .INDENT 0.0 .TP -.B \fI\%\-fplugin\-opt=⟨module⟩:⟨args⟩\fP +.B \fB\-fclear\-plugins\fP +Clear the list of active plugins +.TP +.B \fB\-fplugin\-opt=⟨module⟩:⟨args⟩\fP Give arguments to a plugin module; module must be specified with -\fI\%\-fplugin=⟨module⟩\fP +\fB\-fplugin=⟨module⟩\fP +.TP +.B \fB\-fplugin\-trustworthy\fP +Trust the used plugins and no longer mark the compiled module +as unsafe .TP -.B \fI\%\-fplugin=⟨module⟩\fP +.B \fB\-fplugin=⟨module⟩\fP Load a plugin exported by a given module .TP -.B \fI\%\-hide\-all\-plugin\-packages\fP +.B \fB\-hide\-all\-plugin\-packages\fP Hide all packages for plugins by default .TP -.B \fI\%\-plugin\-package ⟨pkg⟩\fP +.B \fB\-plugin\-package ⟨pkg⟩\fP Expose ⟨pkg⟩ for plugins .TP -.B \fI\%\-plugin\-package\-id ⟨pkg\-id⟩\fP +.B \fB\-plugin\-package\-id ⟨pkg\-id⟩\fP Expose ⟨pkg\-id⟩ for plugins .UNINDENT .SS Profiling .INDENT 0.0 .TP -.B \fI\%\-fno\-prof\-auto\fP -Disables any previous \fI\%\-fprof\-auto\fP, -\fI\%\-fprof\-auto\-top\fP, or \fI\%\-fprof\-auto\-exported\fP options. +.B \fB\-fno\-prof\-auto\fP +Disables any previous \fB\-fprof\-auto\fP, +\fB\-fprof\-auto\-top\fP, or \fB\-fprof\-auto\-exported\fP options. .TP -.B \fI\%\-fno\-prof\-cafs\fP -Disables any previous \fI\%\-fprof\-cafs\fP option. +.B \fB\-fno\-prof\-cafs\fP +Disables any previous \fB\-fprof\-cafs\fP option. .TP -.B \fI\%\-fno\-prof\-count\-entries\fP +.B \fB\-fno\-prof\-count\-entries\fP Do not collect entry counts .TP -.B \fI\%\-fprof\-auto\fP +.B \fB\-fprof\-auto\fP Auto\-add \fBSCC\fP\e s to all bindings not marked INLINE .TP -.B \fI\%\-fprof\-auto\-calls\fP +.B \fB\-fprof\-auto\-calls\fP Auto\-add \fBSCC\fP\e s to all call sites .TP -.B \fI\%\-fprof\-auto\-exported\fP +.B \fB\-fprof\-auto\-exported\fP Auto\-add \fBSCC\fP\e s to all exported bindings not marked INLINE .TP -.B \fI\%\-fprof\-auto\-top\fP +.B \fB\-fprof\-auto\-top\fP Auto\-add \fBSCC\fP\e s to all top\-level bindings not marked INLINE .TP -.B \fI\%\-fprof\-cafs\fP +.B \fB\-fprof\-cafs\fP Auto\-add \fBSCC\fP\e s to all CAFs .TP -.B \fI\%\-prof\fP +.B \fB\-prof\fP Turn on profiling .TP -.B \fI\%\-ticky\fP -\fI\%Turn on ticky\-ticky profiling\fP +.B \fB\-ticky\fP +Turn on ticky\-ticky profiling .UNINDENT .SS Program coverage .INDENT 0.0 .TP -.B \fI\%\-fhpc\fP +.B \fB\-fhpc\fP Turn on Haskell program coverage instrumentation .UNINDENT .SS Recompilation checking .INDENT 0.0 .TP -.B \fI\%\-fforce\-recomp\fP +.B \fB\-fforce\-recomp\fP Turn off recompilation checking. This is implied by any \fB\-ddump\-X\fP option when compiling a single file (i.e. when using \fB\-c\fP). .TP -.B \fI\%\-fignore\-hpc\-changes\fP +.B \fB\-fignore\-hpc\-changes\fP Do not recompile modules just to match changes to HPC flags. This is especially useful for avoiding recompilation when using GHCi, and is enabled by default for GHCi. .TP -.B \fI\%\-fignore\-optim\-changes\fP +.B \fB\-fignore\-optim\-changes\fP Do not recompile modules just to match changes to optimisation flags. This is especially useful for avoiding recompilation when using GHCi, and is enabled by default for @@ -1622,430 +1780,549 @@ GHCi. .SS Redirecting output .INDENT 0.0 .TP -.B \fI\%\-\-exclude\-module=⟨file⟩\fP +.B \fB\-\-exclude\-module=⟨file⟩\fP Regard \fB⟨file⟩\fP as "stable"; i.e., exclude it from having dependencies on it. .TP -.B \fI\%\-ddump\-mod\-cycles\fP +.B \fB\-ddump\-mod\-cycles\fP Dump module cycles .TP -.B \fI\%\-dep\-makefile ⟨file⟩\fP +.B \fB\-dep\-makefile ⟨file⟩\fP Use ⟨file⟩ as the makefile .TP -.B \fI\%\-dep\-suffix ⟨suffix⟩\fP +.B \fB\-dep\-suffix ⟨suffix⟩\fP Make dependencies that declare that files with suffix \fB\&.⟨suf⟩⟨osuf⟩\fP depend on interface files with suffix \fB\&.⟨suf⟩hi\fP .TP -.B \fI\%\-dumpdir ⟨dir⟩\fP +.B \fB\-dumpdir ⟨dir⟩\fP redirect dump files .TP -.B \fI\%\-hcsuf ⟨suffix⟩\fP +.B \fB\-hcsuf ⟨suffix⟩\fP set the suffix to use for intermediate C files .TP -.B \fI\%\-hidir ⟨dir⟩\fP +.B \fB\-hidir ⟨dir⟩\fP set directory for interface files .TP -.B \fI\%\-hisuf ⟨suffix⟩\fP +.B \fB\-hiedir ⟨dir⟩\fP +set directory for extended interface files +.TP +.B \fB\-hiesuf ⟨suffix⟩\fP +set the suffix to use for extended interface files +.TP +.B \fB\-hisuf ⟨suffix⟩\fP set the suffix to use for interface files .TP -.B \fI\%\-include\-pkg\-deps\fP +.B \fB\-include\-cpp\-deps\fP +Include preprocessor dependencies +.TP +.B \fB\-include\-pkg\-deps\fP Regard modules imported from packages as unstable .TP -.B \fI\%\-o ⟨file⟩\fP +.B \fB\-o ⟨file⟩\fP set output filename .TP -.B \fI\%\-odir ⟨dir⟩\fP +.B \fB\-odir ⟨dir⟩\fP set directory for object files .TP -.B \fI\%\-ohi ⟨file⟩\fP +.B \fB\-ohi ⟨file⟩\fP set the filename in which to put the interface .TP -.B \fI\%\-osuf ⟨suffix⟩\fP +.B \fB\-osuf ⟨suffix⟩\fP set the output file suffix .TP -.B \fI\%\-outputdir ⟨dir⟩\fP +.B \fB\-outputdir ⟨dir⟩\fP set output directory .TP -.B \fI\%\-stubdir ⟨dir⟩\fP +.B \fB\-stubdir ⟨dir⟩\fP redirect FFI stub files .UNINDENT .SS Temporary files .INDENT 0.0 .TP -.B \fI\%\-tmpdir ⟨dir⟩\fP +.B \fB\-tmpdir ⟨dir⟩\fP set the directory for temporary files .UNINDENT .SS Verbosity options .INDENT 0.0 .TP -.B \fI\%\-fdiagnostics\-color=⟨always|auto|never⟩\fP +.B \fB\-fabstract\-refinement\-hole\-fits\fP +\fIdefault: off.\fP Toggles whether refinements where one or more +of the holes are abstract are reported. +.TP +.B \fB\-fdefer\-diagnostics\fP +Defer and group diagnostic messages by severity +.TP +.B \fB\-fdiagnostics\-color=⟨always|auto|never⟩\fP Use colors in error messages .TP -.B \fI\%\-fdiagnostics\-show\-caret\fP +.B \fB\-fdiagnostics\-show\-caret\fP Whether to show snippets of original source code .TP -.B \fI\%\-ferror\-spans\fP +.B \fB\-ferror\-spans\fP Output full span in error messages .TP -.B \fI\%\-fhide\-source\-paths\fP +.B \fB\-fhide\-source\-paths\fP hide module source and object paths .TP -.B \fI\%\-fprint\-equality\-relations\fP +.B \fB\-fkeep\-going\fP +Continue compilation as far as possible on errors +.TP +.B \fB\-fmax\-refinement\-hole\-fits=⟨n⟩\fP +\fIdefault: 6.\fP Set the maximum number of refinement hole fits +for typed holes to display in type error messages. +.TP +.B \fB\-fmax\-relevant\-binds=⟨n⟩\fP +\fIdefault: 6.\fP Set the maximum number of bindings to display in +type error messages. +.TP +.B \fB\-fmax\-valid\-hole\-fits=⟨n⟩\fP +\fIdefault: 6.\fP Set the maximum number of valid hole fits for +typed holes to display in type error messages. +.TP +.B \fB\-fno\-show\-valid\-hole\-fits\fP +Disables showing a list of valid hole fits for typed holes +in type error messages. +.TP +.B \fB\-fno\-sort\-valid\-hole\-fits\fP +Disables the sorting of the list of valid hole fits for typed holes +in type error messages. +.TP +.B \fB\-fprint\-axiom\-incomps\fP +Display equation incompatibilities in closed type families +.TP +.B \fB\-fprint\-equality\-relations\fP Distinguish between equality relations when printing .TP -.B \fI\%\-fprint\-expanded\-synonyms\fP +.B \fB\-fprint\-expanded\-synonyms\fP In type errors, also print type\-synonym\-expanded types. .TP -.B \fI\%\-fprint\-explicit\-coercions\fP +.B \fB\-fprint\-explicit\-coercions\fP Print coercions in types .TP -.B \fI\%\-fprint\-explicit\-foralls\fP +.B \fB\-fprint\-explicit\-foralls\fP Print explicit \fBforall\fP quantification in types. -See also \fB\-XExplicitForAll\fP +See also \fBExplicitForAll\fP .TP -.B \fI\%\-fprint\-explicit\-kinds\fP +.B \fB\-fprint\-explicit\-kinds\fP Print explicit kind foralls and kind arguments in types. -See also \fB\-XKindSignatures\fP -.TP -.B \fI\%\-fprint\-explicit\-runtime\-rep\fP -Print \fBRuntimeRep\fP variables in types which are -runtime\-representation polymorphic. +See also \fBKindSignatures\fP .TP -.B \fI\%\-fprint\-explicit\-runtime\-reps\fP +.B \fB\-fprint\-explicit\-runtime\-reps\fP Print \fBRuntimeRep\fP variables in types which are runtime\-representation polymorphic. .TP -.B \fI\%\-fprint\-potential\-instances\fP +.B \fB\-fprint\-potential\-instances\fP display all available instances in type error messages .TP -.B \fI\%\-fprint\-typechecker\-elaboration\fP +.B \fB\-fprint\-typechecker\-elaboration\fP Print extra information from typechecker. .TP -.B \fI\%\-fprint\-unicode\-syntax\fP +.B \fB\-fprint\-unicode\-syntax\fP Use unicode syntax when printing expressions, types and kinds. -See also \fB\-XUnicodeSyntax\fP +See also \fBUnicodeSyntax\fP +.TP +.B \fB\-frefinement\-level\-hole\-fits=⟨n⟩\fP +\fIdefault: off.\fP Sets the level of refinement of the +refinement hole fits, where level \fBn\fP means that hole fits +of up to \fBn\fP holes will be considered. +.TP +.B \fB\-freverse\-errors\fP +Output errors in reverse order +.TP +.B \fB\-fshow\-docs\-of\-hole\-fits\fP +Toggles whether to show the documentation of the valid +hole fits in the output. .TP -.B \fI\%\-fshow\-hole\-constraints\fP -Show constraints when reporting typed holes +.B \fB\-fshow\-hole\-constraints\fP +Show constraints when reporting typed holes. .TP -.B \fI\%\-Rghc\-timing\fP +.B \fB\-fshow\-hole\-matches\-of\-hole\-fits\fP +Toggles whether to show the type of the additional holes +in refinement hole fits. +.TP +.B \fB\-fshow\-provenance\-of\-hole\-fits\fP +Toggles whether to show the provenance of the valid hole fits +in the output. +.TP +.B \fB\-fshow\-type\-app\-of\-hole\-fits\fP +Toggles whether to show the type application of the valid +hole fits in the output. +.TP +.B \fB\-fshow\-type\-app\-vars\-of\-hole\-fits\fP +Toggles whether to show what type each quantified +variable takes in a valid hole fit. +.TP +.B \fB\-fshow\-type\-of\-hole\-fits\fP +Toggles whether to show the type of the valid hole fits +in the output. +.TP +.B \fB\-funclutter\-valid\-hole\-fits\fP +Unclutter the list of valid hole fits by not showing +provenance nor type applications of suggestions. +.TP +.B \fB\-Rghc\-timing\fP Summarise timing stats for GHC (same as \fB+RTS \-tstderr\fP). .TP -.B \fI\%\-v\fP +.B \fB\-v\fP verbose mode (equivalent to \fB\-v3\fP) .TP -.B \fI\%\-v⟨n⟩\fP +.B \fB\-v⟨n⟩\fP set verbosity level .UNINDENT .SS Warnings .INDENT 0.0 .TP -.B \fI\%\-fdefer\-out\-of\-scope\-variables\fP +.B \fB\-fdefer\-out\-of\-scope\-variables\fP Convert variable out of scope variables errors into warnings. -Implied by \fI\%\-fdefer\-type\-errors\fP\&. -See also \fI\%\-Wdeferred\-out\-of\-scope\-variables\fP\&. -.TP -.B \fI\%\-fdefer\-type\-errors\fP -Turn type errors into warnings, \fIdeferring the error until -runtime\fP\&. Implies -\fI\%\-fdefer\-typed\-holes\fP and -\fI\%\-fdefer\-out\-of\-scope\-variables\fP\&. -See also \fI\%\-Wdeferred\-type\-errors\fP -.TP -.B \fI\%\-fdefer\-typed\-holes\fP -Convert \fItyped hole\fP errors into warnings, -\fIdeferring the error until runtime\fP\&. -Implied by \fI\%\-fdefer\-type\-errors\fP\&. -See also \fI\%\-Wtyped\-holes\fP\&. -.TP -.B \fI\%\-fhelpful\-errors\fP +Implied by \fB\-fdefer\-type\-errors\fP\&. +See also \fB\-Wdeferred\-out\-of\-scope\-variables\fP\&. +.TP +.B \fB\-fdefer\-type\-errors\fP +Turn type errors into warnings, deferring the error until +runtime\&. Implies +\fB\-fdefer\-typed\-holes\fP and +\fB\-fdefer\-out\-of\-scope\-variables\fP\&. +See also \fB\-Wdeferred\-type\-errors\fP +.TP +.B \fB\-fdefer\-typed\-holes\fP +Convert typed hole errors into warnings, +deferring the error until runtime\&. +Implied by \fB\-fdefer\-type\-errors\fP\&. +See also \fB\-Wtyped\-holes\fP\&. +.TP +.B \fB\-fenable\-th\-splice\-warnings\fP +Generate warnings for Template Haskell splices +.TP +.B \fB\-fhelpful\-errors\fP Make suggestions for mis\-spelled names. .TP -.B \fI\%\-fmax\-pmcheck\-iterations=⟨n⟩\fP -the iteration limit for the pattern match checker +.B \fB\-fmax\-pmcheck\-models=⟨n⟩\fP +soft limit on the number of parallel models the pattern match +checker should check a pattern match clause against .TP -.B \fI\%\-fshow\-warning\-groups\fP +.B \fB\-fshow\-warning\-groups\fP show which group an emitted warning belongs to. .TP -.B \fI\%\-W\fP +.B \fB\-fvia\-C\fP +use the C code generator +.TP +.B \fB\-W\fP enable normal warnings .TP -.B \fI\%\-w\fP +.B \fB\-w\fP disable all warnings .TP -.B \fI\%\-Wall\fP -enable almost all warnings (details in \fI\%Warnings and sanity\-checking\fP) +.B \fB\-Wall\fP +enable almost all warnings (details in options\-sanity) .TP -.B \fI\%\-Wall\-missed\-specialisations\fP +.B \fB\-Wall\-missed\-specialisations\fP warn when specialisation of any overloaded function fails. .TP -.B \fI\%\-Wamp\fP -\fI(deprecated)\fP warn on definitions conflicting with the -Applicative\-Monad Proposal (AMP) -.TP -.B \fI\%\-Wcompat\fP +.B \fB\-Wcompat\fP enable future compatibility warnings -(details in \fI\%Warnings and sanity\-checking\fP) +(details in options\-sanity) +.TP +.B \fB\-Wcompat\-unqualified\-imports\fP +Report unqualified imports of core libraries which are expected +to cause compatibility problems in future releases. .TP -.B \fI\%\-Wcpp\-undef\fP +.B \fB\-Wcpp\-undef\fP warn on uses of the \fI#if\fP directive on undefined identifiers .TP -.B \fI\%\-Wdeferred\-out\-of\-scope\-variables\fP +.B \fB\-Wdeferred\-out\-of\-scope\-variables\fP Report warnings when variable out\-of\-scope errors are -\fIdeferred until runtime\fP\&. -See \fI\%\-fdefer\-out\-of\-scope\-variables\fP\&. +deferred until runtime\&. +See \fB\-fdefer\-out\-of\-scope\-variables\fP\&. .TP -.B \fI\%\-Wdeferred\-type\-errors\fP -Report warnings when \fIdeferred type errors\fP are enabled. This option is enabled by -default. See \fI\%\-fdefer\-type\-errors\fP\&. +.B \fB\-Wdeferred\-type\-errors\fP +Report warnings when deferred type errors are enabled. This option is enabled by +default. See \fB\-fdefer\-type\-errors\fP\&. .TP -.B \fI\%\-Wdeprecated\-flags\fP +.B \fB\-Wdeprecated\-flags\fP warn about uses of commandline flags that are deprecated .TP -.B \fI\%\-Wdeprecations\fP +.B \fB\-Wdeprecations\fP warn about uses of functions & types that have warnings or -deprecated pragmas. Alias for \fI\%\-Wwarnings\-deprecations\fP +deprecated pragmas. Alias for \fB\-Wwarnings\-deprecations\fP .TP -.B \fI\%\-Wdodgy\-exports\fP +.B \fB\-Wderiving\-defaults\fP +warn about default deriving when using both +\fBDeriveAnyClass\fP and \fBGeneralizedNewtypeDeriving\fP +.TP +.B \fB\-Wdodgy\-exports\fP warn about dodgy exports .TP -.B \fI\%\-Wdodgy\-foreign\-imports\fP +.B \fB\-Wdodgy\-foreign\-imports\fP warn about dodgy foreign imports .TP -.B \fI\%\-Wdodgy\-imports\fP +.B \fB\-Wdodgy\-imports\fP warn about dodgy imports .TP -.B \fI\%\-Wduplicate\-constraints\fP +.B \fB\-Wduplicate\-constraints\fP warn when a constraint appears duplicated in a type signature .TP -.B \fI\%\-Wduplicate\-exports\fP +.B \fB\-Wduplicate\-exports\fP warn when an entity is exported multiple times .TP -.B \fI\%\-Wempty\-enumerations\fP +.B \fB\-Wempty\-enumerations\fP warn about enumerations that are empty .TP -.B \fI\%\-Werror\fP +.B \fB\-Werror\fP make warnings fatal .TP -.B \fI\%\-Weverything\fP +.B \fB\-Weverything\fP enable all warnings supported by GHC .TP -.B \fI\%\-Whi\-shadowing\fP +.B \fB\-Whi\-shadowing\fP +\fI(deprecated)\fP warn when a \fB\&.hi\fP file in the current directory shadows a library .TP -.B \fI\%\-Widentities\fP +.B \fB\-Widentities\fP warn about uses of Prelude numeric conversions that are probably the identity (and hence could be omitted) .TP -.B \fI\%\-Wimplicit\-prelude\fP +.B \fB\-Wimplicit\-kind\-vars\fP +warn when kind variables are implicitly quantified over. +.TP +.B \fB\-Wimplicit\-prelude\fP warn when the Prelude is implicitly imported .TP -.B \fI\%\-Wincomplete\-patterns\fP +.B \fB\-Winaccessible\-code\fP +warn about inaccessible code +.TP +.B \fB\-Wincomplete\-patterns\fP warn when a pattern match could fail .TP -.B \fI\%\-Wincomplete\-record\-updates\fP +.B \fB\-Wincomplete\-record\-updates\fP warn when a record update could fail .TP -.B \fI\%\-Wincomplete\-uni\-patterns\fP +.B \fB\-Wincomplete\-uni\-patterns\fP warn when a pattern match in a lambda expression or pattern binding could fail .TP -.B \fI\%\-Winline\-rule\-shadowing\fP +.B \fB\-Winline\-rule\-shadowing\fP Warn if a rewrite RULE might fail to fire because the function might be inlined before the rule has a chance to fire. -See \fIrules\-inline\fP\&. +See rules\-inline\&. +.TP +.B \fB\-Wmissed\-extra\-shared\-lib\fP +Warn when GHCi can\(aqt load a shared lib. .TP -.B \fI\%\-Wmissed\-specialisations\fP +.B \fB\-Wmissed\-specialisations\fP warn when specialisation of an imported, overloaded function fails. .TP -.B \fI\%\-Wmissing\-export\-lists\fP +.B \fB\-Wmissing\-deriving\-strategies\fP +warn when a deriving clause is missing a deriving strategy +.TP +.B \fB\-Wmissing\-export\-lists\fP warn when a module declaration does not explicitly list all exports .TP -.B \fI\%\-Wmissing\-exported\-signatures\fP +.B \fB\-Wmissing\-exported\-signatures\fP warn about top\-level functions without signatures, only if they are exported. takes precedence over \-Wmissing\-signatures .TP -.B \fI\%\-Wmissing\-exported\-sigs\fP +.B \fB\-Wmissing\-exported\-sigs\fP \fI(deprecated)\fP warn about top\-level functions without signatures, only if they are exported. takes precedence over \-Wmissing\-signatures .TP -.B \fI\%\-Wmissing\-fields\fP +.B \fB\-Wmissing\-fields\fP warn when fields of a record are uninitialised .TP -.B \fI\%\-Wmissing\-home\-modules\fP +.B \fB\-Wmissing\-home\-modules\fP warn when encountering a home module imported, but not listed on the command line. Useful for cabal to ensure GHC won\(aqt pick up modules, not listed neither in \fBexposed\-modules\fP, nor in \fBother\-modules\fP\&. .TP -.B \fI\%\-Wmissing\-import\-lists\fP +.B \fB\-Wmissing\-import\-lists\fP warn when an import declaration does not explicitly list all the names brought into scope .TP -.B \fI\%\-Wmissing\-local\-signatures\fP +.B \fB\-Wmissing\-local\-signatures\fP warn about polymorphic local bindings without signatures .TP -.B \fI\%\-Wmissing\-local\-sigs\fP +.B \fB\-Wmissing\-local\-sigs\fP \fI(deprecated)\fP warn about polymorphic local bindings without signatures .TP -.B \fI\%\-Wmissing\-methods\fP +.B \fB\-Wmissing\-methods\fP warn when class methods are undefined .TP -.B \fI\%\-Wmissing\-monadfail\-instances\fP +.B \fB\-Wmissing\-monadfail\-instances\fP Warn when a failable pattern is used in a do\-block that does not have a \fBMonadFail\fP instance. .TP -.B \fI\%\-Wmissing\-pattern\-synonym\-signatures\fP +.B \fB\-Wmissing\-pattern\-synonym\-signatures\fP warn when pattern synonyms do not have type signatures .TP -.B \fI\%\-Wmissing\-signatures\fP +.B \fB\-Wmissing\-signatures\fP warn about top\-level functions without signatures .TP -.B \fI\%\-Wmonomorphism\-restriction\fP +.B \fB\-Wmonomorphism\-restriction\fP warn when the Monomorphism Restriction is applied .TP -.B \fI\%\-Wname\-shadowing\fP +.B \fB\-Wname\-shadowing\fP warn when names are shadowed .TP -.B \fI\%\-Wno\-compat\fP -Disables all warnings enabled by \fI\%\-Wcompat\fP\&. +.B \fB\-Wno\-compat\fP +Disables all warnings enabled by \fB\-Wcompat\fP\&. .TP -.B \fI\%\-Wnoncanonical\-monad\-instances\fP +.B \fB\-Wnoncanonical\-monad\-instances\fP warn when \fBApplicative\fP or \fBMonad\fP instances have noncanonical definitions of \fBreturn\fP, \fBpure\fP, \fB(>>)\fP, or \fB(*>)\fP\&. -See flag description in \fI\%Warnings and sanity\-checking\fP for more details. +See flag description in options\-sanity for more details. .TP -.B \fI\%\-Wnoncanonical\-monadfail\-instances\fP +.B \fB\-Wnoncanonical\-monadfail\-instances\fP warn when \fBMonad\fP or \fBMonadFail\fP instances have noncanonical definitions of \fBfail\fP\&. -See flag description in \fI\%Warnings and sanity\-checking\fP for more details. +See flag description in options\-sanity for more details. .TP -.B \fI\%\-Wnoncanonical\-monoid\-instances\fP +.B \fB\-Wnoncanonical\-monoid\-instances\fP warn when \fBSemigroup\fP or \fBMonoid\fP instances have noncanonical definitions of \fB(<>)\fP or \fBmappend\fP\&. -See flag description in \fI\%Warnings and sanity\-checking\fP for more details. +See flag description in options\-sanity for more details. .TP -.B \fI\%\-Worphans\fP -warn when the module contains \fIorphan instance declarations -or rewrite rules\fP +.B \fB\-Worphans\fP +warn when the module contains orphan instance declarations +or rewrite rules .TP -.B \fI\%\-Woverflowed\-literals\fP +.B \fB\-Woverflowed\-literals\fP warn about literals that will overflow their type .TP -.B \fI\%\-Woverlapping\-patterns\fP +.B \fB\-Woverlapping\-patterns\fP warn about overlapping patterns .TP -.B \fI\%\-Wpartial\-fields\fP +.B \fB\-Wpartial\-fields\fP warn when defining a partial record field. .TP -.B \fI\%\-Wpartial\-type\-signatures\fP +.B \fB\-Wpartial\-type\-signatures\fP warn about holes in partial type signatures when -\fB\-XPartialTypeSignatures\fP is enabled. Not applicable when -\fB\-XPartialTypesignatures\fP is not enabled, in which case -errors are generated for such holes. See -\fIpartial\-type\-signatures\fP\&. +\fBPartialTypeSignatures\fP is enabled. Not applicable when +\fBPartialTypeSignatures\fP is not enabled, in which case +errors are generated for such holes. .TP -.B \fI\%\-Wredundant\-constraints\fP +.B \fB\-Wredundant\-constraints\fP Have the compiler warn about redundant constraints in type signatures. .TP -.B \fI\%\-Wsafe\fP +.B \fB\-Wredundant\-record\-wildcards\fP +Warn about record wildcard matches when the wildcard binds no patterns. +.TP +.B \fB\-Wsafe\fP warn if the module being compiled is regarded to be safe. .TP -.B \fI\%\-Wsemigroup\fP +.B \fB\-Wsemigroup\fP warn when a \fBMonoid\fP is not \fBSemigroup\fP, and on non\- \fBSemigroup\fP definitions of \fB(<>)\fP? .TP -.B \fI\%\-Wsimplifiable\-class\-constraints\fP -2arn about class constraints in a type signature that can +.B \fB\-Wsimplifiable\-class\-constraints\fP +Warn about class constraints in a type signature that can be simplified using a top\-level instance declaration. .TP -.B \fI\%\-Wtabs\fP +.B \fB\-Wspace\-after\-bang\fP +warn for missing space before the second argument +of an infix definition of \fB(!)\fP when +\fBBangPatterns\fP are not enabled +.TP +.B \fB\-Wstar\-binder\fP +warn about binding the \fB(*)\fP type operator despite +\fBStarIsType\fP +.TP +.B \fB\-Wstar\-is\-type\fP +warn when \fB*\fP is used to mean \fBData.Kind.Type\fP +.TP +.B \fB\-Wtabs\fP warn if there are tabs in the source file .TP -.B \fI\%\-Wtrustworthy\-safe\fP +.B \fB\-Wtrustworthy\-safe\fP warn if the module being compiled is marked as -\fI\%Trustworthy\fP but it could instead be marked as -\fI\%Safe\fP, a more informative bound. +\fBTrustworthy\fP but it could instead be marked as +\fBSafe\fP, a more informative bound. .TP -.B \fI\%\-Wtype\-defaults\fP +.B \fB\-Wtype\-defaults\fP warn when defaulting happens .TP -.B \fI\%\-Wtyped\-holes\fP -Report warnings when \fItyped hole\fP errors are -\fIdeferred until runtime\fP\&. See -\fI\%\-fdefer\-typed\-holes\fP\&. +.B \fB\-Wtyped\-holes\fP +Report warnings when typed hole errors are +deferred until runtime\&. See +\fB\-fdefer\-typed\-holes\fP\&. .TP -.B \fI\%\-Wunbanged\-strict\-patterns\fP +.B \fB\-Wunbanged\-strict\-patterns\fP warn on pattern bind of unlifted variable that is neither bare nor banged .TP -.B \fI\%\-Wunrecognised\-pragmas\fP +.B \fB\-Wunrecognised\-pragmas\fP warn about uses of pragmas that GHC doesn\(aqt recognise .TP -.B \fI\%\-Wunrecognised\-warning\-flags\fP -throw a warning when an unreconised \fB\-W...\fP flag is +.B \fB\-Wunrecognised\-warning\-flags\fP +throw a warning when an unrecognised \fB\-W...\fP flag is encountered on the command line. .TP -.B \fI\%\-Wunsafe\fP +.B \fB\-Wunsafe\fP warn if the module being compiled is regarded to be unsafe. -See \fI\%Safe Haskell\fP +See safe\-haskell .TP -.B \fI\%\-Wunsupported\-calling\-conventions\fP +.B \fB\-Wunsupported\-calling\-conventions\fP warn about use of an unsupported calling convention .TP -.B \fI\%\-Wunsupported\-llvm\-version\fP +.B \fB\-Wunsupported\-llvm\-version\fP Warn when using \fB\-fllvm\fP with an unsupported version of LLVM. .TP -.B \fI\%\-Wunticked\-promoted\-constructors\fP +.B \fB\-Wunticked\-promoted\-constructors\fP warn if promoted constructors are not ticked .TP -.B \fI\%\-Wunused\-binds\fP +.B \fB\-Wunused\-binds\fP warn about bindings that are unused. Alias for -\fI\%\-Wunused\-top\-binds\fP, \fI\%\-Wunused\-local\-binds\fP and -\fI\%\-Wunused\-pattern\-binds\fP +\fB\-Wunused\-top\-binds\fP, \fB\-Wunused\-local\-binds\fP and +\fB\-Wunused\-pattern\-binds\fP .TP -.B \fI\%\-Wunused\-do\-bind\fP +.B \fB\-Wunused\-do\-bind\fP warn about do bindings that appear to throw away values of types other than \fB()\fP .TP -.B \fI\%\-Wunused\-foralls\fP +.B \fB\-Wunused\-foralls\fP warn about type variables in user\-written \fBforall\fP\es that are unused .TP -.B \fI\%\-Wunused\-imports\fP +.B \fB\-Wunused\-imports\fP warn about unnecessary imports .TP -.B \fI\%\-Wunused\-local\-binds\fP +.B \fB\-Wunused\-local\-binds\fP warn about local bindings that are unused .TP -.B \fI\%\-Wunused\-matches\fP +.B \fB\-Wunused\-matches\fP warn about variables in patterns that aren\(aqt used .TP -.B \fI\%\-Wunused\-pattern\-binds\fP +.B \fB\-Wunused\-packages\fP +warn when package is requested on command line, but was never loaded. +.TP +.B \fB\-Wunused\-pattern\-binds\fP warn about pattern match bindings that are unused .TP -.B \fI\%\-Wunused\-top\-binds\fP +.B \fB\-Wunused\-record\-wildcards\fP +Warn about record wildcard matches when none of the bound variables +are used. +.TP +.B \fB\-Wunused\-top\-binds\fP warn about top\-level bindings that are unused .TP -.B \fI\%\-Wunused\-type\-patterns\fP -warn about unused type variables which arise from patterns +.B \fB\-Wunused\-type\-patterns\fP +warn about unused type variables which arise from patterns in in type family and data family instances .TP -.B \fI\%\-Wwarn\fP +.B \fB\-Wwarn\fP make warnings non\-fatal .TP -.B \fI\%\-Wwarnings\-deprecations\fP +.B \fB\-Wwarnings\-deprecations\fP warn about uses of functions & types that have warnings or deprecated pragmas .TP -.B \fI\%\-Wwrong\-do\-bind\fP +.B \fB\-Wwrong\-do\-bind\fP warn about do bindings that appear to throw away monadic values that you should have bound instead .UNINDENT diff --git a/haskell/ghc/ghc.SlackBuild b/haskell/ghc/ghc.SlackBuild index 2d5985a6e8..f36be75be0 100644 --- a/haskell/ghc/ghc.SlackBuild +++ b/haskell/ghc/ghc.SlackBuild @@ -24,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ghc -VERSION=${VERSION:-8.4.3} -BUILD=${BUILD:-2} +VERSION=${VERSION:-8.10.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,7 +69,7 @@ if [ "${BOOTSTRAP:-yes}" = "yes" ] ; then cd $TMP rm -rf $PRGNAM-$VERSION - tar xvf $CWD/$PRGNAM-$VERSION-$TARARCH-deb8-linux.tar.xz + tar xvf $CWD/$PRGNAM-$VERSION-$TARARCH-deb9-linux.tar.xz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -96,7 +96,7 @@ if [ "${BOOTSTRAP:-yes}" = "yes" ] ; then mkdir -p $LIBTINFO_DIR ln -s /lib$LIBDIRSUFFIX/libncurses.so.5 $LIBTINFO_DIR/libtinfo.so.5 LD_LIBRARY_PATH=$LIBTINFO_DIR \ - make install + make -j1 install sed -i -r -e "s|^exec |LD_LIBRARY_PATH=$LIBTINFO_DIR exec |" $BOOTSTRAPDIR/usr/bin/ghc{,-pkg}-$VERSION BOOTSTRAPGHC=$BOOTSTRAPDIR/usr/bin/ghc @@ -115,11 +115,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 {} \; -# Fix build with Sphinx -# https://phabricator.haskell.org/D5161 -# https://github.com/ghc/ghc/commit/4eebc8016f68719e1ccdf460754a97d1f4d6ef05.patch -patch -p1 < $CWD/4eebc8016f68719e1ccdf460754a97d1f4d6ef05.patch - +GHC=$BOOTSTRAPGHC \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -128,21 +124,23 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-ghc=$BOOTSTRAPGHC + --docdir=/usr/doc/$PRGNAM-$VERSION make -make install DESTDIR=$PKG +make -j1 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 docs were not built and installed, let's install the prebuilt manpage -# (taken from ghc-8.4.3-x86_64-deb8-linux.tar.xz) +# (taken from the prebuilt tarball) if [ ! -d $PKG/usr/man ]; then install -D -m0644 $CWD/ghc.1 $PKG/usr/man/man1 fi +# Install the bash completion file too +install -D -m0644 utils/completion/ghc.bash $PKG/usr/share/bash-completion/completions/ghc + 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/haskell/ghc/ghc.info b/haskell/ghc/ghc.info index d77ec3fb35..b842c62d9f 100644 --- a/haskell/ghc/ghc.info +++ b/haskell/ghc/ghc.info @@ -1,14 +1,14 @@ PRGNAM="ghc" -VERSION="8.4.3" +VERSION="8.10.4" HOMEPAGE="https://haskell.org/ghc/" -DOWNLOAD="https://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-i386-deb8-linux.tar.xz \ - https://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-src.tar.xz" -MD5SUM="fcd2b5c34a3276146731dc34d0dc4694 \ - 5aebdda828eb544578b80132a1658315" -DOWNLOAD_x86_64="https://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-x86_64-deb8-linux.tar.xz \ - https://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-src.tar.xz" -MD5SUM_x86_64="99b63b934ed9f9659ac4adc3b711a3c0 \ - 5aebdda828eb544578b80132a1658315" +DOWNLOAD="https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-i386-deb9-linux.tar.xz \ + https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-src.tar.xz" +MD5SUM="7d55b957ea04db1eb214b92b52e1fa5c \ + 6262720694e38941ecb500c30a019342" +DOWNLOAD_x86_64="https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-x86_64-deb9-linux.tar.xz \ + https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-src.tar.xz" +MD5SUM_x86_64="4379535901684abd010bf1eac6664d21 \ + 6262720694e38941ecb500c30a019342" REQUIRES="" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" 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 -# Copyright 2008, 2009, 2010, 2011, 2015 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2015 Marcel Saegebarth -# Copyright 2016 Matteo Bernardini , Pisa, Italy -# Copyright 2017 Larry Hajali -# 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 -# Modified by Eric Hameleers -# Adapted by Marcel Saegebarth -# Adapted by Matteo Bernardini -# Updated for Qt5-5.9.6 by David Woodfall - -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 f1c927be4a..0000000000 --- a/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -# Slackware build script for QScintilla-qt5 - -# Copyright 2019-2021 Benjamin Trigona-Harany -# 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.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.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 75acbf5437..0000000000 --- a/libraries/QScintilla-qt5/QScintilla-qt5.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="QScintilla-qt5" -VERSION="2.11.6" -HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla" -DOWNLOAD="https://jaxartes.net/files/QScintilla-2.11.6.tar.gz" -MD5SUM="343cd0c2c8b425518df2e51eb994fbc6" -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 027bf390b1..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 f8758ec607..0000000000 --- a/libraries/SDL2/SDL2.SlackBuild +++ /dev/null @@ -1,100 +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. - -# 20210204 bkw: update for v2.0.14, reflow README. -# 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.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 /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 fb33399243..0000000000 --- a/libraries/SDL2/SDL2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="SDL2" -VERSION="2.0.14" -HOMEPAGE="https://libsdl.org" -DOWNLOAD="https://www.libsdl.org/release/SDL2-2.0.14.tar.gz" -MD5SUM="76ed4e6da9c07bd168b2acd9bfefab1b" -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..7fa81dd1b8 100644 --- a/libraries/VTK/VTK.SlackBuild +++ b/libraries/VTK/VTK.SlackBuild @@ -96,6 +96,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 {} \; +# Build with libfreetype-2.10.3 and higher patch courtesy of +# https://bugs.archlinux.org/task/68291#comments +# also upstream at https://gitlab.kitware.com/vtk/vtk/-/issues/18033 +patch -p1 < $CWD/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch + +sed -i '/include /a #include ' \ + 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 @@ -105,6 +114,11 @@ else proj="" fi +# https://github.com/archlinux/svntogit-community/blob/packages/vtk/trunk/PKGBUILD +( cd ThirdParty/exodusII/vtkexodusII + patch -p1 < $CWD/patch-gcc10.diff ) +sed -i 's|REGEX MATCH \"\[3-9\]|REGEX MATCH \"[1-9][0-9]|' CMake/VTKGenerateExportHeader.cmake + mkdir -p build cd build cmake \ diff --git a/libraries/VTK/patch-gcc10.diff b/libraries/VTK/patch-gcc10.diff new file mode 100644 index 0000000000..507c8a7a64 --- /dev/null +++ b/libraries/VTK/patch-gcc10.diff @@ -0,0 +1,40 @@ +From a9079bdccbb2165583d6773a5ed848427e2a38a8 Mon Sep 17 00:00:00 2001 +From: Seacas Upstream +Date: Tue, 28 Jan 2020 09:13:38 -0500 +Subject: [PATCH] exodusII 2020-01-28 (d97eb08d) + +Code extracted from: + + https://gitlab.kitware.com/third-party/seacas.git + +at commit d97eb08d79e87c82facfae39bc75deb60c0a2d83 (for/vtk-20200128-7.24f-v2019-12-18). +--- + src/ex_create_par.c | 2 +- + src/ex_open_par.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ex_create_par.c b/src/ex_create_par.c +index 8d5d6734f0..ef439618da 100644 +--- a/src/ex_create_par.c ++++ b/src/ex_create_par.c +@@ -216,5 +216,5 @@ int ex_create_par_int(const char *path, int cmode, int *comp_ws, int *io_ws, MPI + * Prevent warning in some versions of ranlib(1) because the object + * file has no symbols. + */ +-const char exodus_unused_symbol_dummy_1; ++const char exodus_unused_symbol_dummy_ex_create_par; + #endif +diff --git a/src/ex_open_par.c b/src/ex_open_par.c +index b2faa22c29..9df4818767 100644 +--- a/src/ex_open_par.c ++++ b/src/ex_open_par.c +@@ -459,5 +459,5 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float + * Prevent warning in some versions of ranlib(1) because the object + * file has no symbols. + */ +-const char exodus_unused_symbol_dummy_1; ++const char exodus_unused_symbol_dummy_ex_open_par; + #endif +-- +GitLab + diff --git a/libraries/VTK/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/libraries/VTK/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch new file mode 100644 index 0000000000..b467487350 --- /dev/null +++ b/libraries/VTK/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch @@ -0,0 +1,18 @@ +--- VTK-8.2.0/ThirdParty/freetype/vtk_freetype.h.in.orig 2019-01-30 18:15:13.000000000 +0100 ++++ VTK-8.2.0/ThirdParty/freetype/vtk_freetype.h.in 2020-10-17 00:03:32.730820908 +0200 +@@ -20,6 +20,15 @@ + + #ifdef VTK_USE_SYSTEM_FREETYPE + # include ++/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */ ++/* has been moved to */ ++# ifndef FT_CALLBACK_DEF ++# ifdef __cplusplus ++# define FT_CALLBACK_DEF( x ) extern "C" x ++# else ++# define FT_CALLBACK_DEF( x ) static x ++# endif ++# endif /* FT_CALLBACK_DEF */ + #else + # include + #endif diff --git a/libraries/afflib/afflib.SlackBuild b/libraries/afflib/afflib.SlackBuild index 8e74ea4dcd..e597e7263f 100644 --- a/libraries/afflib/afflib.SlackBuild +++ b/libraries/afflib/afflib.SlackBuild @@ -26,7 +26,7 @@ SRCNAM=AFFLIBv3 PRGNAM=afflib -VERSION=${VERSION:-3.7.7} +VERSION=${VERSION:-3.7.19} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/afflib/afflib.info b/libraries/afflib/afflib.info index 6a3ac46f4c..c06131732e 100644 --- a/libraries/afflib/afflib.info +++ b/libraries/afflib/afflib.info @@ -1,8 +1,8 @@ PRGNAM="afflib" -VERSION="3.7.7" +VERSION="3.7.19" HOMEPAGE="https://github.com/sshock/AFFLIBv3" -DOWNLOAD="https://github.com/sshock/AFFLIBv3/archive/v3.7.7/AFFLIBv3-3.7.7.tar.gz" -MD5SUM="a35ef9a443225fcbe99f7ad61fadb33b" +DOWNLOAD="https://github.com/sshock/AFFLIBv3/archive/v3.7.19/AFFLIBv3-3.7.19.tar.gz" +MD5SUM="83b2b89e23090930905547e7e47f9e09" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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(m_profile); } + + //--------------------------------------------------------------------- + int subpixel_width() const { return m_profile->subpixel_width(); } diff --git a/libraries/allegro4/allegro4.SlackBuild b/libraries/allegro4/allegro4.SlackBuild index 27a3b21428..2c4ab236f4 100644 --- a/libraries/allegro4/allegro4.SlackBuild +++ b/libraries/allegro4/allegro4.SlackBuild @@ -32,7 +32,7 @@ PRGNAM=allegro4 SRCNAM=allegro -VERSION=${VERSION:-4.4.2} +VERSION=${VERSION:-4.4.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -79,6 +79,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; patch -p1 < $CWD/build-dir.diff +patch -p1 < $CWD/texinfo-6.7.patch mkdir -p build cd build @@ -110,8 +111,7 @@ if [ -e /usr/share/sounds/eawpats/default.cfg ]; then $PKG/usr/share/$SRCNAM/patches.dat fi -mkdir -p $PKG/usr/doc/$SRCNAM-$VERSION -cp -a readme.txt todo.txt AUTHORS CHANGES THANKS $PKG/usr/doc/$SRCNAM-$VERSION +mv $PKG/usr/doc/$SRCNAM-* $PKG/usr/doc/$SRCNAM-$VERSION || true cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$SRCNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/allegro4/allegro4.info b/libraries/allegro4/allegro4.info index ebe3d3df24..cdb82cbe35 100644 --- a/libraries/allegro4/allegro4.info +++ b/libraries/allegro4/allegro4.info @@ -1,8 +1,8 @@ PRGNAM="allegro4" -VERSION="4.4.2" +VERSION="4.4.3.1" HOMEPAGE="https://www.allegro.cc/" -DOWNLOAD="https://downloads.sourceforge.net/alleg/allegro-4.4.2.tar.gz" -MD5SUM="4db71b0460fc99926ae91d223199c2e6" +DOWNLOAD="https://github.com/liballeg/allegro5/releases/download/4.4.3.1/allegro-4.4.3.1.tar.gz" +MD5SUM="d0435da87d4c157ad3620e1cc58b807e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/allegro4/texinfo-6.7.patch b/libraries/allegro4/texinfo-6.7.patch new file mode 100644 index 0000000000..23f3dc83d9 --- /dev/null +++ b/libraries/allegro4/texinfo-6.7.patch @@ -0,0 +1,10 @@ +--- a/docs/src/allegro._tx 2020-12-24 17:20:47.460212662 -0600 ++++ a/docs/src/allegro._tx 2020-12-24 17:22:03.453620793 -0600 +@@ -23,6 +23,7 @@ + @man_shortdesc_force1=allegro + @man_shortdesc_force2=Allegro game programming library. + @$\input texinfo ++@$@documentencoding ISO-8859-1 + @$@setfilename allegro.inf + @$@settitle Allegro Manual + @$@setchapternewpage odd 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/cfitsio/README b/libraries/cfitsio/README deleted file mode 100644 index 2f344cd6d6..0000000000 --- a/libraries/cfitsio/README +++ /dev/null @@ -1,13 +0,0 @@ -cfitsio is a library of ANSI C routines for reading and writing -FITS format data files. A set of Fortran-callable wrapper routines -is also included for the convenience of Fortran programmers. - -The documentation directory contains a comprehensive API reference -guide and instructions on using cfistio in Fortran programs. - -If you wish to build the library with the --enable-reentrant option, -run the SlackBuild script like this: - CFITSIO_REENTRANT=yes ./cfitsio.SlackBuild - -This option is disabled by default because some legacy software will -not link against reentrant libcfitsio. diff --git a/libraries/cfitsio/cfitsio.SlackBuild b/libraries/cfitsio/cfitsio.SlackBuild deleted file mode 100644 index a03fd5cf34..0000000000 --- a/libraries/cfitsio/cfitsio.SlackBuild +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh - -# Slackware build script for cfitsio - -# Copyright 2011-2020 Dominik Drobek -# 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=cfitsio -VERSION=${VERSION:-3.49} -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-reentrant is disabled by default, as it causes problems with legacy software -CFITSIO_REENTRANT=${CFITSIO_REENTRANT:-no} - -if [ "$CFITSIO_REENTRANT" = "no" ]; then - USE_REENTRANT="--disable-reentrant" -else - USE_REENTRANT="--enable-reentrant" -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 \ - --with-bzip2 \ - ${USE_REENTRANT} \ - --build=$ARCH-slackware-linux - -make shared -make install DESTDIR=$PKG - -# remove the static library: -rm $PKG/usr/lib${LIBDIRSUFFIX}/libcfitsio.a - -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.txt README docs/*.doc docs/changes.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/cfitsio/cfitsio.info b/libraries/cfitsio/cfitsio.info deleted file mode 100644 index 57e6cee76e..0000000000 --- a/libraries/cfitsio/cfitsio.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="cfitsio" -VERSION="3.49" -HOMEPAGE="https://heasarc.gsfc.nasa.gov/fitsio/" -DOWNLOAD="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz" -MD5SUM="171860ffed8c1a396fc497d853f285c1" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dominik Drobek" -EMAIL="dominik.drobek (at) o2.pl" diff --git a/libraries/cfitsio/slack-desc b/libraries/cfitsio/slack-desc deleted file mode 100644 index fad48f6b34..0000000000 --- a/libraries/cfitsio/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------------------------------------------------------| -cfitsio: cfitsio (FITS file I/O library for C) -cfitsio: -cfitsio: cfitsio is a library of ANSI C routines for reading and writing -cfitsio: FITS format data files. A set of Fortran-callable wrapper routines -cfitsio: is also included for the convenience of Fortran programmers. -cfitsio: -cfitsio: Homepage: https://heasarc.gsfc.nasa.gov/fitsio -cfitsio: -cfitsio: -cfitsio: -cfitsio: 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 , 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/cpprestsdk/cpprestsdk.SlackBuild b/libraries/cpprestsdk/cpprestsdk.SlackBuild index 6482c6239a..96cb2a7019 100644 --- a/libraries/cpprestsdk/cpprestsdk.SlackBuild +++ b/libraries/cpprestsdk/cpprestsdk.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cpprestsdk -VERSION=${VERSION:-2.9.1} +VERSION=${VERSION:-20201210_eb6801f} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,9 +60,8 @@ 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 -patch -p1 < $CWD/cpprestsdk.patch chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -74,9 +73,10 @@ mkdir -p Release/build cd Release/build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=format-truncation=" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_BINDIR=/usr/bin \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib$LIBDIRSUFFIX \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/cpprestsdk/cpprestsdk.info b/libraries/cpprestsdk/cpprestsdk.info index 58b9f3945a..ccff5876c0 100644 --- a/libraries/cpprestsdk/cpprestsdk.info +++ b/libraries/cpprestsdk/cpprestsdk.info @@ -1,8 +1,8 @@ PRGNAM="cpprestsdk" -VERSION="2.9.1" +VERSION="20201210_eb6801f" HOMEPAGE="https://github.com/Microsoft/cpprestsdk/" -DOWNLOAD="https://github.com/Microsoft/cpprestsdk/archive/v2.9.1/cpprestsdk-2.9.1.tar.gz" -MD5SUM="0c0e86ef413a05773ffad9de663f8889" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/cpprestsdk-20201210_eb6801f.tar.xz" +MD5SUM="dd06c04b302de7e9543e8485034176a9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/cpprestsdk/cpprestsdk.patch b/libraries/cpprestsdk/cpprestsdk.patch deleted file mode 100644 index cd6035db8a..0000000000 --- a/libraries/cpprestsdk/cpprestsdk.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur cpprestsdk-2.9.0.old/Release/src/CMakeLists.txt cpprestsdk-2.9.0/Release/src/CMakeLists.txt ---- cpprestsdk-2.9.0.old/Release/src/CMakeLists.txt 2016-10-18 17:30:28.000000000 -0200 -+++ cpprestsdk-2.9.0/Release/src/CMakeLists.txt 2016-12-20 22:36:53.079208022 -0200 -@@ -147,7 +147,7 @@ - - install( - TARGETS cpprest -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} - ) - endif() 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 -# 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/cryptopp/README b/libraries/cryptopp/README deleted file mode 100644 index 3efbfacbaf..0000000000 --- a/libraries/cryptopp/README +++ /dev/null @@ -1,4 +0,0 @@ -Crypto++ Library is a free C++ class library of cryptographic schemes. - -Pass DOC=yes to the script to create proper documentation (html), in -case you want man 3 pages created too, check the buildscript for hints. diff --git a/libraries/cryptopp/cryptopp.SlackBuild b/libraries/cryptopp/cryptopp.SlackBuild deleted file mode 100644 index 3f5a569364..0000000000 --- a/libraries/cryptopp/cryptopp.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh - -# Slackware build script for cryptopp -# Written by Iskar Enev (iskar.enev@gmail.com) -# -# Maintained by Markus Reichelt 0xCCEEF115 - -PRGNAM=cryptopp -VERSION=${VERSION:-8.5.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 -unzip -a -d $PRGNAM-$VERSION $CWD/${PRGNAM}$(echo $VERSION | tr -d .).zip -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 Makefile to install correctly on x86_64. -sed -i "s%(PREFIX)/lib%(PREFIX)/lib${LIBDIRSUFFIX}%g" GNUmakefile - -make dynamic CFLAGS="$SLKCFLAGS" CXXFLAGS="-DNDEBUG $SLKCFLAGS" -make install PREFIX=$PKG/usr -ln -s libcryptopp.so $PKG/usr/lib${LIBDIRSUFFIX}/libcryptopp-${VERSION}.so.0 - -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 a pkgconfig file -mkdir $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig -sed "s|@LIBDIRSUFFIX@|$LIBDIRSUFFIX|" $CWD/$PRGNAM.pc \ - > $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/$PRGNAM.pc -sed -i "s/5.6.2/${VERSION}/" $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/$PRGNAM.pc - - -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 - -if [ "$DOC" = "yes" ]; then - # Fix Doxyfile to create man pages - #sed -i "s/GENERATE_MAN = NO/GENERATE_MAN = YES/" Doxyfile - #sed -i "s/MAN_LINKS = NO/MAN_LINKS = YES/" Doxyfile - - doxygen Doxyfile - - cp -a html-docs $PKG/usr/doc/$PRGNAM-$VERSION - - # uncomment the following to also have the prepared man 3 pages properly installed - #mv $PKG/usr/doc/$PRGNAM-$VERSION/html-docs/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 -fi - -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/cryptopp/cryptopp.info b/libraries/cryptopp/cryptopp.info deleted file mode 100644 index e5f0afa890..0000000000 --- a/libraries/cryptopp/cryptopp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="cryptopp" -VERSION="8.5.0" -HOMEPAGE="https://www.cryptopp.com/" -DOWNLOAD="https://www.cryptopp.com/cryptopp850.zip" -MD5SUM="43d448bf8e11c24f808e3a1006f5cc97" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Markus Reichelt" -EMAIL="slackbuilds@mareichelt.de" diff --git a/libraries/cryptopp/cryptopp.pc b/libraries/cryptopp/cryptopp.pc deleted file mode 100644 index 45d65d071b..0000000000 --- a/libraries/cryptopp/cryptopp.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib@LIBDIRSUFFIX@ -includedir=${prefix}/include/cryptopp - -Name: Crypto++ -Description: A free C++ class library of cryptographic schemes -Version: 5.6.2 -URL: http://www.cryptopp.com -Requires: -Conflicts: -Libs: -L${libdir} -lcryptopp -Cflags: -I${includedir} diff --git a/libraries/cryptopp/slack-desc b/libraries/cryptopp/slack-desc deleted file mode 100644 index 3dfed21c6b..0000000000 --- a/libraries/cryptopp/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------------------------------------------------------| -cryptopp: cryptopp (library of cryptographic schemes) -cryptopp: -cryptopp: Crypto++ Library is a free C++ class library of cryptographic schemes. -cryptopp: -cryptopp: Homepage: http://www.cryptopp.com/ -cryptopp: -cryptopp: -cryptopp: -cryptopp: -cryptopp: -cryptopp: 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 + typedef std::vector 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 +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 ++#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/dotconf/README b/libraries/dotconf/README deleted file mode 100644 index 2ddae26f2a..0000000000 --- a/libraries/dotconf/README +++ /dev/null @@ -1,2 +0,0 @@ -Dot.conf is a lightweight and simple configuration file parser that -contains many features. diff --git a/libraries/dotconf/dotconf.SlackBuild b/libraries/dotconf/dotconf.SlackBuild deleted file mode 100644 index 87d4e0d2b8..0000000000 --- a/libraries/dotconf/dotconf.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# Slackware build script for dotconf - -# Copyright 2016 Edward W. Koenig, Vancouver, WA -# 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=dotconf -VERSION=${VERSION:-1.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 $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 {} \; - -autoreconf -fi - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --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 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/libraries/dotconf/dotconf.info b/libraries/dotconf/dotconf.info deleted file mode 100644 index 5fac8a6d04..0000000000 --- a/libraries/dotconf/dotconf.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="dotconf" -VERSION="1.3" -HOMEPAGE="https://github.com/williamh/dotconf/" -DOWNLOAD="https://github.com/williamh/dotconf/archive/v1.3/dotconf-1.3.tar.gz" -MD5SUM="b3ba921e45b05e89bf69835c0f30bc14" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" diff --git a/libraries/dotconf/slack-desc b/libraries/dotconf/slack-desc deleted file mode 100644 index c018dd8cce..0000000000 --- a/libraries/dotconf/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------------------------------------------------------| -dotconf: dotconf (configuration file parser) -dotconf: -dotconf: Dot.conf is a lightweight and simple configuration file parser that -dotconf: contains many features. -dotconf: -dotconf: Homepage: https://github.com/williamh/dotconf/ -dotconf: -dotconf: -dotconf: -dotconf: -dotconf: 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/efl/efl.SlackBuild b/libraries/efl/efl.SlackBuild index 9bee1447f0..722047b2eb 100644 --- a/libraries/efl/efl.SlackBuild +++ b/libraries/efl/efl.SlackBuild @@ -22,7 +22,7 @@ # . PRGNAM=efl -VERSION=${VERSION:-1.24.3} +VERSION=${VERSION:-1.24.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -75,6 +75,8 @@ meson . build \ --prefix=/usr/ \ --libdir=/usr/lib${LIBDIRSUFFIX} \ -Dsystemd=false \ + -Decore-imf-loaders-disabler=scim \ + -Dglib=true \ -Dbuild-id="$ARCH"-slackware-linux # 20200416 bkw: vita_cell on IRC reported missing DSO errors for -lm diff --git a/libraries/efl/efl.info b/libraries/efl/efl.info index 8f3836e1d5..73911767bd 100644 --- a/libraries/efl/efl.info +++ b/libraries/efl/efl.info @@ -1,8 +1,8 @@ PRGNAM="efl" -VERSION="1.24.3" +VERSION="1.24.4" HOMEPAGE="https://www.enlightenment.org/" -DOWNLOAD="https://download.enlightenment.org/rel/libs/efl/efl-1.24.3.tar.xz" -MD5SUM="6d0d60b8bceeb1749f4ac66d910486bb" +DOWNLOAD="https://download.enlightenment.org/rel/libs/efl/efl-1.24.4.tar.xz" +MD5SUM="ea5f532761e33d7cb6fe9000a7237463" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="luajit bullet libwebp check meson" diff --git a/libraries/enchant2/enchant2.SlackBuild b/libraries/enchant2/enchant2.SlackBuild index 66366b399e..5e0c6d5042 100644 --- a/libraries/enchant2/enchant2.SlackBuild +++ b/libraries/enchant2/enchant2.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=enchant2 SRCNAM=enchant -VERSION=${VERSION:-2.2.8} +VERSION=${VERSION:-2.2.14} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,7 +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 {} \; -tar xvf $CWD/gnulib-20180922.tar.gz +tar xvf $CWD/gnulib-20201213_67b5d51.tar.xz ./bootstrap CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/enchant2/enchant2.info b/libraries/enchant2/enchant2.info index 54451cc932..dce8b8f93d 100644 --- a/libraries/enchant2/enchant2.info +++ b/libraries/enchant2/enchant2.info @@ -1,10 +1,10 @@ PRGNAM="enchant2" -VERSION="2.2.8" +VERSION="2.2.14" HOMEPAGE="https://github.com/AbiWord/enchant" -DOWNLOAD="https://github.com/AbiWord/enchant/archive/v2.2.8/enchant-2.2.8.tar.gz \ - https://sourceforge.net/projects/slackbuildsdirectlinks/files/enchant2/gnulib-20180922.tar.gz" -MD5SUM="8f812cc3b39571a716d0553a92817952 \ - 92f099bb383ba5e706c7c78a437b2222" +DOWNLOAD="https://github.com/AbiWord/enchant/archive/v2.2.14/enchant-2.2.14.tar.gz \ + http://ponce.cc/slackware/sources/repo/gnulib-20201213_67b5d51.tar.xz" +MD5SUM="f3945f326293307f990abe8431b92fc6 \ + 3fb109af6068c38b8aa88e07398fd47f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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/flatbuffers/flatbuffers.SlackBuild b/libraries/flatbuffers/flatbuffers.SlackBuild index 0553016c62..b741bb42af 100644 --- a/libraries/flatbuffers/flatbuffers.SlackBuild +++ b/libraries/flatbuffers/flatbuffers.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=flatbuffers -VERSION=${VERSION:-1.7.1} +VERSION=${VERSION:-1.12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -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 {} \; -patch -p1 < $CWD/flatbuffers.patch mkdir -p build cd build cmake \ @@ -77,7 +76,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ -DFLATBUFFERS_BUILD_FLATC=ON \ -DFLATBUFFERS_BUILD_FLATHASH=ON \ -DFLATBUFFERS_BUILD_FLATLIB=ON \ diff --git a/libraries/flatbuffers/flatbuffers.info b/libraries/flatbuffers/flatbuffers.info index e17e5d52f0..2a03c03c48 100644 --- a/libraries/flatbuffers/flatbuffers.info +++ b/libraries/flatbuffers/flatbuffers.info @@ -1,8 +1,8 @@ PRGNAM="flatbuffers" -VERSION="1.7.1" +VERSION="1.12.0" HOMEPAGE="https://github.com/google/flatbuffers/" -DOWNLOAD="https://github.com/google/flatbuffers/archive/v1.7.1/flatbuffers-1.7.1.tar.gz" -MD5SUM="81934736f31fbd2cfdb513e71b53b358" +DOWNLOAD="https://github.com/google/flatbuffers/archive/v1.12.0/flatbuffers-1.12.0.tar.gz" +MD5SUM="c62ffefb3d4548b127cca14ce047f16c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/flatbuffers/flatbuffers.patch b/libraries/flatbuffers/flatbuffers.patch deleted file mode 100644 index ffa0a99208..0000000000 --- a/libraries/flatbuffers/flatbuffers.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ur flatbuffers-1.5.0.old/CMakeLists.txt flatbuffers-1.5.0/CMakeLists.txt ---- flatbuffers-1.5.0.old/CMakeLists.txt 2017-01-03 20:56:44.000000000 -0200 -+++ flatbuffers-1.5.0/CMakeLists.txt 2017-01-05 18:41:09.742061141 -0200 -@@ -224,13 +224,13 @@ - if(FLATBUFFERS_INSTALL) - install(DIRECTORY include/flatbuffers DESTINATION include) - if(FLATBUFFERS_BUILD_FLATLIB) -- install(TARGETS flatbuffers DESTINATION lib) -+ install(TARGETS flatbuffers DESTINATION lib${LIB_SUFFIX}) - endif() - if(FLATBUFFERS_BUILD_FLATC) - install(TARGETS flatc DESTINATION bin) - endif() - if(FLATBUFFERS_BUILD_SHAREDLIB) -- install(TARGETS flatbuffers_shared DESTINATION lib) -+ install(TARGETS flatbuffers_shared DESTINATION lib${LIB_SUFFIX}) - endif() - endif() - diff --git a/libraries/frei0r/README b/libraries/frei0r/README deleted file mode 100644 index 903e6aad22..0000000000 --- a/libraries/frei0r/README +++ /dev/null @@ -1,6 +0,0 @@ -Frei0r is a minimalistic plugin API for video sources and filters. The -behaviour of the effects can be controlled from the host by simple parameters. -The intent is to solve the recurring reimplementation or adaptation issue of -standard effects. - -Optional dependencies are opencv and gavl. diff --git a/libraries/frei0r/frei0r.SlackBuild b/libraries/frei0r/frei0r.SlackBuild deleted file mode 100644 index a78fc62f3f..0000000000 --- a/libraries/frei0r/frei0r.SlackBuild +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/sh - -# Slackware build script for frei0r - -# Copyright 2009, Jonathan Larsen (agentc0re), SLC, UT -# Contact Info: agentc0re 'AT' learnix 'DOT' net -# Copyright 2012-2020 Matteo Bernardini , 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. - -# Change Log -# -# Mar 3rd, 2010 -# *Revised to build "2" - fixed the "strip" for bash 4 -# *compatibility and removed the man page section -# Mar 12th, 2013 -# *Updated for 1.4 -# Sep 7th, 2015 -# *Patch for opencv-3.0 -# Dec 29th, 2016 -# *Updated for 1.5.0 -# May 25th, 2017 -# *Updated for 1.6.0 -# Mar 14th, 2018 -# *Updated for 1.6.1 -# Jan 1st, 2020 -# *Updated for 1.7.0 -# Jan 20th, 2020 -# *Disabled opencv support - -PRGNAM=frei0r -VERSION=${VERSION:-1.7.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 $PRGNAM-plugins-$VERSION -tar xvf $CWD/$PRGNAM-plugins-$VERSION.tar.gz -cd $PRGNAM-plugins-$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 upstream patches if present -if [ -d $CWD/patches ]; then - for i in $CWD/patches/* ; do patch -p1 < $i ; done -fi - -# Disable opencv support, not compatible with 4.2.x -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib$LIBDIRSUFFIX \ - -DWITHOUT_OPENCV=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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS.txt COPYING* ChangeLog.txt README.txt 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/libraries/frei0r/frei0r.info b/libraries/frei0r/frei0r.info deleted file mode 100644 index f50f66034b..0000000000 --- a/libraries/frei0r/frei0r.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="frei0r" -VERSION="1.7.0" -HOMEPAGE="https://frei0r.dyne.org" -DOWNLOAD="https://files.dyne.org/frei0r/releases/frei0r-plugins-1.7.0.tar.gz" -MD5SUM="78a7c7511cbda93013147563dc7a3618" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/libraries/frei0r/slack-desc b/libraries/frei0r/slack-desc deleted file mode 100644 index c1c1dc1dd6..0000000000 --- a/libraries/frei0r/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------------------------------------------------------| -frei0r: frei0r (a minimalistic plugin API for video sources and filters) -frei0r: -frei0r: Frei0r is a minimalistic plugin API for video sources and filters. -frei0r: The behaviour of the effects can be controlled from the host by -frei0r: simple parameters. The intent is to solve the recurring -frei0r: reimplementation or adaptation issue of standard effects. -frei0r: -frei0r: homepage: https://frei0r.dyne.org -frei0r: -frei0r: -frei0r: 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 4969e07df4..d0a9958ef5 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:-2} TAG=${TAG:-_SBo} @@ -91,7 +91,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 +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?= +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/README b/libraries/gtksourceview3/README deleted file mode 100644 index 50bc5ddb9c..0000000000 --- a/libraries/gtksourceview3/README +++ /dev/null @@ -1,4 +0,0 @@ -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/gtksourceview3/gtksourceview3.SlackBuild b/libraries/gtksourceview3/gtksourceview3.SlackBuild deleted file mode 100644 index adf532d033..0000000000 --- a/libraries/gtksourceview3/gtksourceview3.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -# Slackware build script for gtksourceview - -# Copyright 2012-2016 Willy Sudiarto Raharjo -# 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=gtksourceview3 -SRCNAM=gtksourceview -VERSION=${VERSION:-3.18.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 $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 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/gtksourceview3/gtksourceview3.info b/libraries/gtksourceview3/gtksourceview3.info deleted file mode 100644 index 4f05f8d29b..0000000000 --- a/libraries/gtksourceview3/gtksourceview3.info +++ /dev/null @@ -1,10 +0,0 @@ -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" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="glade" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/libraries/gtksourceview3/slack-desc b/libraries/gtksourceview3/slack-desc deleted file mode 100644 index 62d82504a6..0000000000 --- a/libraries/gtksourceview3/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------------------------------------------------------| -gtksourceview3: gtksourceview3 (a GTK+ framework for source code editing) -gtksourceview3: -gtksourceview3: GtkSourceView is a portable C library that extends the standard -gtksourceview3: GTK+ framework for multiline text editing with support for -gtksourceview3: configurable syntax highlighting, unlimited undo/redo, UTF-8 -gtksourceview3: compliant caseless searching, printing and other features -gtksourceview3: typical of a source code editor. -gtksourceview3: -gtksourceview3: Homepage: http://projects.gnome.org/gtksourceview/ -gtksourceview3: -gtksourceview3: 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 +# 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/hdf/hdf.SlackBuild b/libraries/hdf/hdf.SlackBuild index 1c57e91ef9..fed0b01c13 100644 --- a/libraries/hdf/hdf.SlackBuild +++ b/libraries/hdf/hdf.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 -I/usr/include/tirpc -Wl,-ltirpc" \ CPPFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/hidapi/configure.ac.patch b/libraries/hidapi/configure.ac.patch new file mode 100644 index 0000000000..7aae59deff --- /dev/null +++ b/libraries/hidapi/configure.ac.patch @@ -0,0 +1,13 @@ +diff -Naur hidapi-hidapi-0.8.0-rc1.orig/configure.ac hidapi-hidapi-0.8.0-rc1/configure.ac +--- hidapi-hidapi-0.8.0-rc1.orig/configure.ac 2013-10-07 00:43:37.000000000 +0200 ++++ hidapi-hidapi-0.8.0-rc1/configure.ac 2020-12-13 19:26:32.602903000 +0100 +@@ -18,8 +18,7 @@ + lt_age="0" + LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}" + +-AC_CONFIG_MACRO_DIR([m4]) +-AM_INIT_AUTOMAKE([foreign -Wall -Werror]) ++AM_INIT_AUTOMAKE([foreign -Wall]) + AC_CONFIG_MACRO_DIR([m4]) + + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) diff --git a/libraries/hidapi/hidapi.SlackBuild b/libraries/hidapi/hidapi.SlackBuild index 7d26d8d259..028766847a 100644 --- a/libraries/hidapi/hidapi.SlackBuild +++ b/libraries/hidapi/hidapi.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/configure.ac.patch + ./bootstrap CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ 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 +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/hyperscan/hyperscan.SlackBuild b/libraries/hyperscan/hyperscan.SlackBuild index 2118f45b11..258d4ad1dc 100644 --- a/libraries/hyperscan/hyperscan.SlackBuild +++ b/libraries/hyperscan/hyperscan.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 {} \; -sed -i -e 's/mktemp/mktemp-gnu/' cmake/build_wrapper.sh - mkdir -p build cd build cmake \ 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 -# Copyright 2006-2010 Halim Issa -# Copyright 2020 Dominik Drobek -# 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(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(field)->GetEncoding()); -+ } -+ return enc; -+ } -+ -+ ID3_C_EXPORT bool CCONV -+ ID3Field_IsEncodable(const ID3Field *field) -+ { -+ bool isEncodable = false; -+ if (field) -+ { -+ ID3_CATCH(isEncodable = reinterpret_cast(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 -+#include - - #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 -+#include - - 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 . Manual page written for -+Debian GNU/Linux by Robert Woodcock . -+ ---- /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 . Manual page written for -+Debian GNU/Linux by Robert Woodcock . -+ ---- /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 . Manual page written for -+Debian GNU/Linux by Robert Woodcock . ---- /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 . Manual page written for -+Debian GNU/Linux by Robert Woodcock . 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 - - * 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 -# 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 -# 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 , 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 Binary files a/libraries/lame/CVE-2017-15018.patch.gz and /dev/null 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 -# 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 - -# 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/lensfun/README b/libraries/lensfun/README deleted file mode 100644 index f9ba83d9f5..0000000000 --- a/libraries/lensfun/README +++ /dev/null @@ -1,9 +0,0 @@ -lensfun is a library that provide a open source database of photographic -lenses and their characteristics, also provides a set of algorithms for -correcting images based on detailed knowledge of lens properties and -calibration data. - -NOTE: -There are 2 scripts that requires python3: -- lensfun-add-adapter -- lensfun-update-data diff --git a/libraries/lensfun/lensfun-fix-python-install-dir.patch b/libraries/lensfun/lensfun-fix-python-install-dir.patch deleted file mode 100644 index e6713f9bb6..0000000000 --- a/libraries/lensfun/lensfun-fix-python-install-dir.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3b46bb2a4eada7f29e016d586229782f6d1c35bb Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Sat, 9 Jan 2016 11:47:37 +0100 -Subject: [PATCH] cmake: fix DESTDIR installation for python - -When running `setup.py install`, respect the value of the DESTDIR -environment variable so staged installs (used by distros, for example) -work. ---- - apps/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt -index 70c77fd..2f6f8f1 100644 ---- a/apps/CMakeLists.txt -+++ b/apps/CMakeLists.txt -@@ -42,5 +42,5 @@ IF(PYTHON) - IF(NOT DEFINED SETUP_PY_INSTALL_PREFIX) - SET(SETUP_PY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - ENDIF() -- INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=${SETUP_PY_INSTALL_PREFIX})") -+ INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=\$ENV{DESTDIR}${SETUP_PY_INSTALL_PREFIX})") - ENDIF(PYTHON) --- -2.6.4 - - diff --git a/libraries/lensfun/lensfun.SlackBuild b/libraries/lensfun/lensfun.SlackBuild deleted file mode 100644 index 6e9fc0a567..0000000000 --- a/libraries/lensfun/lensfun.SlackBuild +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh -# -# Slackware build script of lensfun - -# Copyright 2009 Ricardson Williams -# Copyright 2013-2016 Willy Sudiarto Raharjo -# 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=lensfun -VERSION=${VERSION:-0.3.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 -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/lensfun-fix-python-install-dir.patch -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DBUILD_FOR_SSE=ON \ - -DBUILD_FOR_SSE2=ON \ - -DBUILD_TESTS=OFF \ - -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 README* docs/*.txt $PKG/usr/doc/$PRGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/lensfun/lensfun.info b/libraries/lensfun/lensfun.info deleted file mode 100644 index 9f66e9188b..0000000000 --- a/libraries/lensfun/lensfun.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="lensfun" -VERSION="0.3.2" -HOMEPAGE="http://lensfun.sourceforge.net/" -DOWNLOAD="http://sourceforge.net/projects/lensfun/files/0.3.2/lensfun-0.3.2.tar.gz" -MD5SUM="247e59a0812ec451f6cd0d20b3379cb5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/libraries/lensfun/slack-desc b/libraries/lensfun/slack-desc deleted file mode 100644 index 690364a276..0000000000 --- a/libraries/lensfun/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------------------------------------------------------| -lensfun: lensfun (photographic lens characteristics database library) -lensfun: -lensfun: lensfun is a library that provide a open source database of -lensfun: photographic lenses and their characteristics also provides -lensfun: a set of algorithms for correcting images based on detailed -lensfun: knowledge of lens properties and calibration data. -lensfun: -lensfun: Homepage: http://lensfun.sourceforge.net/ -lensfun: -lensfun: -lensfun: diff --git a/libraries/libalkimia/README b/libraries/libalkimia/README deleted file mode 100644 index eecb1195b8..0000000000 --- a/libraries/libalkimia/README +++ /dev/null @@ -1,3 +0,0 @@ -libalkimia is a library with common classes and functionality used by KDE -finance applications. Currently it supports a common class to represent -monetary values with arbitrary precision. diff --git a/libraries/libalkimia/libalkimia.SlackBuild b/libraries/libalkimia/libalkimia.SlackBuild deleted file mode 100644 index 7db1569dfb..0000000000 --- a/libraries/libalkimia/libalkimia.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# SlackBuild script for libalkimia - -# Copyright 2011 Gilcio Amaral -# 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=libalkimia -VERSION=${VERSION:-5.0.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 -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 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 VERBOSE=1 - make install VERBOSE=1 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/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -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/libalkimia/libalkimia.info b/libraries/libalkimia/libalkimia.info deleted file mode 100644 index 5c3f807eb0..0000000000 --- a/libraries/libalkimia/libalkimia.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libalkimia" -VERSION="5.0.0" -HOMEPAGE="http://kde-apps.org/content/show.php/libalkimia?content=137323" -DOWNLOAD="http://download.kde.org/stable/alkimia/5.0.0/src/libalkimia-5.0.0.tar.xz" -MD5SUM="910c153bc6a15aed678fcafb773dd389" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Christophe Nguyen" -EMAIL="cnguyenminhtan@free.fr" diff --git a/libraries/libalkimia/slack-desc b/libraries/libalkimia/slack-desc deleted file mode 100644 index c6df59f83e..0000000000 --- a/libraries/libalkimia/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------------------------------------------------------| -libalkimia: libalkimia (library used by KDE finance applications) -libalkimia: -libalkimia: libalkimia is a library with common classes and functionality used by -libalkimia: KDE finance applications. -libalkimia: -libalkimia: -libalkimia: -libalkimia: Homepage: -libalkimia: http://kde-apps.org/content/show.php/libalkimia?content=137323 -libalkimia: -libalkimia: 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 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 , 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 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 -# 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/libburn/README b/libraries/libburn/README deleted file mode 100644 index 010a2d1a61..0000000000 --- a/libraries/libburn/README +++ /dev/null @@ -1,3 +0,0 @@ -libburn is a library by which preformatted data gets onto optical -media. libburn also offers a facility for reading data blocks from -its drives without using the normal block device i/o. diff --git a/libraries/libburn/libburn.SlackBuild b/libraries/libburn/libburn.SlackBuild deleted file mode 100644 index 57eb12999f..0000000000 --- a/libraries/libburn/libburn.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -# Slackware build script for libburn - -# Copyright 2008-2013 Robby Workman, Northport, Alabama, USA -# All rights reserved. -# -# Copyright 2014-2018 Nishant Limbachia, Hoffman Estates, IL, 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="libburn" -VERSION=${VERSION:-1.5.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} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-static=no \ - --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 CONTRIBUTORS COPYING COPYRIGHT 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/libraries/libburn/libburn.info b/libraries/libburn/libburn.info deleted file mode 100644 index b6a9adc8fb..0000000000 --- a/libraries/libburn/libburn.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libburn" -VERSION="1.5.0" -HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/Libburn" -DOWNLOAD="http://files.libburnia-project.org/releases/libburn-1.5.0.tar.gz" -MD5SUM="b32edefdd9a978edc65aacddfe7c588a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Nishant Limbachia" -EMAIL="nishant@mnspace.net" diff --git a/libraries/libburn/slack-desc b/libraries/libburn/slack-desc deleted file mode 100644 index ade13ac0c7..0000000000 --- a/libraries/libburn/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------------------------------------------------------| -libburn: libburn (optical media writing library) -libburn: -libburn: libburn is a library by which preformatted data gets onto optical -libburn: media. libburn also offers a facility for reading data blocks from -libburn: its drives without using the normal block device i/o. -libburn: -libburn: Homepage: https://dev.lovelyhq.com/libburnia/web/wikis/Libburn -libburn: -libburn: -libburn: -libburn: 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 +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’ 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 +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::operator()(boost::_bi::type, F&, A&, int) [with F = void (*)(double&, double&); A = boost::_bi::rrlist1; A1 = boost::reference_wrapper; A2 = boost::arg<1>]’: + /usr/include/boost/bind/bind.hpp:1234:50: required from ‘boost::_bi::bind_t::result_type boost::_bi::bind_t::operator()(A1&&) [with A1 = double; R = void; F = void (*)(double&, double&); L = boost::_bi::list2, boost::arg<1> >; boost::_bi::bind_t::result_type = void]’ + /usr/include/boost/function/function_template.hpp:159:11: required from ‘static void boost::detail::function::void_function_obj_invoker1::invoke(boost::detail::function::function_buffer&, T0) [with FunctionObj = boost::_bi::bind_t, boost::arg<1> > >; R = void; T0 = double]’ + /usr/include/boost/function/function_template.hpp:937:38: required from ‘void boost::function1::assign_to(Functor) [with Functor = boost::_bi::bind_t, boost::arg<1> > >; R = void; T0 = double]’ + /usr/include/boost/function/function_template.hpp:727:7: required from ‘boost::function1::function1(Functor, typename boost::enable_if_c<(! boost::is_integral::value), int>::type) [with Functor = boost::_bi::bind_t, boost::arg<1> > >; R = void; T0 = double; typename boost::enable_if_c<(! boost::is_integral::value), int>::type = int]’ + /usr/include/boost/function/function_template.hpp:1073:16: required from ‘boost::function::function(Functor, typename boost::enable_if_c<(! boost::is_integral::value), int>::type) [with Functor = boost::_bi::bind_t, boost::arg<1> > >; R = void; T0 = double; typename boost::enable_if_c<(! boost::is_integral::value), int>::type = int]’ + /usr/include/boost/function/function_template.hpp:1126:5: required from ‘typename boost::enable_if_c<(! boost::is_integral::value), boost::function&>::type boost::function::operator=(Functor) [with Functor = boost::_bi::bind_t, boost::arg<1> > >; R = void; T0 = double; typename boost::enable_if_c<(! boost::is_integral::value), boost::function&>::type = boost::function&]’ + 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::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 update_function; ++ typedef boost::function update_function; + + /** \brief The type of the function used to compute the new value. */ + typedef boost::function 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 +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 + claw::math::box_2d claw::math::box_2d::cast_value_type_to() const + { + return claw::math::box_2d +- ( first_point.cast_value_type_to(), +- second_point.cast_value_type_to() ); ++ ( first_point.template cast_value_type_to(), ++ second_point.template cast_value_type_to() ); + } // 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 + claw::math::rectangle claw::math::rectangle::cast_value_type_to() const + { + return claw::math::rectangle +- ( position.cast_value_type_to(), (U)width, (U)height ); ++ ( position.template cast_value_type_to(), (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 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 - #include - #include -+#include - - 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 + #include + #include +-#include + + #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 @@ + + + +- +
Docs generated $datetime
+ + +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/0001_no-deprecated-gnome-common-macros.patch b/libraries/libdbusmenu/0001_no-deprecated-gnome-common-macros.patch deleted file mode 100644 index fbe7ca334c..0000000000 --- a/libraries/libdbusmenu/0001_no-deprecated-gnome-common-macros.patch +++ /dev/null @@ -1,12 +0,0 @@ -Description: Drop deprecated gnome-common variables. -Author: Mike Gabriel - ---- a/autogen.sh -+++ b/autogen.sh -@@ -9,6 +9,4 @@ - - gtkdocize || exit 1 - --USE_GNOME2_MACROS=1 \ --USE_COMMON_DOC_BUILD=yes \ - gnome-autogen.sh --enable-gtk-doc $@ diff --git a/libraries/libdbusmenu/README b/libraries/libdbusmenu/README deleted file mode 100644 index cad08910ee..0000000000 --- a/libraries/libdbusmenu/README +++ /dev/null @@ -1,8 +0,0 @@ -libdbusmenu (library for passing menus over DBus) - -libdbusmenu is a small little library that was created by -pulling some common code out of indicator-applet. - -It passes a menu structure across DBus so that a program -can create a menu simply without worrying about how it is -displayed on the other side of the bus. diff --git a/libraries/libdbusmenu/libdbusmenu.SlackBuild b/libraries/libdbusmenu/libdbusmenu.SlackBuild deleted file mode 100644 index 554247df9c..0000000000 --- a/libraries/libdbusmenu/libdbusmenu.SlackBuild +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh -# -# Slackware build script for libdbusmenu. -# -# Copyright 2020 Donald Cooley, South Haven, Indiana, USA -# Copyright 2015-2019 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=libdbusmenu -VERSION=${VERSION:-18.10.20180917~bzr492} -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 - -SRCVER=${SRCVER:-18.10.20180917~bzr492+repack1} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -mkdir -p $PRGNAM-$VERSION -tar xvf $CWD/${PRGNAM}_${SRCVER}.orig.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 {} \; - -patch -p1 < $CWD/0001_no-deprecated-gnome-common-macros.patch - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./autogen.sh \ - --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="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/libdbusmenu/libdbusmenu.info b/libraries/libdbusmenu/libdbusmenu.info deleted file mode 100644 index b340fe3630..0000000000 --- a/libraries/libdbusmenu/libdbusmenu.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libdbusmenu" -VERSION="18.10.20180917~bzr492" -HOMEPAGE="https://launchpad.net/libdbusmenu/" -DOWNLOAD="http://cdn-fastly.deb.debian.org/debian/pool/main/libd/libdbusmenu/libdbusmenu_18.10.20180917~bzr492+repack1.orig.tar.xz" -MD5SUM="8ae2fedae25a862a3bf79855955c2540" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="json-glib gnome-common" -MAINTAINER="Donald Cooley" -EMAIL="chytraeus@protonmail.com" diff --git a/libraries/libdbusmenu/slack-desc b/libraries/libdbusmenu/slack-desc deleted file mode 100644 index e71e4833f1..0000000000 --- a/libraries/libdbusmenu/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------------------------------------------------------| -libdbusmenu: libdbusmenu (library for passing menus over DBus) -libdbusmenu: -libdbusmenu: libdbusmenu passes a menu structure across DBus so that a program can -libdbusmenu: create a menu simply without worrying about how it is displayed on -libdbusmenu: the other side of the bus. -libdbusmenu: -libdbusmenu: Home page: https://launchpad.net/libdbusmenu/ -libdbusmenu: -libdbusmenu: -libdbusmenu: -libdbusmenu: diff --git a/libraries/libdmtx/README b/libraries/libdmtx/README deleted file mode 100644 index 653db41736..0000000000 --- a/libraries/libdmtx/README +++ /dev/null @@ -1,7 +0,0 @@ -libdmtx (Data Matrix barcode library and utilities) - -libdmtx is open source software for reading and writing Data Matrix barcodes -on Linux, Unix, OS X, Windows, and some mobile devices. At its core libdmtx -is a shared library, allowing C/C++ programs to use its capabilities without -restrictions or overhead. The included utility programs, dmtxread and -dmtxwrite, serve as the official interface to libdmtx from the command line. diff --git a/libraries/libdmtx/libdmtx.SlackBuild b/libraries/libdmtx/libdmtx.SlackBuild deleted file mode 100644 index b50ea62188..0000000000 --- a/libraries/libdmtx/libdmtx.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -# Slackware build script for libdmtx - -# Written by David Miller dave@frop.net -# This script is released into the public domain - -PRGNAM=libdmtx -VERSION=${VERSION:-0.7.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 $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 \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man - -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 - -( 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 \ - AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL KNOWNBUG 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/libraries/libdmtx/libdmtx.info b/libraries/libdmtx/libdmtx.info deleted file mode 100644 index b38ced7120..0000000000 --- a/libraries/libdmtx/libdmtx.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libdmtx" -VERSION="0.7.2" -HOMEPAGE="http://www.libdmtx.org/" -DOWNLOAD="http://downloads.sourceforge.net/project/libdmtx/libdmtx/0.7.2/libdmtx-0.7.2.tar.bz2" -MD5SUM="0684cf3857591e777b57248d652444ae" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="David Miller" -EMAIL="dave@frop.net" diff --git a/libraries/libdmtx/slack-desc b/libraries/libdmtx/slack-desc deleted file mode 100644 index f9cb669663..0000000000 --- a/libraries/libdmtx/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------------------------------------------------------| -libdmtx: libdmtx (Data Matrix barcode library and utilities) -libdmtx: -libdmtx: libdmtx is open source software for reading and writing Data Matrix -libdmtx: barcodes on Linux, Unix, OS X, Windows, and some mobile devices. At -libdmtx: its core libdmtx is a shared library, allowing C/C++ programs -libdmtx: to use its capabilities without restrictions or overhead. The -libdmtx: included utility programs, dmtxread and dmtxwrite, serve as the -libdmtx: official interface to libdmtx from the command line. -libdmtx: -libdmtx: -libdmtx: diff --git a/libraries/libechonest/libechonest-fix-double-encoding-on-qt4.patch b/libraries/libechonest/libechonest-fix-double-encoding-on-qt4.patch deleted file mode 100644 index 0ebee8b1e5..0000000000 --- a/libraries/libechonest/libechonest-fix-double-encoding-on-qt4.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 009514f65044823ef29045397d4b58dd04d09977 Mon Sep 17 00:00:00 2001 -From: Leo Franchi -Date: Mon, 18 May 2015 22:08:31 -0400 -Subject: Don't double-encode on Qt4 - -Fixes issue #27 ---- - src/Util.cpp | 4 +++- - tests/PlaylistTest.cpp | 22 ++++++++++++++++++++++ - tests/PlaylistTest.h | 1 + - 3 files changed, 26 insertions(+), 1 deletion(-) - -diff --git a/src/Util.cpp b/src/Util.cpp -index 8401e8c..595435b 100644 ---- a/src/Util.cpp -+++ b/src/Util.cpp -@@ -150,7 +150,9 @@ void Echonest::urlAddQueryItem(QUrl& url, const QString& key, const QString& val - urlQuery.addQueryItem( key, value ); - url.setQuery( urlQuery ); - #else -- url.addQueryItem( key, value ); -+ // We assume here that the key and values, though QStrings, are actually latin1 and not UTF-8. -+ // That is, they've already gone through playlistParamToString(). This is terrible. -+ url.addEncodedQueryItem( key.toLatin1(), value.toLatin1() ); - #endif - } - -diff --git a/tests/PlaylistTest.cpp b/tests/PlaylistTest.cpp -index 6f7c606..2ec7eb2 100644 ---- a/tests/PlaylistTest.cpp -+++ b/tests/PlaylistTest.cpp -@@ -201,6 +201,28 @@ void PlaylistTest::testStaticXSPF() - } - - -+void PlaylistTest::testStaticWithSpecialChars() -+{ -+ DynamicPlaylist::PlaylistParams p; -+ p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Artist, QString::fromUtf8( "Björk" ) ) ); -+ p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistRadioType ) ); -+ p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Results, 10 ) ); -+ -+ QNetworkReply* reply = DynamicPlaylist::staticPlaylist( p ); -+ -+ QVERIFY( reply->url().toEncoded() == "http://developer.echonest.com/api/v4/playlist/static?api_key=JGJCRKWLXLBZIFAZB&format=xml&artist=Bj%C3%B6rk&type=artist-radio&results=10" ); -+ -+ QEventLoop loop; -+ loop.connect( reply, SIGNAL(finished()), SLOT(quit()) ); -+ loop.exec(); -+ SongList songs = DynamicPlaylist::parseStaticPlaylist( reply ); -+ -+ QVERIFY( songs.size() == 10 ); -+ Q_FOREACH( const Song& song, songs ) -+ QVERIFY( !song.id().isEmpty() ); -+ -+} -+ - void PlaylistTest::testDynamic1() - { - DynamicPlaylist::PlaylistParams p; -diff --git a/tests/PlaylistTest.h b/tests/PlaylistTest.h -index 9d75c05..71c21d6 100644 ---- a/tests/PlaylistTest.h -+++ b/tests/PlaylistTest.h -@@ -30,6 +30,7 @@ private slots: - void testStaticArtistYears(); - void testStaticWithSongType(); - void testStaticXSPF(); -+ void testStaticWithSpecialChars(); - void testDynamic1(); - void testDynamic2(); - void testNewDynamicAPI(); --- -cgit v0.11.2 - diff --git a/libraries/libechonest/libechonest.SlackBuild b/libraries/libechonest/libechonest.SlackBuild index 59b03bf995..78ff7c5726 100644 --- a/libraries/libechonest/libechonest.SlackBuild +++ b/libraries/libechonest/libechonest.SlackBuild @@ -70,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 {} \; -# Upstream fix - git revision 009514f -patch -p1 -i $CWD/libechonest-fix-double-encoding-on-qt4.patch - mkdir build cd build cmake \ @@ -80,6 +77,7 @@ cd build -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DBUILD_WITH_QT4=OFF \ .. make VERBOSE=1 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-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..22bf575e07 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.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 @@ -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 @@ -54,6 +54,8 @@ elif [ "$ARCH" = "x86_64" ]; then TARGET="x86_64" fi +PYTHON_VERSION=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') + set -e rm -rf $PKG @@ -69,25 +71,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 {} \; -# Use our CFLAGS -sed -i "s/-O2 -DNDEBUG/$SLKCFLAGS -DNDEBUG/" SConstruct - -patch -p1 < $CWD/libffado-mixer.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" \ - DEBUG="False" + PYTHON_INTERPRETER='/usr/bin/python3' \ + PYPKGDIR="/usr/lib$LIBDIRSUFFIX/python${PYTHON_VERSION}/site-packages" \ + CUSTOM_ENV="True" \ + DEBUG="False" \ + UDEVDIR='/lib/udev/rules.d' 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..4949534f21 100644 --- a/libraries/libffado/libffado.info +++ b/libraries/libffado/libffado.info @@ -1,10 +1,10 @@ PRGNAM="libffado" -VERSION="2.2.1" +VERSION="2.4.4" 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.4.tgz" +MD5SUM="f27970e21a80a1e9ccc1842c4a6a3c62" 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..ba4ec018ef 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.26.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/libfilezilla/libfilezilla.info b/libraries/libfilezilla/libfilezilla.info index a8fcd5e7ef..cb8f9d8daf 100644 --- a/libraries/libfilezilla/libfilezilla.info +++ b/libraries/libfilezilla/libfilezilla.info @@ -1,8 +1,8 @@ PRGNAM="libfilezilla" -VERSION="0.16.0" +VERSION="0.26.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.26.0.tar.bz2" +MD5SUM="bfee6ef3cb473dba7556b6ead8f78df4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libftdi1/libftdi1.SlackBuild b/libraries/libftdi1/libftdi1.SlackBuild index 6ba1c561fe..b02bce3642 100644 --- a/libraries/libftdi1/libftdi1.SlackBuild +++ b/libraries/libftdi1/libftdi1.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libftdi1 -VERSION=${VERSION:-1.4} +VERSION=${VERSION:-1.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -77,11 +77,15 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DSTATICLIBS:BOOL=OFF \ + -DFTDIPP=ON \ + -DDOCUMENTATION=ON \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG cd .. +# fix a wrong library name in the pkgconfig file +sed -i "s|libftdipp1|$PRGNAM|" $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/$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 @@ -89,16 +93,17 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING.* README.* LICENSE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -mv ./build/doc/html $PKG/usr/doc/$PRGNAM-$VERSION +mv ./build/doc/html $PKG/usr/doc/$PRGNAM-$VERSION rm -r $PKG/usr/share mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples cp -a examples/*.c examples/*.cpp python/examples/*.py ftdi_eeprom/example.conf \ $PKG/usr/doc/$PRGNAM-$VERSION/examples mv ./build/doc/man $PKG/usr -rm -f $PKG/usr/man/man3/*SBo* - +mv $PKG/usr/man/man3/{,ftdi_}deprecated.3 +mv $PKG/usr/man/man3/{,ftdi_}size_and_time.3 +rm -f $PKG/usr/man/man3/*{SBo,CMake}* 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/libraries/libftdi1/libftdi1.info b/libraries/libftdi1/libftdi1.info index 42543c4cab..26a3a68d0c 100644 --- a/libraries/libftdi1/libftdi1.info +++ b/libraries/libftdi1/libftdi1.info @@ -1,8 +1,8 @@ PRGNAM="libftdi1" -VERSION="1.4" +VERSION="1.5" HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/download.php" -DOWNLOAD="https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.4.tar.bz2" -MD5SUM="0c09fb2bb19a57c839fa6845c6c780a2" +DOWNLOAD="https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.5.tar.bz2" +MD5SUM="f515d7d69170a9afc8b273e8f1466a80" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="confuse" diff --git a/libraries/libgaminggear/libgaminggear.SlackBuild b/libraries/libgaminggear/libgaminggear.SlackBuild index 2b4ed5a9b3..7eb5e6a701 100644 --- a/libraries/libgaminggear/libgaminggear.SlackBuild +++ b/libraries/libgaminggear/libgaminggear.SlackBuild @@ -82,8 +82,8 @@ find -L . \ mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -isystem /usr/include/harfbuzz" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -isystem /usr/include/harfbuzz" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ diff --git a/libraries/libgee/README b/libraries/libgee/README deleted file mode 100644 index e5f6093a12..0000000000 --- a/libraries/libgee/README +++ /dev/null @@ -1,4 +0,0 @@ -libgee is a collection library providing GObject-based interfaces -and classes for commonly used data structures. - -This package can be installed alongside with libgee1 diff --git a/libraries/libgee/libgee.SlackBuild b/libraries/libgee/libgee.SlackBuild deleted file mode 100644 index 628ce277e2..0000000000 --- a/libraries/libgee/libgee.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -# Slackware build script for libgee - -# Written by Larry Hajali -# Copyright 2011-2020 Matteo Bernardini , 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=libgee -VERSION=${VERSION:-0.20.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 {} \; - -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --disable-silent-rules \ - --enable-introspection=auto \ - --disable-dependency-tracking \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -rm -f $PKG/usr/lib$LIBDIRSUFFIX/*.la - -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 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/libgee/libgee.info b/libraries/libgee/libgee.info deleted file mode 100644 index 1c5edb8e8c..0000000000 --- a/libraries/libgee/libgee.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libgee" -VERSION="0.20.3" -HOMEPAGE="https://live.gnome.org/Libgee" -DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/libgee/0.20/libgee-0.20.3.tar.xz" -MD5SUM="e574b3952b93d219b5ec7c74c5892c33" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="vala" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/libraries/libgee/slack-desc b/libraries/libgee/slack-desc deleted file mode 100644 index 50a1a339ea..0000000000 --- a/libraries/libgee/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------------------------------------------------------| -libgee: libgee (GObject-based interfaces and classes) -libgee: -libgee: libgee is a collection library providing GObject-based interfaces and -libgee: classes for commonly used data structures. -libgee: -libgee: Homepage: http://live.gnome.org/Libgee -libgee: -libgee: -libgee: -libgee: -libgee: 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 be7c46c925..0000000000 --- a/libraries/libinput/libinput.SlackBuild +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -# -# Slackware build script for libinput. -# -# Copyright 2016-2021 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.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=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 4a64c2eb96..0000000000 --- a/libraries/libinput/libinput.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libinput" -VERSION="1.17.1" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput" -DOWNLOAD="https://www.freedesktop.org/software/libinput/libinput-1.17.1.tar.xz" -MD5SUM="284f078a1788a8ae947a5606087a5d92" -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/liblrdf/liblrdf.info b/libraries/liblrdf/liblrdf.info index 4172065cc5..98f482ba78 100644 --- a/libraries/liblrdf/liblrdf.info +++ b/libraries/liblrdf/liblrdf.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/swh/LRDF/archive/v0.6.1/liblrdf-0.6.1.tar.gz" MD5SUM="8bb0ac7e8fe1a5a90083c89776bd3deb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ladspa_sdk" +REQUIRES="ladspa_sdk raptor" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/libraries/libmemcached/libmemcached.SlackBuild b/libraries/libmemcached/libmemcached.SlackBuild index 3cc3e35ca1..1a08cb6a2f 100644 --- a/libraries/libmemcached/libmemcached.SlackBuild +++ b/libraries/libmemcached/libmemcached.SlackBuild @@ -80,6 +80,8 @@ export PATH="/usr/libexec:$PATH" # Fix bug: https://bugzilla.redhat.com/show_bug.cgi?id=1037707 patch -p1 < $CWD/patches/libmemcached-fix-linking-with-libpthread.patch +# https://bugs.launchpad.net/libmemcached/+bug/1663985 + fix for gcc >= 10.x +patch -p1 < $CWD/patches/libmemcached-build.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libmemcached/patches/libmemcached-build.patch b/libraries/libmemcached/patches/libmemcached-build.patch new file mode 100644 index 0000000000..fcbe2fe31a --- /dev/null +++ b/libraries/libmemcached/patches/libmemcached-build.patch @@ -0,0 +1,60 @@ +diff -up ./clients/memflush.cc.old ./clients/memflush.cc +--- ./clients/memflush.cc.old 2017-02-12 10:12:59.615209225 +0100 ++++ ./clients/memflush.cc 2017-02-12 10:13:39.998382783 +0100 +@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) + { + options_parse(argc, argv); + +- if (opt_servers == false) ++ if (!opt_servers) + { + char *temp; + +@@ -48,7 +48,7 @@ int main(int argc, char *argv[]) + opt_servers= strdup(temp); + } + +- if (opt_servers == false) ++ if (!opt_servers) + { + std::cerr << "No Servers provided" << std::endl; + exit(EXIT_FAILURE); +diff -up ./clients/memaslap.c.old ./clients/memaslap.c +--- ./clients/memaslap.c.old 2020-02-04 14:11:45.029205068 +0100 ++++ ./clients/memaslap.c 2020-02-04 14:12:05.409115227 +0100 +@@ -32,6 +32,15 @@ + #include "ms_setting.h" + #include "ms_thread.h" + ++/* global structure */ ++ms_global_t ms_global; ++ ++/* global stats information structure */ ++ms_stats_t ms_stats; ++ ++/* global statistic structure */ ++ms_statistic_t ms_statistic; ++ + #define PROGRAM_NAME "memslap" + #define PROGRAM_DESCRIPTION \ + "Generates workload against memcached servers." +diff -up ./clients/ms_memslap.h.old ./clients/ms_memslap.h +--- ./clients/ms_memslap.h.old 2020-02-04 14:11:50.072182835 +0100 ++++ ./clients/ms_memslap.h 2020-02-04 14:12:13.268080586 +0100 +@@ -117,13 +117,13 @@ typedef struct global + } ms_global_t; + + /* global structure */ +-ms_global_t ms_global; ++extern ms_global_t ms_global; + + /* global stats information structure */ +-ms_stats_t ms_stats; ++extern ms_stats_t ms_stats; + + /* global statistic structure */ +-ms_statistic_t ms_statistic; ++extern ms_statistic_t ms_statistic; + + #ifdef __cplusplus + } diff --git a/libraries/libmirage/libmirage-3.2.4-gcc-10.patch b/libraries/libmirage/libmirage-3.2.4-gcc-10.patch new file mode 100644 index 0000000000..7834e39eed --- /dev/null +++ b/libraries/libmirage/libmirage-3.2.4-gcc-10.patch @@ -0,0 +1,34 @@ +From 7288d06f79d935798b917f707b86a33f5b69125a Mon Sep 17 00:00:00 2001 +From: Rok Mandeljc +Date: Sat, 2 May 2020 17:37:34 +0200 +Subject: [PATCH] libMirage: utils.h: added missing extern specifiers + +The lack thereof seems to be causing errors with gcc 10 on Fedora 32. +--- + libmirage/mirage/utils.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libmirage/mirage/utils.h b/libmirage/mirage/utils.h +index 64611810..fc431d2f 100644 +--- a/mirage/utils.h ++++ b/mirage/utils.h +@@ -83,8 +83,8 @@ gchar mirage_helper_isrc2ascii (guint8 c); + gboolean mirage_helper_validate_isrc (const gchar *isrc); + + /* CRC utility functions */ +-guint16 *crc16_1021_lut; +-guint32 *crc32_d8018001_lut; ++extern guint16 *crc16_1021_lut; ++extern guint32 *crc32_d8018001_lut; + + guint16 *mirage_helper_init_crc16_lut (guint16 genpoly); + guint32 *mirage_helper_init_crc32_lut (guint32 genpoly, guint slices); +@@ -139,7 +139,7 @@ const gchar *mirage_helper_encoding_from_bom (const guint8 *buffer); + + + /* ECMA-130 Annex B sector data scrambler */ +-guint8 *ecma_130_scrambler_lut; ++extern guint8 *ecma_130_scrambler_lut; + + guint8 *mirage_helper_init_ecma_130b_scrambler_lut (void); + diff --git a/libraries/libmirage/libmirage.SlackBuild b/libraries/libmirage/libmirage.SlackBuild index 74e0ab5f14..1d2e81d297 100644 --- a/libraries/libmirage/libmirage.SlackBuild +++ b/libraries/libmirage/libmirage.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/libmirage-3.2.4-gcc-10.patch + mkdir -p build cd build cmake \ diff --git a/libraries/libmp4v2/libmp4v2-2.0.0-unsigned-int-cast.patch b/libraries/libmp4v2/libmp4v2-2.0.0-unsigned-int-cast.patch new file mode 100644 index 0000000000..25830bc596 --- /dev/null +++ b/libraries/libmp4v2/libmp4v2-2.0.0-unsigned-int-cast.patch @@ -0,0 +1,96 @@ +From a5ca35b044bbf13c0b16f0066bf24646604bb218 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Thu, 6 Aug 2020 15:22:04 +0200 +Subject: [PATCH] Static cast to unsigned int for cases + +Signed-off-by: Jason A. Donenfeld +--- + libutil/Utility.cpp | 2 +- + util/mp4art.cpp | 2 +- + util/mp4chaps.cpp | 2 +- + util/mp4file.cpp | 2 +- + util/mp4subtitle.cpp | 2 +- + util/mp4track.cpp | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp +index 76cdd12..d6739d4 100644 +--- a/libutil/Utility.cpp ++++ b/libutil/Utility.cpp +@@ -493,7 +493,7 @@ Utility::process_impl() + if( codes.find( code ) == codes.end() ) + continue; + +- switch( code ) { ++ switch( static_cast( code ) ) { + case 'z': + _optimize = true; + break; +diff --git a/util/mp4art.cpp b/util/mp4art.cpp +index add935e..6e7f531 100644 +--- a/util/mp4art.cpp ++++ b/util/mp4art.cpp +@@ -376,7 +376,7 @@ ArtUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast ( code ) ) { + case LC_ART_ANY: + _artFilter = numeric_limits::max(); + break; +diff --git a/util/mp4chaps.cpp b/util/mp4chaps.cpp +index 98400f8..ccc8b70 100644 +--- a/util/mp4chaps.cpp ++++ b/util/mp4chaps.cpp +@@ -632,7 +632,7 @@ ChapterUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast ( code ) ) { + case 'A': + case LC_CHPT_ANY: + _ChapterType = MP4ChapterTypeAny; +diff --git a/util/mp4file.cpp b/util/mp4file.cpp +index c27844b..b127cd1 100644 +--- a/util/mp4file.cpp ++++ b/util/mp4file.cpp +@@ -189,7 +189,7 @@ FileUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast( code ) ) { + case LC_LIST: + _action = &FileUtility::actionList; + break; +diff --git a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp +index 7462153..19d977d 100644 +--- a/util/mp4subtitle.cpp ++++ b/util/mp4subtitle.cpp +@@ -164,7 +164,7 @@ SubtitleUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast( code ) ) { + case LC_LIST: + _action = &SubtitleUtility::actionList; + break; +diff --git a/util/mp4track.cpp b/util/mp4track.cpp +index d550506..cd63d7e 100644 +--- a/util/mp4track.cpp ++++ b/util/mp4track.cpp +@@ -788,7 +788,7 @@ TrackUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast( code ) ) { + case LC_TRACK_WILDCARD: + _trackMode = TM_WILDCARD; + break; +-- +2.28.0 + diff --git a/libraries/libmp4v2/libmp4v2.SlackBuild b/libraries/libmp4v2/libmp4v2.SlackBuild index a7e1eb8c40..28d9fe3a22 100644 --- a/libraries/libmp4v2/libmp4v2.SlackBuild +++ b/libraries/libmp4v2/libmp4v2.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 {} \; +# thanks to Gentoo! +patch -p1 < $CWD/libmp4v2-2.0.0-unsigned-int-cast.patch + autoreconf -vif CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libmspub/libmspub.SlackBuild b/libraries/libmspub/libmspub.SlackBuild index 378f667fbb..4775da530c 100644 --- a/libraries/libmspub/libmspub.SlackBuild +++ b/libraries/libmspub/libmspub.SlackBuild @@ -74,6 +74,9 @@ case "${DOC:-0}" in *) doc='--with-docs' ;; esac +# https://github.com/LibreOffice/libmspub/commit/698bed8 +sed -i '/^#include $/a #include ' src/lib/MSPUBMetaData.h + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ 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 +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 fbf3de0ac1..9fde26487e 100644 --- a/libraries/libmwaw/libmwaw.SlackBuild +++ b/libraries/libmwaw/libmwaw.SlackBuild @@ -77,7 +77,7 @@ esac autoreconf -fi 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 -# 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 + ++#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 +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 -# 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 , Pisa, Italy +# Copyright 2013-2019 Matteo Bernardini , 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/libpinyin/README b/libraries/libpinyin/README deleted file mode 100644 index e985b2be06..0000000000 --- a/libraries/libpinyin/README +++ /dev/null @@ -1,4 +0,0 @@ -libpinyin is a library for dealing with pinyin. - -The libpinyin project aims to provide the algorithms core for -intelligent sentence-based Chinese pinyin input methods. diff --git a/libraries/libpinyin/libpinyin.SlackBuild b/libraries/libpinyin/libpinyin.SlackBuild deleted file mode 100644 index ac63384f86..0000000000 --- a/libraries/libpinyin/libpinyin.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -# Slackware build script for libpinyin -# -# Copyright 2019 Isaac Yu -# 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=libpinyin -VERSION=${VERSION:-2.3.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 \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --with-dbm=KyotoCabinet \ - --enable-libzhuyin - -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 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/libraries/libpinyin/libpinyin.info b/libraries/libpinyin/libpinyin.info deleted file mode 100644 index c23d33f87c..0000000000 --- a/libraries/libpinyin/libpinyin.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libpinyin" -VERSION="2.3.0" -HOMEPAGE="https://github.com/libpinyin/libpinyin" -DOWNLOAD="https://github.com/libpinyin/libpinyin/releases/download/2.3.0/libpinyin-2.3.0.tar.gz" -MD5SUM="89ae0068a9c96361c0a9e1db60ae5184" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="kyotocabinet" -MAINTAINER="Isaac Yu" -EMAIL="isaacyu1@isaacyu1.com" diff --git a/libraries/libpinyin/slack-desc b/libraries/libpinyin/slack-desc deleted file mode 100644 index c4784f3236..0000000000 --- a/libraries/libpinyin/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------------------------------------------------------| -libpinyin: libpinyin (Chinese input method library) -libpinyin: -libpinyin: libpinyin is a library for dealing with pinyin. The libpinyin project -libpinyin: aims to provide the algorithms core for intelligent sentence-based -libpinyin: Chinese pinyin input methods. -libpinyin: -libpinyin: Homepage: https://github.com/libpinyin/libpinyin -libpinyin: -libpinyin: -libpinyin: -libpinyin: diff --git a/libraries/libportal/README b/libraries/libportal/README new file mode 100644 index 0000000000..b0c094e310 --- /dev/null +++ b/libraries/libportal/README @@ -0,0 +1 @@ +libportal provides GIO-style async APIs for most Flatpak portals. diff --git a/libraries/libportal/libportal.SlackBuild b/libraries/libportal/libportal.SlackBuild new file mode 100644 index 0000000000..fc2e2e368b --- /dev/null +++ b/libraries/libportal/libportal.SlackBuild @@ -0,0 +1,101 @@ +#!/bin/sh + +# Slackware build script for libportal + +# Copyright 2020 Matteo Bernardini , 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=libportal +VERSION=${VERSION:-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 + +DOCS="COPYING NEWS 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 {} \; + +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 + +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/libportal/libportal.info b/libraries/libportal/libportal.info new file mode 100644 index 0000000000..f1691b481b --- /dev/null +++ b/libraries/libportal/libportal.info @@ -0,0 +1,10 @@ +PRGNAM="libportal" +VERSION="0.3" +HOMEPAGE="https://github.com/flatpak/libportal" +DOWNLOAD="https://github.com/flatpak/libportal/releases/download/0.3/libportal-0.3.tar.xz" +MD5SUM="dffd58a937dfbabc873e51029dc587f3" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/libraries/libportal/slack-desc b/libraries/libportal/slack-desc new file mode 100644 index 0000000000..22caae2077 --- /dev/null +++ b/libraries/libportal/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------------------------------------------------------| +libportal: libportal (Flatpak portal library) +libportal: +libportal: libportal provides GIO-style async APIs for most Flatpak portals. +libportal: +libportal: homepage: https://github.com/flatpak/libportal +libportal: +libportal: +libportal: +libportal: +libportal: +libportal: 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/README b/libraries/libsass/README deleted file mode 100644 index 4d71f0cac5..0000000000 --- a/libraries/libsass/README +++ /dev/null @@ -1,13 +0,0 @@ -LibSass - Sass compiler written in C++ - -LibSass is just a library! If you want to use LibSass to compile Sass, -you need an implementer. - -Some implementations are only bindings into other programming -languages. But most also ship with a command line interface (CLI) you -can use directly. - -There is also SassC, which is the official lightweight CLI tool built -by the same people as LibSass. - -sassc is available on SlackBuilds.org. diff --git a/libraries/libsass/libsass.SlackBuild b/libraries/libsass/libsass.SlackBuild deleted file mode 100644 index 1bd0d73920..0000000000 --- a/libraries/libsass/libsass.SlackBuild +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -# Slackware build script for libsass -# -# Yth | Pont-en-Royans, France | yth@ythogtha.org -# -# 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=libsass -VERSION=${VERSION:-3.6.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} - -DOCS="COPYING INSTALL LICENSE *.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 - -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 {} \; - -autoreconf -i - -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-shared=yes \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -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/libsass/libsass.info b/libraries/libsass/libsass.info deleted file mode 100644 index 9ed96c3c27..0000000000 --- a/libraries/libsass/libsass.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libsass" -VERSION="3.6.4" -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_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Yth - Arnaud" -EMAIL="yth@ythogtha.org" diff --git a/libraries/libsass/slack-desc b/libraries/libsass/slack-desc deleted file mode 100644 index aee695dbbc..0000000000 --- a/libraries/libsass/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------------------------------------------------------| -libsass: libsass (Sass compiler written in C++) -libsass: -libsass: LibSass is the library of the C/C++ port of the Sass engine. -libsass: -libsass: LibSass is just a library! If you want to use LibSass to compile Sass, -libsass: you need an implementer. SassC, which is the official lightweight CLI -libsass: tool built by the same people as LibSass, is available on Slackbuilds -libsass: as sassc. -libsass: -libsass: -libsass: 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/libsigrok/libsigrok.SlackBuild b/libraries/libsigrok/libsigrok.SlackBuild index 18f82d2f93..bc6874a7c1 100644 --- a/libraries/libsigrok/libsigrok.SlackBuild +++ b/libraries/libsigrok/libsigrok.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libsigrok -VERSION=${VERSION:-0.5.2} +VERSION=${VERSION:-20201229_f93bf8b} 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 {} \; +./autogen.sh + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/libsigrok/libsigrok.info b/libraries/libsigrok/libsigrok.info index 49fb295548..2344736184 100644 --- a/libraries/libsigrok/libsigrok.info +++ b/libraries/libsigrok/libsigrok.info @@ -1,8 +1,8 @@ PRGNAM="libsigrok" -VERSION="0.5.2" +VERSION="20201229_f93bf8b" HOMEPAGE="https://sigrok.org/wiki/Libsigrok" -DOWNLOAD="https://sigrok.org/download/source/libsigrok/libsigrok-0.5.2.tar.gz" -MD5SUM="e258d471b6d5eaa58daf927a0dc3ba67" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/libsigrok-20201229_f93bf8b.tar.xz" +MD5SUM="8c072b43fc5b940f500be3e4680a7280" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libsigrokdecode/libsigrokdecode.SlackBuild b/libraries/libsigrokdecode/libsigrokdecode.SlackBuild index a4e213bdd3..8c33c97ce0 100644 --- a/libraries/libsigrokdecode/libsigrokdecode.SlackBuild +++ b/libraries/libsigrokdecode/libsigrokdecode.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libsigrokdecode -VERSION=${VERSION:-0.5.3} +VERSION=${VERSION:-20201111_3f77dc2} 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 {} \; +./autogen.sh + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -89,7 +91,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 ChangeLog COPYING Doxyfile HACKING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING Doxyfile HACKING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/libsigrokdecode/libsigrokdecode.info b/libraries/libsigrokdecode/libsigrokdecode.info index 7bd312dccd..0b55aec4a0 100644 --- a/libraries/libsigrokdecode/libsigrokdecode.info +++ b/libraries/libsigrokdecode/libsigrokdecode.info @@ -1,8 +1,8 @@ PRGNAM="libsigrokdecode" -VERSION="0.5.3" +VERSION="20201111_3f77dc2" HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode" -DOWNLOAD="https://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-0.5.3.tar.gz" -MD5SUM="7ba4ed4ef1f06ae96979751e096c2821" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/libsigrokdecode-20201111_3f77dc2.tar.xz" +MD5SUM="ed61f17ddfbc14c8cdd6d8caaf931d82" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" 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 -# 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 -# 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 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 + #include + +-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 + #include + +-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 -# 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 ef22976f7b..0000000000 --- a/libraries/libuv/libuv.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -# SlackBuild script for libuv - -# Copyright 2014-2020 Benjamin Trigona-Harany -# 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.40.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 7c765bda43..0000000000 --- a/libraries/libuv/libuv.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libuv" -VERSION="1.40.0" -HOMEPAGE="http://libuv.org/" -DOWNLOAD="https://dist.libuv.org/dist/v1.40.0/libuv-v1.40.0.tar.gz" -MD5SUM="7cb2fdadb61a76fc55cbbe928e322862" -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-4.0.0-cast-align.patch b/libraries/libvirt-glib/libvirt-glib-4.0.0-cast-align.patch new file mode 100644 index 0000000000..666babaca6 --- /dev/null +++ b/libraries/libvirt-glib/libvirt-glib-4.0.0-cast-align.patch @@ -0,0 +1,12 @@ +diff -rup libvirt-glib-4.0.0.orig/meson.build libvirt-glib-4.0.0.new/meson.build +--- libvirt-glib-4.0.0.orig/meson.build 2021-02-15 12:23:04.609036200 +0000 ++++ libvirt-glib-4.0.0.new/meson.build 2021-02-15 14:50:24.838971022 +0000 +@@ -175,8 +175,6 @@ cc_flags += [ + '-Wbuiltin-declaration-mismatch', + '-Wbuiltin-macro-redefined', + '-Wcannot-profile', +- '-Wcast-align', +- '-Wcast-align=strict', + '-Wcast-function-type', + '-Wchar-subscripts', + '-Wclobbered', diff --git a/libraries/libvirt-glib/libvirt-glib.SlackBuild b/libraries/libvirt-glib/libvirt-glib.SlackBuild index 60a9c1969f..487a9681b5 100644 --- a/libraries/libvirt-glib/libvirt-glib.SlackBuild +++ b/libraries/libvirt-glib/libvirt-glib.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libvirt-glib -# Copyright 2012-2017 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2012-2021 Robby Workman, Tuscaloosa, Alabama, USA # 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=libvirt-glib -VERSION=${VERSION:-1.0.0} +VERSION=${VERSION:-4.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,7 +57,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 . \ @@ -66,27 +66,26 @@ 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" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --disable-static +patch -p1 < $CWD/libvirt-glib-4.0.0-cast-align.patch -make -make install DESTDIR=$PKG +mkdir build +cd build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson .. \ + --buildtype=release \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --prefix=/usr + 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 README \ + AUTHORS COPYING HACKING NEWS README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/libvirt-glib/libvirt-glib.info b/libraries/libvirt-glib/libvirt-glib.info index 90a4b953cc..bdc2967403 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="4.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-4.0.0.tar.xz" +MD5SUM="0d0932949cde8a8933f6fb6aaf66dfe0" 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..ae54149c9e 100644 --- a/libraries/libvirt-python/libvirt-python.SlackBuild +++ b/libraries/libvirt-python/libvirt-python.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libvirt-python -# Copyright 2013-2018 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2013-2021 Robby Workman, Tuscaloosa, Alabama, USA # 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=libvirt-python -VERSION=${VERSION:-4.5.0} +VERSION=${VERSION:-7.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -66,14 +66,14 @@ 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 +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 \ - AUTHORS COPYING* ChangeLog NEWS PKG-INFO README \ + AUTHORS COPYING* ChangeLog PKG-INFO README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/libvirt-python/libvirt-python.info b/libraries/libvirt-python/libvirt-python.info index 0670df4073..7a6cf6b92e 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="7.1.0" +HOMEPAGE="https://libvirt.org" +DOWNLOAD="https://libvirt.org/sources/python/libvirt-python-7.1.0.tar.gz" +MD5SUM="de8c8f9cdde28b866271fe7e356a1fbb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libvirt" diff --git a/libraries/libvirt/README b/libraries/libvirt/README index 865d1a545d..471c913f8e 100644 --- a/libraries/libvirt/README +++ b/libraries/libvirt/README @@ -47,7 +47,21 @@ Have a look at the commented part of rc.libvirt for some gotchas. netcat-openbsd is an optional dependency (needed if you want to connect from a remote host using virt-manager). Other optional dependencies include avahi, xen, audit, glusterfs, -and numactl. +numactl, open-iscsi and libiscsi. As of the 4.5.0 version, you may have to remove any previously installed versions of libvirt before this will build. + +Note also that sometimes, in consequence of a major-version upgrade, +you might discover that the libvirt configuration is in an inconsistent +state (machine networking broken and so on) and when this happens you +might want to consider starting from a clean state. To do this: +- backup the existing vms files and their configurations too (with + "virsh dumpxml $name > ${name}.xml) +- remove libvirt +- delete all the system directories (/var/lib/libvirt, /var/log/libvirt, + /etc/libvirt) +- install the new libvirt package, logout and login again (might help) + and start the daemon +- recreate your configurations (network and so on) +- reimport the vms xml backups (with "virsh define ${name}.xml") diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild index 84008caff4..469bc6be77 100644 --- a/libraries/libvirt/libvirt.SlackBuild +++ b/libraries/libvirt/libvirt.SlackBuild @@ -5,8 +5,8 @@ # Maintained by Robby Workman PRGNAM=libvirt -VERSION=${VERSION:-4.5.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-7.1.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -35,6 +35,13 @@ fi VIRTGROUP=${VIRTGROUP:-users} +# Some optional dependencies checks +audit="dis" ; if pkg-config --exists audit ; then audit="en" ; fi +bash_completion="" ; if pkg-config --exists bash_completion ; then + bash_completion="-Dbash_completion=enabled -Dbash_completion_dir=/etc/bash_completion.d" +fi +libiscsi="dis" ; if pkg-config --exists libiscsi ; then libiscsi="en" ; fi + set -e rm -rf $PKG @@ -51,38 +58,52 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # we have sysctld files in /etc/sysctl.d -sed -i "s|(prefix)/lib/sysctl|(sysconfdir)/sysctl|" src/Makefile.in +sed -i "s|prefix / 'lib' / 'sysctl.d'|sysconfdir / 'sysctl.d'|" src/remote/meson.build patch -p1 < $CWD/use-virtgroup-in-polkit-rules.diff sed -i -e "s,@VIRTGROUP@,$VIRTGROUP,g" src/remote/libvirtd.rules -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --bindir=/usr/sbin \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-static=no \ - --enable-shared=yes \ - --with-yajl \ - --with-qemu-group=$VIRTGROUP \ - --with-init-script=none - -make \ - HTML_DIR=/usr/doc/$PRGNAM-$VERSION \ - EXAMPLE_DIR=/usr/doc/$PRGNAM-$VERSION/examples -make \ - HTML_DIR=/usr/doc/$PRGNAM-$VERSION \ - EXAMPLE_DIR=/usr/doc/$PRGNAM-$VERSION/examples \ - install-strip DESTDIR=$PKG +# Since 5.10: "configure: error: Build directory must be different from source directory" +mkdir -p 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 \ + -Dqemu_group=$VIRTGROUP \ + $bash_completion \ + -Daudit=${audit}abled \ + -Dlibiscsi=${libiscsi}abled \ + -Dopenwsman=disabled \ + -Dapparmor=disabled \ + -Dselinux=disabled \ + -Dwireshark_dissector=disabled \ + -Ddriver_bhyve=disabled \ + -Ddriver_hyperv=disabled \ + -Ddriver_libxl=disabled \ + -Ddriver_vz=disabled \ + -Dsecdriver_apparmor=disabled \ + -Dsecdriver_selinux=disabled \ + -Dstorage_sheepdog=disabled \ + -Dstorage_vstorage=disabled \ + -Ddtrace=disabled \ + -Dinit_script=none + ninja + DESTDIR=$PKG ninja install +cd .. # we don't have augeas rm -fr $PKG/usr/share/augeas +# this tree is recreated when starting the daemon +rm -fR $PKG/var/run + # add an rc.libvirt to start/stop/restart the daemon install -D -m 0755 $CWD/rc.libvirt $PKG/etc/rc.d/rc.libvirt.new @@ -109,8 +130,10 @@ 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 +mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION/ +rm -fR $PKG/usr/share/doc cp -a \ - AUTHORS ChangeLog COPYING* INSTALL README NEWS examples/polkit/* \ + *.rst COPYING* examples/polkit/* \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info index f8186d1ad3..09db09a33b 100644 --- a/libraries/libvirt/libvirt.info +++ b/libraries/libvirt/libvirt.info @@ -1,10 +1,10 @@ PRGNAM="libvirt" -VERSION="4.5.0" +VERSION="7.1.0" HOMEPAGE="http://libvirt.org" -DOWNLOAD="https://libvirt.org/sources/libvirt-4.5.0.tar.xz" -MD5SUM="692b2d00907438ed08a68813d3177cd3" +DOWNLOAD="https://libvirt.org/sources/libvirt-7.1.0.tar.xz" +MD5SUM="62aec94769a2992fca66c104adc54c78" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="yajl urlgrabber" +REQUIRES="yajl" MAINTAINER="Robby Workman" EMAIL="rworkman@slackbuilds.org" diff --git a/libraries/libvirt/rc.libvirt b/libraries/libvirt/rc.libvirt index fb058a7189..31ccfb1b77 100644 --- a/libraries/libvirt/rc.libvirt +++ b/libraries/libvirt/rc.libvirt @@ -11,6 +11,7 @@ # script if this behaviour conflicts with anything else running # on your setup +VIRSH=/usr/bin/virsh MODULES="tun vhost_net" TIMEOUT=${TIMEOUT:-300} LIBVIRTD_PIDFILE="/var/run/libvirt/libvirtd.pid" @@ -22,16 +23,16 @@ VIRTLOCKD_OPTS=${VIRTLOCKD_OPTS:-" -f /etc/libvirt/virtlockd.conf -p $VIRTLOCKD_ guests_reboot() { - for machine in $(/usr/sbin/virsh list --name --state-running | grep -v ^$) ; do - /usr/sbin/virsh reboot $machine + for machine in $($VIRSH list --name --state-running | grep -v ^$) ; do + $VIRSH reboot $machine done } guests_shutdown() { - for machine in $(/usr/sbin/virsh list --name --state-running | grep -v ^$) ; do - /usr/sbin/virsh shutdown $machine & + for machine in $($VIRSH list --name --state-running | grep -v ^$) ; do + $VIRSH shutdown $machine & done sleep 2 @@ -40,7 +41,7 @@ guests_shutdown() { count=0 - while [ $(/usr/sbin/virsh list --name --state-running | grep -v ^$ | wc -l) -gt "0" ]; do + while [ $($VIRSH list --name --state-running | grep -v ^$ | wc -l) -gt "0" ]; do if [ "$count" -ge "$TIMEOUT" ];then break fi @@ -51,11 +52,11 @@ guests_shutdown() { echo "" - if [ $(/usr/sbin/virsh list --name --state-running | grep -v ^$ | wc -l) -gt "0" ];then + if [ $($VIRSH list --name --state-running | grep -v ^$ | wc -l) -gt "0" ];then echo -n "The following guests are still running after $TIMEOUT seconds; destroying them: " - for machine in $(/usr/sbin/virsh list --name --state-running | grep -v ^$) ; do - /usr/sbin/virsh destroy $machine + for machine in $($VIRSH list --name --state-running | grep -v ^$) ; do + $VIRSH destroy $machine echo -n "$machine " done @@ -73,8 +74,8 @@ guests_managedsave() { # apply managedsave on running and paused machines (as we can't distinguish between # the two states while managedsave is being applied, so won't know when to finish waiting) - for machine in $(/usr/sbin/virsh list --name | grep -v ^$) ; do - /usr/sbin/virsh managedsave $machine & + for machine in $($VIRSH list --name | grep -v ^$) ; do + $VIRSH managedsave $machine & done sleep 2 @@ -83,7 +84,7 @@ guests_managedsave() { count=0 - while [ $(/usr/sbin/virsh list --name | grep -v ^$ | wc -l) -gt "0" ]; do + while [ $($VIRSH list --name | grep -v ^$ | wc -l) -gt "0" ]; do if [ "$count" -ge "$TIMEOUT" ];then break fi @@ -94,11 +95,11 @@ guests_managedsave() { echo "" - if [ $(/usr/sbin/virsh list --name | grep -v ^$ | wc -l) -gt "0" ];then + if [ $($VIRSH list --name | grep -v ^$ | wc -l) -gt "0" ];then echo -n "Following guests are still running after $TIMEOUT seconds, destroying them: " - for machine in $(/usr/sbin/virsh list --name | grep -v ^$) ; do - /usr/sbin/virsh destroy $machine + for machine in $($VIRSH list --name | grep -v ^$) ; do + $VIRSH destroy $machine echo -n "$machine " done @@ -140,7 +141,7 @@ start_libvirtd() { exit 1 fi echo "Starting libvirtd: /usr/sbin/libvirtd -d " - mkdir -p $(dirname $LIBVIRTD_PIDFILE) + mkdir -p $(dirname $LIBVIRTD_PIDFILE) /run/libvirt/{lockd,lxc,network,qemu/swtpm} check_processor /sbin/modprobe -a $MODULES /usr/sbin/libvirtd -d -l $LIBVIRTD_OPTS @@ -154,8 +155,8 @@ stop_libvirtd() { guests_managedsave check_processor echo "Stopping libvirtd..." - for network in $(/usr/sbin/virsh net-list --name); do - /usr/sbin/virsh net-destroy "$network" + for network in $($VIRSH net-list --name); do + $VIRSH net-destroy "$network" done kill -TERM $(cat $LIBVIRTD_PIDFILE) sleep 3 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 c76b558715..0000000000 --- a/libraries/libwacom/libwacom.SlackBuild +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh -# -# Slackware build script for libwacom. -# -# Copyright 2016-2021 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.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-$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 01d4b9bca4..0000000000 --- a/libraries/libwacom/libwacom.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libwacom" -VERSION="1.9" -HOMEPAGE="https://github.com/linuxwacom/libwacom" -DOWNLOAD="https://github.com/linuxwacom/libwacom/archive/libwacom-1.9/libwacom-libwacom-1.9.tar.gz" -MD5SUM="79361dc08df3ee23a9366c3c0ddf3637" -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/libwnck3/README b/libraries/libwnck3/README deleted file mode 100644 index 73bc947ba3..0000000000 --- a/libraries/libwnck3/README +++ /dev/null @@ -1,5 +0,0 @@ -libwnck3 (Window Navigator Construction Kit) - -A library to use for writing pagers and task lists. - -This package can coexist with libwnck from Slackware default stock. diff --git a/libraries/libwnck3/libwnck3.SlackBuild b/libraries/libwnck3/libwnck3.SlackBuild deleted file mode 100644 index 5edc2f83e4..0000000000 --- a/libraries/libwnck3/libwnck3.SlackBuild +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh -# -# Slackware build script for libwnck3. -# -# Copyright 2019 Donald Cooley, South Haven, Indiana, USA -# Copyright 2015 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=libwnck3 -VERSION=${VERSION:-3.20.1} -BUILD=${BUILD:-2} -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 - -SRCNAM="libwnck" - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/${SRCNAM}-${VERSION}.tar.xz -mv ${SRCNAM}-${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" \ -./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 - -# Newer releases will require meson. - -#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 .. - -mv $PKG/usr/bin/wnckprop $PKG/usr/bin/wnckprop3 -mv $PKG/usr/bin/wnck-urgency-monitor $PKG/usr/bin/wnck3-urgency-monitor - -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 MAINTAINERS NEWS README" - -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/libwnck3/libwnck3.info b/libraries/libwnck3/libwnck3.info deleted file mode 100644 index 07c9841ade..0000000000 --- a/libraries/libwnck3/libwnck3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libwnck3" -VERSION="3.20.1" -HOMEPAGE="http://ftp.gnome.org/pub/gnome/sources/libwnck/" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libwnck/3.20/libwnck-3.20.1.tar.xz" -MD5SUM="487938d65d4bfae1f2501052b1bd7492" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Donald Cooley" -EMAIL="chytraeus@protonmail.com" diff --git a/libraries/libwnck3/slack-desc b/libraries/libwnck3/slack-desc deleted file mode 100644 index 96d02f830c..0000000000 --- a/libraries/libwnck3/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------------------------------------------------------| -libwnck3: libwnck3 (Window Navigator Construction Kit) -libwnck3: -libwnck3: A library to use for writing pagers and task lists. -libwnck3: -libwnck3: Home page: http://ftp.gnome.org/pub/gnome/sources/libwnck/ -libwnck3: -libwnck3: -libwnck3: -libwnck3: -libwnck3: -libwnck3: diff --git a/libraries/libwps/libwps.SlackBuild b/libraries/libwps/libwps.SlackBuild index 0e00d37b50..fe0573f60e 100644 --- a/libraries/libwps/libwps.SlackBuild +++ b/libraries/libwps/libwps.SlackBuild @@ -77,7 +77,7 @@ esac autoreconf -fi 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 2113d69d97..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 9906507e18..0000000000 --- a/libraries/libxkbcommon/libxkbcommon.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# Slackware build script for libxkbcommon - -# Copyright 2013 Anton Sil'uev, Russia -# Copyright 2018-2021 Isaac Yu -# 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:-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.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 - -# Compress man files -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 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 48526e42b0..0000000000 --- a/libraries/libxkbcommon/libxkbcommon.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libxkbcommon" -VERSION="1.1.0" -HOMEPAGE="https://xkbcommon.org/" -DOWNLOAD="https://github.com/xkbcommon/libxkbcommon/releases/download/xkbcommon-1.1.0/libxkbcommon-1.1.0.tar.xz" -MD5SUM="6e37602234bf47bbd4700365d1bede27" -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 c1c8fe63b1..5031f75cd5 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 .*/#include /' 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..35a4b9fb6e 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.8.0} 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 . \ @@ -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..991e118b89 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.8.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/lxqt/lxqt-build-tools/releases/download/0.8.0/lxqt-build-tools-0.8.0.tar.xz" +MD5SUM="503532ae4aa7ed35c75d3120e28fd343" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5" diff --git a/libraries/marisa/README b/libraries/marisa/README deleted file mode 100644 index 1400693707..0000000000 --- a/libraries/marisa/README +++ /dev/null @@ -1,3 +0,0 @@ -libmarisa is a C++ library for an implementation of MARISA -(Matching Algorithm with Recursively Implemented StorAge), -which is a space-efficient trie data structure. diff --git a/libraries/marisa/marisa.SlackBuild b/libraries/marisa/marisa.SlackBuild deleted file mode 100644 index a3d0c398f9..0000000000 --- a/libraries/marisa/marisa.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -# Slackware build script for marisa - -# Copyright 2018 CCHsu Taiwan -# 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=marisa -VERSION=${VERSION:-0.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 {} \; - -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 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 $TMP/$PRGNAM-$VERSION/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/marisa/marisa.info b/libraries/marisa/marisa.info deleted file mode 100644 index 8ea8e8a24f..0000000000 --- a/libraries/marisa/marisa.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="marisa" -VERSION="0.2.5" -HOMEPAGE="https://s-yata.github.io/marisa-trie/docs/readme.en.html" -DOWNLOAD="https://github.com/s-yata/marisa-trie/releases/download/v0.2.5/marisa-0.2.5.tar.gz" -MD5SUM="34417c250c4f2eaeb604acbc490fb4ca" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="CCHsu" -EMAIL="a12321aabb@gmail.com" diff --git a/libraries/marisa/slack-desc b/libraries/marisa/slack-desc deleted file mode 100644 index f1672f5baa..0000000000 --- a/libraries/marisa/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------------------------------------------------------| -marisa: marisa (Matching Algorithm with Recursively Implemented StorAge) -marisa: -marisa: libmarisa is a C++ library for an implementation of MARISA (Matching -marisa: Algorithm with Recursively Implemented StorAge), which is a static -marisa: and space-efficient trie data structure library. Users can build -marisa: dictionaries and search keys with this library. -marisa: -marisa: -marisa: Homepage: -marisa: https://s-yata.github.io/marisa-trie/docs/readme.en.html -marisa: 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 +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 + #include + +-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/mongo-c-driver/mongo-c-driver.SlackBuild b/libraries/mongo-c-driver/mongo-c-driver.SlackBuild index b0c707f20e..37ccb1d73b 100644 --- a/libraries/mongo-c-driver/mongo-c-driver.SlackBuild +++ b/libraries/mongo-c-driver/mongo-c-driver.SlackBuild @@ -21,7 +21,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mongo-c-driver -VERSION=${VERSION:-1.6.1} +VERSION=${VERSION:-1.17.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -68,36 +68,28 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Flag Docs, if needed -PDOCS="" -MkDOCS="" -if [ "${DOCS:-no}" = "yes" ]; then - PDOCS="--enable-html-docs --enable-man-pages" - MkDOCS="man html" -fi - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-static \ - --disable-automatic-init-and-cleanup \ - $PDOCS \ - --build=$ARCH-slackware-linux +DOX=0 ; if [ "${DOCS:-no}" = "yes" ]; then DOX=1 ; fi -make $MkDOCS -make install DESTDIR=$PKG +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DENABLE_MAN_PAGES=$DOX \ + -DENABLE_HTML_DOCS=$DOX \ + -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 \ - AUTHORS COPYING ChangeLog CONTRIBUTING.md NEWS README README.rst \ - THIRD_PARTY_NOTICES VERSION_CURRENT VERSION_RELEASED \ + COPYING CONTRIBUTING.md NEWS README.rst \ + THIRD_PARTY_NOTICES VERSION_CURRENT \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/mongo-c-driver/mongo-c-driver.info b/libraries/mongo-c-driver/mongo-c-driver.info index 2c2ecc783f..c37ba0046c 100644 --- a/libraries/mongo-c-driver/mongo-c-driver.info +++ b/libraries/mongo-c-driver/mongo-c-driver.info @@ -1,8 +1,8 @@ PRGNAM="mongo-c-driver" -VERSION="1.6.1" +VERSION="1.17.3" HOMEPAGE="http://mongoc.org" -DOWNLOAD="https://github.com/mongodb/mongo-c-driver/releases/download/1.6.1/mongo-c-driver-1.6.1.tar.gz" -MD5SUM="826946de9a15f7f453aefecdc76b1c0d" +DOWNLOAD="https://github.com/mongodb/mongo-c-driver/releases/download/1.17.3/mongo-c-driver-1.17.3.tar.gz" +MD5SUM="9babfd9883e7c02bd0d7624ea286ee82" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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..267e51360c 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.26} 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 . \ @@ -72,10 +72,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 for the newer binutils (no more l flag for ar) +sed -i -e "s|ArCmdBase\ clq|ArCmdBase cq|" \ + -e "s|ArCmdBase\ rul|ArCmdBase ru|" \ + -e "s|ArCmdBase\ xl|ArCmdBase x|" \ + nx-X11/config/cf/Imake.tmpl + # Fix man install dir sed -i "s|share/man|man|g" Makefile -make CONFIGURE="./configure --libdir=/usr/lib${LIBDIRSUFFIX} --prefix=/usr --mandir=/usr/man" PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} +make CONFIGURE="./configure --libdir=/usr/lib${LIBDIRSUFFIX} --prefix=/usr --mandir=/usr/man" PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} IMAKE_DEFINES="-DUseTIRPC=YES" make install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG diff --git a/libraries/nx-libs/nx-libs.info b/libraries/nx-libs/nx-libs.info index 40682b6b44..61974a26a5 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.26" 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.26/nx-libs-3.5.99.26.tar.gz" +MD5SUM="ce874313e69f1a0f8c09c7363b006f66" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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 5b989e77b5..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 992a67aa78..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.14} -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 de0611bde0..0000000000 --- a/libraries/ocl-icd/ocl-icd.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ocl-icd" -VERSION="2.2.14" -HOMEPAGE="https://github.com/OCL-dev/ocl-icd" -DOWNLOAD="https://github.com/OCL-dev/ocl-icd/archive/v2.2.14/ocl-icd-2.2.14.tar.gz" -MD5SUM="ef0d426bccf2a795013d3c5794550e5e" -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ć -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 -+} - #include - #include - #include -@@ -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 - #include - #include -+#include - - #ifdef HAVE_UNISTD_H - #include -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 - - #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 - #include -+#include - - #ifdef HAVE_UNISTD_H - #include -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 - # 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 - #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/opencv/README b/libraries/opencv/README deleted file mode 100644 index 38ce4bcba5..0000000000 --- a/libraries/opencv/README +++ /dev/null @@ -1,79 +0,0 @@ -OpenCV (Open Source Computer Vision Library) is an open source -computer vision and machine learning software library. -OpenCV was built to provide a common infrastructure for -computer vision applications and to accelerate the use of -machine perception in commercial products. - -This SlackBuild is incompatible with the opencv-legacy SlackBuild -so they should not be installed simultaneously. - -OpenCV will incorporate features from a wide range of additional -software that may exist on the host system at build time. The more -of the relevant software packages that are available, the greater -the feature set available in the resulting OpenCV package. The -additional optional packages will mostly be autodetected and used -at build time without any user intervention. Packages that are -processed in this way include (by SBo package name): - libdc1394 ffmpeg hdf5 VTK libwebp tesseract glog - apache-ant numpy OpenBLAS openjdk8 (or openjdk or jdk) - -In the unlikely situation that features from these packages are not -wanted despite already being installed on the host system, -incorporation of some of them into OpenCV may be suppressed by setting -the appropriate environment variable to "no" e.g. - CVFFMPEG=no sh ./opencv.SlackBuild -Features that may be excluded in this manner are controlled by the -following environment variables: - CV1394 CVFFMPEG CVVTK - -At least one optional package is not autodetected, even though the -necessary prerequisite software may already have been installed. It -must therefore be explicitly enabled by setting the appropriate -environment variable: - CVGDAL=yes ./opencv.SlackBuild -(to support SBo's gis/gdal) - -Access to patented algorithms e.g.SIFT/SURF may be enabled by setting -the CVNONFREE environment variable: - CVNONFREE=yes ./opencv.SlackBuild - -Please note that some combinations of options may not be possible. In -particular, if both qt5 and VTK are installed on the host build system, -VTK support will be disabled unless it was built with qt5 support (which -is possible but not its default). Conversely, if VTK has been built with -qt5, it will be disabled in OpenCV unless it too is being built with qt5. - -Since opencv version 4.1.1, Qt5 is the required widget framework -(Qt4 is insufficient). Therefore qt5 is now a required dependency, -although this may be bypassed (with reduced functionality) by setting -the CVQT5 environment variable e.g. - CVQT5=no sh ./opencv.SlackBuild - -This package is configured to generate python bindings for Python 3 (via -dependency on the numpy3 package). If bindings for Python 2 are required, -the numpy package is required when building opencv. - -The Extra 2D Features Framework from OpenCV's "extra modules" section -is disabled by default as it entails additional downloading during -the configure stage of building. It may be enabled by setting the XF2D -environment variable when building e.g. - XF2D=yes sh ./opencv.SlackBuild -Usually, this also applies to the Deep Neural Network (DNN) module -however it is no longer possible to complete a build without without -it and therefore remains enabled by default. - -The face recognition module is enabled by default. This incurs an additional -download of the face_landmark_model.dat file (~70M) from OpenCV's github -repository during configuration. If this is not desired, the face module -can be disabled by setting OCV_FACE environment variable to "no" -e.g. - OCV_FACE=no sh ./opencv.SlackBuild - -Documentation is generated by the SlackBuild unless it is switched off -by setting the CVDOCS environment variable i.e. - CVDOCS=no sh ./opencv.SlackBuild -Enabling the documentation results in additional downloading of example data -during the configure stage of building. - -The graphviz package is an optional dependency for enhanced -documentation. diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild deleted file mode 100644 index 25380ccf14..0000000000 --- a/libraries/opencv/opencv.SlackBuild +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh - -# Slackware build script for opencv - -# Copyright 2012-2015 Matt Dinslage, Springfield, MO USA -# All rights reserved. -# Copyright 2016-2021 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=opencv -PRGNAM2=opencv_contrib -VERSION=${VERSION:-4.5.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 - -qt5="-DWITH_QT=ON" ; [ "${CVQT5:-yes}" = "no" ] && qt5="-DWITH_QT=OFF" -cvnonfree="" ; [ "${CVNONFREE:-no}" = "yes" ] && cvnonfree="-DOPENCV_ENABLE_NONFREE=ON" -cv1394="" ; [ "${CV1394:-yes}" = "no" ] && cv1394="-DWITH_1394=OFF" -cvffmpeg="" ; [ "${CVFFMPEG:-yes}" = "no" ] && cvffmpeg="-DWITH_FFMPEG=OFF" -cvvtk="" ; [ "${CVVTK:-yes}" = "no" ] && cvvtk="-DWITH_VTK=OFF" -cvgdal="" ; [ "${CVGDAL:-no}" = "yes" ] && cvgdal="-DWITH_GDAL=ON" -dnn=""; #dnn="-DBUILD_opencv_dnn=OFF" ; [ "${DNN:-no}" = "yes" ] && dnn="" -face="" ; [ "${OCV_FACE:-yes}" = "no" ] && face="-DBUILD_opencv_face=OFF" -xf2d="-DBUILD_opencv_xfeatures2d=OFF" ; [ "${XF2D:-no}" = "yes" ] && xf2d="" -cvdocs="-DBUILD_DOCS=ON -DBUILD_EXAMPLES=ON -DINSTALL_C_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON " ; [ "${CVDOCS:-yes}" = "no" ] && cvdocs="" - - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -echo "Unpacking $CWD/$PRGNAM-$VERSION.tar.gz ..." -tar xf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -echo "Unpacking $CWD/$PRGNAM2-$VERSION.tar.gz ..." -tar xf $CWD/$PRGNAM2-$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 {} \; - - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE="Release" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_SHARED_LIBS=ON \ - -DOPENCV_GENERATE_PKGCONFIG=ON \ - -DPYTHON2_PACKAGES_PATH=$(python2 -c "import site; print(site.getsitepackages()[0])") \ - -DPYTHON3_PACKAGES_PATH=$(python3 -c "import site; print(site.getsitepackages()[0])") \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ - -DWITH_IPP=OFF \ - -DWITH_OPENGL=ON \ - -DWITH_OPENMP=ON \ - -DWITH_XINE=ON \ - -DBUILD_CUDA_STUBS=OFF \ - -DWITH_CUDA=OFF \ - $qt5 \ - $cv1394 \ - $cvffmpeg \ - $cvvtk \ - $cvgdal \ - $dnn \ - $face \ - $xf2d \ - $cvdocs \ - $cvnonfree \ - -DBUILD_opencv_intensity_transform=OFF \ - -DOPENCV_EXTRA_MODULES_PATH=../$PRGNAM2-$VERSION/modules .. - - make VERBOSE=1 - [ "${CVDOCS:-yes}" = "yes" ] && make doxygen - 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 -mv $PKG/usr/share/licenses $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 -mv $PKG/usr/share/doc/opencv4/html $PKG/usr/doc/$PRGNAM-$VERSION && rm -rf $PKG/usr/share/doc/ - -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/opencv/opencv.info b/libraries/opencv/opencv.info deleted file mode 100644 index dfb9f12fa7..0000000000 --- a/libraries/opencv/opencv.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="opencv" -VERSION="4.5.1" -HOMEPAGE="https://opencv.org/" -DOWNLOAD="https://github.com/opencv/opencv/archive/4.5.1/opencv-4.5.1.tar.gz \ - https://github.com/opencv/opencv_contrib/archive/4.5.1/opencv_contrib-4.5.1.tar.gz" -MD5SUM="2205d3169238ec1f184438a96de68513 \ - 19a31bf7271978ab426112dbf5d1b83f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="numpy3 qt5" -MAINTAINER="Christoph Willing" -EMAIL="chris.willing@linux.com" diff --git a/libraries/opencv/slack-desc b/libraries/opencv/slack-desc deleted file mode 100644 index 1de2d629ee..0000000000 --- a/libraries/opencv/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------------------------------------------------------| -opencv: opencv (Open Source Computer Vision) -opencv: -opencv: OpenCV (Open Source Computer Vision Library) is an open source -opencv: computer vision and machine learning software library. OpenCV was -opencv: built to provide a common infrastructure for computer vision -opencv: applications and to accelerate the use of machine perception in -opencv: commercial products. -opencv: -opencv: Homepage: https://www.opencv.org -opencv: -opencv: 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 +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 -# 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/pipewire/README b/libraries/pipewire/README deleted file mode 100644 index e9be42ecad..0000000000 --- a/libraries/pipewire/README +++ /dev/null @@ -1,4 +0,0 @@ -pipewire - -pipewire is a library and protocol for multimedia. Like jack and -pulseaudio but also for video. diff --git a/libraries/pipewire/pipewire.SlackBuild b/libraries/pipewire/pipewire.SlackBuild deleted file mode 100644 index 0bbfe2f800..0000000000 --- a/libraries/pipewire/pipewire.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -# Slackware build script for pipewire - -# Copyright 2018 Vincent Batts -# 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=pipewire -VERSION=${VERSION:-0.2.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/$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" \ - meson \ - --libdir lib$LIBDIRSUFFIX \ - --prefix /usr \ - --buildtype=plain \ - 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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - README NEWS PROTOCOL LICENSE GPL LGPL \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo -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/pipewire/pipewire.info b/libraries/pipewire/pipewire.info deleted file mode 100644 index ccc0abe62c..0000000000 --- a/libraries/pipewire/pipewire.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="pipewire" -VERSION="0.2.7" -HOMEPAGE="https://pipewire.org/" -DOWNLOAD="https://github.com/PipeWire/pipewire/archive/0.2.7/pipewire-0.2.7.tar.gz" -MD5SUM="026fe15fc65e4a63bd8e5e63c0e054c6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="meson" -MAINTAINER="Vincent Batts" -EMAIL="vbatts@hashbangbash.com" diff --git a/libraries/pipewire/slack-desc b/libraries/pipewire/slack-desc deleted file mode 100644 index d198576eeb..0000000000 --- a/libraries/pipewire/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------------------------------------------------------| -pipewire: pipewire (multimedia processing graphs) -pipewire: -pipewire: pipewire is a library and protocol for multimedia. Like jack and -pipewire: pulseaudio but also for video. -pipewire: -pipewire: -pipewire: -pipewire: -pipewire: -pipewire: -pipewire: 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/README b/libraries/poppler-qt5/README deleted file mode 100644 index 6449e1b646..0000000000 --- a/libraries/poppler-qt5/README +++ /dev/null @@ -1,4 +0,0 @@ -Poppler is a PDF rendering library based on the xpdf-3.0 code base. - -This package provides the Qt5 bindings for the version of poppler -that comes with Slackware. diff --git a/libraries/poppler-qt5/poppler-qt5.SlackBuild b/libraries/poppler-qt5/poppler-qt5.SlackBuild deleted file mode 100644 index ce99c22afc..0000000000 --- a/libraries/poppler-qt5/poppler-qt5.SlackBuild +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh - -# Slackware build script for poppler-qt5 - -# Copyright 2013-2017 Larry Hajali -# 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=poppler-qt5 -VERSION=${VERSION:-0.45.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 ${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 -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 - -make -make -C qt5 install DESTDIR=$PKG - -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig -install -m 0644 $PRGNAM.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig - -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 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/poppler-qt5/poppler-qt5.info b/libraries/poppler-qt5/poppler-qt5.info deleted file mode 100644 index e99b4f6e11..0000000000 --- a/libraries/poppler-qt5/poppler-qt5.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="poppler-qt5" -VERSION="0.45.0" -HOMEPAGE="https://poppler.freedesktop.org/" -DOWNLOAD="https://poppler.freedesktop.org/poppler-0.45.0.tar.xz" -MD5SUM="a66e8c3cf6dab91dab5ba90d362c6063" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="qt5" -MAINTAINER="Larry Hajali" -EMAIL="larryhaja[at]gmail[dot]com" diff --git a/libraries/poppler-qt5/slack-desc b/libraries/poppler-qt5/slack-desc deleted file mode 100644 index 36dc7add70..0000000000 --- a/libraries/poppler-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------------------------------------------------------| -poppler-qt5: poppler-qt5 (Qt5 bindings for poppler) -poppler-qt5: -poppler-qt5: Poppler is a library based on the xpdf PDF viewer developed by Derek -poppler-qt5: Noonburg of Glyph and Cog, LLC. Since xpdf does not provide a shared -poppler-qt5: library, whenever a flaw was found potentially dozens of applications -poppler-qt5: incorporating code from xpdf would have to be patched. By providing -poppler-qt5: a centralized PDF library this duplicated effort will be eliminated. -poppler-qt5: -poppler-qt5: Homepage: https://poppler.freedesktop.org/ -poppler-qt5: -poppler-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. +Updated By: Bruce Dubbs +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 + # else + # include +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 . */ ++ ++/* 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 while ++** at the University of North Carolina at Chapel Hill. Later tweaked by ++** a couple of people on Usenet. Completely overhauled by Rich $alz ++** and Jim Berets 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 ++#include ++#include ++#include ++ ++#ifndef EOF ++#include ++#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 /* 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 /* 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 /* INFRINGES ON USER NAME SPACE */ ++# elif defined _AIX ++# define YYSTACK_ALLOC __alloca ++# elif defined _MSC_VER ++# include /* 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 /* 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 /* 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 /* 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 ++ ++ 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 + #include +- ++#include ++#include + + #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 -# Copyright 2008, 2009, 2010, 2011, 2015 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2015 Marcel Saegebarth -# 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 -# Modified by Eric Hameleers -# Adapted by Marcel Saegebarth - -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-PyYAML/python3-PyYAML.SlackBuild b/libraries/python3-PyYAML/python3-PyYAML.SlackBuild index 3c64388410..2c10f15db0 100644 --- a/libraries/python3-PyYAML/python3-PyYAML.SlackBuild +++ b/libraries/python3-PyYAML/python3-PyYAML.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=python3-PyYAML SRCNAM=PyYAML -VERSION=${VERSION:-3.13} +VERSION=${VERSION:-5.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/python3-PyYAML/python3-PyYAML.info b/libraries/python3-PyYAML/python3-PyYAML.info index e270a28575..92b8a7ad18 100644 --- a/libraries/python3-PyYAML/python3-PyYAML.info +++ b/libraries/python3-PyYAML/python3-PyYAML.info @@ -1,8 +1,8 @@ PRGNAM="python3-PyYAML" -VERSION="3.13" +VERSION="5.3.1" HOMEPAGE="https://pyyaml.org/" -DOWNLOAD="https://pyyaml.org/download/pyyaml/PyYAML-3.13.tar.gz" -MD5SUM="b78b96636d68ac581c0e2f38158c224f" +DOWNLOAD="https://pyyaml.org/download/pyyaml/PyYAML-5.3.1.tar.gz" +MD5SUM="d3590b85917362e837298e733321962b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" 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 -# -# 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 -# 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 Binary files a/libraries/qca-qt5/Add_support_for_OpenSSL_1.1.0.diff.gz and /dev/null 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 -# 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 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 Binary files a/libraries/qca-qt5/qca.tlsunittest.cpp.diff.gz and /dev/null 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 +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 that is supposed to define 'std::iswspace'. + +Signed-off-by: Sergei Trofimovich +--- + 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 /* 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 , Pisa, Italy +# Copyright 2015-2020 Matteo Bernardini , 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 +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 -# 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 -# 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 : 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 - #endif - --#include -+#include - - #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 -# 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 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 -# 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 , Pisa, Italy +# Copyright 2011-2020 Matteo Bernardini , 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/quazip-qt5/README b/libraries/quazip-qt5/README deleted file mode 100644 index 16d8d75993..0000000000 --- a/libraries/quazip-qt5/README +++ /dev/null @@ -1,11 +0,0 @@ -QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package -that can be used to access ZIP archives. It uses the Qt toolkit. - -QuaZIP allows you to access files inside ZIP archives using QIODevice API, -and - yes! - that means that you can also use QTextStream, QDataStream -or whatever you would like to use on your zipped files. - -QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both -reading from and writing to ZIP archives. - -This is the version based on qt5. diff --git a/libraries/quazip-qt5/quazip-qt5.SlackBuild b/libraries/quazip-qt5/quazip-qt5.SlackBuild deleted file mode 100644 index bbfa3bb078..0000000000 --- a/libraries/quazip-qt5/quazip-qt5.SlackBuild +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh - -# Slackware build script for quazip-qt5 - -# Copyright 2019-2020 Matteo Bernardini , 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=quazip-qt5 -SRCNAM=quazip -VERSION=${VERSION:-0.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" - SLKCFLAGS="-O2" - 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 {} \; - -mkdir build -cd build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - .. - - 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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a NEWS.txt COPYING *.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/quazip-qt5/quazip-qt5.info b/libraries/quazip-qt5/quazip-qt5.info deleted file mode 100644 index 7f3f2550fa..0000000000 --- a/libraries/quazip-qt5/quazip-qt5.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="quazip-qt5" -VERSION="0.9.1" -HOMEPAGE="https://github.com/stachenov/quazip/" -DOWNLOAD="https://github.com/stachenov/quazip/archive/v0.9.1/quazip-0.9.1.tar.gz" -MD5SUM="46a7c344355bd53af8da2bfcd5126c3c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="qt5" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/libraries/quazip-qt5/slack-desc b/libraries/quazip-qt5/slack-desc deleted file mode 100644 index e92132e4e7..0000000000 --- a/libraries/quazip-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------------------------------------------------------| -quazip-qt5: quazip-qt5 (Qt/C++ wrapper for ZIP/UNZIP package) -quazip-qt5: -quazip-qt5: QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package -quazip-qt5: that can be used to access ZIP archives. It uses the Qt toolkit. -quazip-qt5: -quazip-qt5: QuaZIP allows you to access files inside ZIP archives using QIODevice -quazip-qt5: API, quazip: and -yes!- that means that you can also use QTextStream, -quazip-qt5: QDataStream or whatever you would like to use on your zipped files. -quazip-qt5: -quazip-qt5: QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both -quazip-qt5: reading from and writing to ZIP archives. diff --git a/libraries/qwt/qwt.SlackBuild b/libraries/qwt/qwt.SlackBuild index 643e3bf43d..9e821a7474 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/rasqal/README b/libraries/rasqal/README new file mode 100644 index 0000000000..96059cf996 --- /dev/null +++ b/libraries/rasqal/README @@ -0,0 +1,6 @@ +Redland is a library that provides a high-level interface for the +Resource Description Framework (RDF) allowing the RDF graph to be +parsed from XML, stored, queried and manipulated. Redland +implements each of the RDF concepts in its own class via an object +based API, reflected into the language APIs, currently C#, Java, +Perl, PHP, Python, Ruby and Tcl. diff --git a/libraries/rasqal/rasqal.SlackBuild b/libraries/rasqal/rasqal.SlackBuild new file mode 100644 index 0000000000..11995012e3 --- /dev/null +++ b/libraries/rasqal/rasqal.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/sh + +# Slackware build script for rasqal + +# Copyright 2021 Matteo Bernardini , 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=rasqal +VERSION=${VERSION:-0.9.33} +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 INSTALL.html LICENSE* NEWS* NOTICE README*" + +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 \ + --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 +( cd $PKG/usr/doc/$PRGNAM-$VERSION + ln -s /usr/share/gtk-doc/html/$PRGNAM html +) +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/rasqal/rasqal.info b/libraries/rasqal/rasqal.info new file mode 100644 index 0000000000..c2c37b5a03 --- /dev/null +++ b/libraries/rasqal/rasqal.info @@ -0,0 +1,10 @@ +PRGNAM="rasqal" +VERSION="0.9.33" +HOMEPAGE="http://librdf.org" +DOWNLOAD="http://download.librdf.org/source/rasqal-0.9.33.tar.gz" +MD5SUM="1f5def51ca0026cd192958ef07228b52" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="raptor" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/libraries/rasqal/slack-desc b/libraries/rasqal/slack-desc new file mode 100644 index 0000000000..af19c0c904 --- /dev/null +++ b/libraries/rasqal/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------------------------------------------------------| +rasqal: rasqal (RDF parsing library) +rasqal: +rasqal: Rasqal is a library providing full support for querying Resource +rasqal: Description Framework (RDF) including parsing query syntaxes, +rasqal: constructing the queries, executing them and returning result formats. +rasqal: It currently handles the RDF Data Query Language (RDQL) and SPARQL +rasqal: Query language. +rasqal: +rasqal: homepage: http://librdf.org +rasqal: +rasqal: diff --git a/libraries/redland/README b/libraries/redland/README new file mode 100644 index 0000000000..96059cf996 --- /dev/null +++ b/libraries/redland/README @@ -0,0 +1,6 @@ +Redland is a library that provides a high-level interface for the +Resource Description Framework (RDF) allowing the RDF graph to be +parsed from XML, stored, queried and manipulated. Redland +implements each of the RDF concepts in its own class via an object +based API, reflected into the language APIs, currently C#, Java, +Perl, PHP, Python, Ruby and Tcl. diff --git a/libraries/redland/redland.SlackBuild b/libraries/redland/redland.SlackBuild new file mode 100644 index 0000000000..6943a83036 --- /dev/null +++ b/libraries/redland/redland.SlackBuild @@ -0,0 +1,110 @@ +#!/bin/sh + +# Slackware build script for redland + +# Copyright 2021 Matteo Bernardini , 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=redland +VERSION=${VERSION:-1.0.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 + +DOCS="AUTHORS COPYING* INSTALL INSTALL.html LICENSE* NEWS* NOTICE README* RELEASE.html 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 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 \ + --with-included-ltdl=no \ + --with-bdb-lib=/usr/lib${LIBDIRSUFFIX} \ + --with-bdb-dbname=db-4.8 \ + --with-threads \ + --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 +( cd $PKG/usr/doc/$PRGNAM-$VERSION + ln -s /usr/share/gtk-doc/html/$PRGNAM html +) +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/redland/redland.info b/libraries/redland/redland.info new file mode 100644 index 0000000000..a1795efa65 --- /dev/null +++ b/libraries/redland/redland.info @@ -0,0 +1,10 @@ +PRGNAM="redland" +VERSION="1.0.17" +HOMEPAGE="http://librdf.org" +DOWNLOAD="http://download.librdf.org/source/redland-1.0.17.tar.gz" +MD5SUM="e5be03eda13ef68aabab6e42aa67715e" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="rasqal" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/libraries/redland/slack-desc b/libraries/redland/slack-desc new file mode 100644 index 0000000000..e79365ce27 --- /dev/null +++ b/libraries/redland/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------------------------------------------------------| +redland: redland (RDF high-level interface library) +redland: +redland: Redland is a library that provides a high-level interface for the +redland: Resource Description Framework (RDF) allowing the RDF graph to be +redland: parsed from XML, stored, queried and manipulated. Redland +redland: implements each of the RDF concepts in its own class via an object +redland: based API, reflected into the language APIs, currently C#, Java, +redland: Perl, PHP, Python, Ruby and Tcl. +redland: +redland: homepage: http://librdf.org +redland: 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/swfdec/swfdec.info b/libraries/swfdec/swfdec.info index 3543ab6217..c17cc676c1 100644 --- a/libraries/swfdec/swfdec.info +++ b/libraries/swfdec/swfdec.info @@ -5,6 +5,6 @@ DOWNLOAD="http://ponce.cc/slackware/sources/repo/swfdec-0.9.2.tar.gz" MD5SUM="7be5e39236e2d6efa61a18e83e5ab73d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="gst0-plugins-base" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" 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 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/vid.stab/README b/libraries/vid.stab/README deleted file mode 100644 index cb41c8bc17..0000000000 --- a/libraries/vid.stab/README +++ /dev/null @@ -1,5 +0,0 @@ -Vidstab is a video stabilization library which can be plugged-in -with FFmpeg and Transcode. - -Pass TRANSCODE=yes to the script if you want to build the transcode -filters. These filters depend on transcode. diff --git a/libraries/vid.stab/slack-desc b/libraries/vid.stab/slack-desc deleted file mode 100644 index 7bdddcbdec..0000000000 --- a/libraries/vid.stab/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------------------------------------------------------| -vid.stab: vid.stab (video stabilization library) -vid.stab: -vid.stab: Vidstab is a video stabilization library which can be plugged-in -vid.stab: with FFmpeg and Transcode. -vid.stab: -vid.stab: Homepage: http://public.hronopik.de/vid.stab/ -vid.stab: -vid.stab: -vid.stab: -vid.stab: -vid.stab: diff --git a/libraries/vid.stab/vid.stab.SlackBuild b/libraries/vid.stab/vid.stab.SlackBuild deleted file mode 100644 index 447a063349..0000000000 --- a/libraries/vid.stab/vid.stab.SlackBuild +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh - -# Slackware build script for vid.stab - -# Copyright 2015-2016 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=vid.stab -VERSION=${VERSION:-97c6ae2} -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.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 build -cd build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DUSE_OMP=0 \ - .. - - make VERBOSE=1 - make install DESTDIR=$PKG -cd .. - -if ! [ "${TRANSCODE:-no}" = "no" ]; then - mkdir transcode/build - cd transcode/build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS} -I/usr/include/transcode" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS} -I/usr/include/transcode" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - .. - - make VERBOSE=1 - - mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/transcode - install -m 755 filter_deshake.so $PKG/usr/lib$LIBDIRSUFFIX/transcode/ - install -m 755 filter_stabilize.so $PKG/usr/lib$LIBDIRSUFFIX/transcode/ - install -m 755 filter_transform.so $PKG/usr/lib$LIBDIRSUFFIX/transcode/ - cd ../../ -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 Changelog Install LICENSE 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/vid.stab/vid.stab.info b/libraries/vid.stab/vid.stab.info deleted file mode 100644 index 1dcbb6343c..0000000000 --- a/libraries/vid.stab/vid.stab.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="vid.stab" -VERSION="97c6ae2" -HOMEPAGE="http://public.hronopik.de/vid.stab/" -DOWNLOAD="http://www.liwjatan.at/files/src/vid.stab/vid.stab-97c6ae2.tar.xz" -MD5SUM="422fc30cec5453c817d40083220311e6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" 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 +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 +# 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 -# 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 030706f970..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 e6b1d5d903..0000000000 --- a/libraries/wayland/wayland.SlackBuild +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh - -# Slackware build script for Wayland - -# Copyright 2014-2021 Diniz Bortolotto -# 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.19.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 CONTRIBUTING.md 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/libraries/wayland/wayland.info b/libraries/wayland/wayland.info deleted file mode 100644 index 0b2b19c8eb..0000000000 --- a/libraries/wayland/wayland.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wayland" -VERSION="1.19.0" -HOMEPAGE="https://wayland.freedesktop.org/" -DOWNLOAD="https://wayland.freedesktop.org/releases/wayland-1.19.0.tar.xz" -MD5SUM="5d59ac3d8a8f4e42de2ceb8bb19dfca9" -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..520f140d93 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.30.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,10 +55,6 @@ else LIBDIRSUFFIX="" fi -# This is needed to fix build issue on single make job -# Thanks to ponce for investigating this issue. -export MAKEFLAGS=${MAKEFLAGS:--j2} - set -eu rm -rf $PKG @@ -77,16 +73,29 @@ find -L . \ mkdir -p build cd build cmake -DPORT=GTK \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ + -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ -DLIBEXEC_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX}/webkit2gtk-4.0 \ - -DENABLE_MEDIA_SOURCE=NO \ - -DUSE_GSTREAMER_GL=NO \ + -DENABLE_MINIBROWSER=ON \ + -DUSE_SYSTEMD=OFF \ + -Wno-dev \ + -G Ninja \ .. -make -make install DESTDIR=$PKG + +# The build might crash on high specs machines because ninja eat all +# of the resources, so let's try to limit it to half the available ones +ninja -j$(expr $(nproc) / 2) +DESTDIR=$PKG ninja -j1 install + +mkdir -p $PKG/usr/share/gtk-doc/html/webkit{2,dom}gtk-4.0 +install -m 0644 ../Documentation/webkit2gtk-4.0/html/* \ + $PKG/usr/share/gtk-doc/html/webkit2gtk-4.0 +install -m 0644 ../Documentation/webkitdomgtk-4.0/html/* \ + $PKG/usr/share/gtk-doc/html/webkitdomgtk-4.0 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a ../NEWS $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/libraries/webkit2gtk/webkit2gtk.info b/libraries/webkit2gtk/webkit2gtk.info index 8c4164b2e7..deff514688 100644 --- a/libraries/webkit2gtk/webkit2gtk.info +++ b/libraries/webkit2gtk/webkit2gtk.info @@ -1,10 +1,10 @@ PRGNAM="webkit2gtk" -VERSION="2.20.5" +VERSION="2.30.5" 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.30.5.tar.xz" +MD5SUM="c8291af0c5102fff1f73e67f0bff6c87" 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..41793b1448 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 -DU_DEFINE_FALSE_AND_TRUE=1 -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..f8cc16638d 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 -DU_DEFINE_FALSE_AND_TRUE=1 -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 +# 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/01_kfreebsd_ftbfs.diff b/libraries/wvstreams/patches/01_kfreebsd_ftbfs.diff new file mode 100644 index 0000000000..5b98ae2919 --- /dev/null +++ b/libraries/wvstreams/patches/01_kfreebsd_ftbfs.diff @@ -0,0 +1,28 @@ +Description: fix FTBFS on kFreeBSD +Author: Petr Salinger +Bug-Debian: http://bugs.debian.org/537883 +Forwarded: no +Last-Update: 2013-10-30 + +--- a/utils/wvcrash.cc ++++ b/utils/wvcrash.cc +@@ -26,7 +26,7 @@ + #endif + + // FIXME: this file mostly only works in Linux +-#ifdef __linux ++#if 1 + + # include + #include +--- a/utils/wvcrashbase.cc ++++ b/utils/wvcrashbase.cc +@@ -66,7 +66,7 @@ + + + // FIXME: leaving of a will and catching asserts mostly only works in Linux +-#ifdef __linux ++#if 1 + + #ifdef __USE_GNU + static const char *argv0 = program_invocation_short_name; diff --git a/libraries/wvstreams/patches/02_doc_path.diff b/libraries/wvstreams/patches/02_doc_path.diff new file mode 100644 index 0000000000..9f3ebdad7e --- /dev/null +++ b/libraries/wvstreams/patches/02_doc_path.diff @@ -0,0 +1,24 @@ +Description: use new /usr/share/sgml location for docbook.dsl +Author: Matthias Klose +Forwarded: no +Last-Update: 2013-10-30 + +--- a/Docs/sgmlmanual/Makefile ++++ b/Docs/sgmlmanual/Makefile +@@ -88,14 +88,14 @@ + $(MAKE) dirimages htmlimages + rm -f $@ + jade -t rtf -o $*.rtf.tmp \ +- -d /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/print/docbook.dsl $< ++ -d /usr/share/sgml/docbook/stylesheet/dsssl/modular/print/docbook.dsl $< + cat $*.rtf.tmp | sed 's,"img/\(.*\)\.[^.]*","img.tmp/\1.gif",g' >$@ + rm -f $*.rtf.tmp + + %.tex: %.sgml + rm -f $@ + jade -t tex -o $*.tex.tmp \ +- -d /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/print/docbook.dsl $< ++ -d /usr/share/sgml/docbook/stylesheet/dsssl/modular/print/docbook.dsl $< + cat $*.tex.tmp | sed 's,{img/\(.*\)\.[^.]*},{img.tmp/\1.eps},g' >$@ + rm -f $*.tex.tmp + diff --git a/libraries/wvstreams/patches/03_html_sgml.diff b/libraries/wvstreams/patches/03_html_sgml.diff new file mode 100644 index 0000000000..85e6ab2cee --- /dev/null +++ b/libraries/wvstreams/patches/03_html_sgml.diff @@ -0,0 +1,18 @@ +Description: use .html extension for HTML documentation files + Define %html-ext% to ".html" while building HTML documentation, since current + docbook-dsssl appears to default to ".htm". +Author: Matthias Klose +Forwarded: no +Last-Update: 2013-10-30 + +--- a/Docs/sgmlmanual/HTML.dsl ++++ b/Docs/sgmlmanual/HTML.dsl +@@ -10,7 +10,7 @@ + ;; your stuff goes here... + ;;(define %gentext-nav-use-ff% 1) + (define %use-id-as-filename% 1) +- ++(define %html-ext% ".html") + + + diff --git a/libraries/wvstreams/patches/04_signed_request.diff b/libraries/wvstreams/patches/04_signed_request.diff new file mode 100644 index 0000000000..354c85a65f --- /dev/null +++ b/libraries/wvstreams/patches/04_signed_request.diff @@ -0,0 +1,18 @@ +Description: fix return type checking of X509_REQ_verify +Author: Moritz Mühlenhoff +Bug: https://code.google.com/p/wvstreams/issues/detail?id=40 +Bug-Debian: http://bugs.debian.org/513539 +Forwarded: yes +Last-Update: 2013-10-30 + +--- a/crypto/wvx509.cc ++++ b/crypto/wvx509.cc +@@ -325,7 +325,7 @@ + } + + int verify_result = X509_REQ_verify(certreq, pk); +- if (verify_result == 0) ++ if (verify_result == 0 || verify_result == -1) + { + debug(WvLog::Warning, "Self signed request failed"); + X509_REQ_free(certreq); diff --git a/libraries/wvstreams/patches/05_gcc-4.7.diff b/libraries/wvstreams/patches/05_gcc-4.7.diff new file mode 100644 index 0000000000..45f53c5bb8 --- /dev/null +++ b/libraries/wvstreams/patches/05_gcc-4.7.diff @@ -0,0 +1,19 @@ +Description: Fix FTBFS with gcc-4.7 + Small header include change. This is borderlinde cosmetic, but still needed + to prevent the FTBFS. +Author: Paul Tagliamonte +Origin: vendor +Bug: https://code.google.com/p/wvstreams/issues/detail?id=34 +Bug-Debian: http://bugs.debian.org/667418 +Last-Update: 2013-10-30 + +--- a/utils/wvuid.cc ++++ b/utils/wvuid.cc +@@ -33,6 +33,7 @@ + + #else // not WIN32 + ++#include + + WvString wv_username_from_uid(wvuid_t uid) + { diff --git a/libraries/wvstreams/patches/05_gcc.diff b/libraries/wvstreams/patches/05_gcc.diff deleted file mode 100644 index 8e4fd03298..0000000000 --- a/libraries/wvstreams/patches/05_gcc.diff +++ /dev/null @@ -1,41 +0,0 @@ -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 -+++ wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:35.283136585 +0200 -@@ -1,8 +1,6 @@ - #include "wvunixdgsocket.h" --#ifdef MACOS - #include - #include --#endif - - WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms) - : socketfile(filename) -Index: wvstreams-4.6.1/streams/wvatomicfile.cc -=================================================================== ---- wvstreams-4.6.1.orig/streams/wvatomicfile.cc 2011-05-20 00:02:38.223136584 +0200 -+++ wvstreams-4.6.1/streams/wvatomicfile.cc 2011-05-20 00:02:31.619136587 +0200 -@@ -10,10 +10,7 @@ - #include "wvatomicfile.h" - #include "wvfileutils.h" - #include "wvstrutils.h" -- --#ifdef MACOS - #include --#endif - - WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode) - : tmp_file(WvString::null) diff --git a/libraries/wvstreams/patches/06_buildflags.diff b/libraries/wvstreams/patches/06_buildflags.diff new file mode 100644 index 0000000000..0ddaf7069f --- /dev/null +++ b/libraries/wvstreams/patches/06_buildflags.diff @@ -0,0 +1,34 @@ +Description: build flags support + Don't force -O2 optimization. Make build logs verbose. +Author: Matthias Klose +Forwarded: not-needed +Last-Update: 2013-10-30 + +--- a/gen-cc ++++ b/gen-cc +@@ -15,6 +15,11 @@ + shift + shift + ++ echo $CC \$MODE -o \$BASE.o \$BASE.$EXT \\ ++ -MMD -MF \$DEPFILE -MP -MQ \$BASE.o \\ ++ $CPPFLAGS \\ ++ $CFLAGS \\ ++ "\$@" + $CC \$MODE -o \$BASE.o \$BASE.$EXT \\ + -MMD -MF \$DEPFILE -MP -MQ \$BASE.o \\ + $CPPFLAGS \\ +--- a/wvrules-posix.mk ++++ b/wvrules-posix.mk +@@ -35,11 +35,6 @@ + # Default compiler we use for linking + WVLINK_CC = $(CXX) + +-ifneq ("$(enable_optimization)", "no") +- CXXFLAGS+=-O2 +- CFLAGS+=-O2 +-endif +- + ifneq ("$(enable_warnings)", "no") + CXXFLAGS+=-Wall -Woverloaded-virtual + CFLAGS+=-Wall diff --git a/libraries/wvstreams/patches/07_openssl-1.0.diff b/libraries/wvstreams/patches/07_openssl-1.0.diff new file mode 100644 index 0000000000..fd2099d318 --- /dev/null +++ b/libraries/wvstreams/patches/07_openssl-1.0.diff @@ -0,0 +1,18 @@ +Description: fix FTBFS with OpenSSL 1.0 +Author: Luca Falavigna +Bug: https://code.google.com/p/wvstreams/issues/detail?id=27 +Bug-Debian: http://bugs.debian.org/621990 +Forwarded: no +Last-Update: 2013-10-30 + +--- a/crypto/wvx509.cc ++++ b/crypto/wvx509.cc +@@ -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; diff --git a/libraries/wvstreams/patches/08_glibc-2.12.diff b/libraries/wvstreams/patches/08_glibc-2.12.diff new file mode 100644 index 0000000000..f9e1d6beaf --- /dev/null +++ b/libraries/wvstreams/patches/08_glibc-2.12.diff @@ -0,0 +1,30 @@ +Description: fix FTBFS with glibc 2.12 +Author: Luca Falavigna +Bug: https://code.google.com/p/wvstreams/issues/detail?id=28 +Forwarded: no +Last-Update: 2013-10-30 + +--- a/ipstreams/wvunixdgsocket.cc ++++ b/ipstreams/wvunixdgsocket.cc +@@ -1,8 +1,6 @@ + #include "wvunixdgsocket.h" +-#ifdef MACOS + #include + #include +-#endif + + WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms) + : socketfile(filename) +--- a/streams/wvatomicfile.cc ++++ b/streams/wvatomicfile.cc +@@ -10,10 +10,7 @@ + #include "wvatomicfile.h" + #include "wvfileutils.h" + #include "wvstrutils.h" +- +-#ifdef MACOS + #include +-#endif + + WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode) + : tmp_file(WvString::null) diff --git a/libraries/wvstreams/patches/09_readline.diff b/libraries/wvstreams/patches/09_readline.diff new file mode 100644 index 0000000000..3902436ae3 --- /dev/null +++ b/libraries/wvstreams/patches/09_readline.diff @@ -0,0 +1,16 @@ +Description: make it possible to disable readline +Author: Jakub Wilk +Bug: https://code.google.com/p/wvstreams/issues/detail?id=38 +Forwarded: no +Last-Update: 2013-10-30 + +--- a/configure.ac ++++ b/configure.ac +@@ -59,6 +59,7 @@ + + AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus], [DBUS])) + AC_ARG_WITH(openssl, AC_HELP_STRING([--with-openssl], [OpenSSL >= 0.9.7 (required)])) ++AC_ARG_WITH(readline, AC_HELP_STRING([--with-readline], [readline])) + AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam], [PAM])) + AC_ARG_WITH(tcl, AC_HELP_STRING([--with-tcl], [Tcl])) + AC_ARG_WITH(qt, AC_HELP_STRING([--with-qt], [Qt])) diff --git a/libraries/wvstreams/patches/10_typos.diff b/libraries/wvstreams/patches/10_typos.diff new file mode 100644 index 0000000000..56245e38dc --- /dev/null +++ b/libraries/wvstreams/patches/10_typos.diff @@ -0,0 +1,39 @@ +Description: fix typos +Author: Jakub Wilk +Bug: https://code.google.com/p/wvstreams/issues/detail?id=39 +Forwared: not-needed +Last-Update: 2013-10-30 + +--- a/ChangeLog ++++ b/ChangeLog +@@ -745,7 +745,7 @@ + "wvtestmain ''" actually still runs all the tests, so skip the warning. + + wvtest.cc prints a message "WARNING: WvTest: only ran tests starting +- with specifed prefix(es)" if you give it any parameters restricting the ++ with specified prefix(es)" if you give it any parameters restricting the + tests to be run. But 'make runtests' actually sometimes provides an + existing but empty parameter, which doesn't restrict anything because *any* + test starts with the empty string. So suppress the warning in that case; +--- a/utils/wvtest.cc ++++ b/utils/wvtest.cc +@@ -252,7 +252,7 @@ + + if (prefixes && *prefixes && **prefixes) + printf("WvTest: WARNING: only ran tests starting with " +- "specifed prefix(es).\n"); ++ "specified prefix(es).\n"); + else + printf("WvTest: ran all tests.\n"); + printf("WvTest: %d test%s, %d failure%s.\n", +--- a/uniconf/tests/uni.8.subst ++++ b/uniconf/tests/uni.8.subst +@@ -78,7 +78,7 @@ + .SH COMMANDS + .TP + get +-Retreive the ++Retrieve the + .I VALUE + associated with the provided + .I KEY diff --git a/libraries/wvstreams/patches/11_gcc-6.patch b/libraries/wvstreams/patches/11_gcc-6.patch new file mode 100644 index 0000000000..b084887ba7 --- /dev/null +++ b/libraries/wvstreams/patches/11_gcc-6.patch @@ -0,0 +1,42 @@ +Description: Fix compilation with gcc-6 +Author: Gert Wollny +Last-Updated: 2016-07-26 +Forwarded: No +Bug-Debian: https://bugs.debian.org/811659 +Bug-Debian: https://bugs.debian.org/831146 + +--- a/streams/wvstream.cc ++++ b/streams/wvstream.cc +@@ -907,9 +907,9 @@ + + if (forceable) + { +- si.wants.readable = readcb; +- si.wants.writable = writecb; +- si.wants.isexception = exceptcb; ++ si.wants.readable = static_cast(readcb); ++ si.wants.writable = static_cast(writecb); ++ si.wants.isexception = static_cast(exceptcb); + } + else + { +@@ -1019,7 +1019,8 @@ + + IWvStream::SelectRequest WvStream::get_select_request() + { +- return IWvStream::SelectRequest(readcb, writecb, exceptcb); ++ return IWvStream::SelectRequest(static_cast(readcb), static_cast(writecb), ++ static_cast(exceptcb)); + } + + +@@ -1107,7 +1108,8 @@ + // 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(readcb), ++ static_cast(writecb), static_cast(exceptcb)); + } + + diff --git a/libraries/wvstreams/patches/12_increase_task_stack.patch b/libraries/wvstreams/patches/12_increase_task_stack.patch new file mode 100644 index 0000000000..e8d7d5d52c --- /dev/null +++ b/libraries/wvstreams/patches/12_increase_task_stack.patch @@ -0,0 +1,15 @@ +Description: Increase the task stack to work around stack corruption +Author: Karol Ossowski +Bug-Debian: https://bugs.debian.org/863039 + +--- wvstreams-4.6.1.orig/utils/wvtask.cc ++++ wvstreams-4.6.1/utils/wvtask.cc +@@ -429,7 +429,7 @@ void WvTaskMan::_stackmaster() + total = (val+1) * (size_t)1024; + + if (!use_shared_stack()) +- total = 1024; // enough to save the do_task stack frame ++ total = 2048; // enough to save the do_task stack frame + + // set up a stack frame for the new task. This runs once + // per get_stack. diff --git a/libraries/wvstreams/patches/13_wvstreams_openssl1.1.patch b/libraries/wvstreams/patches/13_wvstreams_openssl1.1.patch new file mode 100644 index 0000000000..caa39fdadc --- /dev/null +++ b/libraries/wvstreams/patches/13_wvstreams_openssl1.1.patch @@ -0,0 +1,539 @@ +Author: Reiner Herrmann +Description: Port to OpenSSL 1.1 +Bug-Debian: https://bugs.debian.org/859791 +Forwarded: https://github.com/apenwarr/wvstreams/pull/2 + +diff --git a/crypto/wvcrl.cc b/crypto/wvcrl.cc +index fa00c76..880ad85 100644 +--- a/crypto/wvcrl.cc ++++ b/crypto/wvcrl.cc +@@ -357,31 +357,19 @@ bool WvCRL::isrevoked(WvStringParm serial_number) const + ASN1_INTEGER *serial = serial_to_int(serial_number); + if (serial) + { +- X509_REVOKED mayberevoked; +- mayberevoked.serialNumber = serial; +- if (crl->crl->revoked) +- { +- int idx = sk_X509_REVOKED_find(crl->crl->revoked, +- &mayberevoked); +- ASN1_INTEGER_free(serial); +- if (idx >= 0) +- { +- debug("Certificate is revoked.\n"); +- return true; +- } +- else +- { +- debug("Certificate is not revoked.\n"); +- return false; +- } +- } +- else +- { +- ASN1_INTEGER_free(serial); +- debug("CRL does not have revoked list.\n"); +- return false; +- } +- ++ X509_REVOKED *revoked_entry = NULL; ++ int idx = X509_CRL_get0_by_serial(crl, &revoked_entry, serial); ++ ASN1_INTEGER_free(serial); ++ if (idx >= 1 || revoked_entry) ++ { ++ debug("Certificate is revoked.\n"); ++ return true; ++ } ++ else ++ { ++ debug("Certificate is not revoked.\n"); ++ return false; ++ } + } + else + debug(WvLog::Warning, "Can't convert serial number to ASN1 format. " +diff --git a/crypto/wvdiffiehellman.cc b/crypto/wvdiffiehellman.cc +index 7c0bf32..15cd104 100644 +--- a/crypto/wvdiffiehellman.cc ++++ b/crypto/wvdiffiehellman.cc +@@ -39,24 +39,25 @@ WvDiffieHellman::WvDiffieHellman(const unsigned char *_key, int _keylen, + { + int problems; + int check; +- { ++ + info = DH_new(); +- info->p = BN_bin2bn(_key, _keylen, NULL); ++ BIGNUM *p = BN_bin2bn(_key, _keylen, NULL); + // info->p->top = 0; + // info->p->dmax = _keylen * 8 / BN_BITS2; + // info->p->neg = 0; + // info->p->flags = 0; + +- info->g = BN_new(); +- BN_set_word(info->g, generator); ++ BIGNUM *g = BN_new(); ++ BN_set_word(g, generator); + // info->g->d = &generator; + // info->g->top = 0; + // info->g->dmax = 1; + // info->g->neg = 0; + // info->g->flags = 0; +- } + +- check = BN_mod_word(info->p, 24); ++ DH_set0_pqg(info, p, NULL, g); ++ ++ check = BN_mod_word(p, 24); + DH_check(info, &problems); + if (problems & DH_CHECK_P_NOT_PRIME) + log(WvLog::Error, "Using a composite number for authentication.\n"); +@@ -64,7 +65,7 @@ WvDiffieHellman::WvDiffieHellman(const unsigned char *_key, int _keylen, + log(WvLog::Error,"Using an unsafe prime number for authentication.\n"); + if (problems & DH_NOT_SUITABLE_GENERATOR) + log(WvLog::Error, "Can you just use 2 instead of %s (%s)!!\n", +- BN_bn2hex(info->g), check); ++ BN_bn2hex(g), check); + if (problems & DH_UNABLE_TO_CHECK_GENERATOR) + log(WvLog::Notice, "Using a strange argument for diffie-hellman.\n"); + DH_generate_key(info); +@@ -72,18 +73,23 @@ WvDiffieHellman::WvDiffieHellman(const unsigned char *_key, int _keylen, + + int WvDiffieHellman::pub_key_len() + { +- return BN_num_bytes(info->pub_key); ++ const BIGNUM *pub_key = NULL; ++ DH_get0_key(info, &pub_key, NULL); ++ return BN_num_bytes(pub_key); + } + + int WvDiffieHellman::get_public_value(WvBuf &outbuf, int len) + { +- int key_len = BN_num_bytes(info->pub_key); ++ const BIGNUM *pub_key = NULL; ++ DH_get0_key(info, &pub_key, NULL); ++ ++ int key_len = BN_num_bytes(pub_key); + if (key_len < len) + len = key_len; + + // alloca is stack allocated, don't free it. + unsigned char *foo = (unsigned char*)alloca(key_len); +- BN_bn2bin(info->pub_key, foo); ++ BN_bn2bin(pub_key, foo); + outbuf.put(foo, len); + + return len; +@@ -91,8 +97,10 @@ int WvDiffieHellman::get_public_value(WvBuf &outbuf, int len) + + bool WvDiffieHellman::create_secret(WvBuf &inbuf, size_t in_len, WvBuf& outbuf) + { ++ const BIGNUM *pub_key = NULL; ++ DH_get0_key(info, &pub_key, NULL); + unsigned char *foo = (unsigned char *)alloca(DH_size(info)); +- log("My public value\n%s\nYour public value\n%s\n",BN_bn2hex(info->pub_key), ++ log("My public value\n%s\nYour public value\n%s\n",BN_bn2hex(pub_key), + hexdump_buffer(inbuf.peek(0, in_len), in_len, false)); + int len = DH_compute_key (foo, BN_bin2bn(inbuf.get(in_len), in_len, NULL), + info); +diff --git a/crypto/wvdigest.cc b/crypto/wvdigest.cc +index 150edee..73ebb5d 100644 +--- a/crypto/wvdigest.cc ++++ b/crypto/wvdigest.cc +@@ -13,10 +13,10 @@ + + /***** WvEVPMDDigest *****/ + +-WvEVPMDDigest::WvEVPMDDigest(const env_md_st *_evpmd) : ++WvEVPMDDigest::WvEVPMDDigest(const EVP_MD*_evpmd) : + evpmd(_evpmd), active(false) + { +- evpctx = new EVP_MD_CTX; ++ evpctx = EVP_MD_CTX_new(); + _reset(); + } + +@@ -24,7 +24,7 @@ WvEVPMDDigest::WvEVPMDDigest(const env_md_st *_evpmd) : + WvEVPMDDigest::~WvEVPMDDigest() + { + cleanup(); +- delete evpctx; ++ EVP_MD_CTX_free(evpctx); + } + + +@@ -60,7 +60,7 @@ bool WvEVPMDDigest::_reset() + // the typecast is necessary for API compatibility with different + // versions of openssl. None of them *actually* change the contents of + // the pointer. +- EVP_DigestInit(evpctx, (env_md_st *)evpmd); ++ EVP_DigestInit(evpctx, evpmd); + active = true; + return true; + } +@@ -79,7 +79,7 @@ void WvEVPMDDigest::cleanup() + + size_t WvEVPMDDigest::digestsize() const + { +- return EVP_MD_size((env_md_st *)evpmd); ++ return EVP_MD_size(evpmd); + } + + +@@ -104,14 +104,14 @@ WvHMACDigest::WvHMACDigest(WvEVPMDDigest *_digest, + { + key = new unsigned char[keysize]; + memcpy(key, _key, keysize); +- hmacctx = new HMAC_CTX; ++ hmacctx = HMAC_CTX_new(); + _reset(); + } + + WvHMACDigest::~WvHMACDigest() + { + cleanup(); +- delete hmacctx; ++ HMAC_CTX_free(hmacctx); + deletev key; + delete digest; + } +@@ -145,7 +145,7 @@ bool WvHMACDigest::_finish(WvBuf &outbuf) + bool WvHMACDigest::_reset() + { + cleanup(); +- HMAC_Init(hmacctx, key, keysize, (env_md_st *)digest->getevpmd()); ++ HMAC_Init(hmacctx, key, keysize, digest->getevpmd()); + active = true; + return true; + } +diff --git a/crypto/wvocsp.cc b/crypto/wvocsp.cc +index ddb2de4..7d5da07 100644 +--- a/crypto/wvocsp.cc ++++ b/crypto/wvocsp.cc +@@ -118,9 +118,10 @@ bool WvOCSPResp::check_nonce(const WvOCSPReq &req) const + + bool WvOCSPResp::signedbycert(const WvX509 &cert) const + { +- EVP_PKEY *skey = X509_get_pubkey(cert.cert); +- int i = OCSP_BASICRESP_verify(bs, skey, 0); +- EVP_PKEY_free(skey); ++ STACK_OF(X509) *sk = sk_X509_new_null(); ++ sk_X509_push(sk, cert.cert); ++ int i = OCSP_basic_verify(bs, sk, NULL, OCSP_NOVERIFY); ++ sk_X509_free(sk); + + if(i > 0) + return true; +@@ -131,33 +132,15 @@ bool WvOCSPResp::signedbycert(const WvX509 &cert) const + + WvX509 WvOCSPResp::get_signing_cert() const + { +- if (!bs || !sk_X509_num(bs->certs)) ++ const STACK_OF(X509) *certs = OCSP_resp_get0_certs(bs); ++ if (!bs || !sk_X509_num(certs)) + return WvX509(); + +- // note: the following bit of code is taken almost verbatim from +- // ocsp_vfy.c in OpenSSL 0.9.8. Copyright and attribution should +- // properly belong to them +- +- OCSP_RESPID *id = bs->tbsResponseData->responderId; +- +- if (id->type == V_OCSP_RESPID_NAME) +- { +- X509 *x = X509_find_by_subject(bs->certs, id->value.byName); +- if (x) +- return WvX509(X509_dup(x)); ++ X509 *signer = NULL; ++ if (OCSP_resp_get0_signer(bs, &signer, NULL) == 1) { ++ return WvX509(X509_dup(signer)); + } + +- if (id->value.byKey->length != SHA_DIGEST_LENGTH) return NULL; +- unsigned char tmphash[SHA_DIGEST_LENGTH]; +- unsigned char *keyhash = id->value.byKey->data; +- for (int i = 0; i < sk_X509_num(bs->certs); i++) +- { +- X509 *x = sk_X509_value(bs->certs, i); +- X509_pubkey_digest(x, EVP_sha1(), tmphash, NULL); +- if(!memcmp(keyhash, tmphash, SHA_DIGEST_LENGTH)) +- return WvX509(X509_dup(x)); +- } +- + return WvX509(); + } + +diff --git a/crypto/wvx509.cc b/crypto/wvx509.cc +index 70c9fa0..5e5f9be 100644 +--- a/crypto/wvx509.cc ++++ b/crypto/wvx509.cc +@@ -974,7 +974,7 @@ static void add_aia(WvStringParm type, WvString identifier, + sk_ACCESS_DESCRIPTION_push(ainfo, acc); + acc->method = OBJ_txt2obj(type.cstr(), 0); + acc->location->type = GEN_URI; +- acc->location->d.ia5 = M_ASN1_IA5STRING_new(); ++ acc->location->d.ia5 = ASN1_IA5STRING_new(); + unsigned char *cident + = reinterpret_cast(identifier.edit()); + ASN1_STRING_set(acc->location->d.ia5, cident, identifier.len()); +@@ -1059,7 +1059,7 @@ void WvX509::set_crl_urls(WvStringList &urls) + GENERAL_NAMES *uris = GENERAL_NAMES_new(); + GENERAL_NAME *uri = GENERAL_NAME_new(); + uri->type = GEN_URI; +- uri->d.ia5 = M_ASN1_IA5STRING_new(); ++ uri->d.ia5 = ASN1_IA5STRING_new(); + unsigned char *cident + = reinterpret_cast(i().edit()); + ASN1_STRING_set(uri->d.ia5, cident, i().len()); +@@ -1158,10 +1158,11 @@ WvString WvX509::get_extension(int nid) const + if (ext) + { + X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD *)X509V3_EXT_get(ext); ++ ASN1_OCTET_STRING *ext_data_str = X509_EXTENSION_get_data(ext); + if (!method) + { + WvDynBuf buf; +- buf.put(ext->value->data, ext->value->length); ++ buf.put(ext_data_str->data, ext_data_str->length); + retval = buf.getstr(); + } + else +@@ -1172,21 +1173,21 @@ WvString WvX509::get_extension(int nid) const + // even though it's const (at least as of version 0.9.8e). + // gah. + #if OPENSSL_VERSION_NUMBER >= 0x0090800fL +- const unsigned char * ext_value_data = ext->value->data; ++ const unsigned char * ext_value_data = ext_data_str->data; + #else + unsigned char *ext_value_data = ext->value->data; + #endif + if (method->it) + { + ext_data = ASN1_item_d2i(NULL, &ext_value_data, +- ext->value->length, ++ ext_data_str->length, + ASN1_ITEM_ptr(method->it)); + TRACE("Applied generic conversion!\n"); + } + else + { + ext_data = method->d2i(NULL, &ext_value_data, +- ext->value->length); ++ ext_data_str->length); + TRACE("Applied method specific conversion!\n"); + } + +@@ -1321,13 +1322,13 @@ bool WvX509::verify(WvBuf &original, WvStringParm signature) const + return false; + + /* Verify the signature */ +- EVP_MD_CTX sig_ctx; +- EVP_VerifyInit(&sig_ctx, EVP_sha1()); +- EVP_VerifyUpdate(&sig_ctx, original.peek(0, original.used()), ++ EVP_MD_CTX *sig_ctx = EVP_MD_CTX_new(); ++ EVP_VerifyInit(sig_ctx, EVP_sha1()); ++ EVP_VerifyUpdate(sig_ctx, original.peek(0, original.used()), + original.used()); +- int sig_err = EVP_VerifyFinal(&sig_ctx, sig_buf, sig_size, pk); ++ int sig_err = EVP_VerifyFinal(sig_ctx, sig_buf, sig_size, pk); + EVP_PKEY_free(pk); +- EVP_MD_CTX_cleanup(&sig_ctx); // Again, not my fault... ++ EVP_MD_CTX_free(sig_ctx); // Again, not my fault... + if (sig_err != 1) + { + debug("Verify failed!\n"); +@@ -1446,19 +1447,19 @@ void WvX509::set_ski() + { + CHECK_CERT_EXISTS_SET("ski"); + +- ASN1_OCTET_STRING *oct = M_ASN1_OCTET_STRING_new(); +- ASN1_BIT_STRING *pk = cert->cert_info->key->public_key; ++ ASN1_OCTET_STRING *oct = ASN1_OCTET_STRING_new(); ++ ASN1_BIT_STRING *pk = X509_get0_pubkey_bitstr(cert); + unsigned char pkey_dig[EVP_MAX_MD_SIZE]; + unsigned int diglen; + + EVP_Digest(pk->data, pk->length, pkey_dig, &diglen, EVP_sha1(), NULL); + +- M_ASN1_OCTET_STRING_set(oct, pkey_dig, diglen); ++ ASN1_OCTET_STRING_set(oct, pkey_dig, diglen); + X509_EXTENSION *ext = X509V3_EXT_i2d(NID_subject_key_identifier, 0, + oct); + X509_add_ext(cert, ext, -1); + X509_EXTENSION_free(ext); +- M_ASN1_OCTET_STRING_free(oct); ++ ASN1_OCTET_STRING_free(oct); + } + + +diff --git a/crypto/wvx509mgr.cc b/crypto/wvx509mgr.cc +index f249eec..156d3a4 100644 +--- a/crypto/wvx509mgr.cc ++++ b/crypto/wvx509mgr.cc +@@ -350,6 +350,8 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const + return false; + } + ++ uint32_t ex_flags = X509_get_extension_flags(cert); ++ uint32_t ex_kusage = X509_get_key_usage(cert); + if (cert == unsignedcert.cert) + { + debug("Self Signing!\n"); +@@ -362,8 +364,8 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const + return false; + } + #endif +- else if (!((cert->ex_flags & EXFLAG_KUSAGE) && +- (cert->ex_kusage & KU_KEY_CERT_SIGN))) ++ else if (!((ex_flags & EXFLAG_KUSAGE) && ++ (ex_kusage & KU_KEY_CERT_SIGN))) + { + debug("This Certificate is not allowed to sign certificates!\n"); + return false; +@@ -390,6 +392,8 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const + + bool WvX509Mgr::signcrl(WvCRL &crl) const + { ++ uint32_t ex_flags = X509_get_extension_flags(cert); ++ uint32_t ex_kusage = X509_get_key_usage(cert); + if (!isok() || !crl.isok()) + { + debug(WvLog::Warning, "Asked to sign CRL, but certificate or CRL (or " +@@ -403,12 +407,12 @@ bool WvX509Mgr::signcrl(WvCRL &crl) const + "CRLs!\n"); + return false; + } +- else if (!((cert->ex_flags & EXFLAG_KUSAGE) && +- (cert->ex_kusage & KU_CRL_SIGN))) ++ else if (!((ex_flags & EXFLAG_KUSAGE) && ++ (ex_kusage & KU_CRL_SIGN))) + { + debug("Certificate not allowed to sign CRLs! (%s %s)\n", +- (cert->ex_flags & EXFLAG_KUSAGE), +- (cert->ex_kusage & KU_CRL_SIGN)); ++ (ex_flags & EXFLAG_KUSAGE), ++ (ex_kusage & KU_CRL_SIGN)); + return false; + } + #endif +@@ -454,7 +458,6 @@ WvString WvX509Mgr::sign(WvBuf &data) const + { + assert(rsa); + +- EVP_MD_CTX sig_ctx; + unsigned char sig_buf[4096]; + + EVP_PKEY *pk = EVP_PKEY_new(); +@@ -467,20 +470,22 @@ WvString WvX509Mgr::sign(WvBuf &data) const + return WvString::null; + } + +- EVP_SignInit(&sig_ctx, EVP_sha1()); +- EVP_SignUpdate(&sig_ctx, data.peek(0, data.used()), data.used()); ++ EVP_MD_CTX *sig_ctx = EVP_MD_CTX_new(); ++ EVP_SignInit(sig_ctx, EVP_sha1()); ++ EVP_SignUpdate(sig_ctx, data.peek(0, data.used()), data.used()); + unsigned int sig_len = sizeof(sig_buf); +- int sig_err = EVP_SignFinal(&sig_ctx, sig_buf, ++ int sig_err = EVP_SignFinal(sig_ctx, sig_buf, + &sig_len, pk); + if (sig_err != 1) + { + debug("Error while signing.\n"); + EVP_PKEY_free(pk); ++ EVP_MD_CTX_free(sig_ctx); + return WvString::null; + } + + EVP_PKEY_free(pk); +- EVP_MD_CTX_cleanup(&sig_ctx); // this isn't my fault :// ++ EVP_MD_CTX_free(sig_ctx); // this isn't my fault :// + WvDynBuf buf; + buf.put(sig_buf, sig_len); + debug("Signature size: %s\n", buf.used()); +diff --git a/include/wvdiffiehellman.h b/include/wvdiffiehellman.h +index af75ffa..a2d001f 100644 +--- a/include/wvdiffiehellman.h ++++ b/include/wvdiffiehellman.h +@@ -27,7 +27,7 @@ public: + bool create_secret(WvBuf &inbuf, size_t in_len, WvBuf& outbuf); + + protected: +- struct dh_st *info; ++ DH *info; + BN_ULONG generator; + + private: +diff --git a/include/wvdigest.h b/include/wvdigest.h +index fdc39bd..f2eed40 100644 +--- a/include/wvdigest.h ++++ b/include/wvdigest.h +@@ -9,10 +9,8 @@ + + #include "wvencoder.h" + #include ++#include + +-struct env_md_st; +-struct env_md_ctx_st; +-struct hmac_ctx_st; + + /** + * Superclass for all message digests. +@@ -45,8 +43,8 @@ public: + class WvEVPMDDigest : public WvDigest + { + friend class WvHMACDigest; +- const env_md_st *evpmd; +- env_md_ctx_st *evpctx; ++ const EVP_MD *evpmd; ++ EVP_MD_CTX *evpctx; + bool active; + + public: +@@ -54,13 +52,13 @@ public: + virtual size_t digestsize() const; + + protected: +- WvEVPMDDigest(const env_md_st *_evpmd); ++ WvEVPMDDigest(const EVP_MD *_evpmd); + virtual bool _encode(WvBuf &inbuf, WvBuf &outbuf, + bool flush); // consumes input + virtual bool _finish(WvBuf &outbuf); // outputs digest + virtual bool _reset(); // supported: resets digest value + +- const env_md_st *getevpmd() ++ const EVP_MD *getevpmd() + { return evpmd; } + + private: +@@ -104,7 +102,7 @@ class WvHMACDigest : public WvDigest + WvEVPMDDigest *digest; + unsigned char *key; + size_t keysize; +- hmac_ctx_st *hmacctx; ++ HMAC_CTX *hmacctx; + bool active; + + public: +diff --git a/include/wvtripledes.h b/include/wvtripledes.h +index 185fe8a..a442e7a 100644 +--- a/include/wvtripledes.h ++++ b/include/wvtripledes.h +@@ -70,11 +70,11 @@ protected: + + private: + Mode mode; +- des_cblock key; +- des_key_schedule deskey1; +- des_key_schedule deskey2; +- des_key_schedule deskey3; +- des_cblock ivec; // initialization vector ++ DES_cblock key; ++ DES_key_schedule deskey1; ++ DES_key_schedule deskey2; ++ DES_key_schedule deskey3; ++ DES_cblock ivec; // initialization vector + int ivecoff; // current offset into initvec + }; + diff --git a/libraries/wvstreams/patches/14_cross.diff b/libraries/wvstreams/patches/14_cross.diff new file mode 100644 index 0000000000..35e815f944 --- /dev/null +++ b/libraries/wvstreams/patches/14_cross.diff @@ -0,0 +1,53 @@ +From: Helmut Grohne +Subject: prefix pkg-config with $ac_tool_prefix to support cross compilation + +Index: wvstreams-4.6.1/configure.ac +=================================================================== +--- wvstreams-4.6.1.orig/configure.ac ++++ wvstreams-4.6.1/configure.ac +@@ -345,8 +345,8 @@ + LDFLAGS="$LDFLAGS_save" + + # Detect pkg-config +-AC_PATH_PROG([PKGCONFIG], [pkg-config], [no]) +-if test "$PKGCONFIG" = "no"; then ++PKG_PROG_PKG_CONFIG ++if test "x$PKG_CONFIG" = "x"; then + AC_MSG_WARN([pkg-config is not installed]) + fi + +@@ -370,10 +370,10 @@ + if test "$with_dbus" != "no"; then + if test "$with_dbus" = "" -o "$with_dbus" = "yes"; then + AC_MSG_CHECKING([Checking that D-Bus version greater than 1.2.14 installed.]) +- if pkg-config --atleast-version 1.2.14 dbus-1; then +- WV_APPEND(CPPFLAGS, [`pkg-config --cflags dbus-1`]) +- WV_APPEND(LDFLAGS, [`pkg-config --libs-only-L dbus-1`]) +- LIBS_DBUS=`pkg-config --libs-only-l dbus-1` ++ if $PKG_CONFIG --atleast-version 1.2.14 dbus-1; then ++ WV_APPEND(CPPFLAGS, [`$PKG_CONFIG --cflags dbus-1`]) ++ WV_APPEND(LDFLAGS, [`$PKG_CONFIG --libs-only-L dbus-1`]) ++ LIBS_DBUS=`$PKG_CONFIG --libs-only-l dbus-1` + AC_MSG_RESULT([yes]) + else + with_dbus=no +@@ -497,7 +497,7 @@ + CPPFLAGS_save="$CPPFLAGS" + LDFLAGS_save="$LDFLAGS" + LIBS_save="$LIBS" +- for wv_qtdir in $with_qt $QTDIR $QT_SEARCH_PATH $(pkg-config --variable=prefix qt-mt); do ++ for wv_qtdir in $with_qt $QTDIR $QT_SEARCH_PATH $($PKG_CONFIG --variable=prefix qt-mt); do + eval wv_qtdir="$wv_qtdir" + CPPFLAGS="$CPPFLAGS_save -I$wv_qtdir/include -I$wv_qtdir/include/qt3" + LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib" +Index: wvstreams-4.6.1/autogen.sh +=================================================================== +--- wvstreams-4.6.1.orig/autogen.sh ++++ wvstreams-4.6.1/autogen.sh +@@ -1,5 +1,6 @@ + #!/bin/sh + set -e ++aclocal + autoheader + autoconf + (cd argp && autoconf) diff --git a/libraries/wvstreams/patches/15_Fix-narrowing-conversion-error.patch b/libraries/wvstreams/patches/15_Fix-narrowing-conversion-error.patch new file mode 100644 index 0000000000..fc9abd8e63 --- /dev/null +++ b/libraries/wvstreams/patches/15_Fix-narrowing-conversion-error.patch @@ -0,0 +1,29 @@ +From c86c524f951f6e973473bfee76fd5366368b2cbc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Dec 2019 09:32:41 -0800 +Subject: [PATCH] Fix narrowing conversion error + +xplc/moduleloader.cc: In static member function 'static Module* Module::loadModule(const char*)': xplc/moduleloader.cc:67:14: error: narrowing conversion of '-1' from 'int' to 'unsigned int' [-Wnarrowing] 67 | case (int)-1: | ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + xplc/moduleloader.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xplc/moduleloader.cc b/xplc/moduleloader.cc +index 02dd9a4..c53f5d2 100644 +--- a/xplc/moduleloader.cc ++++ b/xplc/moduleloader.cc +@@ -62,7 +62,7 @@ Module* Module::loadModule(const char* modulename) { + return NULL; + } + +- switch(moduleinfo->version_major) { ++ switch((int)moduleinfo->version_major) { + #ifdef UNSTABLE + case -1: + /* nothing to do */ +-- +2.24.1 + diff --git a/libraries/wvstreams/patches/16_wvstreams-4.6.1-parallel-make.patch b/libraries/wvstreams/patches/16_wvstreams-4.6.1-parallel-make.patch new file mode 100644 index 0000000000..5ad79fd7a9 --- /dev/null +++ b/libraries/wvstreams/patches/16_wvstreams-4.6.1-parallel-make.patch @@ -0,0 +1,58 @@ +diff -ur wvstreams-4.6.1.orig/Makefile wvstreams-4.6.1/Makefile +--- wvstreams-4.6.1.orig/Makefile 2009-09-16 00:26:50.000000000 +0300 ++++ wvstreams-4.6.1/Makefile 2010-01-04 18:06:15.000000000 +0200 +@@ -131,12 +131,19 @@ + # libwvstreams: stream/event handling library + # + TARGETS += libwvstreams.so +-TARGETS += crypto/tests/ssltest ipstreams/tests/unixtest ++TARGETS += crypto/tests/ssltest ++crypto/tests/ssltest: $(LIBWVSTREAMS) ++ ++TARGETS += ipstreams/tests/unixtest ++ipstreams/tests/unixtest: $(LIBWVSTREAMS) ++ + TARGETS += crypto/tests/printcert ++crypto/tests/printcert: $(LIBWVSTREAMS) + + ifndef _MACOS + ifneq ("$(with_readline)", "no") + TARGETS += ipstreams/tests/wsd ++ ipstreams/tests/wsd: $(LIBWVSTREAMS) + ipstreams/tests/wsd-LIBS += -lreadline + else + TEST_SKIP_OBJS += ipstreams/tests/wsd +@@ -179,7 +186,11 @@ + # + ifneq ("$(with_dbus)", "no") + TARGETS += libwvdbus.so +- TARGETS += dbus/tests/wvdbus dbus/tests/wvdbusd ++ TARGETS += dbus/tests/wvdbus ++ dbus/tests/wvdbus: $(LIBWVDBUS) ++ ++ TARGETS += dbus/tests/wvdbusd ++ dbus/tests/wvdbusd: $(LIBWVDBUS) + TESTS += $(call tests_cc,dbus/tests) + libwvdbus_OBJS += $(call objects,dbus) + libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS) +diff -ur wvstreams-4.6.1.orig/wvrules-posix.mk wvstreams-4.6.1/wvrules-posix.mk +--- wvstreams-4.6.1.orig/wvrules-posix.mk 2008-10-21 18:31:58.000000000 +0300 ++++ wvstreams-4.6.1/wvrules-posix.mk 2010-01-04 18:04:00.000000000 +0200 +@@ -85,12 +85,15 @@ + $(AR) s $1 + endef + +-CC: FORCE ++CC: + @CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + $(WVSTREAMS)/gen-cc CC c + +-CXX: FORCE ++CXX: + @CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + $(WVSTREAMS)/gen-cc CXX cc + ++#All files must depend on the above two rules. This is a godawful hack. ++$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX ++ + wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS) diff --git a/libraries/wvstreams/patches/wvstreams-4.6.1-gcc47.patch b/libraries/wvstreams/patches/wvstreams-4.6.1-gcc47.patch deleted file mode 100644 index 3d67048324..0000000000 --- a/libraries/wvstreams/patches/wvstreams-4.6.1-gcc47.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- wvstreams-4.6.1-dist/include/wvuid.h 2012-01-05 10:18:58.713661236 +0100 -+++ wvstreams-4.6.1/include/wvuid.h 2012-01-05 10:27:42.198435328 +0100 -@@ -7,6 +7,7 @@ - #ifndef __WVUID_H - #define __WVUID_H - -+#include - #include "wvstring.h" - - #if WIN32 diff --git a/libraries/wvstreams/patches/wvstreams-4.6.1-parallel-make.patch b/libraries/wvstreams/patches/wvstreams-4.6.1-parallel-make.patch deleted file mode 100644 index 5ad79fd7a9..0000000000 --- a/libraries/wvstreams/patches/wvstreams-4.6.1-parallel-make.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -ur wvstreams-4.6.1.orig/Makefile wvstreams-4.6.1/Makefile ---- wvstreams-4.6.1.orig/Makefile 2009-09-16 00:26:50.000000000 +0300 -+++ wvstreams-4.6.1/Makefile 2010-01-04 18:06:15.000000000 +0200 -@@ -131,12 +131,19 @@ - # libwvstreams: stream/event handling library - # - TARGETS += libwvstreams.so --TARGETS += crypto/tests/ssltest ipstreams/tests/unixtest -+TARGETS += crypto/tests/ssltest -+crypto/tests/ssltest: $(LIBWVSTREAMS) -+ -+TARGETS += ipstreams/tests/unixtest -+ipstreams/tests/unixtest: $(LIBWVSTREAMS) -+ - TARGETS += crypto/tests/printcert -+crypto/tests/printcert: $(LIBWVSTREAMS) - - ifndef _MACOS - ifneq ("$(with_readline)", "no") - TARGETS += ipstreams/tests/wsd -+ ipstreams/tests/wsd: $(LIBWVSTREAMS) - ipstreams/tests/wsd-LIBS += -lreadline - else - TEST_SKIP_OBJS += ipstreams/tests/wsd -@@ -179,7 +186,11 @@ - # - ifneq ("$(with_dbus)", "no") - TARGETS += libwvdbus.so -- TARGETS += dbus/tests/wvdbus dbus/tests/wvdbusd -+ TARGETS += dbus/tests/wvdbus -+ dbus/tests/wvdbus: $(LIBWVDBUS) -+ -+ TARGETS += dbus/tests/wvdbusd -+ dbus/tests/wvdbusd: $(LIBWVDBUS) - TESTS += $(call tests_cc,dbus/tests) - libwvdbus_OBJS += $(call objects,dbus) - libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS) -diff -ur wvstreams-4.6.1.orig/wvrules-posix.mk wvstreams-4.6.1/wvrules-posix.mk ---- wvstreams-4.6.1.orig/wvrules-posix.mk 2008-10-21 18:31:58.000000000 +0300 -+++ wvstreams-4.6.1/wvrules-posix.mk 2010-01-04 18:04:00.000000000 +0200 -@@ -85,12 +85,15 @@ - $(AR) s $1 - endef - --CC: FORCE -+CC: - @CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ - $(WVSTREAMS)/gen-cc CC c - --CXX: FORCE -+CXX: - @CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ - $(WVSTREAMS)/gen-cc CXX cc - -+#All files must depend on the above two rules. This is a godawful hack. -+$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX -+ - wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS) diff --git a/libraries/wvstreams/wvstreams.SlackBuild b/libraries/wvstreams/wvstreams.SlackBuild index 562bb05d11..2cbe84c6b1 100644 --- a/libraries/wvstreams/wvstreams.SlackBuild +++ b/libraries/wvstreams/wvstreams.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,26 +46,17 @@ 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 {} \; - -# patch to allow parallel builds -patch -p1 < $CWD/patches/wvstreams-4.6.1-parallel-make.patch - -# patch for gcc-4.7 -# https://code.google.com/p/wvstreams/issues/detail?id=34 -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 - -# 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 -CFLAGS="$SLKCFLAGS -fno-tree-dce -fno-optimize-sibling-calls" \ -CXXFLAGS="$SLKCFLAGS -fno-tree-dce -fno-optimize-sibling-calls" \ + \( -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 debian patches +for i in $CWD/patches/*; do patch -p1 < $i ; done + +./autogen.sh + +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -78,7 +69,7 @@ CXXFLAGS="$SLKCFLAGS -fno-tree-dce -fno-optimize-sibling-calls" \ 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 # Let's not clobber the config file diff --git a/libraries/wxPython4/newer_setuptools.patch b/libraries/wxPython4/newer_setuptools.patch new file mode 100644 index 0000000000..8def77882a --- /dev/null +++ b/libraries/wxPython4/newer_setuptools.patch @@ -0,0 +1,29 @@ +based on the upstream commit aa8430ad391d93391988451f43ecedd76ca4dd77 + +diff -Naur wxPython-4.0.7.post2.orig/setup.py wxPython-4.0.7.post2/setup.py +--- wxPython-4.0.7.post2.orig/setup.py 2019-11-12 03:54:31.000000000 +0100 ++++ wxPython-4.0.7.post2/setup.py 2020-11-05 19:00:12.489380000 +0100 +@@ -11,6 +11,7 @@ + + import sys, os + import glob ++import stat + + from setuptools import setup, find_packages + from distutils.command.build import build as orig_build +@@ -306,7 +307,15 @@ + orig_copy_tree = distutils.dir_util.copy_tree + distutils.dir_util.copy_tree = wx_copy_tree + ++# Monkey-patch make_writeable too. Sometimes the link is copied before the ++# target, and the original make_writable will fail on a link to a missing ++# target. ++def wx_make_writable(target): ++ if not os.path.islink(target): ++ os.chmod(target, os.stat(target).st_mode | stat.S_IWRITE) + ++import setuptools.command.build_py ++setuptools.command.build_py.make_writable = wx_make_writable + + #---------------------------------------------------------------------- + diff --git a/libraries/wxPython4/wxPython4.SlackBuild b/libraries/wxPython4/wxPython4.SlackBuild index fb1167e6df..c47043b4ac 100644 --- a/libraries/wxPython4/wxPython4.SlackBuild +++ b/libraries/wxPython4/wxPython4.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/newer_setuptools.patch + python3 setup.py install --root=$PKG mkdir -p $PKG/usr/share/{applications,pixmaps} $PKG/usr/share/icons/hicolor/{16x16,32x32}/apps 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 , Pisa, Italy +# Copyright 2013-2019 Matteo Bernardini , 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/xerces-c/xerces-c.SlackBuild b/libraries/xerces-c/xerces-c.SlackBuild index 6410b82b15..84fa228ae5 100644 --- a/libraries/xerces-c/xerces-c.SlackBuild +++ b/libraries/xerces-c/xerces-c.SlackBuild @@ -49,7 +49,7 @@ ################################################################ PRGNAM=xerces-c -VERSION=${VERSION:-3.2.0} +VERSION=${VERSION:-3.2.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -113,7 +113,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --build=$ARCH-slackware-linux -make -j1 +make make install DESTDIR=$PKG if [ "$WITHSAMPLES" = "1" ]; then diff --git a/libraries/xerces-c/xerces-c.info b/libraries/xerces-c/xerces-c.info index a76b355080..bac10d4a05 100644 --- a/libraries/xerces-c/xerces-c.info +++ b/libraries/xerces-c/xerces-c.info @@ -1,8 +1,8 @@ PRGNAM="xerces-c" -VERSION="3.2.0" +VERSION="3.2.3" HOMEPAGE="http://xerces.apache.org/xerces-c/" -DOWNLOAD="http://archive.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.0.tar.gz" -MD5SUM="71f035103ef8157586a3be825c1553fd" +DOWNLOAD="http://archive.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.3.tar.gz" +MD5SUM="a5fa4d920fce31c9ca3bfef241644494" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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 -# 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 -Date: Fri, 14 Aug 2015 08:50:38 +0900 -Subject: [PATCH] Bug 1194520 - Add a system header wrapper for - - ---- - 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 -# 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/libraries/xview/xinitrc.olvwm b/libraries/xview/xinitrc.olvwm new file mode 100644 index 0000000000..203011e0a3 --- /dev/null +++ b/libraries/xview/xinitrc.olvwm @@ -0,0 +1,16 @@ +#!/bin/sh +# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $ + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# merge in defaults and keymaps +[ -f $sysresources ] && xrdb -merge $sysresources +[ -f $sysmodmap ] && xmodmap $sysmodmap +[ -f $userresources ] && xrdb -merge $userresources +[ -f $usermodmap ] && xmodmap $usermodmap + +# Start the window manager: +/usr/bin/olvwm diff --git a/libraries/xview/xinitrc.olwm b/libraries/xview/xinitrc.olwm new file mode 100644 index 0000000000..ec81c6341a --- /dev/null +++ b/libraries/xview/xinitrc.olwm @@ -0,0 +1,16 @@ +#!/bin/sh +# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $ + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# merge in defaults and keymaps +[ -f $sysresources ] && xrdb -merge $sysresources +[ -f $sysmodmap ] && xmodmap $sysmodmap +[ -f $userresources ] && xrdb -merge $userresources +[ -f $usermodmap ] && xmodmap $usermodmap + +# Start the window manager: +/usr/bin/olwm diff --git a/libraries/xview/xview.SlackBuild b/libraries/xview/xview.SlackBuild index d5e643a36c..7d52c36f51 100644 --- a/libraries/xview/xview.SlackBuild +++ b/libraries/xview/xview.SlackBuild @@ -86,7 +86,7 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ # Apply our CFLAGS. There might be a simpler way to do it, but this works: -sed -i "s,-O2,$SLKCFLAGS,g" \ +sed -i "s|-O2|$SLKCFLAGS -fcommon -I/usr/include/tirpc -Wl,-ltirpc|g" \ clients/olvwm-4.1/compiler.tmpl \ clients/olwm/Makefile.simple \ config/XView.tmpl 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 +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/fcitx-configtool/README b/misc/fcitx-configtool/README deleted file mode 100644 index 3d8e03b013..0000000000 --- a/misc/fcitx-configtool/README +++ /dev/null @@ -1 +0,0 @@ -fcitx-configtool is a GTK-based configuration tool for fcitx. diff --git a/misc/fcitx-configtool/fcitx-configtool.SlackBuild b/misc/fcitx-configtool/fcitx-configtool.SlackBuild deleted file mode 100644 index 0cecb62533..0000000000 --- a/misc/fcitx-configtool/fcitx-configtool.SlackBuild +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -# Slackware build script for fcitx-configtool - -# Copyright 2012 vvoody -# Copyright 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=fcitx-configtool -VERSION=${VERSION:-0.4.9} -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.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 {} \; - -mkdir build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a 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/misc/fcitx-configtool/fcitx-configtool.info b/misc/fcitx-configtool/fcitx-configtool.info deleted file mode 100644 index 668dea588c..0000000000 --- a/misc/fcitx-configtool/fcitx-configtool.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx-configtool" -VERSION="0.4.9" -HOMEPAGE="https://fcitx-im.org/wiki/Fcitx" -DOWNLOAD="https://download.fcitx-im.org/fcitx-configtool/fcitx-configtool-0.4.9.tar.xz" -MD5SUM="b7f28c13d912826d41a4f815bef4d12b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/misc/fcitx-configtool/slack-desc b/misc/fcitx-configtool/slack-desc deleted file mode 100644 index fc87d15e47..0000000000 --- a/misc/fcitx-configtool/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------------------------------------------------------| -fcitx-configtool: fcitx-configtool (configuration tool for fcitx) -fcitx-configtool: -fcitx-configtool: fcitx-configtool is a GTK-based configuration tool for fcitx. -fcitx-configtool: -fcitx-configtool: Homepage: https://fcitx-im.org -fcitx-configtool: -fcitx-configtool: -fcitx-configtool: -fcitx-configtool: -fcitx-configtool: -fcitx-configtool: diff --git a/misc/fcitx-libpinyin/README b/misc/fcitx-libpinyin/README deleted file mode 100644 index e9594fb1a9..0000000000 --- a/misc/fcitx-libpinyin/README +++ /dev/null @@ -1 +0,0 @@ -fcitx-libpinyin is a fcitx wrapper for libpinyin. diff --git a/misc/fcitx-libpinyin/fcitx-libpinyin.SlackBuild b/misc/fcitx-libpinyin/fcitx-libpinyin.SlackBuild deleted file mode 100644 index 0d2292db3f..0000000000 --- a/misc/fcitx-libpinyin/fcitx-libpinyin.SlackBuild +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh - -# Slackware build script for fcitx-libpinyin -# -# Copyright 2019 Isaac Yu -# 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=fcitx-libpinyin -VERSION=${VERSION:-0.5.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.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 build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a 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/misc/fcitx-libpinyin/fcitx-libpinyin.info b/misc/fcitx-libpinyin/fcitx-libpinyin.info deleted file mode 100644 index e70b49b6eb..0000000000 --- a/misc/fcitx-libpinyin/fcitx-libpinyin.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx-libpinyin" -VERSION="0.5.3" -HOMEPAGE="https://fcitx-im.org/wiki/Fcitx" -DOWNLOAD="https://download.fcitx-im.org/fcitx-libpinyin/fcitx-libpinyin-0.5.3.tar.xz" -MD5SUM="8ed5dff04bf869c9572e12f93b225761" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx-qt5 libpinyin" -MAINTAINER="Isaac Yu" -EMAIL="isaacyu1@isaacyu1.com" diff --git a/misc/fcitx-libpinyin/slack-desc b/misc/fcitx-libpinyin/slack-desc deleted file mode 100644 index 25663fb0d7..0000000000 --- a/misc/fcitx-libpinyin/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------------------------------------------------------| -fcitx-libpinyin: fcitx-libpinyin (wrapper for libpinyin) -fcitx-libpinyin: -fcitx-libpinyin: fcitx-libpinyin is a fcitx wrapper for libpinyin. -fcitx-libpinyin: -fcitx-libpinyin: Homepage: https://fcitx-im.org -fcitx-libpinyin: -fcitx-libpinyin: -fcitx-libpinyin: -fcitx-libpinyin: -fcitx-libpinyin: -fcitx-libpinyin: diff --git a/misc/fcitx-qt5/README b/misc/fcitx-qt5/README deleted file mode 100644 index 66926fc454..0000000000 --- a/misc/fcitx-qt5/README +++ /dev/null @@ -1 +0,0 @@ -fcitx-qt5 is the Fcitx IME plugin for Qt5 based applications. diff --git a/misc/fcitx-qt5/fcitx-qt5.SlackBuild b/misc/fcitx-qt5/fcitx-qt5.SlackBuild deleted file mode 100644 index 9c6ae20257..0000000000 --- a/misc/fcitx-qt5/fcitx-qt5.SlackBuild +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh - -# Slackware build script for fcitx-qt5 input plugin - -# Copyright 2018 CapEnt -# -# 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=fcitx-qt5 -VERSION=${VERSION:-1.2.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.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 {} \; - -mkdir build -cd build - cmake -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - .. - 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 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/misc/fcitx-qt5/fcitx-qt5.info b/misc/fcitx-qt5/fcitx-qt5.info deleted file mode 100644 index 47738b475e..0000000000 --- a/misc/fcitx-qt5/fcitx-qt5.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx-qt5" -VERSION="1.2.3" -HOMEPAGE="https://fcitx-im.org/" -DOWNLOAD="https://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-1.2.3.tar.xz" -MD5SUM="0d7703f96729dfb756c6c7821cc8c5fd" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx qt5 extra-cmake-modules" -MAINTAINER="CapEnt" -EMAIL="capent@yahoo.com" diff --git a/misc/fcitx-qt5/slack-desc b/misc/fcitx-qt5/slack-desc deleted file mode 100644 index 994e862232..0000000000 --- a/misc/fcitx-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------------------------------------------------------| -fcitx-qt5: fcitx-qt5 (Qt5 IME plugin for Fcitx) -fcitx-qt5: -fcitx-qt5: fcitx-qt5 is the Fcitx IME plugin for Qt5 based applications -fcitx-qt5: -fcitx-qt5: -fcitx-qt5: -fcitx-qt5: Homepage: https://fcitx-im.org -fcitx-qt5: -fcitx-qt5: -fcitx-qt5: -fcitx-qt5: diff --git a/misc/fcitx/README b/misc/fcitx/README deleted file mode 100644 index d85f15ffda..0000000000 --- a/misc/fcitx/README +++ /dev/null @@ -1,21 +0,0 @@ -Fcitx is an input method framework with extension support. Currently it -supports linux and Unix systems, like freebsd. It has three builtin -Input Method Engine, Pinyin, QuWei and Table-based input methods. - -By default, this slackbuild will build IM module support for GTK2, GTK3 -and Qt4. - -To enable OpenCC support for chinese input, you can pass OPENCC=On to -the script: - - OPENCC=On ./fcitx.SlackBuild - -To enable fcitx put the following lines in your ~/.bashrc file - -export GTK_IM_MODULE=fcitx -export XMODIFIERS=@im=fcitx -export QT_IM_MODULE=fcitx - -fcitx is pre-configured to autostart on xdg-compliant desktop environments -if these settings are present. On other desktop environments you can add -"fcitx-autostart" to the respective autostart settings. diff --git a/misc/fcitx/doinst.sh b/misc/fcitx/doinst.sh deleted file mode 100644 index dff5a780c3..0000000000 --- a/misc/fcitx/doinst.sh +++ /dev/null @@ -1,17 +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-gtk-immodules ]; then - chroot . /usr/bin/update-gtk-immodules --verbose 1>/dev/null -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/misc/fcitx/fcitx-autostart.patch b/misc/fcitx/fcitx-autostart.patch deleted file mode 100644 index d2d206bb09..0000000000 --- a/misc/fcitx/fcitx-autostart.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- fcitx-autostart.orig 2017-03-26 17:58:45.586105103 +0200 -+++ fcitx-autostart 2017-03-26 17:59:09.693105345 +0200 -@@ -1,4 +1,26 @@ --#!/bin/sh -+#!/bin/bash -+ -+START="no" -+ -+if [ "$XIM" = "fcitx" ]; then -+ START="yes" -+fi -+ -+if [ "$XIM_PROGRAM" = "fcitx" ]; then -+ START="yes" -+fi -+ -+if [ "$GTK_IM_MODULE" = "fcitx" ]; then -+ START="yes" -+fi -+ -+if [ "$QT_IM_MOFULE" = "fcitx" ]; then -+ START="yes" -+fi -+ -+if [ "$START" = "no" ]; then -+ exit 0 -+fi - - # sleep for a little while to avoid duplicate startup - sleep 2 diff --git a/misc/fcitx/fcitx.SlackBuild b/misc/fcitx/fcitx.SlackBuild deleted file mode 100644 index 53824c26b3..0000000000 --- a/misc/fcitx/fcitx.SlackBuild +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh - -# Slackware build script for fcitx. - -# Copyright 2012 vvoody -# Copyright 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=fcitx -VERSION=${VERSION:-4.2.9.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -OPENCC=${OPENCC:-Off} - -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}_dict.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 fcitx-autostart to only start when fcitx is the configured input method -patch -p0 -d data/script/ -i $CWD/fcitx-autostart.patch - -mkdir build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONFDIR=/etc \ - -DENABLE_GTK2_IM_MODULE=On \ - -DENABLE_GTK3_IM_MODULE=On \ - -DENABLE_QT_IM_MODULE=On \ - -DENABLE_OPENCC=${OPENCC} \ - .. - make - make install/strip DESTDIR=$PKG -cd .. - -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mv $PKG/usr/share/doc $PKG/usr -mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL 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 -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/misc/fcitx/fcitx.info b/misc/fcitx/fcitx.info deleted file mode 100644 index a9b974cb70..0000000000 --- a/misc/fcitx/fcitx.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx" -VERSION="4.2.9.4" -HOMEPAGE="https://fcitx-im.org" -DOWNLOAD="https://download.fcitx-im.org/fcitx/fcitx-4.2.9.4_dict.tar.xz" -MD5SUM="01a95b63fae67623cd594ab8517e80e9" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libxkbcommon extra-cmake-modules" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/misc/fcitx/slack-desc b/misc/fcitx/slack-desc deleted file mode 100644 index d56560b5aa..0000000000 --- a/misc/fcitx/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------------------------------------------------------| -fcitx: fcitx (Free Chinese Input Toy for X) -fcitx: -fcitx: Fcitx(Free Chinese Input Toy for X) is a collection of -fcitx: Simplified Chinese input methods for Linux. It supports Pinyin, -fcitx: QuWei and Table-based input methods. -fcitx: -fcitx: There are some good modules you can choose, like fcitx-config, -fcitx: fcitx-{googlepinyin,sunpinyin,cloudpinyin}, fcitx-fbterm, etc. -fcitx: -fcitx: Homepage: https://fcitx-im.org -fcitx: diff --git a/misc/g15daemon/g15daemon.SlackBuild b/misc/g15daemon/g15daemon.SlackBuild index 32b216e4eb..39b167efd7 100644 --- a/misc/g15daemon/g15daemon.SlackBuild +++ b/misc/g15daemon/g15daemon.SlackBuild @@ -75,7 +75,7 @@ find -L . \ # Thanks to Gentoo bugzilla people! patch -p1 < "$CWD/g15daemon-1.9.5.3-uinput.patch" -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --disable-static \ 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-anthy/README b/misc/ibus-anthy/README deleted file mode 100644 index 1a73db55ae..0000000000 --- a/misc/ibus-anthy/README +++ /dev/null @@ -1,8 +0,0 @@ -Ibus module for Anthy Japanese conversion engine. - -Ibus-Anthy allows users to use Anthy Japanese conversion engine in -Ibus Intelligent Input Bus, a new input framework for Linux. - -After the install of the package, add Japanese-Anthy Input Method in -IBus preferences, Input Method Tab. You will also need to restart -the ibus service after upgrading this package. diff --git a/misc/ibus-anthy/ibus-anthy.SlackBuild b/misc/ibus-anthy/ibus-anthy.SlackBuild deleted file mode 100644 index 22d94a8433..0000000000 --- a/misc/ibus-anthy/ibus-anthy.SlackBuild +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -# Slackware build script for ibus-anthy - -# Written by Ozan Türkyılmaz ozan.turkyilmaz@gmail.com -# This script is in public domain. If this is not legally possible -# I grant anyone the right to use this work for any purpose, without any conditions, -# unless such conditions are required by law. - -PRGNAM=ibus-anthy -VERSION=${VERSION:-1.2.7} -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 \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -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/misc/ibus-anthy/ibus-anthy.info b/misc/ibus-anthy/ibus-anthy.info deleted file mode 100644 index d327a1ecc8..0000000000 --- a/misc/ibus-anthy/ibus-anthy.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ibus-anthy" -VERSION="1.2.7" -HOMEPAGE="https://github.com/ibus/ibus/wiki" -DOWNLOAD="https://github.com/ibus/ibus-anthy/releases/download/1.2.7/ibus-anthy-1.2.7.tar.gz" -MD5SUM="091a13ff950171981768463993ffb683" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="ibus" -MAINTAINER="Ozan Türkyılmaz" -EMAIL="ozan.turkyilmaz@gmail.com" diff --git a/misc/ibus-anthy/slack-desc b/misc/ibus-anthy/slack-desc deleted file mode 100644 index 559c966e0d..0000000000 --- a/misc/ibus-anthy/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------------------------------------------------------| -ibus-anthy: ibus-anthy (Anthy Japanese engine for ibus) -ibus-anthy: -ibus-anthy: Ibus-anthy allows users to use anthy Japanese conversion engine in -ibus-anthy: Ibus Intelligent Input Bus, a new input framework for Linux. -ibus-anthy: -ibus-anthy: https://github.com/ibus/ibus/wiki -ibus-anthy: -ibus-anthy: -ibus-anthy: -ibus-anthy: -ibus-anthy: diff --git a/misc/ibus-hangul/README b/misc/ibus-hangul/README deleted file mode 100644 index c1dd099aee..0000000000 --- a/misc/ibus-hangul/README +++ /dev/null @@ -1,3 +0,0 @@ -ibus-hangul is a Korean input method engine for IBus. - -Go to IBus preferences, Input Method tab to add the Korean input engine diff --git a/misc/ibus-hangul/doinst.sh b/misc/ibus-hangul/doinst.sh deleted file mode 100644 index 19400050fd..0000000000 --- a/misc/ibus-hangul/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/misc/ibus-hangul/ibus-hangul.SlackBuild b/misc/ibus-hangul/ibus-hangul.SlackBuild deleted file mode 100644 index 55bd7c7c82..0000000000 --- a/misc/ibus-hangul/ibus-hangul.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh - -# Slackware build script ibus-hangul - -# Written by Young Chol Song -# 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=ibus-hangul -VERSION=${VERSION:-1.5.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.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-strip DESTDIR=$PKG - -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/misc/ibus-hangul/ibus-hangul.info b/misc/ibus-hangul/ibus-hangul.info deleted file mode 100644 index 0e36310286..0000000000 --- a/misc/ibus-hangul/ibus-hangul.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ibus-hangul" -VERSION="1.5.0" -HOMEPAGE="https://github.com/ibus/ibus/wiki" -DOWNLOAD="https://github.com/choehwanjin/ibus-hangul/releases/download/1.5.0/ibus-hangul-1.5.0.tar.gz" -MD5SUM="a171bf7b25752a1f71257fb85d56346b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="ibus" -MAINTAINER="Young Chol Song" -EMAIL="youngchol.song@gmail.com" diff --git a/misc/ibus-hangul/slack-desc b/misc/ibus-hangul/slack-desc deleted file mode 100644 index 30bf91bc99..0000000000 --- a/misc/ibus-hangul/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------------------------------------------------------| -ibus-hangul: ibus-hangul (The Hangul engine for IBus) -ibus-hangul: -ibus-hangul: ibus-hangul is a Korean input method engine for IBus. -ibus-hangul: -ibus-hangul: https://github.com/ibus/ibus/wiki -ibus-hangul: -ibus-hangul: -ibus-hangul: -ibus-hangul: -ibus-hangul: -ibus-hangul: diff --git a/misc/ibus-unikey/README b/misc/ibus-unikey/README deleted file mode 100644 index eaebb03f04..0000000000 --- a/misc/ibus-unikey/README +++ /dev/null @@ -1 +0,0 @@ -ibus-unikey is a Vietnamese input engine for the ibus input framework. diff --git a/misc/ibus-unikey/gcc-6.diff b/misc/ibus-unikey/gcc-6.diff deleted file mode 100644 index 424bd74fb0..0000000000 --- a/misc/ibus-unikey/gcc-6.diff +++ /dev/null @@ -1,227 +0,0 @@ -Index: b/ukengine/data.cpp -=================================================================== ---- a/ukengine/data.cpp -+++ b/ukengine/data.cpp -@@ -96,144 +96,144 @@ See TCVN3 & VPS below for examples - unsigned char SingleByteTables[][TOTAL_VNCHARS] = - - // TCVN3 --{{'A','a','','','','','','','','','','', // 0: a -- '','','','','','','','','','','','', // 1: a^ -- '','','','','','','','','','','','', // 2: a( -+{{'A','a',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 0: a -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 1: a^ -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 2: a( - 'B','b','C','c','D','d', -- '','', -- 'E','e','','','','','','','','','','', // 3: e -- '','','','','','','','','','','','', // 4: e^ -+ static_cast(''),static_cast(''), -+ 'E','e',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 3: e -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 4: e^ - 'F','f','G','g','H','h', -- 'I','i','','','','','','','','','','', // 5: i -+ 'I','i',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 5: i - 'J','j','K','k','L','l','M','m','N','n', -- 'O','o','','','','','','','','','','', // 6: o -- '','','','','','','','','','','','', // 7: o^ -- '','','','','','','','','','','','', // 8: o+ -+ 'O','o',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 6: o -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 7: o^ -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 8: o+ - 'P','p','Q','q','R','r','S','s','T','t', -- 'U','u','','','','','','','','','','', // 9: u -- '','','','','','','','','','','','', //10: u+ -+ 'U','u',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 9: u -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), //10: u+ - 'V','v','W','w','X','x', -- 'Y','y','','','','','','','','','','', //11: y -+ 'Y','y',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), //11: y - 'Z','z', - 0x80, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, - 0x89, 0x8A, 0x8B, 0x8C, 0x8E, 0x91, 0x92, 0x93, - 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, - 0x9C, 0x9E, 0x9F}, - //VPS --{ 'A','a','','','','','','','','','','', -- '','','','','','','','','','','','', -- '','','','','','','','','','','','', -+{ 'A','a',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'B','b','C','c','D','d', -- '','', -- 'E','e','','','','','','','','','','', -- '','','','','','','','','','','','', -+ static_cast(''),static_cast(''), -+ 'E','e',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'F','f','G','g','H','h', -- 'I','i','','','','','','','','','','', -+ 'I','i',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'J','j','K','k','L','l','M','m','N','n', -- 'O','o','','','','','','','','','','', -- '','','','','','','','','','','','', -- '','','','','','','','','','','','', -+ 'O','o',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'P','p','Q','q','R','r','S','s','T','t', -- 'U','u','','','','','','','','','','', -- '','','','','','','','','','','','', -+ 'U','u',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'V','v','W','w','X','x', -- 'Y','y','','','','','','','','','','', -+ 'Y','y',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'Z','z', - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x8E, 0x91, 0x92, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x9E, 0x00}, - //VISCII --{ 'A','a','','','','','','','','','','', -- '','','','','','','','','','','','', -- '','','','','','','','','','','','', -+{ 'A','a',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'B','b','C','c','D','d', -- '','', -- 'E','e','','','','','','','','','','', -- '','','','','','','','','','','','', -+ static_cast(''),static_cast(''), -+ 'E','e',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'F','f','G','g','H','h', -- 'I','i','','','','','','','','','','', -+ 'I','i',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'J','j','K','k','L','l','M','m','N','n', -- 'O','o','','','','','','','','','','', -- '','','','','','','','','','','','', -- '','','','','','','','','','','','', -+ 'O','o',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'P','p','Q','q','R','r','S','s','T','t', -- 'U','u','','','','','','','','','','', -- '','','','','','','','','','','','', -+ 'U','u',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'V','v','W','w','X','x', -- 'Y','y','','','','','','','','','','', -+ 'Y','y',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'Z','z', - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x9E, 0x00}, - // BKHCM1 --{'A','a','','','','','','','','','','', -- '','','~','','','','','','','','','', -- '','','','','','','','','','','','', -+{'A','a',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),'~',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'B','b','C','c','D','d', -- '}','', -- 'E','e','','','','','','','','','','', -- '','','','','','','','','','','','', -+ '}',static_cast(''), -+ 'E','e',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'F','f','G','g','H','h', -- 'I','i','','','','','','','','','','', -+ 'I','i',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'J','j','K','k','L','l','M','m','N','n', -- 'O','o','','','','','','','','','','', -- '','','','','','','','','','','','', -- '','','','','','','','','','','','', -+ 'O','o',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'P','p','Q','q','R','r','S','s','T','t', -- 'U','u','','','','','','','','','','', -- '','','','','','','','','','','','', -+ 'U','u',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'V','v','W','w','X','x', -- 'Y','y','{','','^','','`','','|','','','', -+ 'Y','y','{',static_cast(''),'^',static_cast(''),'`',static_cast(''),'|',static_cast(''),static_cast(''),static_cast(''), - 'Z','z', - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x9E, 0x00}, - //Vietware-F --{ 'A','a','','','','','','','','','','', -- '','','','','','','','','','','','', -- '','','','','','','','','','','','', -+{ 'A','a',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'B','b','C','c','D','d', -- '','', -- 'E','e','','','','','','','','','','', -- '','','','','','','','','','','','', -+ static_cast(''),static_cast(''), -+ 'E','e',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'F','f','G','g','H','h', -- 'I','i','','','','','','','','','','', -+ 'I','i',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'J','j','K','k','L','l','M','m','N','n', -- 'O','o','','','','','','','','','','', -- '','','','','','','','','','','','', -- '','','','','','','','','','','','', -+ 'O','o',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'P','p','Q','q','R','r','S','s','T','t', -- 'U','u','','','','','','','','','','', -- '','','','','','','','','','','','', -+ 'U','u',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'V','v','W','w','X','x', -- 'Y','y','','','','','','','','','','', -+ 'Y','y',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'Z','z', - 0x80, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, - 0x89, 0x8A, 0x8B, 0x8C, 0x8E, 0x91, 0x92, 0x93, - 0x94, 0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x9E, 0x00}, - // ISC -- {'A','a','','','','','','','','','','', -- '','','','','','','','','','','','', -- '','','','','','','','','','','','', -+ {'A','a',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'B','b','C','c','D','d', -- '','', -- 'E','e','','','','','','','','','','', -- '','','','','','','','','','','','', -+ static_cast(''),static_cast(''), -+ 'E','e',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'F','f','G','g','H','h', -- 'I','i','','','','','','','','','','', -+ 'I','i',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'J','j','K','k','L','l','M','m','N','n', -- 'O','o','','','','','','','','','','', -- '','','','','','','','','','','','', -- '','','','','','','','','','','','', -+ 'O','o',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), -+ static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'P','p','Q','q','R','r','S','s','T','t', -- 'U','u','@','','','','','','','','|','', -- '','','`','',0x5C,'','^','','~','','#','', -+ 'U','u','@',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),'|',static_cast(''), -+ static_cast(''),static_cast(''),'`',static_cast(''),0x5C,static_cast(''),'^',static_cast(''),'~',static_cast(''),'#',static_cast(''), - 'V','v','W','w','X','x', -- 'Y','y','','','','','','','','','','', -+ 'Y','y',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), - 'Z','z', - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x12, 0x13, diff --git a/misc/ibus-unikey/ibus-unikey.SlackBuild b/misc/ibus-unikey/ibus-unikey.SlackBuild deleted file mode 100644 index 3e2c7cc047..0000000000 --- a/misc/ibus-unikey/ibus-unikey.SlackBuild +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh - -# Slackware build script for ibus-unikey - -# Originally written in ibus-pinyin by Grissiom -# Adapted to ibus-unikey by Hoang Xuan Phu -# Maintained by Binh Nguyen from version 0.5.1 - -PRGNAM=ibus-unikey -VERSION=${VERSION:-0.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 $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 {} \; - -# Debian patch to fix compile errors with gcc -patch -p1 -i $CWD/gcc-6.diff - -./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 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 \ - ABOUT-NLS AUTHORS ChangeLog 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/misc/ibus-unikey/ibus-unikey.info b/misc/ibus-unikey/ibus-unikey.info deleted file mode 100644 index d12327e7e8..0000000000 --- a/misc/ibus-unikey/ibus-unikey.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ibus-unikey" -VERSION="0.6.1" -HOMEPAGE="https://github.com/ibus/ibus/wiki" -DOWNLOAD="https://github.com/mrlequoctuan/ibus-unikey/archive/0.6.1/ibus-unikey-0.6.1.tar.gz" -MD5SUM="a219025729840ff86dec307373d78f33" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="ibus" -MAINTAINER="Binh Nguyen" -EMAIL="binhvng@gmail.com" diff --git a/misc/ibus-unikey/slack-desc b/misc/ibus-unikey/slack-desc deleted file mode 100644 index f73acc1441..0000000000 --- a/misc/ibus-unikey/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------------------------------------------------------| -ibus-unikey: ibus-unikey (unikey engine for ibus input framework) -ibus-unikey: -ibus-unikey: ibus-unikey is a Vietnamese input engine for the ibus input framework -ibus-unikey: this input engine uses the TELEX input method -ibus-unikey: -ibus-unikey: Homepage: https://github.com/ibus/ibus/wiki -ibus-unikey: -ibus-unikey: -ibus-unikey: -ibus-unikey: -ibus-unikey: diff --git a/misc/ibus/README b/misc/ibus/README deleted file mode 100644 index bddcfd6af2..0000000000 --- a/misc/ibus/README +++ /dev/null @@ -1,19 +0,0 @@ -IBus is an Intelligent Input Bus. It is a new input framework for Linux. -It provides a full featured and user friendly input method user interface. -It also may help developers to develop input method easily. - -After installing at least one engine (e.g. PinYin engine) and enabling it -in ibus-setup, ibus itself should be fully functional. If you want to use -ibus as your primary input method, you should remove the scim package. - -If you use qt applications, then you probably want ibus-qt as well. - -To enable ibus put the following lines in your ~/.bashrc file: - -export GTK_IM_MODULE=ibus -export XMODIFIERS=@im=ibus -export QT_IM_MODULE=ibus - -ibus is pre-configured to autostart on xdg-compliant desktop environments -if these settings are present. On other desktop environments you can add -"ibus-autostart" to the respective autostart settings. diff --git a/misc/ibus/doinst.sh b/misc/ibus/doinst.sh deleted file mode 100644 index 6450401b66..0000000000 --- a/misc/ibus/doinst.sh +++ /dev/null @@ -1,20 +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-gtk-immodules ]; then - chroot . /usr/bin/update-gtk-immodules --verbose 1>/dev/null -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 [ -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/misc/ibus/ibus-autostart b/misc/ibus/ibus-autostart deleted file mode 100644 index 29fab3a050..0000000000 --- a/misc/ibus/ibus-autostart +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -START="no" - -if [ "$XIM" = "ibus" ]; then - START="yes" -fi - -if [ "$XIM_PROGRAM" = "ibus" ]; then - START="yes" -fi - -if [ "$GTK_IM_MODULE" = "ibus" ]; then - START="yes" -fi - -if [ "$QT_IM_MOFULE" = "ibus" ]; then - START="yes" -fi - -if [ "$START" = "yes" ]; then - ibus-daemon -drx -fi diff --git a/misc/ibus/ibus-autostart.desktop b/misc/ibus/ibus-autostart.desktop deleted file mode 100644 index 1dcf7dae84..0000000000 --- a/misc/ibus/ibus-autostart.desktop +++ /dev/null @@ -1,32 +0,0 @@ -[Desktop Entry] -Name=IBus -Name[de]=IBus -Name[es]=IBus -Name[ja]=IBus -Name[zh_CN]=IBus -Name[zh_TW]=IBus -Name[ko]=IBus -GenericName=Input Method -GenericName[de]=Eingabemethode -GenericName[es]=Método de entrada -GenericName[ja]=入力メソッド -GenericName[zh_CN]=输入法 -GenericName[zh_TW]=輸入法 -GenericName[ko]=입력 방법 -Comment=Start Input Method -Comment[de]=Eingabemethode starten -Comment[ja]=入力メソッドを開始 -Comment[zh_CN]=启动输入法 -Comment[zh_TW]=啓動輸入法 -Comment[ko]=입력기 시작 -Exec=ibus-autostart -Icon=ibus -Terminal=false -Type=Application -Categories=System;Utility; -StartupNotify=false -X-GNOME-Autostart-Phase=Applications -X-GNOME-AutoRestart=false -X-GNOME-Autostart-Notify=false -X-KDE-autostart-after=panel -X-KDE-StartupNotify=false diff --git a/misc/ibus/ibus.SlackBuild b/misc/ibus/ibus.SlackBuild deleted file mode 100644 index a5f477e4e8..0000000000 --- a/misc/ibus/ibus.SlackBuild +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/sh - -# Slackware build script for ibus - -# Copyright 2006,2007,2008 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA -# Copyright 2017 Heinz Wiesinger, Amsterdam, The Netherlands -# 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. - -# Modified by Grissiom to build ibus -# Feedback (especially improvements) is encouraged! :-) - -PRGNAM=ibus -VERSION=${VERSION:-1.5.16} -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 - -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 - -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 {} \; - -cat $CWD/emoji-test.txt > emoji-test.txt - -# fix libdir -sed -i "s|/lib/python|/lib$LIBDIRSUFFIX/python|g" ./configure - -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var/lib \ - --mandir=/usr/man \ - --enable-python-library \ - --with-unicode-emoji-dir=$TMP/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -mkdir -p $PKG/etc/xdg/autostart -install -m 755 $CWD/ibus-autostart $PKG/usr/bin/ -install -m 644 $CWD/ibus-autostart.desktop $PKG/etc/xdg/autostart/ - -# cleanup temporary files -rm -rf $PKG/usr/lib$LIBDIRSUFFIX/python2.7/site-packages/gi - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog 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 -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/ibus/ibus.info b/misc/ibus/ibus.info deleted file mode 100644 index 24badc3075..0000000000 --- a/misc/ibus/ibus.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="ibus" -VERSION="1.5.16" -HOMEPAGE="https://github.com/ibus/ibus/wiki" -DOWNLOAD="https://github.com/ibus/ibus/releases/download/1.5.16/ibus-1.5.16.tar.gz \ - http://www.unicode.org/Public/emoji/4.0/emoji-test.txt" -MD5SUM="31ea7c1259c7285bd9d71f3000cbd95b \ - 965fe35c4db4401cb9644ebb6251df55" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="json-glib cldr-emoji-annotation" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/misc/ibus/slack-desc b/misc/ibus/slack-desc deleted file mode 100644 index 7ead9487bc..0000000000 --- a/misc/ibus/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------------------------------------------------------| -ibus: ibus (Intelligent Input Bus for Linux) -ibus: -ibus: IBus is an Intelligent Input Bus. It is a new input framework for -ibus: Linux. It provides a full featured and user friendly input method -ibus: user interface. It also may help developers create an input method -ibus: easily. -ibus: -ibus: Homepage: https://github.com/ibus/ibus/wiki -ibus: -ibus: -ibus: diff --git a/misc/kcm-fcitx/README b/misc/kcm-fcitx/README deleted file mode 100644 index 559facee7f..0000000000 --- a/misc/kcm-fcitx/README +++ /dev/null @@ -1,2 +0,0 @@ -kcm-fcitx is a configuration tool that highly integrated with KDE. -You can start it from Fcitx, or find it in KDE Systemsettings -> Locale. diff --git a/misc/kcm-fcitx/doinst.sh b/misc/kcm-fcitx/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/misc/kcm-fcitx/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/misc/kcm-fcitx/kcm-fcitx.SlackBuild b/misc/kcm-fcitx/kcm-fcitx.SlackBuild deleted file mode 100644 index 1959c69bec..0000000000 --- a/misc/kcm-fcitx/kcm-fcitx.SlackBuild +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -# Slackware build script for kcm-fcitx - -# Copyright 2012 vvoody -# -# 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=kcm-fcitx -VERSION=${VERSION:-0.4.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 $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 build -cd build - cmake -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ - .. - make - make install/strip DESTDIR=$PKG -cd .. - -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 -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/misc/kcm-fcitx/kcm-fcitx.info b/misc/kcm-fcitx/kcm-fcitx.info deleted file mode 100644 index 9b3f34e2c2..0000000000 --- a/misc/kcm-fcitx/kcm-fcitx.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kcm-fcitx" -VERSION="0.4.3" -HOMEPAGE="https://fcitx-im.org/wiki/Kcm" -DOWNLOAD="https://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.4.3.tar.xz" -MD5SUM="4cc0c0a4362ba9a3b814437273d9adb0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/misc/kcm-fcitx/slack-desc b/misc/kcm-fcitx/slack-desc deleted file mode 100644 index 4b80aed61d..0000000000 --- a/misc/kcm-fcitx/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------------------------------------------------------| -kcm-fcitx: kcm-fcitx (KDE config module for Fcitx) -kcm-fcitx: -kcm-fcitx: kcm-fcitx is a configuration tool that highly integrated with KDE. -kcm-fcitx: -kcm-fcitx: *Features* -kcm-fcitx: - Change input method list -kcm-fcitx: - Change global configuration -kcm-fcitx: - Change addon configuration and enable/disable addon. -kcm-fcitx: - Download skin from kde-look.org -kcm-fcitx: -kcm-fcitx: Homepage: http://fcitx-im.org/wiki/Kcm diff --git a/misc/krename/README b/misc/krename/README deleted file mode 100644 index 6e6fb3fb3e..0000000000 --- a/misc/krename/README +++ /dev/null @@ -1,9 +0,0 @@ -KRename is a powerful batch renamer for KDE. - -It allows you to easily rename hundreds or even more files in -one go. The filenames can be created by parts of the original -filename, numbering the files or accessing hundreds of -informations about the file, like creation date or Exif -informations of an image. - -krename optionally depends on podofo. diff --git a/misc/krename/doinst.sh b/misc/krename/doinst.sh deleted file mode 100644 index 0d2fdbbd5e..0000000000 --- a/misc/krename/doinst.sh +++ /dev/null @@ -1,16 +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/locolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/locolor >/dev/null 2>&1 - fi -fi - diff --git a/misc/krename/krename.SlackBuild b/misc/krename/krename.SlackBuild deleted file mode 100644 index f084711cd4..0000000000 --- a/misc/krename/krename.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -# Slackware build script for krename - -# Copyright 2008-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. - -# Modified by the slackbuilds.org project. - -PRGNAM=krename -VERSION=${VERSION:-r247} -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 {} \; - -KDEPREF=$(kde4-config --prefix) - -cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX="$KDEPREF" \ - -DLIB_SUFFIX="$LIBDIRSUFFIX" \ - . - -make -make install DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS 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 -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/misc/krename/krename.info b/misc/krename/krename.info deleted file mode 100644 index 2e04ab61b4..0000000000 --- a/misc/krename/krename.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="krename" -VERSION="r247" -HOMEPAGE="http://www.krename.net" -DOWNLOAD="http://www.liwjatan.at/files/src/krename/krename-r247.tar.xz" -MD5SUM="bfbf30b0df6107de2c9ef6788f69b759" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/misc/krename/slack-desc b/misc/krename/slack-desc deleted file mode 100644 index a3cf1f87d6..0000000000 --- a/misc/krename/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------------------------------------------------------| -krename: krename (a powerful batch renamer for KDE) -krename: -krename: It allows you to easily rename hundreds or even more files in one go. -krename: The filenames can be created by parts of the original filename, -krename: numbering the files or accessing hundreds of informations about the -krename: file, like creation date or Exif informations of an image. -krename: -krename: Homepage: http://www.krename.net -krename: -krename: -krename: diff --git a/misc/opencc/README b/misc/opencc/README deleted file mode 100644 index 0ba21ba6e1..0000000000 --- a/misc/opencc/README +++ /dev/null @@ -1,4 +0,0 @@ -Open Chinese Convert (OpenCC) is an opensource project for conversion -between Traditional Chinese and Simplified Chinese, supporting -character-level conversion, phrase-level conversion, variant conversion -and regional idioms among Mainland China, Taiwan and Hong kong. diff --git a/misc/opencc/opencc.SlackBuild b/misc/opencc/opencc.SlackBuild deleted file mode 100644 index c46eb39e14..0000000000 --- a/misc/opencc/opencc.SlackBuild +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh - -# Slackware build script for OpenCC - -# Copyright 2015 CCHsu, Taiwan -# 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=opencc -SRCNAM=OpenCC -VERSION=${VERSION:-1.0.3} -SRCVER=ver.$VERSION -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-$SRCVER -tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz || tar xvf $CWD/$SRCVER.tar.gz -cd $SRCNAM-$SRCVER -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 -e "s/set (LIB_SUFFIX \"\")/set (LIB_SUFFIX \"$LIBDIRSUFFIX\")/" CMakeLists.txt - -make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" -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/misc/opencc/opencc.info b/misc/opencc/opencc.info deleted file mode 100644 index 27e4a923cb..0000000000 --- a/misc/opencc/opencc.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="opencc" -VERSION="1.0.3" -HOMEPAGE="http://byvoid.github.io/OpenCC/" -DOWNLOAD="https://github.com/BYVoid/OpenCC/archive/ver.1.0.3.tar.gz" -MD5SUM="c196d6fe29d57b2efcc32e868f5ed21b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="CCHsu" -EMAIL="a12321aabb@gmail.com" diff --git a/misc/opencc/slack-desc b/misc/opencc/slack-desc deleted file mode 100644 index f238fed167..0000000000 --- a/misc/opencc/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------------------------------------------------------| -opencc: opencc (Open Chinese Convert) -opencc: -opencc: Open Chinese Convert is an opensource project for conversion -opencc: between Traditional Chinese and Simplified Chinese, supporting -opencc: character-level conversion, phrase-level conversion, variant -opencc: conversion and regional idioms among Mainland China, Taiwan and -opencc: Hong kong. -opencc: -opencc: Homepage: http://byvoid.github.io/OpenCC/ -opencc: -opencc: diff --git a/misc/pinfo/gcc10-stringop.diff b/misc/pinfo/gcc10-stringop.diff new file mode 100644 index 0000000000..a57fa91d08 --- /dev/null +++ b/misc/pinfo/gcc10-stringop.diff @@ -0,0 +1,28 @@ +diff --git a/src/utils.c b/src/utils.c +index cb2fe76..2e4139c 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -848,10 +848,9 @@ char * + make_tempfile() + { + char *filename; +- size_t len; + + /* TODO: fix hardcoded /tmp */ +- char tmpfile_template[] = "/tmp/pinfo.XXXXXX"; ++ char tmpfile_template[32] = "/tmp/pinfo.XXXXXX"; + + /* create a tmpfile */ + int fd = mkstemp(tmpfile_template); +@@ -864,9 +863,8 @@ make_tempfile() + } + + /* allocate a new string and copy the filename there */ +- len = strlen(tmpfile_template)+1; +- filename = xmalloc(len+1); /* guarenteerd to be set to \0's */ +- strncpy(filename, tmpfile_template, len); ++ filename = xmalloc(33); /* guarenteerd to be set to \0's */ ++ strncpy(filename, tmpfile_template, 32); + + /* close the file */ + close(fd); diff --git a/misc/pinfo/pinfo.SlackBuild b/misc/pinfo/pinfo.SlackBuild index 5b318d1b5a..779bf904ac 100644 --- a/misc/pinfo/pinfo.SlackBuild +++ b/misc/pinfo/pinfo.SlackBuild @@ -79,9 +79,11 @@ 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/gcc10-stringop.diff + [ -e configure ] || sh autogen.sh -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/misc/po4a/po4a.info b/misc/po4a/po4a.info index f699d19960..caa17c89ed 100644 --- a/misc/po4a/po4a.info +++ b/misc/po4a/po4a.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/mquinson/po4a/releases/download/v0.63/po4a-0.63.tar MD5SUM="25881c0a02c1180ffdec4bf452b4ff0f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="perl-Unicode-LineBreak perl-Module-Build perl-YAML-Tiny" +REQUIRES="perl-Pod-Parser perl-Unicode-LineBreak perl-Module-Build perl-YAML-Tiny" MAINTAINER="Didier Spaier" EMAIL="didier at slint dot fr" diff --git a/misc/projectM/projectM.SlackBuild b/misc/projectM/projectM.SlackBuild index 9d968995a7..6e09e5937d 100644 --- a/misc/projectM/projectM.SlackBuild +++ b/misc/projectM/projectM.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=projectM -VERSION=${VERSION:-2.1.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.1.7} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -60,33 +60,19 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-complete-$VERSION-Source.tar.gz -cd $PRGNAM-complete-$VERSION-Source - -patch -p0 < $CWD/patch_use_LIB_SUFFIX.diff -patch -p0 < $CWD/patch_use_both_fonts.diff -patch -p1 < $CWD/projectM-2.1.0_gcc.patch - -chown -R root:root . +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION 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_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -lglut -lGL -std=c++11" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DINCLUDE-PROJECTM-PULSEAUDIO:BOOLEAN=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. +# thanks archlinux! +./configure --prefix=/usr --enable-gles --enable-sdl --enable-threading --enable-qt +sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool # Fix overlinking +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 diff --git a/misc/projectM/projectM.info b/misc/projectM/projectM.info index 789ec2ae31..9b18f846d3 100644 --- a/misc/projectM/projectM.info +++ b/misc/projectM/projectM.info @@ -1,10 +1,10 @@ PRGNAM="projectM" -VERSION="2.1.0" +VERSION="3.1.7" HOMEPAGE="http://projectm.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/projectm/projectM-complete-2.1.0-Source.tar.gz" -MD5SUM="debf30f7ce94ff0102f06fbb0cc4e92b" +DOWNLOAD="https://github.com/projectM-visualizer/projectm/releases/download/v3.1.7/projectM-3.1.7.tar.gz" +MD5SUM="abd4cab7abec65fe05b4dcc064bf5ba3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ftgl" +REQUIRES="ftgl glm" MAINTAINER="M.Dinslage" EMAIL="daedra1980@gmail.com" diff --git a/misc/qtkeychain/README b/misc/qtkeychain/README deleted file mode 100644 index 5457220f6f..0000000000 --- a/misc/qtkeychain/README +++ /dev/null @@ -1,11 +0,0 @@ -QtKeychain is a Qt API to store passwords and other secret data -securely. How the data is stored on Linux: - -If running, GNOME Keyring is used, otherwise qtkeychain tries to -use KWallet (via D-Bus), if available. In unsupported environments -QtKeychain will report an error. It will not store any data -unencrypted unless explicitly requested -(setInsecureFallback( true )). - -If this is built against the optional dependency qt5 it will use -that instead of qt-4.x. diff --git a/misc/qtkeychain/qtkeychain.SlackBuild b/misc/qtkeychain/qtkeychain.SlackBuild deleted file mode 100644 index a56078d4bc..0000000000 --- a/misc/qtkeychain/qtkeychain.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh - -# Slackware build script for qtkeychain - -# Copyright 2014 Donald Cooley La Porte, IN USA -# Copyright 2016-2020 Donald Cooley South Haven, IN 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=qtkeychain -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.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 \ - -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 ChangeLog 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/misc/qtkeychain/qtkeychain.info b/misc/qtkeychain/qtkeychain.info deleted file mode 100644 index 122ee046de..0000000000 --- a/misc/qtkeychain/qtkeychain.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="qtkeychain" -VERSION="0.10.0" -HOMEPAGE="https://github.com/frankosterfeld/qtkeychain" -DOWNLOAD="https://github.com/frankosterfeld/qtkeychain/archive/v0.10.0/qtkeychain-0.10.0.tar.gz" -MD5SUM="00856441d995146b11fb8cfab87b8bc6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Donald Cooley" -EMAIL="chytraeu@sdf.org" diff --git a/misc/qtkeychain/slack-desc b/misc/qtkeychain/slack-desc deleted file mode 100644 index 7ad29dd2d7..0000000000 --- a/misc/qtkeychain/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------------------------------------------------------| -qtkeychain: qtkeychain (A Qt API to store passwords and secret data securely) -qtkeychain: -qtkeychain: How the data is stored on Linux: -qtkeychain: -qtkeychain: If running, GNOME Keyring is used, otherwise qtkeychain tries to -qtkeychain: use KWallet (via D-Bus), if available. In unsupported environments -qtkeychain: QtKeychain will report an error. It will not store any data -qtkeychain: unencrypted unless explicitly requested (setInsecureFallback( -qtkeychain: true )). -qtkeychain: -qtkeychain: https://github.com/frankosterfeld/qtkeychain diff --git a/misc/qtspell/qtspell.SlackBuild b/misc/qtspell/qtspell.SlackBuild index a238528724..782cb162f0 100644 --- a/misc/qtspell/qtspell.SlackBuild +++ b/misc/qtspell/qtspell.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qtspell -VERSION=${VERSION:-0.8.2} +VERSION=${VERSION:-0.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/misc/qtspell/qtspell.info b/misc/qtspell/qtspell.info index 45f5b7816a..30f4b2db68 100644 --- a/misc/qtspell/qtspell.info +++ b/misc/qtspell/qtspell.info @@ -1,8 +1,8 @@ PRGNAM="qtspell" -VERSION="0.8.2" +VERSION="0.9.0" HOMEPAGE="https://github.com/manisandro/qtspell/" -DOWNLOAD="https://github.com/manisandro/qtspell/releases/download/0.8.2/qtspell-0.8.2.tar.xz" -MD5SUM="08672fa184b7b27c4695bf6ad39b3114" +DOWNLOAD="https://github.com/manisandro/qtspell/archive/0.9.0/qtspell-0.9.0.tar.gz" +MD5SUM="51cec935f402d51ac0d3b3f1f08fc8ae" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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/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/ykpers/fix-boolean-value-with-json-c-0.14.patch b/misc/ykpers/fix-boolean-value-with-json-c-0.14.patch new file mode 100644 index 0000000000..8a57ea3184 --- /dev/null +++ b/misc/ykpers/fix-boolean-value-with-json-c-0.14.patch @@ -0,0 +1,83 @@ +From 0aa2e2cae2e1777863993a10c809bb50f4cde7f8 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Sat, 25 Apr 2020 20:55:28 +0200 +Subject: [PATCH 1/1] fix boolean value with json-c 0.14 + +Upstream removed the TRUE and FALSE defines in commit +0992aac61f8b087efd7094e9ac2b84fa9c040fcd. +--- + ykpers-json.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/ykpers-json.c b/ykpers-json.c +index a62e907..15ad380 100644 +--- a/ykpers-json.c ++++ b/ykpers-json.c +@@ -40,7 +40,7 @@ + #define yk_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value) + #else + typedef int json_bool; +-#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE ++#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? 0 : 1 + #endif + + static void set_json_value(struct map_st *p, int mode, json_object *options, YKP_CONFIG *cfg) { +@@ -50,7 +50,7 @@ static void set_json_value(struct map_st *p, int mode, json_object *options, YKP + if(p->mode && (mode & p->mode) == mode) { + json_object *joption; + json_bool ret = yk_json_object_object_get(options, p->json_text, joption); +- if(ret == TRUE && json_object_get_type(joption) == json_type_boolean) { ++ if(ret == 1 && json_object_get_type(joption) == json_type_boolean) { + int value = json_object_get_boolean(joption); + if(value == 1) { + p->setter(cfg, true); +@@ -230,20 +230,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { + ykp_errno = YKP_EINVAL; + goto out; + } +- if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == FALSE) { ++ if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == 0) { + ykp_errno = YKP_EINVAL; + goto out; + } +- if(yk_json_object_object_get(yprod_json, "mode", jmode) == FALSE) { ++ if(yk_json_object_object_get(yprod_json, "mode", jmode) == 0) { + ykp_errno = YKP_EINVAL; + goto out; + } +- if(yk_json_object_object_get(yprod_json, "options", options) == FALSE) { ++ if(yk_json_object_object_get(yprod_json, "options", options) == 0) { + ykp_errno = YKP_EINVAL; + goto out; + } + +- if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == TRUE) { ++ if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == 1) { + int target_config = json_object_get_int(jtarget); + int command; + if(target_config == 1) { +@@ -275,13 +275,13 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { + if(mode == MODE_OATH_HOTP) { + json_object *jdigits, *jrandom; + ykp_set_tktflag_OATH_HOTP(cfg, true); +- if(yk_json_object_object_get(options, "oathDigits", jdigits) == TRUE) { ++ if(yk_json_object_object_get(options, "oathDigits", jdigits) == 1) { + int digits = json_object_get_int(jdigits); + if(digits == 8) { + ykp_set_cfgflag_OATH_HOTP8(cfg, true); + } + } +- if(yk_json_object_object_get(options, "randomSeed", jrandom) == TRUE) { ++ if(yk_json_object_object_get(options, "randomSeed", jrandom) == 1) { + int random = json_object_get_boolean(jrandom); + int seed = 0; + if(random == 1) { +@@ -290,7 +290,7 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { + goto out; + } else { + json_object *jseed; +- if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == TRUE) { ++ if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == 1) { + seed = json_object_get_int(jseed); + } + } diff --git a/misc/ykpers/ykpers.SlackBuild b/misc/ykpers/ykpers.SlackBuild index f6aca572e7..95626291ff 100644 --- a/misc/ykpers/ykpers.SlackBuild +++ b/misc/ykpers/ykpers.SlackBuild @@ -71,7 +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 {} \; -CFLAGS="$SLKCFLAGS" \ +# Thanks archlinux! +patch -p1 < $CWD/fix-boolean-value-with-json-c-0.14.patch + +CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ 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(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/MuseScore/MuseScore.SlackBuild b/multimedia/MuseScore/MuseScore.SlackBuild index d36d21c67f..7b4065170a 100644 --- a/multimedia/MuseScore/MuseScore.SlackBuild +++ b/multimedia/MuseScore/MuseScore.SlackBuild @@ -3,7 +3,7 @@ # Maintained by Klaatu at member.fsf dot org PRGNAM=MuseScore -VERSION=${VERSION:-3.6} +VERSION=${VERSION:-3.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/multimedia/MuseScore/MuseScore.info b/multimedia/MuseScore/MuseScore.info index aa3acac807..dc0ec32b08 100644 --- a/multimedia/MuseScore/MuseScore.info +++ b/multimedia/MuseScore/MuseScore.info @@ -1,10 +1,10 @@ PRGNAM="MuseScore" VERSION="3.6" HOMEPAGE="http://www.musescore.org/" -DOWNLOAD="https://github.com/musescore/MuseScore/archive/v3.6/MuseScore-3.6.tar.gz \ +DOWNLOAD="https://github.com/musescore/MuseScore/archive/v3.6.1/MuseScore-3.6.1.tar.gz \ http://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General.sf3 \ http://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General_License.md" -MD5SUM="63c890ef7849da113b80d699a23ccaac \ +MD5SUM="b798eb965a8f786980b81df45014c797 \ 7b354559c7ef4e859a2bfad8738d477d \ bc7b4fbe58b37788876b6c36f19577d0" DOWNLOAD_x86_64="" diff --git a/multimedia/aegisub/aegisub.SlackBuild b/multimedia/aegisub/aegisub.SlackBuild index 0bdf6b18bb..cc3600c6c8 100644 --- a/multimedia/aegisub/aegisub.SlackBuild +++ b/multimedia/aegisub/aegisub.SlackBuild @@ -69,10 +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 {} \; -sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i tools/Makefile +for i in $CWD/patches/* ; do patch -p1 < $i ; done +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 LDFLAGS="$LDFLAGS -lz" \ CFLAGS="$SLKCFLAGS" \ +CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1' \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/multimedia/aegisub/patches/boost.patch b/multimedia/aegisub/patches/boost.patch new file mode 100644 index 0000000000..5d917f607e --- /dev/null +++ b/multimedia/aegisub/patches/boost.patch @@ -0,0 +1,34 @@ +From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001 +From: Jan Beich +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 >] +distance(_InputIter __first, _InputIter __last) +^ +/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = + boost::u32regex_iterator >] + 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(begin(text), end(text), *ms.re), + boost::u32regex_iterator()); + diag_field = u32regex_replace(text, *ms.re, settings.replace_with); diff --git a/multimedia/aegisub/patches/icu.patch b/multimedia/aegisub/patches/icu.patch new file mode 100644 index 0000000000..2145140ed0 --- /dev/null +++ b/multimedia/aegisub/patches/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 + #include + #include ++#include + #include + #include + #include diff --git a/multimedia/aegisub/patches/make-4.3.patch b/multimedia/aegisub/patches/make-4.3.patch new file mode 100644 index 0000000000..6edb8c3b5e --- /dev/null +++ b/multimedia/aegisub/patches/make-4.3.patch @@ -0,0 +1,23 @@ +From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001 +From: wangqr +Date: Mon, 17 Feb 2020 14:42:07 +0800 +Subject: [PATCH] Use target name without directory in $*_OBJ macro + +Fix Aegisub/Aegisub#171 +--- + Makefile.target | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.target b/Makefile.target +index 516ef3c24..5c4c5d259 100644 +--- a/Makefile.target ++++ b/Makefile.target +@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $< + # Libraries contain all object files they depend on (but they may depend on other files) + # Not using libtool on OS X because it has an unsilenceable warning about a + # compatibility issue with BSD 4.3 (wtf) +-lib%.a: $$($$*_OBJ) ++lib%.a: $$($$(*F)_OBJ) + @$(BIN_MKDIR_P) $(dir $@) + $(BIN_AR) cru $@ $(filter %.o,$^) + $(BIN_RANLIB) $@ diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild index 2856a1de47..c8e627f179 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 ++#include + #include + #include + #include 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 + std::string MakeString(const T& t) + { +- return (str::stream() << t).str(); ++ str::stream ss; ++ ss << t; ++ return ss.str(); + } + + template +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 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/ccextractor/ccextractor-0.88-fno-common.patch b/multimedia/ccextractor/ccextractor-0.88-fno-common.patch new file mode 100644 index 0000000000..1f42132bf8 --- /dev/null +++ b/multimedia/ccextractor/ccextractor-0.88-fno-common.patch @@ -0,0 +1,55 @@ +From dfd25022e2a775a8b5eb03e4ad28bab6fe6a0658 Mon Sep 17 00:00:00 2001 +From: Ed Marshall +Date: Sat, 1 Feb 2020 15:03:22 -0800 +Subject: [PATCH] Fix multiple definitions with new -fno-common default in GCC + 10 + +--- + ccextractor.c | 3 +++ + ccextractor.h | 4 ++-- + lib_ccx/ccx_decoders_708.h | 4 ++-- + 3 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/ccextractor.c b/ccextractor.c +index a2fb0a24f..8ed27936d 100644 +--- a/ccextractor.c ++++ b/ccextractor.c +@@ -9,6 +9,9 @@ License: GPL 2.0 + + volatile int terminate_asap = 0; + ++struct ccx_s_options ccx_options; ++struct lib_ccx_ctx *signal_ctx; ++ + void sigusr1_handler(int sig) + { + mprint("Caught SIGUSR1. Filename Change Requested\n"); +diff --git a/ccextractor.h b/ccextractor.h +index 4e9ae68f6..e5cde3055 100644 +--- a/ccextractor.h ++++ b/ccextractor.h +@@ -41,8 +41,8 @@ char * api_param(struct ccx_s_options* api_options, int count); + #endif + + +-struct ccx_s_options ccx_options; +-struct lib_ccx_ctx *signal_ctx; ++extern struct ccx_s_options ccx_options; ++extern struct lib_ccx_ctx *signal_ctx; + //volatile int terminate_asap = 0; + + struct ccx_s_options* api_init_options(); +diff --git a/lib_ccx/ccx_decoders_708.h b/lib_ccx/ccx_decoders_708.h +index 324f3890d..df52c6002 100644 +--- a/lib_ccx/ccx_decoders_708.h ++++ b/lib_ccx/ccx_decoders_708.h +@@ -371,7 +371,7 @@ void ccx_dtvcc_process_service_block(ccx_dtvcc_ctx *dtvcc, + unsigned char *data, + int data_length); + +-ccx_dtvcc_pen_color ccx_dtvcc_default_pen_color; +-ccx_dtvcc_pen_attribs ccx_dtvcc_default_pen_attribs; ++extern ccx_dtvcc_pen_color ccx_dtvcc_default_pen_color; ++extern ccx_dtvcc_pen_attribs ccx_dtvcc_default_pen_attribs; + + #endif diff --git a/multimedia/ccextractor/ccextractor.SlackBuild b/multimedia/ccextractor/ccextractor.SlackBuild index 78018a2b3b..56f59a96f8 100644 --- a/multimedia/ccextractor/ccextractor.SlackBuild +++ b/multimedia/ccextractor/ccextractor.SlackBuild @@ -79,6 +79,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 gentoo for this patch! +( cd ../src ; patch -p1 < $CWD/ccextractor-0.88-fno-common.patch ) + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./autogen.sh 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..5be43e80db 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:-20210211_54b918a} +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 +make -j1 +make -j1 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..25b53cb265 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="20210211_54b918a" +HOMEPAGE="https://cinelerra-gg.org" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/cinelerra-20210211_54b918a.tar.xz" +MD5SUM="8b79127fbe89858a22eaf41765cf0308" 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/README b/multimedia/dvdauthor/README deleted file mode 100644 index e2e4e08b5d..0000000000 --- a/multimedia/dvdauthor/README +++ /dev/null @@ -1,2 +0,0 @@ -dvdauthor is a program that will generate a DVD movie from a valid mpeg2 -stream. The movie should play when you put it in a standard DVD player. diff --git a/multimedia/dvdauthor/dvdauthor.SlackBuild b/multimedia/dvdauthor/dvdauthor.SlackBuild deleted file mode 100644 index bf785bab21..0000000000 --- a/multimedia/dvdauthor/dvdauthor.SlackBuild +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -# Slackware build script for dvdauthor - -# Copyright 2007 Brian Reichert -# Copyright 2010,2013 Niels Horn - Rio de Janeiro, Brazil -# Copyright 2015, 2017 Edward W. Koenig - Vancouver, Washington 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. - -# Revision date: 2013/03/28 -# 25-JUL-2015: new maintainer -# 29-JAN-2017: version update fixes missing header includes - -PRGNAM=dvdauthor -VERSION=${VERSION:-0.7.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 $PRGNAM -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -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 {} \; - -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING INSTALL README 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 {} \; -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/multimedia/dvdauthor/dvdauthor.info b/multimedia/dvdauthor/dvdauthor.info deleted file mode 100644 index 637ac2e379..0000000000 --- a/multimedia/dvdauthor/dvdauthor.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="dvdauthor" -VERSION="0.7.2" -HOMEPAGE="http://dvdauthor.sf.net" -DOWNLOAD="http://downloads.sourceforge.net/dvdauthor/dvdauthor-0.7.2.tar.gz" -MD5SUM="1173dcb8d40e74fc90c0f3a25dbd642d" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" diff --git a/multimedia/dvdauthor/slack-desc b/multimedia/dvdauthor/slack-desc deleted file mode 100644 index 7305c61f0b..0000000000 --- a/multimedia/dvdauthor/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------------------------------------------------------| -dvdauthor: dvdauthor (A simple set of tools to help you author a DVD) -dvdauthor: -dvdauthor: dvdauthor is a program that will generate a DVD movie from a valid -dvdauthor: mpeg2 stream. -dvdauthor: The resulting movie should play in a standard DVD player. -dvdauthor: -dvdauthor: Homepage: http://dvdauthor.sf.net -dvdauthor: -dvdauthor: -dvdauthor: -dvdauthor: 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 , Pisa, Italy +# Copyright 2013-2019 Matteo Bernardini , 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..c505f542bb 100644 --- a/multimedia/farsight2/farsight2.SlackBuild +++ b/multimedia/farsight2/farsight2.SlackBuild @@ -69,7 +69,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +patch -p1 < $CWD/make-4.3.patch + +autoreconf -vif + +CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ ./configure \ diff --git a/multimedia/farsight2/make-4.3.patch b/multimedia/farsight2/make-4.3.patch new file mode 100644 index 0000000000..f42517fb1a --- /dev/null +++ b/multimedia/farsight2/make-4.3.patch @@ -0,0 +1,122 @@ +Matteo Bernardini +fix it like https://gitweb.gentoo.org/repo/gentoo.git/plain/net-libs/farstream/files/farstream-0.2.8-make43.patch + +diff -Naur farsight2-0.0.31.orig/common/glib-gen.mak farsight2-0.0.31/common/glib-gen.mak +--- farsight2-0.0.31.orig/common/glib-gen.mak 2010-10-08 18:38:56.000000000 +0200 ++++ farsight2-0.0.31/common/glib-gen.mak 2021-02-16 09:48:20.885387000 +0100 +@@ -1,11 +1,13 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_enum_prefix=gst_color_balance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + + # these are all the rules generating the relevant files + %-marshal.h: %-marshal.list +diff -Naur farsight2-0.0.31.orig/common/gst-glib-gen.mak farsight2-0.0.31/common/gst-glib-gen.mak +--- farsight2-0.0.31.orig/common/gst-glib-gen.mak 2010-10-08 18:38:56.000000000 +0200 ++++ farsight2-0.0.31/common/gst-glib-gen.mak 2021-02-16 09:47:43.231387000 +0100 +@@ -1,12 +1,14 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + + # these are all the rules generating the relevant files + $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list +diff -Naur farsight2-0.0.31.orig/common-modified/gst-glib-gen.mak farsight2-0.0.31/common-modified/gst-glib-gen.mak +--- farsight2-0.0.31.orig/common-modified/gst-glib-gen.mak 2011-09-07 22:20:18.000000000 +0200 ++++ farsight2-0.0.31/common-modified/gst-glib-gen.mak 2021-02-16 09:48:55.282387000 +0100 +@@ -1,12 +1,14 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + + # these are all the rules generating the relevant files + $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list +diff -Naur farsight2-0.0.31.orig/gst/fsrtpconference/Makefile.in farsight2-0.0.31/gst/fsrtpconference/Makefile.in +--- farsight2-0.0.31.orig/gst/fsrtpconference/Makefile.in 2011-10-10 21:59:55.000000000 +0200 ++++ farsight2-0.0.31/gst/fsrtpconference/Makefile.in 2021-02-16 09:49:52.456387000 +0100 +@@ -18,6 +18,8 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance +@@ -458,7 +460,7 @@ + glib_enum_define = FS_RTP + glib_gen_prefix = _fs_rtp + glib_gen_basename = fs-rtp +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +diff -Naur farsight2-0.0.31.orig/gst-libs/gst/farsight/Makefile.in farsight2-0.0.31/gst-libs/gst/farsight/Makefile.in +--- farsight2-0.0.31.orig/gst-libs/gst/farsight/Makefile.in 2011-10-10 21:59:55.000000000 +0200 ++++ farsight2-0.0.31/gst-libs/gst/farsight/Makefile.in 2021-02-16 09:50:34.663387000 +0100 +@@ -18,6 +18,8 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance +@@ -438,7 +440,7 @@ + glib_enum_define = FS + glib_gen_prefix = _fs + glib_gen_basename = fs +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +diff -Naur farsight2-0.0.31.orig/transmitters/rawudp/Makefile.in farsight2-0.0.31/transmitters/rawudp/Makefile.in +--- farsight2-0.0.31.orig/transmitters/rawudp/Makefile.in 2011-10-10 21:59:56.000000000 +0200 ++++ farsight2-0.0.31/transmitters/rawudp/Makefile.in 2021-02-16 09:51:10.249387000 +0100 +@@ -18,6 +18,8 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance +@@ -392,7 +394,7 @@ + glib_enum_define = FS_RAWUDP + glib_gen_prefix = _fs_rawudp + glib_gen_basename = fs-rawudp +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + 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 -+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H -+# include -+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H - # include - #elif HAVE_OPENJPEG_2_0_OPENJPEG_H - # include -@@ -44,7 +48,7 @@ - # include - #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 -+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H -+# include -+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H - # include - #elif HAVE_OPENJPEG_2_0_OPENJPEG_H - # include -@@ -42,7 +46,7 @@ - # include - #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 - -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 30f00771d1..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-2021 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.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 - -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 dad8d9f9a9..0000000000 --- a/multimedia/ffmpeg4/ffmpeg4.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ffmpeg4" -VERSION="4.3.2" -HOMEPAGE="https://ffmpeg.org/" -DOWNLOAD="https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2" -MD5SUM="d84e0f81740adefa76d94ed8c3aa9006" -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 -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 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 -Date: Mon, 15 Jul 2013 07:16:39 +0000 -Subject: Add support fir GIFLIB-5.0 (bug #39482) - -Signed-off-by: Sandro Santilli ---- -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 - #include - #include -+#include - - #include - #include 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 -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 - #include - #include -+#include - - #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::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::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 -# 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..55bb8a3365 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++, aom, 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..d302667621 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-2021 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.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 @@ -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..fe20da3a8c 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.3" 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.3.tar.xz" +MD5SUM="e2ff6ae97d5831124daf168d227a2980" 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..901d1c11fd 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-2021 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.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 @@ -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..969fb9d792 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.3" 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.3.tar.xz" +MD5SUM="fe7b807ea4e91c757366ba209e553a99" 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/README b/multimedia/gst0-plugins-bad/README deleted file mode 100644 index 5c3bfb00d8..0000000000 --- a/multimedia/gst0-plugins-bad/README +++ /dev/null @@ -1,9 +0,0 @@ -GStreamer Bad Plug-ins is a set of plug-ins that aren't up to par compared -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 libass, libcdaudio, celt, libdc1394, dirac, -libdca, faac, faad, flite, gsm, libkate, liblrdf, slv2, libmms, libmodplug, -libmimic, libmusicbrainz, libofa, OpenAL, opencv, TiMidity++, soundtouch, -swfdec, xvidcore, schroedinger, and rtmpdump. diff --git a/multimedia/gst0-plugins-bad/drop-vpx-compat-defines.patch b/multimedia/gst0-plugins-bad/drop-vpx-compat-defines.patch deleted file mode 100644 index 599ec08a18..0000000000 --- a/multimedia/gst0-plugins-bad/drop-vpx-compat-defines.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h.drop-compat-defines gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h ---- gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h.drop-compat-defines 2015-04-07 09:28:01.637679239 -0400 -+++ gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h 2015-04-07 09:28:10.397622550 -0400 -@@ -25,23 +25,6 @@ - - G_BEGIN_DECLS - --/* Some compatibility defines for older libvpx versions */ --#ifndef VPX_IMG_FMT_I420 --#define VPX_IMG_FMT_I420 IMG_FMT_I420 --#endif -- --#ifndef VPX_PLANE_Y --#define VPX_PLANE_Y PLANE_Y --#endif -- --#ifndef VPX_PLANE_U --#define VPX_PLANE_U PLANE_U --#endif -- --#ifndef VPX_PLANE_V --#define VPX_PLANE_V PLANE_V --#endif -- - const char * gst_vpx_error_name (vpx_codec_err_t status); - - G_END_DECLS diff --git a/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild b/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild deleted file mode 100644 index c06474d672..0000000000 --- a/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh - -# Slackware build script for gst0-plugins-bad - -# Copyright 2007-2011 Michiel van Wessem, Manchester, United Kingdom -# 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=gst0-plugins-bad -VERSION=${VERSION:-0.10.23} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -SRCNAM=gst-plugins-bad - -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.?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 {} \; - -# Fix libmodplug include directory. -patch -p1 < $CWD/libmodplug-include.patch - -# Fix build against libvpx 1.4.0. -patch -p1 < $CWD/drop-vpx-compat-defines.patch - -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 \ - --disable-musepack \ - --disable-opus \ - --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/plugins -cp -a AUTHORS COPYING* INSTALL NEWS README RELEASE REQUIREMENTS \ - docs/plugins/html docs/plugins/$SRCNAM-* $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/gst0-plugins-bad/gst0-plugins-bad.info b/multimedia/gst0-plugins-bad/gst0-plugins-bad.info deleted file mode 100644 index 726cbbe79d..0000000000 --- a/multimedia/gst0-plugins-bad/gst0-plugins-bad.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gst0-plugins-bad" -VERSION="0.10.23" -HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-plugins-bad.html" -DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz" -MD5SUM="e4822fa2cc933768e2998311a1565979" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Michiel van Wessem" -EMAIL="michiel@slackbuilds.org" diff --git a/multimedia/gst0-plugins-bad/libmodplug-include.patch b/multimedia/gst0-plugins-bad/libmodplug-include.patch deleted file mode 100644 index a38c5af9ab..0000000000 --- a/multimedia/gst0-plugins-bad/libmodplug-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur gst-plugins-bad-0.10.23.orig/ext/modplug/gstmodplug.cc gst-plugins-bad-0.10.23/ext/modplug/gstmodplug.cc ---- gst-plugins-bad-0.10.23.orig/ext/modplug/gstmodplug.cc 2012-01-18 12:32:55.000000000 +0000 -+++ gst-plugins-bad-0.10.23/ext/modplug/gstmodplug.cc 2015-02-03 16:31:44.428094306 +0000 -@@ -50,7 +50,7 @@ - #define WORDS_BIGENDIAN 0 - #endif - --#include -+#include - #include - - #include "gstmodplug.h" diff --git a/multimedia/gst0-plugins-bad/slack-desc b/multimedia/gst0-plugins-bad/slack-desc deleted file mode 100644 index be75d1dd65..0000000000 --- a/multimedia/gst0-plugins-bad/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------------------------------------------------------| -gst0-plugins-bad: gst0-plugins-bad (a set of bad GStreamer-0.10.x plugins) -gst0-plugins-bad: -gst0-plugins-bad: GStreamer Bad Plug-ins is a set of plug-ins that aren't up to -gst0-plugins-bad: par compared to the rest. They might be close to being good -gst0-plugins-bad: quality, but they're missing something - be it a good code -gst0-plugins-bad: review, some documentation, a set of tests, a real live -gst0-plugins-bad: maintainer, or some actual wide use. -gst0-plugins-bad: -gst0-plugins-bad: gst0-plugins-bad is a set of plug-ins that need more quality. -gst0-plugins-bad: -gst0-plugins-bad: diff --git a/multimedia/gst0-plugins-base/README b/multimedia/gst0-plugins-base/README new file mode 100644 index 0000000000..28f07fc897 --- /dev/null +++ b/multimedia/gst0-plugins-base/README @@ -0,0 +1,6 @@ +GStreamer Base Plug-ins is a well-groomed and well-maintained +collection of GStreamer plug-ins and elements, spanning the range of +possible types of elements one would want to write for GStreamer. +It also contains helper libraries and base classes useful for +writing elements. A wide range of video and audio decoders, encoders, +and filters are included. diff --git a/multimedia/gst0-plugins-base/gst0-plugins-base.SlackBuild b/multimedia/gst0-plugins-base/gst0-plugins-base.SlackBuild new file mode 100644 index 0000000000..dabd9c133c --- /dev/null +++ b/multimedia/gst0-plugins-base/gst0-plugins-base.SlackBuild @@ -0,0 +1,114 @@ +#!/bin/sh + +# Slackware build script for gst0-plugins-base + +# Copyright 2008 Michiel van Wessem +# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2021 Matteo Bernardini , 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=gst0-plugins-base +SRCNAM=gst-plugins-base +VERSION=${VERSION:-0.10.36} +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="ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* RELEASE REQUIREMENTS" + +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 {} \; + +# Thanks AUR for the patches +sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac +for i in $CWD/patches/* ; do patch -p1 < $i ; done +if [[ $ARCH == i?86 ]]; then patch -p1 < $CWD/x86.patch ; fi + +NOCONFIGURE=1 ./autogen.sh + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --disable-debug \ + --disable-static \ + --build=$ARCH-slackware-linux + +make +sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile +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/multimedia/gst0-plugins-base/gst0-plugins-base.info b/multimedia/gst0-plugins-base/gst0-plugins-base.info new file mode 100644 index 0000000000..053dcd0d2b --- /dev/null +++ b/multimedia/gst0-plugins-base/gst0-plugins-base.info @@ -0,0 +1,10 @@ +PRGNAM="gst0-plugins-base" +VERSION="0.10.36" +HOMEPAGE="https://gstreamer.freedesktop.org" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz" +MD5SUM="3d2337841b132fe996e5eb2396ac9438" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="gstreamer0" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/multimedia/gst0-plugins-base/patches/00-fix-crash-0-byte-ogg.patch b/multimedia/gst0-plugins-base/patches/00-fix-crash-0-byte-ogg.patch new file mode 100644 index 0000000000..2c03e820b5 --- /dev/null +++ b/multimedia/gst0-plugins-base/patches/00-fix-crash-0-byte-ogg.patch @@ -0,0 +1,22 @@ +From 7f22e3ea7f713867e1fbf2ef71b6a6e36e1f0531 Mon Sep 17 00:00:00 2001 +From: Jonathan Liu +Date: Sun, 28 Oct 2012 10:07:16 +0000 +Subject: oggstream: fix crash with 0 byte ogg packets + +https://bugzilla.gnome.org/show_bug.cgi?id=687030 +--- +diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c +index c79f088..fe28f2e 100644 +--- a/ext/ogg/gstoggstream.c ++++ b/ext/ogg/gstoggstream.c +@@ -790,7 +790,7 @@ setup_vorbis_mapper (GstOggStream * pad, ogg_packet * packet) + static gboolean + is_header_vorbis (GstOggStream * pad, ogg_packet * packet) + { +- if (packet->bytes > 0 && (packet->packet[0] & 0x01) == 0) ++ if (packet->bytes == 0 || (packet->packet[0] & 0x01) == 0) + return FALSE; + + if (packet->packet[0] == 5) { +-- +cgit v0.9.0.2-2-gbebe diff --git a/multimedia/gst0-plugins-base/patches/01-colorbalance-fix-abi.patch b/multimedia/gst0-plugins-base/patches/01-colorbalance-fix-abi.patch new file mode 100644 index 0000000000..1e7b8f2c11 --- /dev/null +++ b/multimedia/gst0-plugins-base/patches/01-colorbalance-fix-abi.patch @@ -0,0 +1,23 @@ +From 0cb4ccb1f09d39820682e052fc106f5fd7fa1309 Mon Sep 17 00:00:00 2001 +From: Stefan Sauer +Date: Fri, 24 Feb 2012 20:37:00 +0000 +Subject: interfaces: fix ABI class padding after the recent changes + +--- +(limited to 'gst-libs/gst/interfaces/colorbalance.h') + +diff --git a/gst-libs/gst/interfaces/colorbalance.h b/gst-libs/gst/interfaces/colorbalance.h +index fd8ceaa..9f0a1cd 100644 +--- a/gst-libs/gst/interfaces/colorbalance.h ++++ b/gst-libs/gst/interfaces/colorbalance.h +@@ -102,7 +102,7 @@ struct _GstColorBalanceClass { + GstColorBalanceType (*get_balance_type) (GstColorBalance *balance); + + /*< private >*/ +- gpointer _gst_reserved[GST_PADDING]; ++ gpointer _gst_reserved[GST_PADDING-1]; + }; + + GType gst_color_balance_get_type (void); +-- +cgit v0.9.0.2-2-gbebe diff --git a/multimedia/gst0-plugins-base/patches/02-ayuv64-lanczos.patch b/multimedia/gst0-plugins-base/patches/02-ayuv64-lanczos.patch new file mode 100644 index 0000000000..64106e4650 --- /dev/null +++ b/multimedia/gst0-plugins-base/patches/02-ayuv64-lanczos.patch @@ -0,0 +1,236 @@ +From e4f01106d08f3c2a65897bfe919bd65ce55545a8 Mon Sep 17 00:00:00 2001 +From: David Schleef +Date: Wed, 25 Jan 2012 23:49:00 +0000 +Subject: videoscale: Add AYUV64 path to Lanczos + +--- +diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c +index 7b44647..6df4ba6 100644 +--- a/gst/videoscale/gstvideoscale.c ++++ b/gst/videoscale/gstvideoscale.c +@@ -1199,6 +1199,11 @@ gst_video_scale_transform (GstBaseTransform * trans, GstBuffer * in, + case GST_VIDEO_SCALE_4TAP: + vs_image_scale_4tap_AYUV64 (&dest, &src, videoscale->tmp_buf); + break; ++ case GST_VIDEO_SCALE_LANCZOS: ++ vs_image_scale_lanczos_AYUV64 (&dest, &src, videoscale->tmp_buf, ++ videoscale->sharpness, videoscale->dither, videoscale->submethod, ++ videoscale->envelope, videoscale->sharpen); ++ break; + default: + goto unknown_mode; + } +diff --git a/gst/videoscale/vs_image.h b/gst/videoscale/vs_image.h +index 2312acc..7b34991 100644 +--- a/gst/videoscale/vs_image.h ++++ b/gst/videoscale/vs_image.h +@@ -52,6 +52,9 @@ void vs_image_scale_linear_RGBA (const VSImage *dest, const VSImage *src, + void vs_image_scale_lanczos_AYUV (const VSImage * dest, const VSImage * src, + uint8_t * tmpbuf, double sharpness, gboolean dither, int submethod, + double a, double sharpen); ++void vs_image_scale_lanczos_AYUV64 (const VSImage * dest, const VSImage * src, ++ uint8_t * tmpbuf, double sharpness, gboolean dither, int submethod, ++ double a, double sharpen); + + void vs_image_scale_nearest_RGB (const VSImage *dest, const VSImage *src, + uint8_t *tmpbuf); +diff --git a/gst/videoscale/vs_lanczos.c b/gst/videoscale/vs_lanczos.c +index 1c87ba3..d141a01 100644 +--- a/gst/videoscale/vs_lanczos.c ++++ b/gst/videoscale/vs_lanczos.c +@@ -204,6 +204,9 @@ static void vs_image_scale_lanczos_AYUV_float (const VSImage * dest, + static void vs_image_scale_lanczos_AYUV_double (const VSImage * dest, + const VSImage * src, uint8_t * tmpbuf, double sharpness, gboolean dither, + double a, double sharpen); ++static void vs_image_scale_lanczos_AYUV64_double (const VSImage * dest, ++ const VSImage * src, uint8_t * tmpbuf, double sharpness, gboolean dither, ++ double a, double sharpen); + + static double + sinc (double x) +@@ -590,6 +593,15 @@ vs_image_scale_lanczos_AYUV (const VSImage * dest, const VSImage * src, + } + } + ++void ++vs_image_scale_lanczos_AYUV64 (const VSImage * dest, const VSImage * src, ++ uint8_t * tmpbuf, double sharpness, gboolean dither, int submethod, ++ double a, double sharpen) ++{ ++ vs_image_scale_lanczos_AYUV64_double (dest, src, tmpbuf, sharpness, dither, ++ a, sharpen); ++} ++ + + + #define RESAMPLE_HORIZ_FLOAT(function, dest_type, tap_type, src_type, _n_taps) \ +@@ -813,9 +825,9 @@ RESAMPLE_VERT_DITHER (resample_vert_dither_int16_generic, gint16, gint16, + n_taps, shift) + /* *INDENT-ON* */ + +-#define RESAMPLE_VERT_FLOAT(function, tap_type, src_type, _n_taps, _shift) \ ++#define RESAMPLE_VERT_FLOAT(function, dest_type, clamp, tap_type, src_type, _n_taps, _shift) \ + static void \ +-function (guint8 *dest, \ ++function (dest_type *dest, \ + const tap_type *taps, const src_type *src, int stride, int n_taps, \ + int shift, int n) \ + { \ +@@ -828,13 +840,13 @@ function (guint8 *dest, \ + const src_type *line = PTR_OFFSET(src, stride * l); \ + sum_y += line[i] * taps[l]; \ + } \ +- dest[i] = CLAMP (floor(0.5 + sum_y), 0, 255); \ ++ dest[i] = CLAMP (floor(0.5 + sum_y), 0, clamp); \ + } \ + } + +-#define RESAMPLE_VERT_FLOAT_DITHER(function, tap_type, src_type, _n_taps, _shift) \ ++#define RESAMPLE_VERT_FLOAT_DITHER(function, dest_type, clamp, tap_type, src_type, _n_taps, _shift) \ + static void \ +-function (guint8 *dest, \ ++function (dest_type *dest, \ + const tap_type *taps, const src_type *src, int stride, int n_taps, \ + int shift, int n) \ + { \ +@@ -849,19 +861,24 @@ function (guint8 *dest, \ + sum_y += line[i] * taps[l]; \ + } \ + err_y += sum_y; \ +- dest[i] = CLAMP (floor (err_y), 0, 255); \ ++ dest[i] = CLAMP (floor (err_y), 0, clamp); \ + err_y -= floor (err_y); \ + } \ + } + + /* *INDENT-OFF* */ +-RESAMPLE_VERT_FLOAT (resample_vert_double_generic, double, double, n_taps, ++RESAMPLE_VERT_FLOAT (resample_vert_double_generic, guint8, 255, double, double, n_taps, + shift) +-RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_double_generic, double, double, ++RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_double_generic, guint8, 255, double, double, + n_taps, shift) + +-RESAMPLE_VERT_FLOAT (resample_vert_float_generic, float, float, n_taps, shift) +-RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_float_generic, float, float, ++RESAMPLE_VERT_FLOAT (resample_vert_double_generic_u16, guint16, 65535, double, double, n_taps, ++ shift) ++RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_double_generic_u16, guint16, 65535, double, double, ++ n_taps, shift) ++ ++RESAMPLE_VERT_FLOAT (resample_vert_float_generic, guint8, 255, float, float, n_taps, shift) ++RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_float_generic, guint8, 255, float, float, + n_taps, shift) + /* *INDENT-ON* */ + +@@ -1556,3 +1573,77 @@ vs_image_scale_lanczos_AYUV_float (const VSImage * dest, const VSImage * src, + scale1d_cleanup (&scale->y_scale1d); + g_free (scale->tmpdata); + } ++ ++static void ++vs_scale_lanczos_AYUV64_double (Scale * scale) ++{ ++ int j; ++ int yi; ++ int tmp_yi; ++ ++ tmp_yi = 0; ++ ++ for (j = 0; j < scale->dest->height; j++) { ++ guint16 *destline; ++ double *taps; ++ ++ destline = (guint16 *) (scale->dest->pixels + scale->dest->stride * j); ++ ++ yi = scale->y_scale1d.offsets[j]; ++ ++ while (tmp_yi < yi + scale->y_scale1d.n_taps) { ++ scale->horiz_resample_func (TMP_LINE_DOUBLE_AYUV (tmp_yi), ++ scale->x_scale1d.offsets, scale->x_scale1d.taps, SRC_LINE (tmp_yi), ++ scale->x_scale1d.n_taps, 0, scale->dest->width); ++ tmp_yi++; ++ } ++ ++ taps = (double *) scale->y_scale1d.taps + j * scale->y_scale1d.n_taps; ++ if (scale->dither) { ++ resample_vert_dither_double_generic_u16 (destline, ++ taps, TMP_LINE_DOUBLE_AYUV (scale->y_scale1d.offsets[j]), ++ sizeof (double) * 4 * scale->dest->width, ++ scale->y_scale1d.n_taps, 0, scale->dest->width * 4); ++ } else { ++ resample_vert_double_generic_u16 (destline, ++ taps, TMP_LINE_DOUBLE_AYUV (scale->y_scale1d.offsets[j]), ++ sizeof (double) * 4 * scale->dest->width, ++ scale->y_scale1d.n_taps, 0, scale->dest->width * 4); ++ } ++ } ++} ++ ++void ++vs_image_scale_lanczos_AYUV64_double (const VSImage * dest, const VSImage * src, ++ uint8_t * tmpbuf, double sharpness, gboolean dither, double a, ++ double sharpen) ++{ ++ Scale s = { 0 }; ++ Scale *scale = &s; ++ int n_taps; ++ ++ scale->dest = dest; ++ scale->src = src; ++ ++ n_taps = scale1d_get_n_taps (src->width, dest->width, a, sharpness); ++ scale1d_calculate_taps (&scale->x_scale1d, ++ src->width, dest->width, n_taps, a, sharpness, sharpen); ++ ++ n_taps = scale1d_get_n_taps (src->height, dest->height, a, sharpness); ++ scale1d_calculate_taps (&scale->y_scale1d, ++ src->height, dest->height, n_taps, a, sharpness, sharpen); ++ ++ scale->dither = dither; ++ ++ scale->horiz_resample_func = ++ (HorizResampleFunc) resample_horiz_double_ayuv_generic; ++ ++ scale->tmpdata = ++ g_malloc (sizeof (double) * scale->dest->width * scale->src->height * 4); ++ ++ vs_scale_lanczos_AYUV64_double (scale); ++ ++ scale1d_cleanup (&scale->x_scale1d); ++ scale1d_cleanup (&scale->y_scale1d); ++ g_free (scale->tmpdata); ++} +-- +cgit v0.9.0.2-2-gbebe +From f8dc679ca7e9542e6f410062df5e332fc8e0ba9d Mon Sep 17 00:00:00 2001 +From: David Schleef +Date: Sun, 19 Feb 2012 08:03:03 +0000 +Subject: videoscale: fix AYUV64 scaling + +--- +diff --git a/gst/videoscale/vs_lanczos.c b/gst/videoscale/vs_lanczos.c +index d141a01..67cd401 100644 +--- a/gst/videoscale/vs_lanczos.c ++++ b/gst/videoscale/vs_lanczos.c +@@ -728,6 +728,9 @@ RESAMPLE_HORIZ_AYUV_FLOAT (resample_horiz_double_ayuv_generic, double, double, + RESAMPLE_HORIZ_AYUV_FLOAT (resample_horiz_float_ayuv_generic, float, float, + guint8, n_taps) + ++RESAMPLE_HORIZ_AYUV_FLOAT (resample_horiz_double_ayuv_generic_s16, double, double, ++ guint16, n_taps) ++ + RESAMPLE_HORIZ (resample_horiz_int32_int32_u8_generic, gint32, gint32, + guint8, n_taps, shift) + RESAMPLE_HORIZ (resample_horiz_int16_int16_u8_generic, gint16, gint16, +@@ -1636,7 +1639,7 @@ vs_image_scale_lanczos_AYUV64_double (const VSImage * dest, const VSImage * src, + scale->dither = dither; + + scale->horiz_resample_func = +- (HorizResampleFunc) resample_horiz_double_ayuv_generic; ++ (HorizResampleFunc) resample_horiz_double_ayuv_generic_s16; + + scale->tmpdata = + g_malloc (sizeof (double) * scale->dest->width * scale->src->height * 4); +-- +cgit v0.9.0.2-2-gbebe diff --git a/multimedia/gst0-plugins-base/patches/03-videoscale-fix-negotiation.patch b/multimedia/gst0-plugins-base/patches/03-videoscale-fix-negotiation.patch new file mode 100644 index 0000000000..6e34d41c53 --- /dev/null +++ b/multimedia/gst0-plugins-base/patches/03-videoscale-fix-negotiation.patch @@ -0,0 +1,171 @@ +From 63d1316c0fd4ce22cf4a53f4aa7cb1ca16a07aa8 Mon Sep 17 00:00:00 2001 +From: Tim-Philipp Müller +Date: Sun, 26 Feb 2012 18:19:57 +0000 +Subject: videoscale: fix negotiation after addition of new formats and methods + +Now that we no longer support all methods for all formats, we +need to cater for that in the transform function: we can't +transform formats not supported by the currently-selected +mehod. + +make check, folks. It's da bomb. +--- +diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c +index 9f072a3..60dd5ff 100644 +--- a/gst/videoscale/gstvideoscale.c ++++ b/gst/videoscale/gstvideoscale.c +@@ -424,10 +424,118 @@ gst_video_scale_get_property (GObject * object, guint prop_id, GValue * value, + } + } + ++#define NEAREST (1 << GST_VIDEO_SCALE_NEAREST) ++#define BILINEAR (1 << GST_VIDEO_SCALE_BILINEAR) ++#define FOURTAP (1 << GST_VIDEO_SCALE_4TAP) ++#define LANCZOS (1 << GST_VIDEO_SCALE_LANCZOS) ++ ++/* or we could just do lookups via table[format] if we could be bothered.. */ ++static const struct ++{ ++ GstVideoFormat format; ++ guint8 methods; ++} formats_methods_table[] = { ++ { ++ GST_VIDEO_FORMAT_RGBx, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_xRGB, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_BGRx, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_xBGR, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_RGBA, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_ARGB, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_BGRA, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_ABGR, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_AYUV, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_ARGB64, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_AYUV64, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_RGB, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_BGR, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_v308, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_YUY2, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_YVYU, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_UYVY, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_Y800, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_GRAY8, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_GRAY16_LE, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_GRAY16_BE, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_Y16, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_I420, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_YV12, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_Y444, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_Y42B, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_Y41B, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_NV12, NEAREST | BILINEAR}, { ++ GST_VIDEO_FORMAT_RGB16, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_RGB15, NEAREST | BILINEAR | FOURTAP} ++}; ++ ++static gboolean ++gst_video_scale_format_supported_for_method (GstVideoFormat format, ++ GstVideoScaleMethod method) ++{ ++ int i; ++ ++ for (i = 0; i < G_N_ELEMENTS (formats_methods_table); ++i) { ++ if (formats_methods_table[i].format == format) ++ return ((formats_methods_table[i].methods & (1 << method)) != 0); ++ } ++ return FALSE; ++} ++ ++static gboolean ++gst_video_scale_transform_supported (GstVideoScale * videoscale, ++ GstVideoScaleMethod method, GstStructure * structure) ++{ ++ const GValue *val; ++ GstVideoFormat fmt; ++ gboolean supported = TRUE; ++ GstStructure *s; ++ GstCaps *c; ++ ++ /* we support these methods for all formats */ ++ if (method == GST_VIDEO_SCALE_NEAREST || method == GST_VIDEO_SCALE_BILINEAR) ++ return TRUE; ++ ++ /* we need fixed caps if we want to use gst_video_parse_caps() */ ++ s = gst_structure_new (gst_structure_get_name (structure), ++ "width", G_TYPE_INT, 1, "height", G_TYPE_INT, 1, NULL); ++ ++ if ((val = gst_structure_get_value (structure, "format"))) { ++ gst_structure_set_value (s, "format", val); ++ } else { ++ if ((val = gst_structure_get_value (structure, "endianness"))) ++ gst_structure_set_value (s, "endianness", val); ++ if ((val = gst_structure_get_value (structure, "red_mask"))) ++ gst_structure_set_value (s, "red_mask", val); ++ if ((val = gst_structure_get_value (structure, "blue_mask"))) ++ gst_structure_set_value (s, "blue_mask", val); ++ if ((val = gst_structure_get_value (structure, "green_mask"))) ++ gst_structure_set_value (s, "green_mask", val); ++ if ((val = gst_structure_get_value (structure, "alpha_mask"))) ++ gst_structure_set_value (s, "alpha_mask", val); ++ if ((val = gst_structure_get_value (structure, "depth"))) ++ gst_structure_set_value (s, "depth", val); ++ if ((val = gst_structure_get_value (structure, "bpp"))) ++ gst_structure_set_value (s, "bpp", val); ++ } ++ c = gst_caps_new_full (s, NULL); ++ if (!gst_video_format_parse_caps (c, &fmt, NULL, NULL)) { ++ GST_ERROR_OBJECT (videoscale, "couldn't parse %" GST_PTR_FORMAT, c); ++ } else if (!gst_video_scale_format_supported_for_method (fmt, method)) { ++ supported = FALSE; ++ } ++ GST_LOG_OBJECT (videoscale, "method %d %ssupported for format %d", ++ method, (supported) ? "" : "not ", fmt); ++ gst_caps_unref (c); ++ ++ return supported; ++} ++ + static GstCaps * + gst_video_scale_transform_caps (GstBaseTransform * trans, + GstPadDirection direction, GstCaps * caps) + { ++ GstVideoScale *videoscale = GST_VIDEO_SCALE (trans); ++ GstVideoScaleMethod method; + GstCaps *ret; + GstStructure *structure; + +@@ -441,6 +549,13 @@ gst_video_scale_transform_caps (GstBaseTransform * trans, + ret = gst_caps_copy (caps); + structure = gst_structure_copy (gst_caps_get_structure (ret, 0)); + ++ GST_OBJECT_LOCK (videoscale); ++ method = videoscale->method; ++ GST_OBJECT_UNLOCK (videoscale); ++ ++ if (!gst_video_scale_transform_supported (videoscale, method, structure)) ++ goto format_not_supported; ++ + gst_structure_set (structure, + "width", GST_TYPE_INT_RANGE, 1, G_MAXINT, + "height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL); +@@ -452,9 +567,19 @@ gst_video_scale_transform_caps (GstBaseTransform * trans, + } + gst_caps_append_structure (ret, structure); + ++done: ++ + GST_DEBUG_OBJECT (trans, "returning caps: %" GST_PTR_FORMAT, ret); + + return ret; ++ ++format_not_supported: ++ { ++ gst_structure_free (structure); ++ gst_caps_unref (ret); ++ ret = gst_caps_new_empty (); ++ goto done; ++ } + } + + static gboolean +-- +cgit v0.9.0.2-2-gbebe diff --git a/multimedia/gst0-plugins-base/patches/04-gstaudio-symbols.patch b/multimedia/gst0-plugins-base/patches/04-gstaudio-symbols.patch new file mode 100644 index 0000000000..7e2ad0f47d --- /dev/null +++ b/multimedia/gst0-plugins-base/patches/04-gstaudio-symbols.patch @@ -0,0 +1,10 @@ +--- gst-plugins-base/win32/common/libgstaudio.def.orig 2013-12-10 12:09:41.280012610 +0000 ++++ gst-plugins-base/win32/common/libgstaudio.def 2013-12-10 12:10:12.253127720 +0000 +@@ -24,6 +24,7 @@ + gst_audio_decoder_get_plc_aware + gst_audio_decoder_get_tolerance + gst_audio_decoder_get_type ++ gst_audio_decoder_merge_tags + gst_audio_decoder_set_byte_time + gst_audio_decoder_set_drainable + gst_audio_decoder_set_latency diff --git a/multimedia/gst0-plugins-base/patches/05-enum_headers.patch b/multimedia/gst0-plugins-base/patches/05-enum_headers.patch new file mode 100644 index 0000000000..1205da2417 --- /dev/null +++ b/multimedia/gst0-plugins-base/patches/05-enum_headers.patch @@ -0,0 +1,132 @@ +diff --unified --recursive --text package.orig/common/glib-gen.mak package.new/common/glib-gen.mak +--- package.orig/common/glib-gen.mak 2020-03-18 22:16:50.800759634 -0400 ++++ package.new/common/glib-gen.mak 2020-03-18 22:17:26.360479044 -0400 +@@ -5,7 +5,7 @@ + #glib_enum_define=GST_COLOR_BALANCE + #glib_enum_prefix=gst_color_balance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers=$(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + + # these are all the rules generating the relevant files + %-marshal.h: %-marshal.list +diff --unified --recursive --text package.orig/common/gst-glib-gen.mak package.new/common/gst-glib-gen.mak +--- package.orig/common/gst-glib-gen.mak 2020-03-18 22:16:50.800759634 -0400 ++++ package.new/common/gst-glib-gen.mak 2020-03-18 22:17:26.360479044 -0400 +@@ -6,7 +6,7 @@ + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers=$(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + + # these are all the rules generating the relevant files + $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list +diff --unified --recursive --text package.orig/gst/encoding/Makefile.in package.new/gst/encoding/Makefile.in +--- package.orig/gst/encoding/Makefile.in 2020-03-18 22:16:50.807426248 -0400 ++++ package.new/gst/encoding/Makefile.in 2020-03-18 22:17:26.620476983 -0400 +@@ -493,7 +493,7 @@ + BUILT_SOURCES = $(built_headers) $(built_sources) + EXTRA_DIST = gstencode-marshal.list + CLEANFILES = $(BUILT_SOURCES) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +diff --unified --recursive --text package.orig/gst/playback/Makefile.in package.new/gst/playback/Makefile.in +--- package.orig/gst/playback/Makefile.in 2020-03-18 22:16:50.804092941 -0400 ++++ package.new/gst/playback/Makefile.in 2020-03-18 22:17:26.540477618 -0400 +@@ -569,7 +569,7 @@ + BUILT_SOURCES = $(built_headers) $(built_sources) + EXTRA_DIST = gstplay-marshal.list + CLEANFILES = $(BUILT_SOURCES) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +diff --unified --recursive --text package.orig/gst/tcp/Makefile.in package.new/gst/tcp/Makefile.in +--- package.orig/gst/tcp/Makefile.in 2020-03-18 22:16:50.804092941 -0400 ++++ package.new/gst/tcp/Makefile.in 2020-03-18 22:17:26.457144945 -0400 +@@ -471,7 +471,7 @@ + glib_enum_define = GST_TCP + glib_gen_prefix = gst_tcp + glib_gen_basename = gsttcp +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + built_sources = gsttcp-enumtypes.c gsttcp-marshal.c + built_headers = gsttcp-enumtypes.h gsttcp-marshal.h + BUILT_SOURCES = $(built_sources) $(built_headers) +diff --unified --recursive --text package.orig/gst-libs/gst/app/Makefile.in package.new/gst-libs/gst/app/Makefile.in +--- package.orig/gst-libs/gst/app/Makefile.in 2020-03-18 22:16:50.817426170 -0400 ++++ package.new/gst-libs/gst/app/Makefile.in 2020-03-18 22:17:27.103806485 -0400 +@@ -473,7 +473,7 @@ + glib_enum_define = GST_APP + glib_gen_prefix = __gst_app + glib_gen_basename = gstapp +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + built_sources = gstapp-marshal.c + built_headers = gstapp-marshal.h + BUILT_SOURCES = $(built_sources) $(built_headers) +diff --unified --recursive --text package.orig/gst-libs/gst/audio/Makefile.in package.new/gst-libs/gst/audio/Makefile.in +--- package.orig/gst-libs/gst/audio/Makefile.in 2020-03-18 22:16:50.817426170 -0400 ++++ package.new/gst-libs/gst/audio/Makefile.in 2020-03-18 22:17:27.070473416 -0400 +@@ -544,7 +544,7 @@ + $(GST_BASE_LIBS) $(GST_LIBS) + + libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_MAJORMINOR@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstaudio_@GST_MAJORMINOR@include_HEADERS)) \ +diff --unified --recursive --text package.orig/gst-libs/gst/interfaces/Makefile.in package.new/gst-libs/gst/interfaces/Makefile.in +--- package.orig/gst-libs/gst/interfaces/Makefile.in 2020-03-18 22:16:50.814092862 -0400 ++++ package.new/gst-libs/gst/interfaces/Makefile.in 2020-03-18 22:17:26.897141457 -0400 +@@ -551,7 +551,7 @@ + + EXTRA_DIST = interfaces-marshal.list + CLEANFILES = $(BUILT_SOURCES) $(am__append_1) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstInterfaces-@GST_MAJORMINOR@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstinterfacesinclude_HEADERS)) \ +diff --unified --recursive --text package.orig/gst-libs/gst/pbutils/Makefile.in package.new/gst-libs/gst/pbutils/Makefile.in +--- package.orig/gst-libs/gst/pbutils/Makefile.in 2020-03-18 22:16:50.814092862 -0400 ++++ package.new/gst-libs/gst/pbutils/Makefile.in 2020-03-18 22:17:26.937141140 -0400 +@@ -542,7 +542,7 @@ + + # DISTCLEANFILES is for files generated by configure + DISTCLEANFILES = $(built_headers_configure) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstPbutils-@GST_MAJORMINOR@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) \ +diff --unified --recursive --text package.orig/gst-libs/gst/rtsp/Makefile.in package.new/gst-libs/gst/rtsp/Makefile.in +--- package.orig/gst-libs/gst/rtsp/Makefile.in 2020-03-18 22:16:50.817426170 -0400 ++++ package.new/gst-libs/gst/rtsp/Makefile.in 2020-03-18 22:17:27.113806406 -0400 +@@ -517,7 +517,7 @@ + glib_enum_define = gst_rtsp + glib_enum_headers = gstrtspdefs.h + glib_gen_basename = gstrtsp +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_MAJORMINOR@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstrtspinclude_HEADERS)) \ +diff --unified --recursive --text package.orig/gst-libs/gst/video/Makefile.in package.new/gst-libs/gst/video/Makefile.in +--- package.orig/gst-libs/gst/video/Makefile.in 2020-03-18 22:16:50.810759555 -0400 ++++ package.new/gst-libs/gst/video/Makefile.in 2020-03-18 22:17:26.847141854 -0400 +@@ -553,7 +553,7 @@ + $(GST_ALL_LDFLAGS) \ + $(GST_LT_LDFLAGS) + +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstVideo-@GST_MAJORMINOR@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstvideo_@GST_MAJORMINOR@include_HEADERS)) \ diff --git a/multimedia/gst0-plugins-base/slack-desc b/multimedia/gst0-plugins-base/slack-desc new file mode 100644 index 0000000000..54c5be6b02 --- /dev/null +++ b/multimedia/gst0-plugins-base/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------------------------------------------------------| +gst0-plugins-base: gst0-plugins-base (base set of GStreamer plugins, v0) +gst0-plugins-base: +gst0-plugins-base: GStreamer Base Plug-ins is a well-groomed and well-maintained +gst0-plugins-base: collection of GStreamer plug-ins and elements, spanning the range of +gst0-plugins-base: possible types of elements one would want to write for GStreamer. +gst0-plugins-base: It also contains helper libraries and base classes useful for +gst0-plugins-base: writing elements. A wide range of video and audio decoders, encoders, +gst0-plugins-base: and filters are included. +gst0-plugins-base: +gst0-plugins-base: +gst0-plugins-base: diff --git a/multimedia/gst0-plugins-base/x86.patch b/multimedia/gst0-plugins-base/x86.patch new file mode 100644 index 0000000000..127ca6af83 --- /dev/null +++ b/multimedia/gst0-plugins-base/x86.patch @@ -0,0 +1,35 @@ +From 9bd5a7ae5435469c3557a3d70e762791cb3dc5c7 Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot +Date: Mon, 20 Jan 2014 15:44:09 +0100 +Subject: [PATCH] audioresample: fix build on BSD + +On i386, EMMINTRIN is defined but not usable without sse so check for +__SSE__ and __SSE2__ as well. + +https://bugzilla.gnome.org/show_bug.cgi?id=670690 +--- + gst/audioresample/resample.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c +index 98d006c..481fa01 100644 +--- a/gst/audioresample/resample.c ++++ b/gst/audioresample/resample.c +@@ -77,13 +77,13 @@ + #define EXPORT G_GNUC_INTERNAL + + #ifdef _USE_SSE +-#ifndef HAVE_XMMINTRIN_H ++#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H) + #undef _USE_SSE + #endif + #endif + + #ifdef _USE_SSE2 +-#ifndef HAVE_EMMINTRIN_H ++#if !defined(__SSE2__) || !defined(HAVE_XMMINTRIN_H) + #undef _USE_SSE2 + #endif + #endif +-- +1.8.5.3 diff --git a/multimedia/gst0-plugins-good/README b/multimedia/gst0-plugins-good/README new file mode 100644 index 0000000000..c599a59421 --- /dev/null +++ b/multimedia/gst0-plugins-good/README @@ -0,0 +1,3 @@ +GStreamer Good Plug-ins is a set of plug-ins that have good quality +code, correct functionality, and a good license (LGPL for the plug-in +code, LGPL or LGPL-compatible for the supporting library). diff --git a/multimedia/gst0-plugins-good/gst0-plugins-good.SlackBuild b/multimedia/gst0-plugins-good/gst0-plugins-good.SlackBuild new file mode 100644 index 0000000000..ffa1a81d3e --- /dev/null +++ b/multimedia/gst0-plugins-good/gst0-plugins-good.SlackBuild @@ -0,0 +1,116 @@ +#!/bin/sh + +# Slackware build script for gst0-plugins-good + +# Copyright 2008 Michiel van Wessem +# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2021 Matteo Bernardini , 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=gst0-plugins-good +SRCNAM=gst-plugins-good +VERSION=${VERSION:-0.10.31} +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="ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* RELEASE REQUIREMENTS" + +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 {} \; + +# Thanks AUR for the patches +sed -i '/AC_PATH_XTRA/d' configure.ac +sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + +for i in $CWD/patches/* ; do patch -p1 < $i ; done + +NOCONFIGURE=1 ./autogen.sh +find . -name 'Makefile.in' -exec sed -i -e 's/\\#include/#include/g' {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --disable-debug \ + --disable-static \ + --build=$ARCH-slackware-linux + +#quick and dirty fix + echo "#define GST_PLUGIN_DEFINE2(a,b,c,d,e,f,g,h,i) GST_PLUGIN_DEFINE(a,b, #c ,d,e,f,g,h,i)" >> config.h + +make +make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install DESTDIR=$PKG +rm -fR $PKG/etc/gconf + +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/multimedia/gst0-plugins-good/gst0-plugins-good.info b/multimedia/gst0-plugins-good/gst0-plugins-good.info new file mode 100644 index 0000000000..3565b78242 --- /dev/null +++ b/multimedia/gst0-plugins-good/gst0-plugins-good.info @@ -0,0 +1,10 @@ +PRGNAM="gst0-plugins-good" +VERSION="0.10.31" +HOMEPAGE="https://gstreamer.freedesktop.org" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz" +MD5SUM="555845ceab722e517040bab57f9ace95" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="gst0-plugins-base" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/multimedia/gst0-plugins-good/patches/00-test-rtp-payloading.patch b/multimedia/gst0-plugins-good/patches/00-test-rtp-payloading.patch new file mode 100644 index 0000000000..e8a9431360 --- /dev/null +++ b/multimedia/gst0-plugins-good/patches/00-test-rtp-payloading.patch @@ -0,0 +1,422 @@ +From dca42d4767adff3578e5d5990604766735ec1f9b Mon Sep 17 00:00:00 2001 +From: Tim-Philipp Müller +Date: Fri, 10 Feb 2012 13:44:43 +0000 +Subject: tests: clean up rtp-payloading test a little + +Feed data into the pipeline using appsrc instead of fdsrc and +a pipe. Store unsigned byte values in guint8 instead of char. +Getting rid of the capsfilter also helps to avoid 'format is +not fully specified' warnings when pushing "video/x-h264" data +into rtph264pay with fully specified h264 caps in the sink template. +--- +diff --git a/tests/check/elements/rtp-payloading.c b/tests/check/elements/rtp-payloading.c +index b2160f4..7b4985b 100644 +--- a/tests/check/elements/rtp-payloading.c ++++ b/tests/check/elements/rtp-payloading.c +@@ -31,13 +31,11 @@ + typedef struct + { + GstElement *pipeline; +- GstElement *fdsrc; +- GstElement *capsfilter; ++ GstElement *appsrc; + GstElement *rtppay; + GstElement *rtpdepay; + GstElement *fakesink; +- int fd[2]; +- const char *frame_data; ++ const guint8 *frame_data; + int frame_data_size; + int frame_count; + } rtp_pipeline; +@@ -140,13 +138,11 @@ rtp_bus_callback (GstBus * bus, GstMessage * message, gpointer data) + * The user must free the RTP pipeline when it's not used anymore. + */ + static rtp_pipeline * +-rtp_pipeline_create (const char *frame_data, int frame_data_size, ++rtp_pipeline_create (const guint8 * frame_data, int frame_data_size, + int frame_count, const char *filtercaps, const char *pay, const char *depay) + { + gchar *pipeline_name; +- + rtp_pipeline *p; +- + GstCaps *caps; + + /* Check parameters. */ +@@ -165,60 +161,39 @@ rtp_pipeline_create (const char *frame_data, int frame_data_size, + pipeline_name = g_strdup_printf ("%s-%s-pipeline", pay, depay); + p->pipeline = gst_pipeline_new (pipeline_name); + g_free (pipeline_name); +- p->fdsrc = gst_element_factory_make ("fdsrc", NULL); +- p->capsfilter = gst_element_factory_make ("capsfilter", NULL); ++ p->appsrc = gst_element_factory_make ("appsrc", NULL); + p->rtppay = gst_element_factory_make (pay, NULL); + p->rtpdepay = gst_element_factory_make (depay, NULL); + p->fakesink = gst_element_factory_make ("fakesink", NULL); + + /* One or more elements are not created successfully or failed to create p? */ +- if (!p->pipeline || !p->fdsrc || !p->capsfilter || !p->rtppay || !p->rtpdepay +- || !p->fakesink || pipe (p->fd) == -1) { ++ if (!p->pipeline || !p->appsrc || !p->rtppay || !p->rtpdepay || !p->fakesink) { + /* Release created elements. */ + RELEASE_ELEMENT (p->pipeline); +- RELEASE_ELEMENT (p->fdsrc); +- RELEASE_ELEMENT (p->capsfilter); ++ RELEASE_ELEMENT (p->appsrc); + RELEASE_ELEMENT (p->rtppay); + RELEASE_ELEMENT (p->rtpdepay); + RELEASE_ELEMENT (p->fakesink); + +- /* Close pipe. */ +- if (p->fd[0]) { +- close (p->fd[0]); +- } +- +- if (p->fd[1]) { +- close (p->fd[1]); +- } +- + /* Release allocated memory. */ + free (p); + + return NULL; + } + +- /* Set fdsrc properties. */ +- g_object_set (p->fdsrc, "fd", p->fd[0], NULL); +- g_object_set (p->fdsrc, "do-timestamp", TRUE, NULL); +- g_object_set (p->fdsrc, "blocksize", p->frame_data_size, NULL); +- g_object_set (p->fdsrc, "num-buffers", p->frame_count * LOOP_COUNT, NULL); +- +- /* Set caps filters. */ ++ /* Set src properties. */ + caps = gst_caps_from_string (filtercaps); +- +- g_object_set (p->capsfilter, "caps", caps, NULL); ++ g_object_set (p->appsrc, "do-timestamp", TRUE, "caps", caps, NULL); + gst_caps_unref (caps); + + /* Add elements to the pipeline. */ +- gst_bin_add (GST_BIN (p->pipeline), p->fdsrc); +- gst_bin_add (GST_BIN (p->pipeline), p->capsfilter); ++ gst_bin_add (GST_BIN (p->pipeline), p->appsrc); + gst_bin_add (GST_BIN (p->pipeline), p->rtppay); + gst_bin_add (GST_BIN (p->pipeline), p->rtpdepay); + gst_bin_add (GST_BIN (p->pipeline), p->fakesink); + + /* Link elements. */ +- gst_element_link (p->fdsrc, p->capsfilter); +- gst_element_link (p->capsfilter, p->rtppay); ++ gst_element_link (p->appsrc, p->rtppay); + gst_element_link (p->rtppay, p->rtpdepay); + gst_element_link (p->rtpdepay, p->fakesink); + +@@ -240,15 +215,6 @@ rtp_pipeline_destroy (rtp_pipeline * p) + /* Release pipeline. */ + RELEASE_ELEMENT (p->pipeline); + +- /* Close pipe. */ +- if (p->fd[0]) { +- close (p->fd[0]); +- } +- +- if (p->fd[1]) { +- close (p->fd[1]); +- } +- + /* Release allocated memory. */ + free (p); + } +@@ -260,11 +226,10 @@ rtp_pipeline_destroy (rtp_pipeline * p) + static void + rtp_pipeline_run (rtp_pipeline * p) + { ++ GstFlowReturn flow_ret; + GMainLoop *mainloop = NULL; +- + GstBus *bus; +- +- gint i; ++ gint i, j; + + /* Check parameters. */ + if (p == NULL) { +@@ -286,22 +251,28 @@ rtp_pipeline_run (rtp_pipeline * p) + /* Set pipeline to PLAYING. */ + gst_element_set_state (p->pipeline, GST_STATE_PLAYING); + +- /* TODO: Writing may need some changes... */ +- ++ /* Push data into the pipeline */ + for (i = 0; i < LOOP_COUNT; i++) { +- const char *frame_data_pointer = p->frame_data; +- int res; +- int frame_count = p->frame_count; +- +- /* Write in to the pipe. */ +- while (frame_count > 0) { +- res = write (p->fd[1], frame_data_pointer, p->frame_data_size); +- fail_unless_equals_int (res, p->frame_data_size); +- frame_data_pointer += p->frame_data_size; +- frame_count--; ++ const guint8 *data = p->frame_data; ++ ++ for (j = 0; j < p->frame_count; j++) { ++ GstBuffer *buf; ++ ++ buf = gst_buffer_new (); ++ GST_BUFFER_DATA (buf) = (guint8 *) data; ++ GST_BUFFER_SIZE (buf) = p->frame_data_size; ++ GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_READONLY); ++ ++ g_signal_emit_by_name (p->appsrc, "push-buffer", buf, &flow_ret); ++ fail_unless_equals_int (flow_ret, GST_FLOW_OK); ++ data += p->frame_data_size; ++ ++ gst_buffer_unref (buf); + } + } + ++ g_signal_emit_by_name (p->appsrc, "end-of-stream", &flow_ret); ++ + /* Run mainloop. */ + g_main_loop_run (mainloop); + +@@ -350,8 +321,8 @@ rtp_pipeline_enable_lists (rtp_pipeline * p, guint mtu_size) + * @use_lists enable buffer lists + */ + static void +-rtp_pipeline_test (const char *frame_data, int frame_data_size, int frame_count, +- const char *filtercaps, const char *pay, const char *depay, ++rtp_pipeline_test (const guint8 * frame_data, int frame_data_size, ++ int frame_count, const char *filtercaps, const char *pay, const char *depay, + guint bytes_sent, guint mtu_size, gboolean use_lists) + { + /* Create RTP pipeline. */ +@@ -380,7 +351,7 @@ rtp_pipeline_test (const char *frame_data, int frame_data_size, int frame_count, + } + } + +-static char rtp_ilbc_frame_data[] = ++static const guint8 rtp_ilbc_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -397,7 +368,7 @@ GST_START_TEST (rtp_ilbc) + } + + GST_END_TEST; +-static char rtp_gsm_frame_data[] = ++static const guint8 rtp_gsm_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -414,7 +385,7 @@ GST_START_TEST (rtp_gsm) + } + + GST_END_TEST; +-static char rtp_amr_frame_data[] = ++static const guint8 rtp_amr_frame_data[] = + { 0x3c, 0x24, 0x03, 0xb3, 0x48, 0x10, 0x68, 0x46, 0x6c, 0xec, 0x03, + 0x7a, 0x37, 0x16, 0x41, 0x41, 0xc0, 0x00, 0x0d, 0xcd, 0x12, 0xed, + 0xad, 0x80, 0x00, 0x00, 0x11, 0x31, 0x00, 0x00, 0x0d, 0xa0 +@@ -432,7 +403,7 @@ GST_START_TEST (rtp_amr) + } + + GST_END_TEST; +-static char rtp_pcma_frame_data[] = ++static const guint8 rtp_pcma_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -449,7 +420,7 @@ GST_START_TEST (rtp_pcma) + } + + GST_END_TEST; +-static char rtp_pcmu_frame_data[] = ++static const guint8 rtp_pcmu_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -466,7 +437,7 @@ GST_START_TEST (rtp_pcmu) + } + + GST_END_TEST; +-static char rtp_mpa_frame_data[] = ++static const guint8 rtp_mpa_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -483,7 +454,7 @@ GST_START_TEST (rtp_mpa) + } + + GST_END_TEST; +-static char rtp_h263_frame_data[] = ++static const guint8 rtp_h263_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -495,12 +466,12 @@ static int rtp_h263_frame_count = 1; + GST_START_TEST (rtp_h263) + { + rtp_pipeline_test (rtp_h263_frame_data, rtp_h263_frame_data_size, +- rtp_h263_frame_count, "video/x-h263,variant=itu,h263version=h263", ++ rtp_h263_frame_count, "video/x-h263,variant=(string)itu,h263version=h263", + "rtph263pay", "rtph263depay", 0, 0, FALSE); + } + + GST_END_TEST; +-static char rtp_h263p_frame_data[] = ++static const guint8 rtp_h263p_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -512,12 +483,12 @@ static int rtp_h263p_frame_count = 1; + GST_START_TEST (rtp_h263p) + { + rtp_pipeline_test (rtp_h263p_frame_data, rtp_h263p_frame_data_size, +- rtp_h263p_frame_count, "video/x-h263,variant=itu", "rtph263ppay", ++ rtp_h263p_frame_count, "video/x-h263,variant=(string)itu", "rtph263ppay", + "rtph263pdepay", 0, 0, FALSE); + } + + GST_END_TEST; +-static char rtp_h264_frame_data[] = ++static const guint8 rtp_h264_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -528,13 +499,14 @@ static int rtp_h264_frame_count = 1; + + GST_START_TEST (rtp_h264) + { ++ /* FIXME 0.11: fully specify h264 caps (and make payloader check) */ + rtp_pipeline_test (rtp_h264_frame_data, rtp_h264_frame_data_size, + rtp_h264_frame_count, "video/x-h264", "rtph264pay", "rtph264depay", + 0, 0, FALSE); + } + + GST_END_TEST; +-static char rtp_h264_list_lt_mtu_frame_data[] = ++static const guint8 rtp_h264_list_lt_mtu_frame_data[] = + /* not packetized, next NAL starts with 0001 */ + { 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, +@@ -552,6 +524,7 @@ static int rtp_h264_list_lt_mtu_mtu_size = 1024; + + GST_START_TEST (rtp_h264_list_lt_mtu) + { ++ /* FIXME 0.11: fully specify h264 caps (and make payloader check) */ + rtp_pipeline_test (rtp_h264_list_lt_mtu_frame_data, + rtp_h264_list_lt_mtu_frame_data_size, rtp_h264_list_lt_mtu_frame_count, + "video/x-h264", "rtph264pay", "rtph264depay", +@@ -559,7 +532,7 @@ GST_START_TEST (rtp_h264_list_lt_mtu) + } + + GST_END_TEST; +-static char rtp_h264_list_gt_mtu_frame_data[] = ++static const guint8 rtp_h264_list_gt_mtu_frame_data[] = + /* not packetized, next NAL starts with 0001 */ + { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +@@ -580,6 +553,7 @@ static int rtp_h264_list_gt_mtu_mty_size = 28; + + GST_START_TEST (rtp_h264_list_gt_mtu) + { ++ /* FIXME 0.11: fully specify h264 caps (and make payloader check) */ + rtp_pipeline_test (rtp_h264_list_gt_mtu_frame_data, + rtp_h264_list_gt_mtu_frame_data_size, rtp_h264_list_gt_mtu_frame_count, + "video/x-h264", "rtph264pay", "rtph264depay", +@@ -587,7 +561,7 @@ GST_START_TEST (rtp_h264_list_gt_mtu) + } + + GST_END_TEST; +-static char rtp_L16_frame_data[] = ++static const guint8 rtp_L16_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -605,7 +579,7 @@ GST_START_TEST (rtp_L16) + } + + GST_END_TEST; +-static char rtp_mp2t_frame_data[] = ++static const guint8 rtp_mp2t_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -622,7 +596,7 @@ GST_START_TEST (rtp_mp2t) + } + + GST_END_TEST; +-static char rtp_mp4v_frame_data[] = ++static const guint8 rtp_mp4v_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -639,7 +613,7 @@ GST_START_TEST (rtp_mp4v) + } + + GST_END_TEST; +-static char rtp_mp4v_list_frame_data[] = ++static const guint8 rtp_mp4v_list_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -659,7 +633,7 @@ GST_START_TEST (rtp_mp4v_list) + } + + GST_END_TEST; +-static char rtp_mp4g_frame_data[] = ++static const guint8 rtp_mp4g_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -677,7 +651,7 @@ GST_START_TEST (rtp_mp4g) + } + + GST_END_TEST; +-static char rtp_theora_frame_data[] = ++static const guint8 rtp_theora_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -694,7 +668,7 @@ GST_START_TEST (rtp_theora) + } + + GST_END_TEST; +-static char rtp_vorbis_frame_data[] = ++static const guint8 rtp_vorbis_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -711,7 +685,7 @@ GST_START_TEST (rtp_vorbis) + } + + GST_END_TEST; +-static char rtp_jpeg_frame_data[] = ++static const guint8 rtp_jpeg_frame_data[] = + { /* SOF */ 0xFF, 0xC0, 0x00, 0x11, 0x08, 0x00, 0x08, 0x00, 0x08, + 0x03, 0x00, 0x21, 0x08, 0x01, 0x11, 0x08, 0x02, 0x11, 0x08, + /* DQT */ 0xFF, 0xDB, 0x00, 0x43, 0x08, +@@ -738,7 +712,7 @@ GST_START_TEST (rtp_jpeg) + } + + GST_END_TEST; +-static char rtp_jpeg_list_frame_data[] = ++static const guint8 rtp_jpeg_list_frame_data[] = + { /* SOF */ 0xFF, 0xC0, 0x00, 0x11, 0x08, 0x00, 0x08, 0x00, 0x08, + 0x03, 0x00, 0x21, 0x08, 0x01, 0x11, 0x08, 0x02, 0x11, 0x08, + /* DQT */ 0xFF, 0xDB, 0x00, 0x43, 0x08, +@@ -767,7 +741,7 @@ GST_START_TEST (rtp_jpeg_list) + } + + GST_END_TEST; +-static char rtp_g729_frame_data[] = ++static const guint8 rtp_g729_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +-- +cgit v0.9.0.2-2-gbebe diff --git a/multimedia/gst0-plugins-good/patches/01-souptest.patch b/multimedia/gst0-plugins-good/patches/01-souptest.patch new file mode 100644 index 0000000000..a025eb6b98 --- /dev/null +++ b/multimedia/gst0-plugins-good/patches/01-souptest.patch @@ -0,0 +1,28 @@ +From 5765db50a19498e3d1576b4279cb2ca984da9dcd Mon Sep 17 00:00:00 2001 +From: Edward Hervey +Date: Tue, 23 Sep 2014 09:47:31 +0200 +Subject: check/soup: Temporarily disable G_ENABLE_DIAGNOSTIC + +The SOUP_SERVER_PORT property has been deprecated in recent libsoup +versions. + +diff --git a/tests/check/elements/souphttpsrc.c b/tests/check/elements/souphttpsrc.c +index 33431ac..dfb682b 100644 +--- a/tests/check/elements/souphttpsrc.c ++++ b/tests/check/elements/souphttpsrc.c +@@ -602,7 +602,12 @@ run_server (guint * http_port, guint * https_port) + + *http_port = *https_port = 0; + ++ /* The G_ENABLE_DIAGNOSTIC is temporarily overriden to avoid ++ * property deprecation warnings (for the SOUP_SERVER_PORT ++ * property) */ ++ g_setenv ("G_ENABLE_DIAGNOSTIC", "0", TRUE); + server = soup_server_new (SOUP_SERVER_PORT, port, NULL); ++ g_setenv ("G_ENABLE_DIAGNOSTIC", "1", TRUE); + if (!server) { + GST_DEBUG ("Unable to bind to server port %u", port); + return FALSE; +-- +cgit v0.10.2 + diff --git a/multimedia/gst0-plugins-good/patches/02-v4l.compile.fixes.diff b/multimedia/gst0-plugins-good/patches/02-v4l.compile.fixes.diff new file mode 100644 index 0000000000..e03fdac894 --- /dev/null +++ b/multimedia/gst0-plugins-good/patches/02-v4l.compile.fixes.diff @@ -0,0 +1,57 @@ +From fa21c0bb253213c9dc48ce72faaf7090dc8a3554 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 2 May 2013 16:16:46 -0400 +Subject: [PATCH] sys/v4l2: Some blind compilation fixes + +--- + sys/v4l2/gstv4l2bufferpool.c | 1 - + sys/v4l2/v4l2_calls.c | 12 ++++-------- + 2 files changed, 4 insertions(+), 9 deletions(-) + +diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c +index a0b4c84..3916815 100644 +--- a/sys/v4l2/gstv4l2bufferpool.c ++++ b/sys/v4l2/gstv4l2bufferpool.c +@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps) + GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", + ret->vbuffer.m.offset); + GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); +- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); + + ret->mmap_length = ret->vbuffer.length; + data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, +diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c +index 309bfb6..ee3ff9f 100644 +--- a/sys/v4l2/v4l2_calls.c ++++ b/sys/v4l2/v4l2_calls.c +@@ -53,14 +53,6 @@ + + #include "gst/gst-i18n-plugin.h" + +-/* Those are ioctl calls */ +-#ifndef V4L2_CID_HCENTER +-#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED +-#endif +-#ifndef V4L2_CID_VCENTER +-#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED +-#endif +- + GST_DEBUG_CATEGORY_EXTERN (v4l2_debug); + #define GST_CAT_DEFAULT v4l2_debug + +@@ -294,8 +286,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) + break; + case V4L2_CID_HFLIP: + case V4L2_CID_VFLIP: ++#ifdef V4L2_CID_HCENTER + case V4L2_CID_HCENTER: ++#endif ++#ifdef V4L2_CID_VCENTER + case V4L2_CID_VCENTER: ++#endif + #ifdef V4L2_CID_PAN_RESET + case V4L2_CID_PAN_RESET: + #endif +-- +1.7.1 + diff --git a/multimedia/gst0-plugins-good/slack-desc b/multimedia/gst0-plugins-good/slack-desc new file mode 100644 index 0000000000..51d5272810 --- /dev/null +++ b/multimedia/gst0-plugins-good/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 good 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------------------------------------------------------| +gst0-plugins-good: gst0-plugins-good (good set of GStreamer plugins, v0) +gst0-plugins-good: +gst0-plugins-good: GStreamer Good Plug-ins is a set of plug-ins that have good quality +gst0-plugins-good: code, correct functionality, and a good license (LGPL for the plug-in +gst0-plugins-good: code, LGPL or LGPL-compatible for the supporting library). +gst0-plugins-good: +gst0-plugins-good: +gst0-plugins-good: +gst0-plugins-good: +gst0-plugins-good: +gst0-plugins-good: diff --git a/multimedia/gstreamer0/gstreamer-0.10.36-bison3.patch b/multimedia/gstreamer0/gstreamer-0.10.36-bison3.patch new file mode 100644 index 0000000000..f569b1d85c --- /dev/null +++ b/multimedia/gstreamer0/gstreamer-0.10.36-bison3.patch @@ -0,0 +1,31 @@ +From 60516f4798894f958fc53b470e1283318d0f8706 Mon Sep 17 00:00:00 2001 +From: Kerrick Staley +Date: Wed, 21 Aug 2013 06:59:29 +0000 +Subject: parse: make grammar.y work with Bison 3 + +YYLEX_PARAM is no longer supported in Bison 3. + +https://bugzilla.gnome.org/show_bug.cgi?id=706462 +--- +diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y +index 24fc87b..7f9dd16 100644 +--- a/gst/parse/grammar.y ++++ b/gst/parse/grammar.y +@@ -26,7 +26,6 @@ + */ + + #define YYERROR_VERBOSE 1 +-#define YYLEX_PARAM scanner + + #define YYENABLE_NLS 0 + +@@ -648,6 +647,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s); + %right '.' + %left '!' '=' + ++%lex-param { void *scanner } + %parse-param { void *scanner } + %parse-param { graph_t *graph } + %pure-parser +-- +cgit v0.9.0.2-2-gbebe diff --git a/multimedia/gstreamer0/gstreamer0.SlackBuild b/multimedia/gstreamer0/gstreamer0.SlackBuild new file mode 100644 index 0000000000..b598b2b733 --- /dev/null +++ b/multimedia/gstreamer0/gstreamer0.SlackBuild @@ -0,0 +1,113 @@ +#!/bin/sh + +# Slackware build script for gstreamer0 + +# Copyright 2008 Robby Workman, Northport, Alabama, USA +# Copyright 2008 Michiel van Wessem +# Copyright 2008, 2009, 2010, 2013, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2021 Matteo Bernardini , 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=gstreamer0 +SRCNAM=gstreamer +VERSION=${VERSION:-0.10.36} +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 MAINTAINERS NEWS README* RELEASE TODO" + +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 {} \; + +patch -p1 < $CWD/gstreamer-0.10.36-bison3.patch || exit 1 + +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 \ + --disable-debug \ + --disable-gst-debug \ + --enable-glib-asserts=no \ + --with-package-name='gstreamer' \ + --with-package-origin='http://gstreamer.freedesktop.org' \ + --build=$ARCH-slackware-linux || exit 1 + +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 + +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/gstreamer0/gstreamer0.info b/multimedia/gstreamer0/gstreamer0.info new file mode 100644 index 0000000000..4fb19812ae --- /dev/null +++ b/multimedia/gstreamer0/gstreamer0.info @@ -0,0 +1,10 @@ +PRGNAM="gstreamer0" +VERSION="0.10.36" +HOMEPAGE="https://gstreamer.freedesktop.org" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.36.tar.xz" +MD5SUM="15389c73e091b1dda915279c388b9cb2" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/multimedia/gstreamer0/slack-desc b/multimedia/gstreamer0/slack-desc new file mode 100644 index 0000000000..31bcf2128f --- /dev/null +++ b/multimedia/gstreamer0/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------------------------------------------------------| +gstreamer0: gstreamer0 (streaming multimedia framework, v0) +gstreamer0: +gstreamer0: GStreamer is a library that allows the construction of graphs of a +gstreamer0: media-handling components, ranging from simple Ogg/Vorbis playback +gstreamer0: to complex audio (mixing) and video (non-linear editing) processing. +gstreamer0: Applications can take advantage of advances in codec and filter +gstreamer0: technology transparently. Developers can add new codecs and filters +gstreamer0: by writing a simple plugin with a clean, generic interface. +gstreamer0: +gstreamer0: GStreamer is released under the LGPL. +gstreamer0: diff --git a/multimedia/gtkpod/gtkpod.SlackBuild b/multimedia/gtkpod/gtkpod.SlackBuild index 5b0d2dc3c4..8f6d03c72d 100644 --- a/multimedia/gtkpod/gtkpod.SlackBuild +++ b/multimedia/gtkpod/gtkpod.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 -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/multimedia/kdenlive/README b/multimedia/kdenlive/README deleted file mode 100644 index 067bb89104..0000000000 --- a/multimedia/kdenlive/README +++ /dev/null @@ -1,18 +0,0 @@ -kdenlive (KDE Non Linear Video Editor) - -Kdenlive is an intuitive and powerful non-linear multi-track video -editor which supports DV, AVCHD and HDV editing, using many of the latest -video technologies. - -Currently under development and using the MLT video framework, -Kdenlive provides dual video monitors, a multi-track timeline and clip -list. Features include customizable layout support, basic effects and -transitions, in-program access to online resources from Freesound, -Archive.org, and Open Clip Art. Kdenlive also features integrated basic -DVD authoring capability. - -If you do not have the KDE desktop installed, you will need at least: -kdelibs, kdebase - -NOTE: -This requires recordmydesktop from Slackware's extra directory. diff --git a/multimedia/kdenlive/doinst.sh b/multimedia/kdenlive/doinst.sh deleted file mode 100644 index 6c9ac6b5e3..0000000000 --- a/multimedia/kdenlive/doinst.sh +++ /dev/null @@ -1,19 +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 - -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/multimedia/kdenlive/kdenlive.SlackBuild b/multimedia/kdenlive/kdenlive.SlackBuild deleted file mode 100644 index 9304f04db7..0000000000 --- a/multimedia/kdenlive/kdenlive.SlackBuild +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/sh - -# Slackware build script for kdenlive - -# Copyright 2014 Tak Ooishi, Alberta, Canada -# Original SBo script by stormtracknole 8/5/2009 -# 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. - -# CHANGELOG -# --------- -# 2014 MAY 22 -# SBo maintainer change: Tak Ooishi -# * Add license to build script as per SBo requirement -# * Updated to version 0.9.8 released on 2014 MAY 14 -# * Upstream tarball filename format changed again -# * Workaround for CMakeList.txt error at build time -# * Updated slack-desc and README -# * INSTALL no longer in upstream tarball -# * Add ChangeLog to installed documentation -# * Minor changes for consistency with SBo cmake-template -# +---------------------------------------+ -# stormtracknole stormtracknole@gmail.com -# 8/5/2009 -# +---------------------------------------+ -# May 16, 2011 -# *Upgraded to version 0.8. -# *qjson added as a new dependency. -# +---------------------------------------+ -# Dec 14, 2011 -# *Upgraded to version 0.8.2 -# +---------------------------------------+ -# Jul 2, 2012 -# *Upgraded to version 0.9.2 -# *Hosting location of the src file -# changed. -# *Upstream is now tarring files as -# bz2 instead of gz. -# +---------------------------------------+ - -PRGNAM=kdenlive -VERSION=${VERSION:-0.9.10} -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 {} \; - -mkdir build -cd build -cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_VERBOSE_MAKEFILE=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 AUTHORS COPYING README 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 -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/multimedia/kdenlive/kdenlive.info b/multimedia/kdenlive/kdenlive.info deleted file mode 100644 index f95ca6275f..0000000000 --- a/multimedia/kdenlive/kdenlive.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kdenlive" -VERSION="0.9.10" -HOMEPAGE="http://www.kdenlive.org/" -DOWNLOAD="http://download.kde.org/stable/kdenlive/0.9.10/src/kdenlive-0.9.10.tar.bz2" -MD5SUM="40d7ee8e388cb084f5eb1ad1596a14b2" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="amrnb dvdauthor dvgrab faac faad2 gsm lame mlt schroedinger x264 xvidcore" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" diff --git a/multimedia/kdenlive/slack-desc b/multimedia/kdenlive/slack-desc deleted file mode 100644 index 37f69e544e..0000000000 --- a/multimedia/kdenlive/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------------------------------------------------------| -kdenlive: kdenlive (KDE Non Linear Video Editor) -kdenlive: -kdenlive: Using the MLT video framework. It is currently under development -kdenlive: Kdenlive provides dual video monitors, a multi-track timeline and -kdenlive: clip list. Other features include customizable layout support, basic -kdenlive: effects and transition, direct import from online resources such as -kdenlive: Freesound, Archive.org, and Open Clip Art. Integrated DVD authoring. -kdenlive: -kdenlive: http://kdenlive.sourceforge.net -kdenlive: -kdenlive: diff --git a/multimedia/lives/lives.SlackBuild b/multimedia/lives/lives.SlackBuild index c224ef53ef..9fdb34b79b 100644 --- a/multimedia/lives/lives.SlackBuild +++ b/multimedia/lives/lives.SlackBuild @@ -28,7 +28,7 @@ PRGNAM=lives SRCNAM=LiVES -VERSION=${VERSION:-3.0.2} +VERSION=${VERSION:-3.2.0} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} @@ -89,7 +89,7 @@ if [ pkg-config --exists opencv ]; then automake fi -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon -I/usr/include/tirpc -Wl,-ltirpc" \ CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ diff --git a/multimedia/lives/lives.info b/multimedia/lives/lives.info index 75cf5bdf82..027b93b218 100644 --- a/multimedia/lives/lives.info +++ b/multimedia/lives/lives.info @@ -1,8 +1,8 @@ PRGNAM="lives" -VERSION="3.0.2" +VERSION="3.2.0" HOMEPAGE="http://lives-video.com/" -DOWNLOAD="http://lives-video.com/releases/LiVES-3.0.2.tar.bz2" -MD5SUM="70197ae4af2b34ee24a6a66bf1026aff" +DOWNLOAD="http://lives-video.com/releases/LiVES-3.2.0.tar.bz2" +MD5SUM="5d7bd0ad41d3189b62c002e518fb94c8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jack" diff --git a/multimedia/minidlna/minidlna.SlackBuild b/multimedia/minidlna/minidlna.SlackBuild index a1e2d4b26a..fe1e323072 100644 --- a/multimedia/minidlna/minidlna.SlackBuild +++ b/multimedia/minidlna/minidlna.SlackBuild @@ -24,13 +24,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=minidlna -VERSION=${VERSION:-1.1.5} +VERSION=${VERSION:-1.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 @@ -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" @@ -70,9 +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 {} \; -./autogen.sh - -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/multimedia/minidlna/minidlna.info b/multimedia/minidlna/minidlna.info index 1dad012127..78915d092a 100644 --- a/multimedia/minidlna/minidlna.info +++ b/multimedia/minidlna/minidlna.info @@ -1,8 +1,8 @@ PRGNAM="minidlna" -VERSION="1.1.5" +VERSION="1.3.0" HOMEPAGE="http://minidlna.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/minidlna/minidlna-1.1.5.tar.gz" -MD5SUM="1970e553a1eb8a3e7e302e2ce292cbc4" +DOWNLOAD="http://downloads.sourceforge.net/minidlna/minidlna-1.3.0.tar.gz" +MD5SUM="89e92d1938ee3066631d4ca9fbf31507" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ffmpeg" diff --git a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild index 173fe0b26d..276544b8c6 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:-55.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/multimedia/mkvtoolnix/mkvtoolnix.info b/multimedia/mkvtoolnix/mkvtoolnix.info index 7dfe9e7827..5eeb9eac06 100644 --- a/multimedia/mkvtoolnix/mkvtoolnix.info +++ b/multimedia/mkvtoolnix/mkvtoolnix.info @@ -1,8 +1,8 @@ PRGNAM="mkvtoolnix" -VERSION="34.0.0" +VERSION="55.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-55.0.0.tar.xz" +MD5SUM="b5ebe20453aabef3c5912815d64c2160" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cmark" diff --git a/multimedia/mlt/README b/multimedia/mlt/README deleted file mode 100644 index 5177fadcb4..0000000000 --- a/multimedia/mlt/README +++ /dev/null @@ -1,11 +0,0 @@ -MLT is an open source multimedia framework, designed and developed for -television broadcasting. It provides a toolkit for broadcasters, video -editors, media players, transcoders, web streamers and many more types -of applications. The functionality of the system is provided via an -assortment of ready to use tools, XML authoring components, and an -extensible plug-in based API. - -Optional dependencies are qt5, ladspa_sdk, frei0r, swfdec and jack-rack. - -The build script autodetect language interpreters on your system -and build the relative bindings. diff --git a/multimedia/mlt/doinst.sh b/multimedia/mlt/doinst.sh deleted file mode 100644 index a069af7fb1..0000000000 --- a/multimedia/mlt/doinst.sh +++ /dev/null @@ -1,20 +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... -} - -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 diff --git a/multimedia/mlt/mlt.SlackBuild b/multimedia/mlt/mlt.SlackBuild deleted file mode 100644 index f2f9273682..0000000000 --- a/multimedia/mlt/mlt.SlackBuild +++ /dev/null @@ -1,217 +0,0 @@ -#!/bin/sh - -# Slackware build script for mlt. - -# Written by stormtracknole - stormtracknole@gmail.com -# Modified by Erik Hanson (erik@slackbuilds.org) with -# help from Jonathan Larsen (agentc0re@learnix.net) -# Maintatiner: Edward W. Koenig -# -# Feb 16, 2010 - Modified the script and defined the $PYTHON variable -# outside of the if statement because it was causing issues with -# the other if statement that also relies on it's answer. -# - Fixed the second PYTHON if statement that finds the site package -# directory. Added parentheses around the part that cd's into the -# python swig src to copy the files to the site packages so that it -# would interfere with the CWD before it -# -# +---------------------------------------+ -# Mar 3rd, 2010 -# *Version upgrade to 0.5.2 -# *fixed the "strip" for bash 4 -# compatability -# +---------------------------------------+ -# Sept 12, 2010 -# *Version upgrade to 0.5.6 -# *Bug fixes and enhancements added -# +---------------------------------------+ -# May 16, 2011 -# *Version upgrade to 0.7.2 -# +---------------------------------------+ -# Dec 14, 2011 -# *Version upgrade to 0.7.6 -# *Bug fixes -# +---------------------------------------+ -# Jul 2, 2012 -# *Version upgrade to 0.8.0 -# *Bug fixes -# +---------------------------------------+ -# Apr 2, 2013 -# *Version upgrade to 0.8.8 -# *Added frei0r as a dependency -# +---------------------------------------+ -# Jun 9, 2015 -# *Version upgrade to 0.9.6 -# *Fixed lua portion of the code -# thanks to John Vogel. -# +---------------------------------------+ -# 20-MAR-2016 new maintainer, version update to 6.0.0 -# 11-OCT-2016 version update -# 22-OCT-2016 add qt5 support, bug fixes/addenda (Larry Hajali) -# 29-JAN-2017 version update -# 16-APR-2017 Compiling with vdpau is no longer supported ffmpeg-3.x -# 08-AUG-2018 version update, remove qt5 patch -# 16-APR-2019 version update -# 14-JUL-2019 version update - -PRGNAM=mlt -VERSION=${VERSION:-6.16.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} - -# 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 -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 -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 - -# Use qt5 if present, otherwise system default -if pkg-config --exists Qt5 ; then - qt="--qt-libdir=$(pkg-config Qt5 --variable=libdir) - --qt-includedir=$(pkg-config Qt5 --variable=headerdir)" -else - qt="--qt-libdir=$(pkg-config Qt --variable=libdir) - --qt-includedir=$(pkg-config Qt --variable=headerdir)" -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" \ -./configure \ - --disable-debug \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-gpl \ - --enable-gpl3 \ - --luma-compress \ - --enable-motion-est \ - $qt \ - --swig-languages="$java $lua $perl $php $python $ruby $tcl $csharp" \ - --build=$ARCH-slackware-linux - -# qt5 fixup thanks to AlienBOB! -sed -i -e 's/CXXFLAGS :=/CXXFLAGS := --std=c++11/' src/modules/qt/Makefile - -make clean -CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make -make install DESTDIR=$PKG - -# Install built bindings -if [ "$lua" ]; then - ( cd $TMP/$PRGNAM-$VERSION/src/swig/lua - install -D -m 0755 mlt.so $PKG/$(pkg-config --variable INSTALL_CMOD lua)/mlt.so - install -D -m 0644 play.lua $PKG/usr/doc/$PRGNAM-$VERSION/play.lua - ) -fi -if [ "$perl" ]; then - ( cd $TMP/$PRGNAM-$VERSION/src/swig/perl - install -D -m 0644 mlt.pm $PKG/usr/share/perl5/mlt.pm - install -D -m 0755 play.pl $PKG/usr/share/perl5/play.pl - install -D -m 0755 blib/arch/auto/mlt/mlt.so \ - $PKG/usr/lib$LIBDIRSUFFIX/perl5/auto/mlt/mlt.so - install -D -m 0644 mlt.bs \ - $PKG/usr/lib$LIBDIRSUFFIX/perl5/auto/mlt/mlt.bs - ) -fi -if [ "$php" ]; then - ( cd $TMP/$PRGNAM-$VERSION/src/swig/php - install -D -m 0755 mlt.so $PKG/usr/lib$LIBDIRSUFFIX/php/extensions/mlt.so - install -D -m 0644 play.php $PKG/usr/doc/$PRGNAM-$VERSION/play.php - mkdir -p $PKG/etc/php.d - cat > $PKG/etc/php.d/$PRGNAM.ini.new << EOF -; Enable mlt extension module -; extension=$PRGNAM.so -EOF - ) -fi -if [ "$python" ]; then - PYTHONSITEPKG=$(python -c "import sys, os; print os.path.join('/usr/lib${LIBDIRSUFFIX}', 'python%s' % sys.version[:3], 'site-packages')") - ( cd $TMP/$PRGNAM-$VERSION/src/swig/python - install -D -m 0755 _mlt.so $PKG/$PYTHONSITEPKG/_mlt.so - install -D -m 0755 mlt.py $PKG/$PYTHONSITEPKG/mlt.py - install -D -m 0755 play.py $PKG/usr/doc/$PRGNAM-$VERSION/play.py - ) -fi -if [ "$ruby" ]; then - ( cd $TMP/$PRGNAM-$VERSION/src/swig/ruby - install -D -m 0755 mlt.so \ - $PKG$(ruby -e 'print RbConfig::CONFIG["sitearchdir"]')/mlt.so - install -D -m 0755 play.rb $PKG/usr/doc/$PRGNAM-$VERSION/play.rb - install -D -m 0755 thumbs.rb $PKG/usr/doc/$PRGNAM-$VERSION/thumbs.rb - ) -fi -if [ "$tcl" ]; then - ( cd $TMP/$PRGNAM-$VERSION/src/swig/tcl - . /usr/lib$LIBDIRSUFFIX/tclConfig.sh - install -D -m 0755 mlt.so \ - $PKG/usr/lib$LIBDIRSUFFIX/tcl$TCL_MAJOR_VERSION/$TCL_VERSION/mlt.so - install -D -m 0755 play.tcl $PKG/usr/doc/$PRGNAM-$VERSION/play.tcl - ) -fi - -# todo: java, csharp - -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 NEWS COPYING README GPL $PKG/usr/doc/$PRGNAM-$VERSION -cat src/modules/motion_est/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.motion_est -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 - -if [ "$php" ]; then - echo "config etc/php.d/$PRGNAM.ini.new" >> $PKG/install/doinst.sh -fi - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/multimedia/mlt/mlt.info b/multimedia/mlt/mlt.info deleted file mode 100644 index becf041057..0000000000 --- a/multimedia/mlt/mlt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mlt" -VERSION="6.16.0" -HOMEPAGE="https://mltframework.org/" -DOWNLOAD="https://downloads.sourceforge.net/mlt/mlt-6.16.0.tar.gz" -MD5SUM="e3872267232aae89f5182fd567be2596" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="ffmpeg libdv libquicktime" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" diff --git a/multimedia/mlt/slack-desc b/multimedia/mlt/slack-desc deleted file mode 100644 index 4ddf41c733..0000000000 --- a/multimedia/mlt/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------------------------------------------------------| -mlt: mlt (Open source multimedia framework) -mlt: -mlt: MLT is an open source multimedia framework, designed and developed -mlt: for television broadcasting. It provides a toolkit for broadcasters, -mlt: video editors, media players, transcoders, web streamers and many -mlt: more types of applications. The functionality of the system is -mlt: provided via an assortment of ready to use tools, XML authoring -mlt: components, and an extensible plug-in based API. -mlt: -mlt: Homepage: https://mltframework.org/ -mlt: 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 -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 -Signed-off-by: James Zern ---- - 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/obs-studio/obs-studio.SlackBuild b/multimedia/obs-studio/obs-studio.SlackBuild index 6e7f3d75ec..01784c0c87 100644 --- a/multimedia/obs-studio/obs-studio.SlackBuild +++ b/multimedia/obs-studio/obs-studio.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=obs-studio -VERSION=${VERSION:-24.0.6} +VERSION=${VERSION:-26.0.2} 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 xf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/multimedia/obs-studio/obs-studio.info b/multimedia/obs-studio/obs-studio.info index b20d69789b..944e17b577 100644 --- a/multimedia/obs-studio/obs-studio.info +++ b/multimedia/obs-studio/obs-studio.info @@ -1,10 +1,10 @@ PRGNAM="obs-studio" -VERSION="24.0.6" +VERSION="26.0.2" HOMEPAGE="https://obsproject.com/" -DOWNLOAD="https://github.com/obsproject/obs-studio/archive/24.0.6/obs-studio-24.0.6.tar.gz" -MD5SUM="804bccba4476f696d15b01ff88ae02f2" +DOWNLOAD="https://github.com/obsproject/obs-studio/archive/26.0.2/obs-studio-26.0.2.tar.gz" +MD5SUM="75dea679867dce642c8d1910ef6da0a5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="faac ffmpeg jansson qt5 rtmpdump x264 jack libfdk-aac" +REQUIRES="faac ffmpeg jansson luajit qt5 rtmpdump x264 jack libfdk-aac" MAINTAINER="Christoph Willing" EMAIL="chris.willing@linux.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 b54b9fc9fe..4150809dc5 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 , Pisa, Italy +# Copyright 2013-2018 Matteo Bernardini , 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 +# Copyright (C) 2020 Matteo Bernardini , 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-1.1.7-gcc10.patch b/multimedia/transcode/transcode-1.1.7-gcc10.patch new file mode 100644 index 0000000000..fcee415dee --- /dev/null +++ b/multimedia/transcode/transcode-1.1.7-gcc10.patch @@ -0,0 +1,48 @@ +--- a/import/demux_pass.c ++++ b/import/demux_pass.c +@@ -32,8 +32,6 @@ + #include "packets.h" + + +-int gop, gop_pts, gop_cnt; +- + /* if you listen carefully, then you can hear the desesperate + * whisper of this code calling for a rewrite. Or for a redesign. + * Or both. -- FR +--- a/import/extract_ac3.c ++++ b/import/extract_ac3.c +@@ -334,7 +334,6 @@ + FILE *fd; + + #define MAX_BUF 4096 +-char audio[MAX_BUF]; + + + /* from ac3scan.c */ +@@ -472,6 +471,8 @@ + void extract_ac3(info_t *ipipe) + { + ++ char audio[MAX_BUF]; ++ + int error=0; + + avi_t *avifile; +--- a/import/extract_mp3.c ++++ b/import/extract_mp3.c +@@ -243,7 +243,6 @@ + } + + #define MAX_BUF 4096 +-char audio[MAX_BUF]; + + /* ------------------------------------------------------------ + * +@@ -258,6 +257,7 @@ + + void extract_mp3(info_t *ipipe) + { ++ char audio[MAX_BUF]; + + int error=0; + diff --git a/multimedia/transcode/transcode-1.1.7-glibc-2.32.patch b/multimedia/transcode/transcode-1.1.7-glibc-2.32.patch new file mode 100644 index 0000000000..8b5ea837a0 --- /dev/null +++ b/multimedia/transcode/transcode-1.1.7-glibc-2.32.patch @@ -0,0 +1,47 @@ +--- transcode-1.1.7/import/v4l/import_v4l2.c.orig 2020-08-28 08:28:44.311434934 +0000 ++++ transcode-1.1.7/import/v4l/import_v4l2.c 2020-08-28 08:41:19.279323984 +0000 +@@ -455,7 +455,7 @@ + tc_log_warn(MOD_NAME, + "driver does not support cropping" + "(ioctl(VIDIOC_CROPCAP) returns \"%s\"), disabled", +- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); ++ strerror(errno)); + return TC_ERROR; + } + if (verbose_flag > TC_INFO) { +@@ -485,7 +485,7 @@ + tc_log_warn(MOD_NAME, + "driver does not support inquiring cropping" + " parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")", +- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); ++ strerror(errno)); + return -1; + } + +@@ -513,7 +513,7 @@ + tc_log_warn(MOD_NAME, + "driver does not support inquering cropping" + " parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")", +- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); ++ strerror(errno)); + return -1; + } + if (verbose_flag > TC_INFO) { +@@ -613,7 +613,7 @@ + if (err < 0) { + if (verbose_flag) { + tc_log_warn(MOD_NAME, "driver does not support setting parameters (ioctl(VIDIOC_S_PARM) returns \"%s\")", +- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); ++ strerror(errno)); + } + } + return TC_OK; +@@ -628,7 +628,7 @@ + err = ioctl(vs->video_fd, VIDIOC_G_STD, &stdid); + if (err < 0) { + tc_log_warn(MOD_NAME, "driver does not support get std (ioctl(VIDIOC_G_STD) returns \"%s\")", +- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); ++ strerror(errno)); + memset(&stdid, 0, sizeof(v4l2_std_id)); + } + diff --git a/multimedia/transcode/transcode-1.1.7-imagemagick7.patch b/multimedia/transcode/transcode-1.1.7-imagemagick7.patch new file mode 100644 index 0000000000..b9f1476646 --- /dev/null +++ b/multimedia/transcode/transcode-1.1.7-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 ++#include + #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 ++#include + #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 ++#include + #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; rowheight; ++row) { + for(col=LD->xpos; colwidth; ++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+iwidth)) + 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+iheight)) + 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+iwidth)) + 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+iheight)) + 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+iwidth)) + 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+iheight)) + 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 ++#include + #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 ++#include + #else /* we have a SANE wand header */ +-#include ++#include + #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 ++#include + #else /* we have a SANE wand header */ +-#include ++#include + #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 ++# include + # else /* we have a SANE wand header */ +-# include ++# include + # endif /* HAVE_BROKEN_WAND */ + + # undef PACKAGE_BUGREPORT diff --git a/multimedia/transcode/transcode.SlackBuild b/multimedia/transcode/transcode.SlackBuild index 1c07cbc57e..f4dbcab3d9 100644 --- a/multimedia/transcode/transcode.SlackBuild +++ b/multimedia/transcode/transcode.SlackBuild @@ -80,6 +80,15 @@ 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 +# Fix building with imagemagick 7.x +patch -p1 -i $CWD/transcode-1.1.7-imagemagick7.patch +patch -p1 -i $CWD/transcode-1.1.7-gcc10.patch +patch -p1 -i $CWD/transcode-1.1.7-glibc-2.32.patch + +autoreconf -vif + +export MAGICKCORE_QUANTUM_DEPTH=32 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -92,8 +101,6 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --enable-alsa \ --enable-v4l \ - --enable-libv4l2 \ - --enable-libv4lconvert \ --enable-libmpeg2=${LIBMPEG2:-no} \ --enable-libmpeg2convert=${LIBMPEG2:-no} \ --enable-ogg \ diff --git a/multimedia/tvheadend/tvheadend-4.2.8-fno-common.patch b/multimedia/tvheadend/tvheadend-4.2.8-fno-common.patch new file mode 100644 index 0000000000..23f48652f9 --- /dev/null +++ b/multimedia/tvheadend/tvheadend-4.2.8-fno-common.patch @@ -0,0 +1,55 @@ +From 1f2a0a59e3acaef88509d3ac899b905c73b7b8f8 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Fri, 15 May 2020 17:45:30 +0100 +Subject: [PATCH] Fix building with -fno-common (default from GCC 10) + +--- + src/input.h | 4 ++-- + src/input/mpegts.c | 2 ++ + src/input/mpegts.h | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/input.h b/src/input.h +index a9c96df04..3dce355c6 100644 +--- a/src/input.h ++++ b/src/input.h +@@ -133,8 +133,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th ); + extern const idclass_t tvh_input_class; + extern const idclass_t tvh_input_instance_class; + +-tvh_input_list_t tvh_inputs; +-tvh_hardware_list_t tvh_hardware; ++extern tvh_input_list_t tvh_inputs; ++extern tvh_hardware_list_t tvh_hardware; + + #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, &tvh_inputs, ti_link) + #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, &tvh_hardware, th_link) +diff --git a/src/input/mpegts.c b/src/input/mpegts.c +index e02d491f1..fca4f3429 100644 +--- a/src/input/mpegts.c ++++ b/src/input/mpegts.c +@@ -20,6 +20,8 @@ + #include "mpegts/fastscan.h" + #include "memoryinfo.h" + ++struct mpegts_listeners mpegts_listeners; ++ + extern memoryinfo_t mpegts_input_queue_memoryinfo; + extern memoryinfo_t mpegts_input_table_memoryinfo; + +diff --git a/src/input/mpegts.h b/src/input/mpegts.h +index 9dda3baca..9c4c57b73 100644 +--- a/src/input/mpegts.h ++++ b/src/input/mpegts.h +@@ -1149,7 +1149,7 @@ typedef struct mpegts_listener + void (*ml_mux_delete) (mpegts_mux_t *mm, void *p); + } mpegts_listener_t; + +-LIST_HEAD(,mpegts_listener) mpegts_listeners; ++extern LIST_HEAD(mpegts_listeners, mpegts_listener) mpegts_listeners; + + #define mpegts_add_listener(ml)\ + LIST_INSERT_HEAD(&mpegts_listeners, ml, ml_link) +-- +2.26.2 + diff --git a/multimedia/tvheadend/tvheadend-4.2.8-gcc9.patch b/multimedia/tvheadend/tvheadend-4.2.8-gcc9.patch new file mode 100644 index 0000000000..9ccadb44c4 --- /dev/null +++ b/multimedia/tvheadend/tvheadend-4.2.8-gcc9.patch @@ -0,0 +1,36 @@ +diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c +--- ./src/plumbing/transcoding.c.orig 2019-01-12 09:58:47.000000000 +0100 ++++ ./src/plumbing/transcoding.c 2019-03-12 15:49:24.922314869 +0100 +@@ -1804,7 +1804,7 @@ transcoder_init_video(transcoder_t *t, s + char *str, *token, *saveptr, codec_list[sizeof(tp->tp_src_vcodec)]; + int codec_match=0; + +- strncpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1); ++ memcpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1); + + tvhtrace(LS_TRANSCODE, "src_vcodec=\"%s\" ssc_type=%d (%s)\n", + tp->tp_src_vcodec, +@@ -2130,10 +2130,10 @@ transcoder_set_properties(streaming_targ + transcoder_t *t = (transcoder_t *)st; + transcoder_props_t *tp = &t->t_props; + +- strncpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1); +- strncpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1); +- strncpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1); +- strncpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1); ++ memcpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1); ++ memcpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1); ++ memcpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1); ++ memcpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1); + tp->tp_channels = props->tp_channels; + tp->tp_vbitrate = props->tp_vbitrate; + tp->tp_abitrate = props->tp_abitrate; +@@ -2141,7 +2141,7 @@ transcoder_set_properties(streaming_targ + + memcpy(tp->tp_language, props->tp_language, 4); + +- strncpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1); ++ memcpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1); + } + + diff --git a/multimedia/tvheadend/tvheadend.SlackBuild b/multimedia/tvheadend/tvheadend.SlackBuild index 623f21723f..ac5b1e0c4e 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:-4.2.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.tar.gz || tar xvf $CWD/$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -69,15 +69,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 {} \; +patch -p1 < $CWD/tvheadend-4.2.8-gcc9.patch +patch -p1 < $CWD/tvheadend-4.2.8-fno-common.patch -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=stringop-truncation -Wno-error=attributes" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-libffmpeg_static \ + --disable-ffmpeg_static \ + --disable-libx264_static \ + --disable-libx265_static \ + --disable-libvpx_static \ + --disable-libtheora_static \ + --disable-libvorbis_static \ + --disable-libfdkaac_static \ + --python=python3 \ --build=$ARCH-slackware-linux make diff --git a/multimedia/tvheadend/tvheadend.info b/multimedia/tvheadend/tvheadend.info index ad7caed7c3..176900fb09 100644 --- a/multimedia/tvheadend/tvheadend.info +++ b/multimedia/tvheadend/tvheadend.info @@ -1,10 +1,10 @@ PRGNAM="tvheadend" -VERSION="3.4patch1" +VERSION="4.2.8" HOMEPAGE="https://tvheadend.org" -DOWNLOAD="https://github.com/tvheadend/tvheadend/archive/3.4patch1.tar.gz" -MD5SUM="86d1be0ad6e02bd2aecd3d529a026797" +DOWNLOAD="https://github.com/tvheadend/tvheadend/archive/v4.2.8/tvheadend-4.2.8.tar.gz" +MD5SUM="b9571efa46dd489f9fe87acdb391d591" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="uriparser" MAINTAINER="William PC" EMAIL="w_calandrini[at]hotmail[dot]com" 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..1272ad3c7e 100644 --- a/multimedia/vlc/README +++ b/multimedia/vlc/README @@ -37,6 +37,11 @@ environment variable set e.g. 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 detected optional aom package are +incompatible with this version of vlc and in this case the build will +fai. This can be avoided by setting the AOM environment variable to "no" +e.g. + AOM=no sh vlc.SlackBuild Please advise the maintainer to suggest support for any further options. @@ -44,7 +49,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/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild index 8b8543a820..c024322aca 100644 --- a/multimedia/vlc/vlc.SlackBuild +++ b/multimedia/vlc/vlc.SlackBuild @@ -81,6 +81,8 @@ 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 @@ -105,6 +107,9 @@ fi # Enable vlc to be run as root runasroot=""; [ "${RUNASROOT:-no}" != "no" ] && runasroot="--enable-run-as-root" +# Give the possibility to explicitly disable aom support +aom=""; [ "${AOM:-yes}" = "no" ] && aom="--disable-aom" + autoreconf -fiv chown -R root:root . @@ -127,10 +132,10 @@ LDFLAGS="$SLKLDFLAGS" \ --build=$ARCH-slackware-linux \ $qtversion \ $wayland \ - $opencv \ $runasroot \ + $aom \ + --disable-opencv \ --enable-merge-ffmpeg \ - --enable-libva=no \ --with-kde-solid=no \ make @@ -139,8 +144,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/multimedia/w_scan/gcc-10.patch b/multimedia/w_scan/gcc-10.patch new file mode 100644 index 0000000000..50d2488190 --- /dev/null +++ b/multimedia/w_scan/gcc-10.patch @@ -0,0 +1,37 @@ +si_types.h: fix build with gcc 10 + +Drop service_t, p_service_t, transponder_t and p_transponder_t to avoid +the following build failure with gcc 10 (which defaults to -fno-common): + +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -Wall -Wextra -Wno-comment -Wswitch-default -Wno-unused-parameter -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -lrt -o w_scan atsc_psip_section.o countries.o descriptors.o diseqc.o dump-dvbscan.o dump-vdr.o dump-xine.o dump-mplayer.o dump-vlc-m3u.o dvbscan.o lnb.o parse-dvbscan.o satellites.o scan.o section.o tools.o emulate.o dump-xml.o iconv_codes.o char-coding.o +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x404): multiple definition of `p_transponder_t'; countries.o:(.bss+0x0): first defined here +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x408): multiple definition of `transponder_t'; countries.o:(.bss+0x4): first defined here +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x480): multiple definition of `p_service_t'; countries.o:(.bss+0x7c): first defined here +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x484): multiple definition of `service_t'; countries.o:(.bss+0x80): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/5640442cb4ba06bcbcf31540a64f5665862d39f7 + +Signed-off-by: Fabrice Fontaine + +diff -Nura w_scan-20170107.orig/si_types.h w_scan-20170107/si_types.h +--- w_scan-20170107.orig/si_types.h 2020-09-20 11:09:56.776963441 +0200 ++++ w_scan-20170107/si_types.h 2020-09-20 11:13:13.149232478 +0200 +@@ -114,7 +114,7 @@ + uint32_t logical_channel_number; + uint8_t running; + void * priv; +-} service_t, * p_service_t; ++}; + + /******************************************************************************* + /* transponder type. +@@ -201,7 +201,7 @@ + /*----------------------------*/ + char * network_name; + network_change_t network_change; +-} __attribute__((packed)) transponder_t, * p_transponder_t; ++} __attribute__((packed)); + + /******************************************************************************* + /* satellite channel routing type. diff --git a/multimedia/w_scan/w_scan.SlackBuild b/multimedia/w_scan/w_scan.SlackBuild index 308bbdaa27..970cb4c3df 100644 --- a/multimedia/w_scan/w_scan.SlackBuild +++ b/multimedia/w_scan/w_scan.SlackBuild @@ -71,6 +71,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-10.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/xmltv/README.SBo b/multimedia/xmltv/README.SBo index 82de94966a..270be339d3 100644 --- a/multimedia/xmltv/README.SBo +++ b/multimedia/xmltv/README.SBo @@ -1,9 +1,3 @@ -This requires: -libwww-perl, perl-xml-twig, perl-Date-Manip, perl-XML-Writer, -perl-Lingua-Preferred, perl-TermReadKey, perl-Unicode-String, -perl-Term-ProgressBar, perl-File-Slurp, perl-xml-libxml, -perl-Lingua-EN-Numbers-Ordinate. - optional requirements for grabbers: dk requires: perl-HTML-Tree fi requires: perl-HTML-Tree diff --git a/multimedia/xmltv/xmltv.SlackBuild b/multimedia/xmltv/xmltv.SlackBuild index d7efae8986..4e1fb1cd30 100644 --- a/multimedia/xmltv/xmltv.SlackBuild +++ b/multimedia/xmltv/xmltv.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xmltv -VERSION=${VERSION:-0.5.66} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.6.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 @@ -40,13 +40,27 @@ 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 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -76,7 +90,7 @@ find $PKG -depth -type d -empty -delete || true rm -rf $PKG/usr/share/doc mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ChangeLog README README.cygwin doc/* $PKG/usr/doc/$PRGNAM-$VERSION +cp -a Changes README* doc/* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/xmltv/xmltv.info b/multimedia/xmltv/xmltv.info index aa11981c21..698c0cc054 100644 --- a/multimedia/xmltv/xmltv.info +++ b/multimedia/xmltv/xmltv.info @@ -1,8 +1,8 @@ PRGNAM="xmltv" -VERSION="0.5.66" +VERSION="0.6.3" HOMEPAGE="http://xmltv.org/wiki" -DOWNLOAD="http://downloads.sourceforge.net/xmltv/xmltv-0.5.66.tar.bz2" -MD5SUM="1ad51ff5a02e8320bd908c7908c49661" +DOWNLOAD="https://github.com/XMLTV/xmltv/archive/v0.6.3/xmltv-0.6.3.tar.gz" +MD5SUM="60ce0c74b1d7254753d7508ee8a4c46c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libwww-perl perl-Date-Manip perl-File-Slurp perl-Lingua-EN-Numbers-Ordinate perl-Lingua-Preferred perl-Term-ProgressBar perl-Unicode-String perl-XML-Writer perl-xml-libxml perl-xml-twig perl-XML-TreePP" diff --git a/network/MEGAsync/MEGAsync.SlackBuild b/network/MEGAsync/MEGAsync.SlackBuild index d15a188abf..a5659e22ea 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.3.7.0} +SDK=${SDK:-3.7.3e} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/MEGAsync/MEGAsync.info b/network/MEGAsync/MEGAsync.info index dca63a1e20..1944f82f57 100644 --- a/network/MEGAsync/MEGAsync.info +++ b/network/MEGAsync/MEGAsync.info @@ -1,10 +1,10 @@ PRGNAM="MEGAsync" -VERSION="3.7.1.0" +VERSION="4.3.7.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.3.7.0_Linux/MEGAsync-4.3.7.0_Linux.tar.gz \ + https://github.com/meganz/sdk/archive/v3.7.3e/sdk-3.7.3e.tar.gz" +MD5SUM="051cd9c42aad7ad283221e445bf838f7 \ + 916e13eeb9e23c5542122cb1c60dc9ca" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libuv libsodium cryptopp FreeImage c-ares libmediainfo" 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/aircrack-ng/aircrack-ng.SlackBuild b/network/aircrack-ng/aircrack-ng.SlackBuild index 6ab6259982..f5f2491ce2 100644 --- a/network/aircrack-ng/aircrack-ng.SlackBuild +++ b/network/aircrack-ng/aircrack-ng.SlackBuild @@ -79,7 +79,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" \ ./autogen.sh \ --prefix=/usr \ diff --git a/network/avahi/README b/network/avahi/README index 8d1e64903a..8eed1b461a 100644 --- a/network/avahi/README +++ b/network/avahi/README @@ -11,5 +11,4 @@ prior to installing the avahi package. See README.SBo in this directory (it is also installed to the package docmentation directory) for more information and for setup notes. -mono is an optional dependency that also requires gtk-sharp - enable it -with the following: "MONO=yes ./avahi.SlackBuild" +mono support is not working ATM so it's forcibly disabled. diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild index b2b984d3b3..76c94acd67 100644 --- a/network/avahi/avahi.SlackBuild +++ b/network/avahi/avahi.SlackBuild @@ -47,6 +47,7 @@ if [ "${MONO:-no}" = "no" ]; then else MONO="--enable-mono" fi +MONO="--disable-mono" # mono support not working ATM warn_accounts() { echo " You must have an avahi user and group to run this script. " 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 658fc14a62..fccc2bda6e 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 $/a #include ' 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 15da628506..1788a593a0 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/dmitry/dmitry.SlackBuild b/network/dmitry/dmitry.SlackBuild index bca6380c53..7906345345 100644 --- a/network/dmitry/dmitry.SlackBuild +++ b/network/dmitry/dmitry.SlackBuild @@ -68,7 +68,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/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-pigeonhole/dovecot-pigeonhole.SlackBuild b/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild index fb88f7ce6a..4c78eca7d2 100644 --- a/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild +++ b/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=dovecot-pigeonhole -VERSION=${VERSION:-0.5.4} +VERSION=${VERSION:-0.5.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/dovecot-pigeonhole/dovecot-pigeonhole.info b/network/dovecot-pigeonhole/dovecot-pigeonhole.info index 83de02e3e3..7a532dc322 100644 --- a/network/dovecot-pigeonhole/dovecot-pigeonhole.info +++ b/network/dovecot-pigeonhole/dovecot-pigeonhole.info @@ -1,8 +1,8 @@ PRGNAM="dovecot-pigeonhole" -VERSION="0.5.4" +VERSION="0.5.13" HOMEPAGE="http://pigeonhole.dovecot.org/" -DOWNLOAD="http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.4.tar.gz" -MD5SUM="331a7554d6b12ac2cca760146934fc5b" +DOWNLOAD="https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz" +MD5SUM="fc8c2845519869e15216e5c07c316a65" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="dovecot" 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/dsniff.SlackBuild b/network/dsniff/dsniff.SlackBuild index 3fe080fd8b..1f565b0187 100644 --- a/network/dsniff/dsniff.SlackBuild +++ b/network/dsniff/dsniff.SlackBuild @@ -73,11 +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 {} \; -zcat $CWD/dsniff_2.4b1+debian-18.diff.gz | patch -p1 -for i in debian/patches/*.dpatch; do - patch -N < "$i" -done -sed -i 's|${CC-cc} -E|${CC-cc} -O2 -E|g' configure +for i in $CWD/patches/*.patch; do patch -p1 < $i; done + +autoreconf -fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -87,6 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ + --with-libtirpc \ --build=$ARCH-slackware-linux make diff --git a/network/dsniff/dsniff_2.4b1+debian-18.diff.gz b/network/dsniff/dsniff_2.4b1+debian-18.diff.gz deleted file mode 100644 index e83ac181b1..0000000000 Binary files a/network/dsniff/dsniff_2.4b1+debian-18.diff.gz and /dev/null differ diff --git a/network/dsniff/patches/01_time.h.patch b/network/dsniff/patches/01_time.h.patch new file mode 100644 index 0000000000..1867cf901e --- /dev/null +++ b/network/dsniff/patches/01_time.h.patch @@ -0,0 +1,26 @@ +Author: Steve Kemp +Description: Include to fix segfault on some architectures. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=315969 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/msgsnarf.c ++++ b/msgsnarf.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include "buf.h" + #include "decode.h" +--- a/sshow.c ++++ b/sshow.c +@@ -15,6 +15,7 @@ + + #include + #include ++#include + + #include + #include diff --git a/network/dsniff/patches/02_mailsnarf_corrupt.patch b/network/dsniff/patches/02_mailsnarf_corrupt.patch new file mode 100644 index 0000000000..18bb736c3c --- /dev/null +++ b/network/dsniff/patches/02_mailsnarf_corrupt.patch @@ -0,0 +1,17 @@ +Author: Steve Kemp +Description: mailsnarf does not parse mail correctly. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=149330 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/mailsnarf.c ++++ b/mailsnarf.c +@@ -178,7 +178,7 @@ + if (smtp->state != SMTP_DATA) { + while ((i = buf_index(&buf, "\r\n", 2)) >= 0) { + line = buf_tok(&buf, NULL, i + 2); +- line->base[line->end] = '\0'; ++ line->base[line->end-1] = '\0'; + p = buf_ptr(line); + + if (strncasecmp(p, "RSET", 4) == 0) { diff --git a/network/dsniff/patches/03_pcap_read_dump.patch b/network/dsniff/patches/03_pcap_read_dump.patch new file mode 100644 index 0000000000..3cc0374840 --- /dev/null +++ b/network/dsniff/patches/03_pcap_read_dump.patch @@ -0,0 +1,534 @@ +Author: Joseph Battaglia and Joshua Krage +Description: Allow the reading of saved PCAP capture files. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=153462 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=298604 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/dsniff.8 ++++ b/dsniff.8 +@@ -10,7 +10,7 @@ + .nf + .fi + \fBdsniff\fR [\fB-c\fR] [\fB-d\fR] [\fB-m\fR] [\fB-n\fR] [\fB-i +-\fIinterface\fR] [\fB-s \fIsnaplen\fR] [\fB-f \fIservices\fR] ++\fIinterface\fR | \fB-p \fIpcapfile\fR] [\fB-s \fIsnaplen\fR] [\fB-f \fIservices\fR] + [\fB-t \fItrigger[,...]\fR]] + [\fB-r\fR|\fB-w\fR \fIsavefile\fR] [\fIexpression\fR] + .SH DESCRIPTION +@@ -45,6 +45,9 @@ + Do not resolve IP addresses to hostnames. + .IP "\fB-i \fIinterface\fR" + Specify the interface to listen on. ++.IP "\fB-p \fIpcapfile\fR" ++Rather than processing the contents of packets observed upon the network ++process the given PCAP capture file. + .IP "\fB-s \fIsnaplen\fR" + Analyze at most the first \fIsnaplen\fR bytes of each TCP connection, + rather than the default of 1024. +--- a/dsniff.c ++++ b/dsniff.c +@@ -46,8 +46,9 @@ + usage(void) + { + fprintf(stderr, "Version: " VERSION "\n" +- "Usage: dsniff [-cdmn] [-i interface] [-s snaplen] [-f services]\n" +- " [-t trigger[,...]] [-r|-w savefile] [expression]\n"); ++ "Usage: dsniff [-cdmn] [-i interface | -p pcapfile] [-s snaplen]\n" ++ " [-f services] [-t trigger[,...]] [-r|-w savefile]\n" ++ " [expression]\n"); + exit(1); + } + +@@ -79,7 +80,7 @@ + + services = savefile = triggers = NULL; + +- while ((c = getopt(argc, argv, "cdf:i:mnr:s:t:w:h?V")) != -1) { ++ while ((c = getopt(argc, argv, "cdf:i:mnp:r:s:t:w:h?V")) != -1) { + switch (c) { + case 'c': + Opt_client = 1; +@@ -99,6 +100,9 @@ + case 'n': + Opt_dns = 0; + break; ++ case 'p': ++ nids_params.filename = optarg; ++ break; + case 'r': + Opt_read = 1; + savefile = optarg; +@@ -168,10 +172,23 @@ + else nids_register_tcp(trigger_tcp); + + if (nids_params.pcap_filter != NULL) { +- warnx("listening on %s [%s]", nids_params.device, +- nids_params.pcap_filter); ++ if (nids_params.filename == NULL) { ++ warnx("listening on %s [%s]", nids_params.device, ++ nids_params.pcap_filter); ++ } ++ else { ++ warnx("using %s [%s]", nids_params.filename, ++ nids_params.pcap_filter); ++ } ++ } ++ else { ++ if (nids_params.filename == NULL) { ++ warnx("listening on %s", nids_params.device); ++ } ++ else { ++ warnx("using %s", nids_params.filename); ++ } + } +- else warnx("listening on %s", nids_params.device); + + nids_run(); + +--- a/filesnarf.8 ++++ b/filesnarf.8 +@@ -9,7 +9,7 @@ + .na + .nf + .fi +-\fBfilesnarf\fR [\fB-i \fIinterface\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]] ++\fBfilesnarf\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]] + .SH DESCRIPTION + .ad + .fi +@@ -18,6 +18,8 @@ + .SH OPTIONS + .IP "\fB-i \fIinterface\fR" + Specify the interface to listen on. ++.IP "\fB-p \fIpcapfile\fR" ++Process packets from the specified PCAP capture file instead of the network. + .IP \fB-v\fR + "Versus" mode. Invert the sense of matching, to select non-matching + files. +--- a/filesnarf.c ++++ b/filesnarf.c +@@ -51,7 +51,7 @@ + usage(void) + { + fprintf(stderr, "Version: " VERSION "\n" +- "Usage: filesnarf [-i interface] [[-v] pattern [expression]]\n"); ++ "Usage: filesnarf [-i interface | -p pcapfile] [[-v] pattern [expression]]\n"); + exit(1); + } + +@@ -464,11 +464,14 @@ + extern int optind; + int c; + +- while ((c = getopt(argc, argv, "i:vh?V")) != -1) { ++ while ((c = getopt(argc, argv, "i:p:vh?V")) != -1) { + switch (c) { + case 'i': + nids_params.device = optarg; + break; ++ case 'p': ++ nids_params.filename = optarg; ++ break; + case 'v': + Opt_invert = 1; + break; +@@ -498,11 +501,24 @@ + nids_register_ip(decode_udp_nfs); + nids_register_tcp(decode_tcp_nfs); + +- if (nids_params.pcap_filter != NULL) { +- warnx("listening on %s [%s]", nids_params.device, +- nids_params.pcap_filter); +- } +- else warnx("listening on %s", nids_params.device); ++ if (nids_params.pcap_filter != NULL) { ++ if (nids_params.filename == NULL) { ++ warnx("listening on %s [%s]", nids_params.device, ++ nids_params.pcap_filter); ++ } ++ else { ++ warnx("using %s [%s]", nids_params.filename, ++ nids_params.pcap_filter); ++ } ++ } ++ else { ++ if (nids_params.filename == NULL) { ++ warnx("listening on %s", nids_params.device); ++ } ++ else { ++ warnx("using %s", nids_params.filename); ++ } ++ } + + nids_run(); + +--- a/mailsnarf.8 ++++ b/mailsnarf.8 +@@ -9,7 +9,7 @@ + .na + .nf + .fi +-\fBmailsnarf\fR [\fB-i \fIinterface\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]] ++\fBmailsnarf\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]] + .SH DESCRIPTION + .ad + .fi +@@ -19,6 +19,8 @@ + .SH OPTIONS + .IP "\fB-i \fIinterface\fR" + Specify the interface to listen on. ++.IP "\fB-p \fIpcapfile\fR" ++Process packets from the specified PCAP capture file instead of the network. + .IP \fB-v\fR + "Versus" mode. Invert the sense of matching, to select non-matching + messages. +--- a/mailsnarf.c ++++ b/mailsnarf.c +@@ -59,7 +59,7 @@ + usage(void) + { + fprintf(stderr, "Version: " VERSION "\n" +- "Usage: mailsnarf [-i interface] [[-v] pattern [expression]]\n"); ++ "Usage: mailsnarf [-i interface | -p pcapfile] [[-v] pattern [expression]]\n"); + exit(1); + } + +@@ -344,11 +344,14 @@ + extern int optind; + int c; + +- while ((c = getopt(argc, argv, "i:vh?V")) != -1) { ++ while ((c = getopt(argc, argv, "i:p:vh?V")) != -1) { + switch (c) { + case 'i': + nids_params.device = optarg; + break; ++ case 'p': ++ nids_params.filename = optarg; ++ break; + case 'v': + Opt_invert = 1; + break; +@@ -378,10 +381,23 @@ + nids_register_tcp(sniff_pop_session); + + if (nids_params.pcap_filter != NULL) { +- warnx("listening on %s [%s]", nids_params.device, +- nids_params.pcap_filter); +- } +- else warnx("listening on %s", nids_params.device); ++ if (nids_params.filename == NULL) { ++ warnx("listening on %s [%s]", nids_params.device, ++ nids_params.pcap_filter); ++ } ++ else { ++ warnx("using %s [%s]", nids_params.filename, ++ nids_params.pcap_filter); ++ } ++ } ++ else { ++ if (nids_params.filename == NULL) { ++ warnx("listening on %s", nids_params.device); ++ } ++ else { ++ warnx("using %s", nids_params.filename); ++ } ++ } + + nids_run(); + +--- a/msgsnarf.8 ++++ b/msgsnarf.8 +@@ -9,7 +9,7 @@ + .na + .nf + .fi +-\fBmsgsnarf\fR [\fB-i \fIinterface\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]] ++\fBmsgsnarf\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]] + .SH DESCRIPTION + .ad + .fi +@@ -19,6 +19,8 @@ + .SH OPTIONS + .IP "\fB-i \fIinterface\fR" + Specify the interface to listen on. ++.IP "\fB-p \fIpcapfile\fR" ++Process packets from the specified PCAP capture file instead of the network. + .IP \fB-v\fR + "Versus" mode. Invert the sense of matching, to select non-matching + messages. +--- a/msgsnarf.c ++++ b/msgsnarf.c +@@ -45,7 +45,7 @@ + usage(void) + { + fprintf(stderr, "Version: " VERSION "\n" +- "Usage: msgsnarf [-i interface] [[-v] pattern [expression]]\n"); ++ "Usage: msgsnarf [-i interface | -p pcapfile] [[-v] pattern [expression]]\n"); + exit(1); + } + +@@ -633,11 +633,14 @@ + extern int optind; + int c; + +- while ((c = getopt(argc, argv, "i:hv?V")) != -1) { ++ while ((c = getopt(argc, argv, "i:p:hv?V")) != -1) { + switch (c) { + case 'i': + nids_params.device = optarg; + break; ++ case 'p': ++ nids_params.filename = optarg; ++ break; + case 'v': + Opt_invert = 1; + break; +@@ -666,11 +669,24 @@ + + nids_register_tcp(sniff_msgs); + +- if (nids_params.pcap_filter != NULL) { +- warnx("listening on %s [%s]", nids_params.device, +- nids_params.pcap_filter); +- } +- else warnx("listening on %s", nids_params.device); ++ if (nids_params.pcap_filter != NULL) { ++ if (nids_params.filename == NULL) { ++ warnx("listening on %s [%s]", nids_params.device, ++ nids_params.pcap_filter); ++ } ++ else { ++ warnx("using %s [%s]", nids_params.filename, ++ nids_params.pcap_filter); ++ } ++ } ++ else { ++ if (nids_params.filename == NULL) { ++ warnx("listening on %s", nids_params.device); ++ } ++ else { ++ warnx("using %s", nids_params.filename); ++ } ++ } + + nids_run(); + +--- a/sshow.8 ++++ b/sshow.8 +@@ -9,7 +9,7 @@ + .na + .nf + .fi +-\fBsshow\fR [\fB-d\fR] [\fB-i \fIinterface\fR] [\fIexpression\fR] ++\fBsshow\fR [\fB-d\fR] [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [\fIexpression\fR] + .SH DESCRIPTION + .ad + .fi +@@ -28,6 +28,8 @@ + Enable verbose debugging output. + .IP "\fB-i \fIinterface\fR" + Specify the interface to listen on. ++.IP "\fB-p \fIpcapfile\fR" ++Process packets from the specified PCAP capture file instead of the network. + .IP "\fIexpression\fR" + Specify a tcpdump(8) filter expression to select traffic to sniff. + .SH "SEE ALSO" +--- a/sshow.c ++++ b/sshow.c +@@ -82,7 +82,7 @@ + static void + usage(void) + { +- fprintf(stderr, "Usage: sshow [-d] [-i interface]\n"); ++ fprintf(stderr, "Usage: sshow [-d] [-i interface | -p pcapfile]\n"); + exit(1); + } + +@@ -616,7 +616,7 @@ + extern int optind; + int c; + +- while ((c = getopt(argc, argv, "di:h?")) != -1) { ++ while ((c = getopt(argc, argv, "di:p:h?")) != -1) { + switch (c) { + case 'd': + debug++; +@@ -624,6 +624,9 @@ + case 'i': + nids_params.device = optarg; + break; ++ case 'p': ++ nids_params.filename = optarg; ++ break; + default: + usage(); + break; +@@ -652,11 +655,24 @@ + + nids_register_tcp(process_event); + +- if (nids_params.pcap_filter != NULL) { +- warnx("listening on %s [%s]", nids_params.device, +- nids_params.pcap_filter); +- } +- else warnx("listening on %s", nids_params.device); ++ if (nids_params.pcap_filter != NULL) { ++ if (nids_params.filename == NULL) { ++ warnx("listening on %s [%s]", nids_params.device, ++ nids_params.pcap_filter); ++ } ++ else { ++ warnx("using %s [%s]", nids_params.filename, ++ nids_params.pcap_filter); ++ } ++ } ++ else { ++ if (nids_params.filename == NULL) { ++ warnx("listening on %s", nids_params.device); ++ } ++ else { ++ warnx("using %s", nids_params.filename); ++ } ++ } + + nids_run(); + +--- a/urlsnarf.8 ++++ b/urlsnarf.8 +@@ -9,7 +9,7 @@ + .na + .nf + .fi +-\fBurlsnarf\fR [\fB-n\fR] [\fB-i \fIinterface\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]] ++\fBurlsnarf\fR [\fB-n\fR] [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]] + .SH DESCRIPTION + .ad + .fi +@@ -21,6 +21,9 @@ + .IP \fB-n\fR + Do not resolve IP addresses to hostnames. + .IP "\fB-i \fIinterface\fR" ++Specify the interface to listen on. ++.IP "\fB-p \fIpcapfile\fR" ++Process packets from the specified PCAP capture file instead of the network. + .IP \fB-v\fR + "Versus" mode. Invert the sense of matching, to select non-matching + URLs. +--- a/urlsnarf.c ++++ b/urlsnarf.c +@@ -41,7 +41,7 @@ + usage(void) + { + fprintf(stderr, "Version: " VERSION "\n" +- "Usage: urlsnarf [-n] [-i interface] [[-v] pattern [expression]]\n"); ++ "Usage: urlsnarf [-n] [-i interface | -p pcapfile] [[-v] pattern [expression]]\n"); + exit(1); + } + +@@ -201,11 +201,14 @@ + extern int optind; + int c; + +- while ((c = getopt(argc, argv, "i:nvh?V")) != -1) { ++ while ((c = getopt(argc, argv, "i:p:nvh?V")) != -1) { + switch (c) { + case 'i': + nids_params.device = optarg; + break; ++ case 'p': ++ nids_params.filename = optarg; ++ break; + case 'n': + Opt_dns = 0; + break; +@@ -238,8 +241,24 @@ + + nids_register_tcp(sniff_http_client); + +- warnx("listening on %s [%s]", nids_params.device, +- nids_params.pcap_filter); ++ if (nids_params.pcap_filter != NULL) { ++ if (nids_params.filename == NULL) { ++ warnx("listening on %s [%s]", nids_params.device, ++ nids_params.pcap_filter); ++ } ++ else { ++ warnx("using %s [%s]", nids_params.filename, ++ nids_params.pcap_filter); ++ } ++ } ++ else { ++ if (nids_params.filename == NULL) { ++ warnx("listening on %s", nids_params.device); ++ } ++ else { ++ warnx("using %s", nids_params.filename); ++ } ++ } + + nids_run(); + +--- a/webspy.8 ++++ b/webspy.8 +@@ -9,7 +9,7 @@ + .na + .nf + .fi +-\fBwebspy\fR [\fB-i \fIinterface\fR] \fIhost\fR ++\fBwebspy\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] \fIhost\fR + .SH DESCRIPTION + .ad + .fi +@@ -20,6 +20,8 @@ + .SH OPTIONS + .IP "\fB-i \fIinterface\fR" + Specify the interface to listen on. ++.IP "\fB-p \fIpcapfile\fR" ++Process packets from the specified PCAP capture file instead of the network. + .IP \fIhost\fR + Specify the web client to spy on. + .SH "SEE ALSO" +--- a/webspy.c ++++ b/webspy.c +@@ -42,7 +42,7 @@ + usage(void) + { + fprintf(stderr, "Version: " VERSION "\n" +- "Usage: %s [-i interface] host\n", progname); ++ "Usage: %s [-i interface | -p pcapfile] host\n", progname); + exit(1); + } + +@@ -184,11 +184,14 @@ + extern int optind; + int c; + +- while ((c = getopt(argc, argv, "i:h?V")) != -1) { ++ while ((c = getopt(argc, argv, "i:p:h?V")) != -1) { + switch (c) { + case 'i': + nids_params.device = optarg; + break; ++ case 'p': ++ nids_params.filename = optarg; ++ break; + default: + usage(); + } +@@ -216,7 +219,13 @@ + + nids_register_tcp(sniff_http_client); + +- warnx("listening on %s", nids_params.device); ++ if (nids_params.filename == NULL) { ++ warnx("listening on %s", nids_params.device); ++ } ++ else { ++ warnx("using %s", nids_params.filename); ++ } ++ + + nids_run(); + diff --git a/network/dsniff/patches/04_multiple_intf.patch b/network/dsniff/patches/04_multiple_intf.patch new file mode 100644 index 0000000000..b624929d6c --- /dev/null +++ b/network/dsniff/patches/04_multiple_intf.patch @@ -0,0 +1,56 @@ +Author: Steve Kemp +Description: Work with multiple interfaces. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=242369 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/arp.c ++++ b/arp.c +@@ -39,7 +39,7 @@ + + #ifdef BSD + int +-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether) ++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char* linf) + { + int mib[6]; + size_t len; +@@ -91,7 +91,7 @@ + #endif + + int +-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether) ++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char* lif) + { + int sock; + struct arpreq ar; +@@ -99,7 +99,7 @@ + + memset((char *)&ar, 0, sizeof(ar)); + #ifdef __linux__ +- strncpy(ar.arp_dev, "eth0", sizeof(ar.arp_dev)); /* XXX - *sigh* */ ++ strncpy(ar.arp_dev, lif, strlen(lif)); + #endif + sin = (struct sockaddr_in *)&ar.arp_pa; + sin->sin_family = AF_INET; +--- a/arp.h ++++ b/arp.h +@@ -11,6 +11,6 @@ + #ifndef _ARP_H_ + #define _ARP_H_ + +-int arp_cache_lookup(in_addr_t ip, struct ether_addr *ether); ++int arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char* linf); + + #endif /* _ARP_H_ */ +--- a/arpspoof.c ++++ b/arpspoof.c +@@ -113,7 +113,7 @@ + int i = 0; + + do { +- if (arp_cache_lookup(ip, mac) == 0) ++ if (arp_cache_lookup(ip, mac, intf) == 0) + return (1); + #ifdef __linux__ + /* XXX - force the kernel to arp. feh. */ diff --git a/network/dsniff/patches/05_amd64_fix.patch b/network/dsniff/patches/05_amd64_fix.patch new file mode 100644 index 0000000000..c5b9384fcf --- /dev/null +++ b/network/dsniff/patches/05_amd64_fix.patch @@ -0,0 +1,221 @@ +Author: Steve Kemp +Description: Compile under AMD64. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=254002 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/configure ++++ b/configure +@@ -2667,15 +2667,62 @@ + echo "$ac_t""no" 1>&6 + fi + ++echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 ++echo "configure:2672: checking for __dn_expand in -lresolv" >&5 ++ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lresolv $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` ++ cat >> confdefs.h <&6 ++fi ++ + for ac_func in dirname strlcpy strlcat strsep + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2674: checking for $ac_func" >&5 ++echo "configure:2721: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -2728,12 +2775,12 @@ + for ac_func in MD5Update + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2732: checking for $ac_func" >&5 ++echo "configure:2779: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -2788,12 +2835,12 @@ + for ac_func in warnx + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2792: checking for $ac_func" >&5 ++echo "configure:2839: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -2848,12 +2895,12 @@ + for ac_func in ether_ntoa + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2852: checking for $ac_func" >&5 ++echo "configure:2899: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -2912,7 +2959,7 @@ + fi + + echo $ac_n "checking for Berkeley DB with 1.85 compatibility""... $ac_c" 1>&6 +-echo "configure:2916: checking for Berkeley DB with 1.85 compatibility" >&5 ++echo "configure:2963: checking for Berkeley DB with 1.85 compatibility" >&5 + # Check whether --with-db or --without-db was given. + if test "${with_db+set}" = set; then + withval="$with_db" +@@ -3015,7 +3062,7 @@ + + + echo $ac_n "checking for libpcap""... $ac_c" 1>&6 +-echo "configure:3019: checking for libpcap" >&5 ++echo "configure:3066: checking for libpcap" >&5 + # Check whether --with-libpcap or --without-libpcap was given. + if test "${with_libpcap+set}" = set; then + withval="$with_libpcap" +@@ -3063,7 +3110,7 @@ + + + echo $ac_n "checking for libnet""... $ac_c" 1>&6 +-echo "configure:3067: checking for libnet" >&5 ++echo "configure:3114: checking for libnet" >&5 + # Check whether --with-libnet or --without-libnet was given. + if test "${with_libnet+set}" = set; then + withval="$with_libnet" +@@ -3110,7 +3157,7 @@ + + + echo $ac_n "checking for libnids""... $ac_c" 1>&6 +-echo "configure:3114: checking for libnids" >&5 ++echo "configure:3161: checking for libnids" >&5 + # Check whether --with-libnids or --without-libnids was given. + if test "${with_libnids+set}" = set; then + withval="$with_libnids" +@@ -3152,9 +3199,9 @@ + save_cppflags="$CPPFLAGS" + CPPFLAGS="$NIDSINC" + echo $ac_n "checking whether libnids version is good""... $ac_c" 1>&6 +-echo "configure:3156: checking whether libnids version is good" >&5 ++echo "configure:3203: checking whether libnids version is good" >&5 + cat > conftest.$ac_ext < + EOF +@@ -3173,7 +3220,7 @@ + + + echo $ac_n "checking for OpenSSL""... $ac_c" 1>&6 +-echo "configure:3177: checking for OpenSSL" >&5 ++echo "configure:3224: checking for OpenSSL" >&5 + # Check whether --with-openssl or --without-openssl was given. + if test "${with_openssl+set}" = set; then + withval="$with_openssl" +--- a/configure.in ++++ b/configure.in +@@ -57,6 +57,7 @@ + AC_CHECK_LIB(nsl, gethostbyname) + dnl XXX - feh, everything except OpenBSD sux. + AC_CHECK_LIB(resolv, dn_expand) ++AC_CHECK_LIB(resolv, __dn_expand) + AC_REPLACE_FUNCS(dirname strlcpy strlcat strsep) + needmd5=no + AC_CHECK_FUNCS(MD5Update, , [needmd5=yes]) diff --git a/network/dsniff/patches/06_urlsnarf_zeropad.patch b/network/dsniff/patches/06_urlsnarf_zeropad.patch new file mode 100644 index 0000000000..29991708e5 --- /dev/null +++ b/network/dsniff/patches/06_urlsnarf_zeropad.patch @@ -0,0 +1,17 @@ +Author: Steve Kemp +Description: urlsnarf: zero-pad date. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=298605 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/urlsnarf.c ++++ b/urlsnarf.c +@@ -68,7 +68,7 @@ + t->tm_hour - gmt.tm_hour); + tz = hours * 60 + t->tm_min - gmt.tm_min; + +- len = strftime(tstr, sizeof(tstr), "%e/%b/%Y:%X", t); ++ len = strftime(tstr, sizeof(tstr), "%d/%b/%Y:%X", t); + if (len < 0 || len > sizeof(tstr) - 5) + return (NULL); + diff --git a/network/dsniff/patches/07_libnet_1.1.patch b/network/dsniff/patches/07_libnet_1.1.patch new file mode 100644 index 0000000000..66d57cade4 --- /dev/null +++ b/network/dsniff/patches/07_libnet_1.1.patch @@ -0,0 +1,906 @@ +Author: Faidon Liambotis +Description: Use libnet v1.1 instead of v1.0 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/arpspoof.c ++++ b/arpspoof.c +@@ -27,7 +27,7 @@ + + extern char *ether_ntoa(struct ether_addr *); + +-static struct libnet_link_int *llif; ++static libnet_t *l; + static struct ether_addr spoof_mac, target_mac; + static in_addr_t spoof_ip, target_ip; + static char *intf; +@@ -41,47 +41,49 @@ + } + + static int +-arp_send(struct libnet_link_int *llif, char *dev, +- int op, u_char *sha, in_addr_t spa, u_char *tha, in_addr_t tpa) ++arp_send(libnet_t *l, int op, u_int8_t *sha, ++ in_addr_t spa, u_int8_t *tha, in_addr_t tpa) + { +- char ebuf[128]; +- u_char pkt[60]; +- ++ int retval; ++ + if (sha == NULL && +- (sha = (u_char *)libnet_get_hwaddr(llif, dev, ebuf)) == NULL) { ++ (sha = (u_int8_t *)libnet_get_hwaddr(l)) == NULL) { + return (-1); + } + if (spa == 0) { +- if ((spa = libnet_get_ipaddr(llif, dev, ebuf)) == 0) ++ if ((spa = libnet_get_ipaddr4(l)) == -1) + return (-1); +- spa = htonl(spa); /* XXX */ + } + if (tha == NULL) + tha = "\xff\xff\xff\xff\xff\xff"; + +- libnet_build_ethernet(tha, sha, ETHERTYPE_ARP, NULL, 0, pkt); ++ libnet_autobuild_arp(op, sha, (u_int8_t *)&spa, ++ tha, (u_int8_t *)&tpa, l); ++ libnet_build_ethernet(tha, sha, ETHERTYPE_ARP, NULL, 0, l, 0); + +- libnet_build_arp(ARPHRD_ETHER, ETHERTYPE_IP, ETHER_ADDR_LEN, 4, +- op, sha, (u_char *)&spa, tha, (u_char *)&tpa, +- NULL, 0, pkt + ETH_H); +- + fprintf(stderr, "%s ", + ether_ntoa((struct ether_addr *)sha)); + + if (op == ARPOP_REQUEST) { + fprintf(stderr, "%s 0806 42: arp who-has %s tell %s\n", + ether_ntoa((struct ether_addr *)tha), +- libnet_host_lookup(tpa, 0), +- libnet_host_lookup(spa, 0)); ++ libnet_addr2name4(tpa, LIBNET_DONT_RESOLVE), ++ libnet_addr2name4(spa, LIBNET_DONT_RESOLVE)); + } + else { + fprintf(stderr, "%s 0806 42: arp reply %s is-at ", + ether_ntoa((struct ether_addr *)tha), +- libnet_host_lookup(spa, 0)); ++ libnet_addr2name4(spa, LIBNET_DONT_RESOLVE)); + fprintf(stderr, "%s\n", + ether_ntoa((struct ether_addr *)sha)); + } +- return (libnet_write_link_layer(llif, dev, pkt, sizeof(pkt)) == sizeof(pkt)); ++ retval = libnet_write(l); ++ if (retval) ++ fprintf(stderr, "%s", libnet_geterror(l)); ++ ++ libnet_clear_packet(l); ++ ++ return retval; + } + + #ifdef __linux__ +@@ -119,7 +121,7 @@ + /* XXX - force the kernel to arp. feh. */ + arp_force(ip); + #else +- arp_send(llif, intf, ARPOP_REQUEST, NULL, 0, NULL, ip); ++ arp_send(l, ARPOP_REQUEST, NULL, 0, NULL, ip); + #endif + sleep(1); + } +@@ -136,9 +138,9 @@ + if (arp_find(spoof_ip, &spoof_mac)) { + for (i = 0; i < 3; i++) { + /* XXX - on BSD, requires ETHERSPOOF kernel. */ +- arp_send(llif, intf, ARPOP_REPLY, +- (u_char *)&spoof_mac, spoof_ip, +- (target_ip ? (u_char *)&target_mac : NULL), ++ arp_send(l, ARPOP_REPLY, ++ (u_int8_t *)&spoof_mac, spoof_ip, ++ (target_ip ? (u_int8_t *)&target_mac : NULL), + target_ip); + sleep(1); + } +@@ -151,7 +153,8 @@ + { + extern char *optarg; + extern int optind; +- char ebuf[PCAP_ERRBUF_SIZE]; ++ char pcap_ebuf[PCAP_ERRBUF_SIZE]; ++ char libnet_ebuf[LIBNET_ERRBUF_SIZE]; + int c; + + intf = NULL; +@@ -163,7 +166,7 @@ + intf = optarg; + break; + case 't': +- if ((target_ip = libnet_name_resolve(optarg, 1)) == -1) ++ if ((target_ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1) + usage(); + break; + default: +@@ -176,26 +179,26 @@ + if (argc != 1) + usage(); + +- if ((spoof_ip = libnet_name_resolve(argv[0], 1)) == -1) ++ if ((spoof_ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1) + usage(); + +- if (intf == NULL && (intf = pcap_lookupdev(ebuf)) == NULL) +- errx(1, "%s", ebuf); ++ if (intf == NULL && (intf = pcap_lookupdev(pcap_ebuf)) == NULL) ++ errx(1, "%s", pcap_ebuf); + +- if ((llif = libnet_open_link_interface(intf, ebuf)) == 0) +- errx(1, "%s", ebuf); ++ if ((l = libnet_init(LIBNET_LINK, intf, libnet_ebuf)) == NULL) ++ errx(1, "%s", libnet_ebuf); + + if (target_ip != 0 && !arp_find(target_ip, &target_mac)) + errx(1, "couldn't arp for host %s", +- libnet_host_lookup(target_ip, 0)); ++ libnet_addr2name4(target_ip, LIBNET_DONT_RESOLVE)); + + signal(SIGHUP, cleanup); + signal(SIGINT, cleanup); + signal(SIGTERM, cleanup); + + for (;;) { +- arp_send(llif, intf, ARPOP_REPLY, NULL, spoof_ip, +- (target_ip ? (u_char *)&target_mac : NULL), ++ arp_send(l, ARPOP_REPLY, NULL, spoof_ip, ++ (target_ip ? (u_int8_t *)&target_mac : NULL), + target_ip); + sleep(2); + } +--- a/dnsspoof.c ++++ b/dnsspoof.c +@@ -38,7 +38,7 @@ + + pcap_t *pcap_pd = NULL; + int pcap_off = -1; +-int lnet_sock = -1; ++libnet_t *l; + u_long lnet_ip = -1; + + static void +@@ -90,19 +90,18 @@ + dns_init(char *dev, char *filename) + { + FILE *f; +- struct libnet_link_int *llif; ++ libnet_t *l; ++ char libnet_ebuf[LIBNET_ERRBUF_SIZE]; + struct dnsent *de; + char *ip, *name, buf[1024]; + +- if ((llif = libnet_open_link_interface(dev, buf)) == NULL) +- errx(1, "%s", buf); ++ if ((l = libnet_init(LIBNET_LINK, dev, libnet_ebuf)) == NULL) ++ errx(1, "%s", libnet_ebuf); + +- if ((lnet_ip = libnet_get_ipaddr(llif, dev, buf)) == -1) +- errx(1, "%s", buf); ++ if ((lnet_ip = libnet_get_ipaddr4(l)) == -1) ++ errx(1, "%s", libnet_geterror(l)); + +- lnet_ip = htonl(lnet_ip); +- +- libnet_close_link_interface(llif); ++ libnet_destroy(l); + + SLIST_INIT(&dns_entries); + +@@ -180,7 +179,7 @@ + static void + dns_spoof(u_char *u, const struct pcap_pkthdr *pkthdr, const u_char *pkt) + { +- struct libnet_ip_hdr *ip; ++ struct libnet_ipv4_hdr *ip; + struct libnet_udp_hdr *udp; + HEADER *dns; + char name[MAXHOSTNAMELEN]; +@@ -189,7 +188,7 @@ + in_addr_t dst; + u_short type, class; + +- ip = (struct libnet_ip_hdr *)(pkt + pcap_off); ++ ip = (struct libnet_ipv4_hdr *)(pkt + pcap_off); + udp = (struct libnet_udp_hdr *)(pkt + pcap_off + (ip->ip_hl * 4)); + dns = (HEADER *)(udp + 1); + p = (u_char *)(dns + 1); +@@ -212,7 +211,7 @@ + if (class != C_IN) + return; + +- p = buf + IP_H + UDP_H + dnslen; ++ p = buf + dnslen; + + if (type == T_A) { + if ((dst = dns_lookup_a(name)) == -1) +@@ -234,38 +233,38 @@ + anslen += 12; + } + else return; +- +- libnet_build_ip(UDP_H + dnslen + anslen, 0, libnet_get_prand(PRu16), +- 0, 64, IPPROTO_UDP, ip->ip_dst.s_addr, +- ip->ip_src.s_addr, NULL, 0, buf); +- +- libnet_build_udp(ntohs(udp->uh_dport), ntohs(udp->uh_sport), +- NULL, dnslen + anslen, buf + IP_H); + +- memcpy(buf + IP_H + UDP_H, (u_char *)dns, dnslen); ++ memcpy(buf, (u_char *)dns, dnslen); + +- dns = (HEADER *)(buf + IP_H + UDP_H); ++ dns = (HEADER *)buf; + dns->qr = dns->ra = 1; + if (type == T_PTR) dns->aa = 1; + dns->ancount = htons(1); + + dnslen += anslen; ++ ++ libnet_clear_packet(l); ++ libnet_build_udp(ntohs(udp->uh_dport), ntohs(udp->uh_sport), ++ LIBNET_UDP_H + dnslen, 0, ++ (u_int8_t *)buf, dnslen, l, 0); ++ ++ libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_UDP_H + dnslen, 0, ++ libnet_get_prand(LIBNET_PRu16), 0, 64, IPPROTO_UDP, 0, ++ ip->ip_dst.s_addr, ip->ip_src.s_addr, NULL, 0, l, 0); + +- libnet_do_checksum(buf, IPPROTO_UDP, UDP_H + dnslen); +- +- if (libnet_write_ip(lnet_sock, buf, IP_H + UDP_H + dnslen) < 0) ++ if (libnet_write(l) < 0) + warn("write"); + + fprintf(stderr, "%s.%d > %s.%d: %d+ %s? %s\n", +- libnet_host_lookup(ip->ip_src.s_addr, 0), ntohs(udp->uh_sport), +- libnet_host_lookup(ip->ip_dst.s_addr, 0), ntohs(udp->uh_dport), ++ libnet_addr2name4(ip->ip_src.s_addr, 0), ntohs(udp->uh_sport), ++ libnet_addr2name4(ip->ip_dst.s_addr, 0), ntohs(udp->uh_dport), + ntohs(dns->id), type == T_A ? "A" : "PTR", name); + } + + static void + cleanup(int sig) + { +- libnet_close_raw_sock(lnet_sock); ++ libnet_destroy(l); + pcap_close(pcap_pd); + exit(0); + } +@@ -276,6 +275,7 @@ + extern char *optarg; + extern int optind; + char *p, *dev, *hosts, buf[1024]; ++ char ebuf[LIBNET_ERRBUF_SIZE]; + int i; + + dev = hosts = NULL; +@@ -306,7 +306,7 @@ + strlcpy(buf, p, sizeof(buf)); + } + else snprintf(buf, sizeof(buf), "udp dst port 53 and not src %s", +- libnet_host_lookup(lnet_ip, 0)); ++ libnet_addr2name4(lnet_ip, LIBNET_DONT_RESOLVE)); + + if ((pcap_pd = pcap_init(dev, buf, 128)) == NULL) + errx(1, "couldn't initialize sniffing"); +@@ -314,10 +314,10 @@ + if ((pcap_off = pcap_dloff(pcap_pd)) < 0) + errx(1, "couldn't determine link layer offset"); + +- if ((lnet_sock = libnet_open_raw_sock(IPPROTO_RAW)) == -1) ++ if ((l = libnet_init(LIBNET_RAW4, dev, ebuf)) == NULL) + errx(1, "couldn't initialize sending"); + +- libnet_seed_prand(); ++ libnet_seed_prand(l); + + signal(SIGHUP, cleanup); + signal(SIGINT, cleanup); +--- a/filesnarf.c ++++ b/filesnarf.c +@@ -134,8 +134,8 @@ + int fd; + + warnx("%s.%d > %s.%d: %s (%d@%d)", +- libnet_host_lookup(addr->daddr, 0), addr->dest, +- libnet_host_lookup(addr->saddr, 0), addr->source, ++ libnet_addr2name4(addr->daddr, LIBNET_DONT_RESOLVE), addr->dest, ++ libnet_addr2name4(addr->saddr, LIBNET_DONT_RESOLVE), addr->source, + ma->filename, len, ma->offset); + + if ((fd = open(ma->filename, O_WRONLY|O_CREAT, 0644)) >= 0) { +@@ -353,7 +353,7 @@ + } + + static void +-decode_udp_nfs(struct libnet_ip_hdr *ip) ++decode_udp_nfs(struct libnet_ipv4_hdr *ip) + { + static struct tuple4 addr; + struct libnet_udp_hdr *udp; +--- a/macof.c ++++ b/macof.c +@@ -48,8 +48,8 @@ + static void + gen_mac(u_char *mac) + { +- *((in_addr_t *)mac) = libnet_get_prand(PRu32); +- *((u_short *)(mac + 4)) = libnet_get_prand(PRu16); ++ *((in_addr_t *)mac) = libnet_get_prand(LIBNET_PRu32); ++ *((u_short *)(mac + 4)) = libnet_get_prand(LIBNET_PRu16); + } + + int +@@ -59,22 +59,23 @@ + extern int optind; + int c, i; + struct libnet_link_int *llif; +- char ebuf[PCAP_ERRBUF_SIZE]; ++ char pcap_ebuf[PCAP_ERRBUF_SIZE]; ++ char libnet_ebuf[LIBNET_ERRBUF_SIZE]; + u_char sha[ETHER_ADDR_LEN], tha[ETHER_ADDR_LEN]; + in_addr_t src, dst; + u_short sport, dport; + u_int32_t seq; +- u_char pkt[ETH_H + IP_H + TCP_H]; ++ libnet_t *l; + + while ((c = getopt(argc, argv, "vs:d:e:x:y:i:n:h?V")) != -1) { + switch (c) { + case 'v': + break; + case 's': +- Src = libnet_name_resolve(optarg, 0); ++ Src = libnet_name2addr4(l, optarg, 0); + break; + case 'd': +- Dst = libnet_name_resolve(optarg, 0); ++ Dst = libnet_name2addr4(l, optarg, 0); + break; + case 'e': + Tha = (u_char *)ether_aton(optarg); +@@ -101,13 +102,13 @@ + if (argc != 0) + usage(); + +- if (!Intf && (Intf = pcap_lookupdev(ebuf)) == NULL) +- errx(1, "%s", ebuf); ++ if (!Intf && (Intf = pcap_lookupdev(pcap_ebuf)) == NULL) ++ errx(1, "%s", pcap_ebuf); + +- if ((llif = libnet_open_link_interface(Intf, ebuf)) == 0) +- errx(1, "%s", ebuf); ++ if ((l = libnet_init(LIBNET_LINK, Intf, libnet_ebuf)) == NULL) ++ errx(1, "%s", libnet_ebuf); + +- libnet_seed_prand(); ++ libnet_seed_prand(l); + + for (i = 0; i != Repeat; i++) { + +@@ -117,39 +118,39 @@ + else memcpy(tha, Tha, sizeof(tha)); + + if (Src != 0) src = Src; +- else src = libnet_get_prand(PRu32); ++ else src = libnet_get_prand(LIBNET_PRu32); + + if (Dst != 0) dst = Dst; +- else dst = libnet_get_prand(PRu32); ++ else dst = libnet_get_prand(LIBNET_PRu32); + + if (Sport != 0) sport = Sport; +- else sport = libnet_get_prand(PRu16); ++ else sport = libnet_get_prand(LIBNET_PRu16); + + if (Dport != 0) dport = Dport; +- else dport = libnet_get_prand(PRu16); ++ else dport = libnet_get_prand(LIBNET_PRu16); + +- seq = libnet_get_prand(PRu32); +- +- libnet_build_ethernet(tha, sha, ETHERTYPE_IP, NULL, 0, pkt); +- +- libnet_build_ip(TCP_H, 0, libnet_get_prand(PRu16), 0, 64, +- IPPROTO_TCP, src, dst, NULL, 0, pkt + ETH_H); ++ seq = libnet_get_prand(LIBNET_PRu32); + + libnet_build_tcp(sport, dport, seq, 0, TH_SYN, 512, +- 0, NULL, 0, pkt + ETH_H + IP_H); ++ 0, 0, LIBNET_TCP_H, NULL, 0, l, 0); + +- libnet_do_checksum(pkt + ETH_H, IPPROTO_IP, IP_H); +- libnet_do_checksum(pkt + ETH_H, IPPROTO_TCP, TCP_H); ++ libnet_build_ipv4(LIBNET_TCP_H, 0, ++ libnet_get_prand(LIBNET_PRu16), 0, 64, ++ IPPROTO_TCP, 0, src, dst, NULL, 0, l, 0); + +- if (libnet_write_link_layer(llif, Intf, pkt, sizeof(pkt)) < 0) ++ libnet_build_ethernet(tha, sha, ETHERTYPE_IP, NULL, 0, l, 0); ++ ++ if (libnet_write(l) < 0) + errx(1, "write"); + ++ libnet_clear_packet(l); ++ + fprintf(stderr, "%s ", + ether_ntoa((struct ether_addr *)sha)); + fprintf(stderr, "%s %s.%d > %s.%d: S %u:%u(0) win 512\n", + ether_ntoa((struct ether_addr *)tha), +- libnet_host_lookup(Src, 0), sport, +- libnet_host_lookup(Dst, 0), dport, seq, seq); ++ libnet_addr2name4(Src, 0), sport, ++ libnet_addr2name4(Dst, 0), dport, seq, seq); + } + exit(0); + } +--- a/record.c ++++ b/record.c +@@ -65,8 +65,8 @@ + tm = localtime(&rec->time); + strftime(tstr, sizeof(tstr), "%x %X", tm); + +- srcp = libnet_host_lookup(rec->src, Opt_dns); +- dstp = libnet_host_lookup(rec->dst, Opt_dns); ++ srcp = libnet_addr2name4(rec->src, Opt_dns); ++ dstp = libnet_addr2name4(rec->dst, Opt_dns); + + if ((pr = getprotobynumber(rec->proto)) == NULL) + protop = "unknown"; +--- a/sshmitm.c ++++ b/sshmitm.c +@@ -389,7 +389,7 @@ + if (argc < 1) + usage(); + +- if ((ip = libnet_name_resolve(argv[0], 1)) == -1) ++ if ((ip = libnet_name2addr4(NULL, argv[0], LIBNET_RESOLVE)) == -1) + usage(); + + if (argc == 2 && (rport = atoi(argv[1])) == 0) +--- a/tcpkill.c ++++ b/tcpkill.c +@@ -39,17 +39,18 @@ + static void + tcp_kill_cb(u_char *user, const struct pcap_pkthdr *pcap, const u_char *pkt) + { +- struct libnet_ip_hdr *ip; ++ struct libnet_ipv4_hdr *ip; + struct libnet_tcp_hdr *tcp; +- u_char ctext[64], buf[IP_H + TCP_H]; ++ u_char ctext[64]; + u_int32_t seq, win; +- int i, *sock, len; ++ int i, len; ++ libnet_t *l; + +- sock = (int *)user; ++ l = (libnet_t *)user; + pkt += pcap_off; + len = pcap->caplen - pcap_off; + +- ip = (struct libnet_ip_hdr *)pkt; ++ ip = (struct libnet_ipv4_hdr *)pkt; + if (ip->ip_p != IPPROTO_TCP) + return; + +@@ -57,34 +58,31 @@ + if (tcp->th_flags & (TH_SYN|TH_FIN|TH_RST)) + return; + +- libnet_build_ip(TCP_H, 0, 0, 0, 64, IPPROTO_TCP, +- ip->ip_dst.s_addr, ip->ip_src.s_addr, +- NULL, 0, buf); +- +- libnet_build_tcp(ntohs(tcp->th_dport), ntohs(tcp->th_sport), +- 0, 0, TH_RST, 0, 0, NULL, 0, buf + IP_H); +- + seq = ntohl(tcp->th_ack); + win = ntohs(tcp->th_win); + + snprintf(ctext, sizeof(ctext), "%s:%d > %s:%d:", +- libnet_host_lookup(ip->ip_src.s_addr, 0), ++ libnet_addr2name4(ip->ip_src.s_addr, LIBNET_DONT_RESOLVE), + ntohs(tcp->th_sport), +- libnet_host_lookup(ip->ip_dst.s_addr, 0), ++ libnet_addr2name4(ip->ip_dst.s_addr, LIBNET_DONT_RESOLVE), + ntohs(tcp->th_dport)); + +- ip = (struct libnet_ip_hdr *)buf; +- tcp = (struct libnet_tcp_hdr *)(ip + 1); +- + for (i = 0; i < Opt_severity; i++) { +- ip->ip_id = libnet_get_prand(PRu16); + seq += (i * win); +- tcp->th_seq = htonl(seq); + +- libnet_do_checksum(buf, IPPROTO_TCP, TCP_H); ++ libnet_clear_packet(l); ++ ++ libnet_build_tcp(ntohs(tcp->th_dport), ntohs(tcp->th_sport), ++ seq, 0, TH_RST, 0, 0, 0, LIBNET_TCP_H, ++ NULL, 0, l, 0); ++ ++ libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_TCP_H, 0, ++ libnet_get_prand(LIBNET_PRu16), 0, 64, ++ IPPROTO_TCP, 0, ip->ip_dst.s_addr, ++ ip->ip_src.s_addr, NULL, 0, l, 0); + +- if (libnet_write_ip(*sock, buf, sizeof(buf)) < 0) +- warn("write_ip"); ++ if (libnet_write(l) < 0) ++ warn("write"); + + fprintf(stderr, "%s R %lu:%lu(0) win 0\n", ctext, seq, seq); + } +@@ -95,8 +93,10 @@ + { + extern char *optarg; + extern int optind; +- int c, sock; ++ int c; + char *p, *intf, *filter, ebuf[PCAP_ERRBUF_SIZE]; ++ char libnet_ebuf[LIBNET_ERRBUF_SIZE]; ++ libnet_t *l; + pcap_t *pd; + + intf = NULL; +@@ -136,14 +136,14 @@ + if ((pcap_off = pcap_dloff(pd)) < 0) + errx(1, "couldn't determine link layer offset"); + +- if ((sock = libnet_open_raw_sock(IPPROTO_RAW)) == -1) ++ if ((l = libnet_init(LIBNET_RAW4, intf, libnet_ebuf)) == NULL) + errx(1, "couldn't initialize sending"); + +- libnet_seed_prand(); ++ libnet_seed_prand(l); + + warnx("listening on %s [%s]", intf, filter); + +- pcap_loop(pd, -1, tcp_kill_cb, (u_char *)&sock); ++ pcap_loop(pd, -1, tcp_kill_cb, (u_char *)l); + + /* NOTREACHED */ + +--- a/tcpnice.c ++++ b/tcpnice.c +@@ -41,107 +41,106 @@ + } + + static void +-send_tcp_window_advertisement(int sock, struct libnet_ip_hdr *ip, ++send_tcp_window_advertisement(libnet_t *l, struct libnet_ipv4_hdr *ip, + struct libnet_tcp_hdr *tcp) + { + int len; + + ip->ip_hl = 5; +- ip->ip_len = htons(IP_H + TCP_H); +- ip->ip_id = libnet_get_prand(PRu16); +- memcpy(buf, (u_char *)ip, IP_H); ++ ip->ip_len = htons(LIBNET_IPV4_H + LIBNET_TCP_H); ++ ip->ip_id = libnet_get_prand(LIBNET_PRu16); ++ memcpy(buf, (u_char *)ip, LIBNET_IPV4_H); + + tcp->th_off = 5; + tcp->th_win = htons(MIN_WIN); +- memcpy(buf + IP_H, (u_char *)tcp, TCP_H); ++ memcpy(buf + LIBNET_IPV4_H, (u_char *)tcp, LIBNET_TCP_H); + +- libnet_do_checksum(buf, IPPROTO_TCP, TCP_H); ++ libnet_do_checksum(l, buf, IPPROTO_TCP, LIBNET_TCP_H); + +- len = IP_H + TCP_H; ++ len = LIBNET_IPV4_H + LIBNET_TCP_H; + +- if (libnet_write_ip(sock, buf, len) != len) ++ if (libnet_write_raw_ipv4(l, buf, len) != len) + warn("write"); + + fprintf(stderr, "%s:%d > %s:%d: . ack %lu win %d\n", +- libnet_host_lookup(ip->ip_src.s_addr, 0), ntohs(tcp->th_sport), +- libnet_host_lookup(ip->ip_dst.s_addr, 0), ntohs(tcp->th_dport), ++ libnet_addr2name4(ip->ip_src.s_addr, 0), ntohs(tcp->th_sport), ++ libnet_addr2name4(ip->ip_dst.s_addr, 0), ntohs(tcp->th_dport), + ntohl(tcp->th_ack), 1); + } + + static void +-send_icmp_source_quench(int sock, struct libnet_ip_hdr *ip) ++send_icmp_source_quench(libnet_t *l, struct libnet_ipv4_hdr *ip) + { +- struct libnet_icmp_hdr *icmp; ++ struct libnet_icmpv4_hdr *icmp; + int len; + + len = (ip->ip_hl * 4) + 8; + +- libnet_build_ip(ICMP_ECHO_H + len, 0, libnet_get_prand(PRu16), +- 0, 64, IPPROTO_ICMP, ip->ip_dst.s_addr, +- ip->ip_src.s_addr, NULL, 0, buf); +- +- icmp = (struct libnet_icmp_hdr *)(buf + IP_H); ++ icmp = (struct libnet_icmpv4_hdr *)(buf + LIBNET_IPV4_H); + icmp->icmp_type = ICMP_SOURCEQUENCH; + icmp->icmp_code = 0; +- memcpy((u_char *)icmp + ICMP_ECHO_H, (u_char *)ip, len); ++ memcpy((u_char *)icmp + LIBNET_ICMPV4_ECHO_H, (u_char *)ip, len); + +- libnet_do_checksum(buf, IPPROTO_ICMP, ICMP_ECHO_H + len); ++ len += LIBNET_ICMPV4_ECHO_H; + +- len += (IP_H + ICMP_ECHO_H); ++ libnet_build_ipv4(LIBNET_IPV4_H + len, 0, ++ libnet_get_prand(LIBNET_PRu16), 0, 64, IPPROTO_ICMP, ++ 0, ip->ip_dst.s_addr, ip->ip_src.s_addr, ++ (u_int8_t *) icmp, len, l, 0); + +- if (libnet_write_ip(sock, buf, len) != len) ++ if (libnet_write(l) != len) + warn("write"); + + fprintf(stderr, "%s > %s: icmp: source quench\n", +- libnet_host_lookup(ip->ip_dst.s_addr, 0), +- libnet_host_lookup(ip->ip_src.s_addr, 0)); ++ libnet_addr2name4(ip->ip_dst.s_addr, 0), ++ libnet_addr2name4(ip->ip_src.s_addr, 0)); + } + + static void +-send_icmp_frag_needed(int sock, struct libnet_ip_hdr *ip) ++send_icmp_frag_needed(libnet_t *l, struct libnet_ipv4_hdr *ip) + { +- struct libnet_icmp_hdr *icmp; ++ struct libnet_icmpv4_hdr *icmp; + int len; + + len = (ip->ip_hl * 4) + 8; + +- libnet_build_ip(ICMP_MASK_H + len, 4, libnet_get_prand(PRu16), +- 0, 64, IPPROTO_ICMP, ip->ip_dst.s_addr, +- ip->ip_src.s_addr, NULL, 0, buf); +- +- icmp = (struct libnet_icmp_hdr *)(buf + IP_H); ++ icmp = (struct libnet_icmpv4_hdr *)(buf + LIBNET_IPV4_H); + icmp->icmp_type = ICMP_UNREACH; + icmp->icmp_code = ICMP_UNREACH_NEEDFRAG; + icmp->hun.frag.pad = 0; + icmp->hun.frag.mtu = htons(MIN_MTU); +- memcpy((u_char *)icmp + ICMP_MASK_H, (u_char *)ip, len); ++ memcpy((u_char *)icmp + LIBNET_ICMPV4_MASK_H, (u_char *)ip, len); + +- libnet_do_checksum(buf, IPPROTO_ICMP, ICMP_MASK_H + len); +- +- len += (IP_H + ICMP_MASK_H); ++ len += LIBNET_ICMPV4_MASK_H; ++ ++ libnet_build_ipv4(LIBNET_IPV4_H + len, 4, ++ libnet_get_prand(LIBNET_PRu16), 0, 64, IPPROTO_ICMP, ++ 0, ip->ip_dst.s_addr, ip->ip_src.s_addr, ++ (u_int8_t *) icmp, len, l, 0); + +- if (libnet_write_ip(sock, buf, len) != len) ++ if (libnet_write(l) != len) + warn("write"); + + fprintf(stderr, "%s > %s: icmp: ", +- libnet_host_lookup(ip->ip_dst.s_addr, 0), +- libnet_host_lookup(ip->ip_src.s_addr, 0)); ++ libnet_addr2name4(ip->ip_dst.s_addr, 0), ++ libnet_addr2name4(ip->ip_src.s_addr, 0)); + fprintf(stderr, "%s unreachable - need to frag (mtu %d)\n", +- libnet_host_lookup(ip->ip_src.s_addr, 0), MIN_MTU); ++ libnet_addr2name4(ip->ip_src.s_addr, 0), MIN_MTU); + } + + static void + tcp_nice_cb(u_char *user, const struct pcap_pkthdr *pcap, const u_char *pkt) + { +- struct libnet_ip_hdr *ip; ++ struct libnet_ipv4_hdr *ip; + struct libnet_tcp_hdr *tcp; +- int *sock, len; ++ int len; ++ libnet_t *l; + +- sock = (int *)user; ++ l = (libnet_t *)user; + pkt += pcap_off; + len = pcap->caplen - pcap_off; + +- ip = (struct libnet_ip_hdr *)pkt; ++ ip = (struct libnet_ipv4_hdr *)pkt; + if (ip->ip_p != IPPROTO_TCP) + return; + +@@ -151,11 +150,11 @@ + + if (ntohs(ip->ip_len) > (ip->ip_hl << 2) + (tcp->th_off << 2)) { + if (Opt_icmp) +- send_icmp_source_quench(*sock, ip); ++ send_icmp_source_quench(l, ip); + if (Opt_win) +- send_tcp_window_advertisement(*sock, ip, tcp); ++ send_tcp_window_advertisement(l, ip, tcp); + if (Opt_pmtu) +- send_icmp_frag_needed(*sock, ip); ++ send_icmp_frag_needed(l, ip); + } + } + +@@ -164,8 +163,10 @@ + { + extern char *optarg; + extern int optind; +- int c, sock; ++ int c; + char *intf, *filter, ebuf[PCAP_ERRBUF_SIZE]; ++ char libnet_ebuf[LIBNET_ERRBUF_SIZE]; ++ libnet_t *l; + pcap_t *pd; + + intf = NULL; +@@ -209,14 +210,14 @@ + if ((pcap_off = pcap_dloff(pd)) < 0) + errx(1, "couldn't determine link layer offset"); + +- if ((sock = libnet_open_raw_sock(IPPROTO_RAW)) == -1) ++ if ((l = libnet_init(LIBNET_RAW4, intf, libnet_ebuf)) == NULL) + errx(1, "couldn't initialize sending"); + +- libnet_seed_prand(); ++ libnet_seed_prand(l); + + warnx("listening on %s [%s]", intf, filter); + +- pcap_loop(pd, -1, tcp_nice_cb, (u_char *)&sock); ++ pcap_loop(pd, -1, tcp_nice_cb, (u_char *)l); + + /* NOTREACHED */ + +--- a/tcp_raw.c ++++ b/tcp_raw.c +@@ -119,7 +119,7 @@ + } + + struct iovec * +-tcp_raw_input(struct libnet_ip_hdr *ip, struct libnet_tcp_hdr *tcp, int len) ++tcp_raw_input(struct libnet_ipv4_hdr *ip, struct libnet_tcp_hdr *tcp, int len) + { + struct tha tha; + struct tcp_conn *conn; +@@ -131,7 +131,7 @@ + + /* Verify TCP checksum. */ + cksum = tcp->th_sum; +- libnet_do_checksum((u_char *) ip, IPPROTO_TCP, len); ++ libnet_do_checksum(NULL, (u_char *) ip, IPPROTO_TCP, len); + + if (cksum != tcp->th_sum) + return (NULL); +--- a/tcp_raw.h ++++ b/tcp_raw.h +@@ -15,7 +15,7 @@ + u_short sport, u_short dport, + u_char *buf, int len); + +-struct iovec *tcp_raw_input(struct libnet_ip_hdr *ip, ++struct iovec *tcp_raw_input(struct libnet_ipv4_hdr *ip, + struct libnet_tcp_hdr *tcp, int len); + + void tcp_raw_timeout(int timeout, tcp_raw_callback_t callback); +--- a/trigger.c ++++ b/trigger.c +@@ -276,7 +276,7 @@ + } + + void +-trigger_ip(struct libnet_ip_hdr *ip) ++trigger_ip(struct libnet_ipv4_hdr *ip) + { + struct trigger *t, tr; + u_char *buf; +@@ -305,7 +305,7 @@ + + /* libnids needs a nids_register_udp()... */ + void +-trigger_udp(struct libnet_ip_hdr *ip) ++trigger_udp(struct libnet_ipv4_hdr *ip) + { + struct trigger *t, tr; + struct libnet_udp_hdr *udp; +@@ -437,7 +437,7 @@ + } + + void +-trigger_tcp_raw(struct libnet_ip_hdr *ip) ++trigger_tcp_raw(struct libnet_ipv4_hdr *ip) + { + struct trigger *t, tr; + struct libnet_tcp_hdr *tcp; +--- a/trigger.h ++++ b/trigger.h +@@ -24,10 +24,10 @@ + int trigger_set_tcp(int port, char *name); + int trigger_set_rpc(int program, char *name); + +-void trigger_ip(struct libnet_ip_hdr *ip); +-void trigger_udp(struct libnet_ip_hdr *ip); ++void trigger_ip(struct libnet_ipv4_hdr *ip); ++void trigger_udp(struct libnet_ipv4_hdr *ip); + void trigger_tcp(struct tcp_stream *ts, void **conn_save); +-void trigger_tcp_raw(struct libnet_ip_hdr *ip); ++void trigger_tcp_raw(struct libnet_ipv4_hdr *ip); + void trigger_tcp_raw_timeout(int signal); + void trigger_rpc(int program, int proto, int port); + +--- a/urlsnarf.c ++++ b/urlsnarf.c +@@ -145,14 +145,14 @@ + if (user == NULL) + user = "-"; + if (vhost == NULL) +- vhost = libnet_host_lookup(addr->daddr, Opt_dns); ++ vhost = libnet_addr2name4(addr->daddr, Opt_dns); + if (referer == NULL) + referer = "-"; + if (agent == NULL) + agent = "-"; + + printf("%s - %s [%s] \"%s http://%s%s\" - - \"%s\" \"%s\"\n", +- libnet_host_lookup(addr->saddr, Opt_dns), ++ libnet_addr2name4(addr->saddr, Opt_dns), + user, timestamp(), req, vhost, uri, referer, agent); + } + fflush(stdout); +--- a/webmitm.c ++++ b/webmitm.c +@@ -242,7 +242,7 @@ + word = buf_tok(&msg, "/", 1); + vhost = buf_strdup(word); + } +- ssin.sin_addr.s_addr = libnet_name_resolve(vhost, 1); ++ ssin.sin_addr.s_addr = libnet_name2addr4(NULL, vhost, 1); + free(vhost); + + if (ssin.sin_addr.s_addr == ntohl(INADDR_LOOPBACK) || +@@ -510,7 +510,7 @@ + argv += optind; + + if (argc == 1) { +- if ((static_host = libnet_name_resolve(argv[0], 1)) == -1) ++ if ((static_host = libnet_name2addr4(NULL, argv[0], 1)) == -1) + usage(); + } + else if (argc != 0) usage(); +--- a/webspy.c ++++ b/webspy.c +@@ -126,7 +126,7 @@ + if (auth == NULL) + auth = ""; + if (vhost == NULL) +- vhost = libnet_host_lookup(addr->daddr, 0); ++ vhost = libnet_addr2name4(addr->daddr, 0); + + snprintf(cmd, sizeof(cmd), "openURL(http://%s%s%s%s)", + auth, *auth ? "@" : "", vhost, uri); +@@ -205,7 +205,7 @@ + cmdtab[0] = cmd; + cmdtab[1] = NULL; + +- if ((host = libnet_name_resolve(argv[0], 1)) == -1) ++ if ((host = libnet_name2addr4(NULL, argv[0], 1)) == -1) + errx(1, "unknown host"); + + if ((dpy = XOpenDisplay(NULL)) == NULL) diff --git a/network/dsniff/patches/08_openssl-0.9.8.patch b/network/dsniff/patches/08_openssl-0.9.8.patch new file mode 100644 index 0000000000..dc9b327bfe --- /dev/null +++ b/network/dsniff/patches/08_openssl-0.9.8.patch @@ -0,0 +1,15 @@ +Author: +Description: Fix FTBFS with openssl. +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/ssh.c ++++ b/ssh.c +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/network/dsniff/patches/09_sysconf_clocks.patch b/network/dsniff/patches/09_sysconf_clocks.patch new file mode 100644 index 0000000000..a41fa581c5 --- /dev/null +++ b/network/dsniff/patches/09_sysconf_clocks.patch @@ -0,0 +1,23 @@ +Author: +Description: Fix FTBFS: ./sshow.c:226: error: 'CLK_TCK' undeclared. +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/sshow.c ++++ b/sshow.c +@@ -217,6 +217,7 @@ + { + clock_t delay; + int payload; ++ long CLK_TCK= sysconf(_SC_CLK_TCK); + + delay = add_history(session, 0, cipher_size, plain_range); + +@@ -265,6 +266,7 @@ + clock_t delay; + int skip; + range string_range; ++ long CLK_TCK= sysconf(_SC_CLK_TCK); + + delay = add_history(session, 1, cipher_size, plain_range); + diff --git a/network/dsniff/patches/10_urlsnarf_escape.patch b/network/dsniff/patches/10_urlsnarf_escape.patch new file mode 100644 index 0000000000..e6fab01ab3 --- /dev/null +++ b/network/dsniff/patches/10_urlsnarf_escape.patch @@ -0,0 +1,89 @@ +Author: Hilko Bengen +Description: Escape user, vhost, uri, referer, agent strings in log. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=372536 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/urlsnarf.c ++++ b/urlsnarf.c +@@ -84,6 +84,43 @@ + return (tstr); + } + ++static char * ++escape_log_entry(char *string) ++{ ++ char *out; ++ unsigned char *c, *o; ++ size_t len; ++ ++ if (!string) ++ return NULL; ++ ++ /* Determine needed length */ ++ for (c = string, len = 0; *c; c++) { ++ if ((*c < 32) || (*c >= 128)) ++ len += 4; ++ else if ((*c == '"') || (*c =='\\')) ++ len += 2; ++ else ++ len++; ++ } ++ out = malloc(len+1); ++ if (!out) ++ return NULL; ++ for (c = string, o = out; *c; c++, o++) { ++ if ((*c < 32) || (*c >= 128)) { ++ snprintf(o, 5, "\\x%02x", *c); ++ o += 3; ++ } else if ((*c == '"') || ((*c =='\\'))) { ++ *(o++) = '\\'; ++ *o = *c; ++ } else { ++ *o = *c; ++ } ++ } ++ out[len]='\0'; ++ return out; ++} ++ + static int + process_http_request(struct tuple4 *addr, u_char *data, int len) + { +@@ -142,18 +179,26 @@ + buf_tok(NULL, NULL, i); + } + } +- if (user == NULL) +- user = "-"; +- if (vhost == NULL) +- vhost = libnet_addr2name4(addr->daddr, Opt_dns); +- if (referer == NULL) +- referer = "-"; +- if (agent == NULL) +- agent = "-"; +- ++ user = escape_log_entry(user); ++ vhost = escape_log_entry(vhost); ++ uri = escape_log_entry(uri); ++ referer = escape_log_entry(referer); ++ agent = escape_log_entry(agent); ++ + printf("%s - %s [%s] \"%s http://%s%s\" - - \"%s\" \"%s\"\n", + libnet_addr2name4(addr->saddr, Opt_dns), +- user, timestamp(), req, vhost, uri, referer, agent); ++ (user?user:"-"), ++ timestamp(), req, ++ (vhost?vhost:libnet_addr2name4(addr->daddr, Opt_dns)), ++ uri, ++ (referer?referer:"-"), ++ (agent?agent:"-")); ++ ++ free(user); ++ free(vhost); ++ free(uri); ++ free(referer); ++ free(agent); + } + fflush(stdout); + diff --git a/network/dsniff/patches/11_string_header.patch b/network/dsniff/patches/11_string_header.patch new file mode 100644 index 0000000000..1b383f2847 --- /dev/null +++ b/network/dsniff/patches/11_string_header.patch @@ -0,0 +1,166 @@ +Author: Luciano Bello +Description: Avoid the "implicit declaration of function 'str*'" warning +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/arp.c ++++ b/arp.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #include "arp.h" + +--- a/buf.c ++++ b/buf.c +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + + #include "buf.h" + +--- a/decode_nntp.c ++++ b/decode_nntp.c +@@ -15,6 +15,7 @@ + + #include + #include ++#include + + #include "base64.h" + #include "decode.h" +--- a/decode_pop.c ++++ b/decode_pop.c +@@ -14,6 +14,7 @@ + + #include + #include ++#include + + #include "base64.h" + #include "options.h" +--- a/decode_rlogin.c ++++ b/decode_rlogin.c +@@ -14,6 +14,8 @@ + + #include + #include ++#include ++#include + + #include "options.h" + #include "decode.h" +--- a/decode_smb.c ++++ b/decode_smb.c +@@ -15,6 +15,7 @@ + + #include + #include ++#include + + #include "decode.h" + +--- a/decode_smtp.c ++++ b/decode_smtp.c +@@ -14,6 +14,7 @@ + + #include + #include ++#include + + #include "base64.h" + #include "options.h" +--- a/decode_sniffer.c ++++ b/decode_sniffer.c +@@ -15,6 +15,8 @@ + + #include + #include ++#include ++#include + + #include "base64.h" + #include "decode.h" +--- a/decode_socks.c ++++ b/decode_socks.c +@@ -14,6 +14,7 @@ + + #include + #include ++#include + + #include "decode.h" + +--- a/decode_tds.c ++++ b/decode_tds.c +@@ -18,6 +18,7 @@ + + #include + #include ++#include + + #include "decode.h" + +--- a/decode_telnet.c ++++ b/decode_telnet.c +@@ -14,6 +14,7 @@ + + #include + #include ++#include + + #include "options.h" + #include "decode.h" +--- a/decode_x11.c ++++ b/decode_x11.c +@@ -14,6 +14,8 @@ + + #include + #include ++#include ++#include + + #include "decode.h" + +--- a/dnsspoof.c ++++ b/dnsspoof.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- a/magic.c ++++ b/magic.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- /dev/null ++++ b/missing/strlcat.h +@@ -0,0 +1 @@ ++size_t strlcat(char *dst, const char *src, size_t siz); +--- /dev/null ++++ b/missing/strlcpy.h +@@ -0,0 +1 @@ ++size_t strlcpy(char *dst, const char *src, size_t siz); +--- a/sshmitm.c ++++ b/sshmitm.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include "buf.h" + #include "record.h" diff --git a/network/dsniff/patches/12_arpa_inet_header.patch b/network/dsniff/patches/12_arpa_inet_header.patch new file mode 100644 index 0000000000..246cf27b3c --- /dev/null +++ b/network/dsniff/patches/12_arpa_inet_header.patch @@ -0,0 +1,65 @@ +Author: Luciano Bello +Description: avoid the "implicit declaration of function 'ntohs'" warning +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/decode_aim.c ++++ b/decode_aim.c +@@ -14,6 +14,7 @@ + + #include + #include ++#include + + #include "hex.h" + #include "buf.h" +--- a/decode_mmxp.c ++++ b/decode_mmxp.c +@@ -21,6 +21,7 @@ + + #include + #include ++#include + + #include "buf.h" + #include "decode.h" +--- a/decode_pptp.c ++++ b/decode_pptp.c +@@ -16,6 +16,7 @@ + + #include + #include ++#include + + #include "buf.h" + #include "decode.h" +--- a/decode_tds.c ++++ b/decode_tds.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "decode.h" + +--- a/decode_vrrp.c ++++ b/decode_vrrp.c +@@ -15,6 +15,7 @@ + + #include + #include ++#include + + #include "buf.h" + #include "decode.h" +--- a/ssh.c ++++ b/ssh.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + + #include "hex.h" diff --git a/network/dsniff/patches/13_pop_with_version.patch b/network/dsniff/patches/13_pop_with_version.patch new file mode 100644 index 0000000000..80c570c41a --- /dev/null +++ b/network/dsniff/patches/13_pop_with_version.patch @@ -0,0 +1,30 @@ +Author: Luciano Bello +Description: distinguish between pop versions +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/decode.c ++++ b/decode.c +@@ -63,7 +63,8 @@ + { "http", decode_http }, + { "ospf", decode_ospf }, + { "poppass", decode_poppass }, +- { "pop", decode_pop }, ++ { "pop2", decode_pop }, ++ { "pop3", decode_pop }, + { "nntp", decode_nntp }, + { "smb", decode_smb }, + { "imap", decode_imap }, +--- a/dsniff.services ++++ b/dsniff.services +@@ -10,8 +10,8 @@ + ospf 89/ip + http 98/tcp + poppass 106/tcp +-pop 109/tcp +-pop 110/tcp ++pop2 109/tcp ++pop3 110/tcp + portmap 111/tcp + portmap -111/tcp + portmap 111/udp diff --git a/network/dsniff/patches/14_obsolete_time.patch b/network/dsniff/patches/14_obsolete_time.patch new file mode 100644 index 0000000000..f4ca6088c1 --- /dev/null +++ b/network/dsniff/patches/14_obsolete_time.patch @@ -0,0 +1,36 @@ +Author: Luciano Bello +Description: According to /usr/include/time.h, CLK_TCK is the +"obsolete POSIX.1-1988 name" for CLOCKS_PER_SEC. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=420944 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/sshow.c ++++ b/sshow.c +@@ -224,7 +224,7 @@ + if (debug) + printf("- %s -> %s: DATA (%s bytes, %.2f seconds)\n", + s_saddr(ts), s_daddr(ts), s_range(plain_range), +- (float)delay / CLK_TCK); ++ (float)delay / CLOCKS_PER_SEC); + if (debug > 1) + print_data(&ts->server, cipher_size); + +@@ -273,7 +273,7 @@ + if (debug) + printf("- %s <- %s: DATA (%s bytes, %.2f seconds)\n", + s_saddr(ts), s_daddr(ts), s_range(plain_range), +- (float)delay / CLK_TCK); ++ (float)delay / CLOCKS_PER_SEC); + if (debug > 1) + print_data(&ts->client, cipher_size); + +@@ -302,7 +302,7 @@ + + if (session->state == 1 && + #ifdef USE_TIMING +- now - get_history(session, 2)->timestamp >= CLK_TCK && ++ now - get_history(session, 2)->timestamp >= CLOCKS_PER_SEC && + #endif + session->protocol == 1 && + (session->history.directions & 7) == 5 && diff --git a/network/dsniff/patches/15_checksum_libnids.patch b/network/dsniff/patches/15_checksum_libnids.patch new file mode 100644 index 0000000000..47fbbe1d58 --- /dev/null +++ b/network/dsniff/patches/15_checksum_libnids.patch @@ -0,0 +1,98 @@ +Author: Gleb Paharenko +Description: Workaround to this Debian bug +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=420129 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/dsniff.c ++++ b/dsniff.c +@@ -70,6 +70,80 @@ + { + } + ++ ++static int get_all_ifaces(struct ifreq **, int *); ++static unsigned int get_addr_from_ifreq(struct ifreq *); ++ ++int all_local_ipaddrs_chksum_disable() ++{ ++ struct ifreq *ifaces; ++ int ifaces_count; ++ int i, ind = 0; ++ struct nids_chksum_ctl *ctlp; ++ unsigned int tmp; ++ ++ if (!get_all_ifaces(&ifaces, &ifaces_count)) ++ return -1; ++ ctlp = ++ (struct nids_chksum_ctl *) malloc(ifaces_count * ++ sizeof(struct ++ nids_chksum_ctl)); ++ if (!ctlp) ++ return -1; ++ for (i = 0; i < ifaces_count; i++) { ++ tmp = get_addr_from_ifreq(ifaces + i); ++ if (tmp) { ++ ctlp[ind].netaddr = tmp; ++ ctlp[ind].mask = inet_addr("255.255.255.255"); ++ ctlp[ind].action = NIDS_DONT_CHKSUM; ++ ind++; ++ } ++ } ++ free(ifaces); ++ nids_register_chksum_ctl(ctlp, ind); ++} ++ ++/* helper functions for Example 2 */ ++unsigned int get_addr_from_ifreq(struct ifreq *iface) ++{ ++ if (iface->ifr_addr.sa_family == AF_INET) ++ return ((struct sockaddr_in *) &(iface->ifr_addr))-> ++ sin_addr.s_addr; ++ return 0; ++} ++ ++static int get_all_ifaces(struct ifreq **ifaces, int *count) ++{ ++ int ifaces_size = 8 * sizeof(struct ifreq); ++ struct ifconf param; ++ int sock; ++ unsigned int i; ++ ++ *ifaces = malloc(ifaces_size); ++ sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); ++ if (sock <= 0) ++ return 0; ++ for (;;) { ++ param.ifc_len = ifaces_size; ++ param.ifc_req = *ifaces; ++ if (ioctl(sock, SIOCGIFCONF, ¶m)) ++ goto err; ++ if (param.ifc_len < ifaces_size) ++ break; ++ free(*ifaces); ++ ifaces_size *= 2; ++ ifaces = malloc(ifaces_size); ++ } ++ *count = param.ifc_len / sizeof(struct ifreq); ++ close(sock); ++ return 1; ++ err: ++ close(sock); ++ return 0; ++} ++ ++ ++ + int + main(int argc, char *argv[]) + { +@@ -189,6 +263,8 @@ + warnx("using %s", nids_params.filename); + } + } ++ ++ all_local_ipaddrs_chksum_disable(); + + nids_run(); + diff --git a/network/dsniff/patches/16_TDS_decoder.patch b/network/dsniff/patches/16_TDS_decoder.patch new file mode 100644 index 0000000000..a748243f6c --- /dev/null +++ b/network/dsniff/patches/16_TDS_decoder.patch @@ -0,0 +1,20 @@ +Author: Luciano Bello +Description: Fix for DOS y TDS decoder. Patch provided by Hilko Bengen. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=609988 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/decode_tds.c ++++ b/decode_tds.c +@@ -144,6 +144,11 @@ + len > sizeof(*th) && len >= ntohs(th->size); + buf += ntohs(th->size), len -= ntohs(th->size)) { + ++ if (th->size != 8) { ++ /* wrong header length */ ++ break; ++ } ++ + if (th->type == 2) { + /* Version 4.x, 5.0 */ + if (len < sizeof(*th) + sizeof(*tl)) diff --git a/network/dsniff/patches/17_checksum.patch b/network/dsniff/patches/17_checksum.patch new file mode 100644 index 0000000000..96eb3cc80f --- /dev/null +++ b/network/dsniff/patches/17_checksum.patch @@ -0,0 +1,29 @@ +Author: Piotr Engelking +Description: Disable the filtering packets with incorrect checksum. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=372536 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/urlsnarf.c ++++ b/urlsnarf.c +@@ -245,6 +245,7 @@ + extern char *optarg; + extern int optind; + int c; ++ struct nids_chksum_ctl chksum_ctl; + + while ((c = getopt(argc, argv, "i:p:nvh?V")) != -1) { + switch (c) { +@@ -305,6 +306,12 @@ + } + } + ++ chksum_ctl.netaddr = 0; ++ chksum_ctl.mask = 0; ++ chksum_ctl.action = NIDS_DONT_CHKSUM; ++ ++ nids_register_chksum_ctl(&chksum_ctl, 1); ++ + nids_run(); + + /* NOTREACHED */ diff --git a/network/dsniff/patches/18_sshcrypto.patch b/network/dsniff/patches/18_sshcrypto.patch new file mode 100644 index 0000000000..252ffa6e67 --- /dev/null +++ b/network/dsniff/patches/18_sshcrypto.patch @@ -0,0 +1,17 @@ +Author: Steve Kemp +Description: Missing openssl includes in sshcrypto.c. +This patch was through diff.gz and now is implemented as a dpatch. +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/sshcrypto.c ++++ b/sshcrypto.c +@@ -14,6 +14,8 @@ + + #include + #include ++#include ++#include + + #include + #include diff --git a/network/dsniff/patches/19_rewrite-and-modernize-POP-decoder.patch b/network/dsniff/patches/19_rewrite-and-modernize-POP-decoder.patch new file mode 100644 index 0000000000..790931521f --- /dev/null +++ b/network/dsniff/patches/19_rewrite-and-modernize-POP-decoder.patch @@ -0,0 +1,132 @@ +>From b05e27ba9b0ba9ef00ad2183933652e08d8c89af Mon Sep 17 00:00:00 2001 +From: Stefan Tomanek +Date: Sat, 29 Oct 2011 20:48:55 +0200 +Subject: [PATCH] rewrite and modernize POP decoder + + +Signed-off-by: Stefan Tomanek +--- + decode_pop.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++----------- + 1 files changed, 77 insertions(+), 19 deletions(-) +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/decode_pop.c ++++ b/decode_pop.c +@@ -6,6 +6,8 @@ + * Copyright (c) 2000 Dug Song + * + * $Id: decode_pop.c,v 1.4 2001/03/15 08:33:02 dugsong Exp $ ++ * ++ * Rewritten by Stefan Tomanek 2011 + */ + + #include "config.h" +@@ -45,32 +47,88 @@ + decode_pop(u_char *buf, int len, u_char *obuf, int olen) + { + char *p; ++ char *s; ++ int n; + int i, j; ++ char *user; ++ char *password; ++ enum { ++ NONE, ++ AUTHPLAIN, ++ AUTHLOGIN, ++ USERPASS ++ } mode = NONE; ++ + + obuf[0] = '\0'; + + for (p = strtok(buf, "\r\n"); p != NULL; p = strtok(NULL, "\r\n")) { +- if (strncasecmp(p, "AUTH PLAIN", 10) == 0 || +- strncasecmp(p, "AUTH LOGIN", 10) == 0) { +- strlcat(obuf, p, olen); +- strlcat(obuf, "\n", olen); +- +- /* Decode SASL auth. */ +- for (i = 0; i < 2 && (p = strtok(NULL, "\r\n")); i++) { +- strlcat(obuf, p, olen); +- j = base64_pton(p, p, strlen(p)); +- p[j] = '\0'; +- strlcat(obuf, " [", olen); +- strlcat(obuf, p, olen); +- strlcat(obuf, "]\n", olen); ++ if (mode == NONE) { ++ user = NULL; ++ password = NULL; ++ if (strncasecmp(p, "AUTH PLAIN", 10) == 0) { ++ mode = AUTHPLAIN; ++ continue; ++ } ++ if (strncasecmp(p, "AUTH LOGIN", 10) == 0) { ++ mode = AUTHLOGIN; ++ continue; ++ } ++ if (strncasecmp(p, "USER ", 5) == 0) { ++ mode = USERPASS; ++ /* the traditional login cuts right to the case, ++ * so no continue here ++ */ + } + } +- /* Save regular POP2, POP3 auth info. */ +- else if (strncasecmp(p, "USER ", 5) == 0 || +- strncasecmp(p, "PASS ", 5) == 0 || +- strncasecmp(p, "HELO ", 5) == 0) { +- strlcat(obuf, p, olen); +- strlcat(obuf, "\n", olen); ++ printf("(%d) %s\n", mode, p); ++ if (mode == USERPASS) { ++ if (strncasecmp(p, "USER ", 5) == 0) { ++ user = &p[5]; ++ } else if (strncasecmp(p, "PASS ", 5) == 0) { ++ password = &p[5]; ++ } ++ } ++ ++ if (mode == AUTHPLAIN) { ++ j = base64_pton(p, p, strlen(p)); ++ p[j] = '\0'; ++ n = 0; ++ s = p; ++ /* p consists of three parts, divided by \0 */ ++ while (s <= &p[j] && n<=3) { ++ if (n == 0) { ++ /* we do not process this portion yet */ ++ } else if (n == 1) { ++ user = s; ++ } else if (n == 2) { ++ password = s; ++ } ++ n++; ++ while (*s) s++; ++ s++; ++ } ++ } ++ ++ if (mode == AUTHLOGIN) { ++ j = base64_pton(p, p, strlen(p)); ++ p[j] = '\0'; ++ if (! user) { ++ user = p; ++ } else { ++ password = p; ++ /* got everything we need :-) */ ++ } ++ } ++ ++ if (user && password) { ++ strlcat(obuf, "\nusername [", olen); ++ strlcat(obuf, user, olen); ++ strlcat(obuf, "] password [", olen); ++ strlcat(obuf, password, olen); ++ strlcat(obuf, "]\n", olen); ++ ++ mode = NONE; + } + } + return (strlen(obuf)); diff --git a/network/dsniff/patches/20_debian_dirs.patch b/network/dsniff/patches/20_debian_dirs.patch new file mode 100644 index 0000000000..a99a3ff57d --- /dev/null +++ b/network/dsniff/patches/20_debian_dirs.patch @@ -0,0 +1,62 @@ +Author: Steve Kemp +Description: Adapt to Debian directory structure. +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/Makefile.in ++++ b/Makefile.in +@@ -11,7 +11,7 @@ + install_prefix = + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-libdir = @libdir@ ++libdir = $(prefix)/share/dsniff + sbindir = @sbindir@ + mandir = @mandir@ + +@@ -37,8 +37,7 @@ + X11INC = @X_CFLAGS@ + X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@ + +-INCS = -I. $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \ +- -I$(srcdir)/missing ++INCS = -I. $(X11INC) -I$(srcdir)/missing + LIBS = @LIBS@ -L$(srcdir) -lmissing + + INSTALL = @INSTALL@ +--- a/dnsspoof.8 ++++ b/dnsspoof.8 +@@ -31,7 +31,7 @@ + address queries on the LAN with an answer of the local machine's IP + address. + .SH FILES +-.IP \fI/usr/local/lib/dnsspoof.hosts\fR ++.IP \fI/usr/share/dsniff/dnsspoof.hosts\fR + Sample hosts file. + .SH "SEE ALSO" + dsniff(8), hosts(5) +--- a/dsniff.8 ++++ b/dsniff.8 +@@ -68,9 +68,9 @@ + On a hangup signal \fBdsniff\fR will dump its current trigger table to + \fIdsniff.services\fR. + .SH FILES +-.IP \fI/usr/local/lib/dsniff.services\fR ++.IP \fI/usr/share/dsniff/dsniff.services\fR + Default trigger table +-.IP \fI/usr/local/lib/dsniff.magic\fR ++.IP \fI/usr/share/dsniff/dsniff.magic\fR + Network protocol magic + .SH "SEE ALSO" + arpspoof(8), libnids(3), services(5), magic(5) +--- a/pathnames.h ++++ b/pathnames.h +@@ -12,7 +12,7 @@ + #define PATHNAMES_H + + #ifndef DSNIFF_LIBDIR +-#define DSNIFF_LIBDIR "/usr/local/lib/" ++#define DSNIFF_LIBDIR "/usr/share/dsniff/" + #endif + + #define DSNIFF_SERVICES "dsniff.services" diff --git a/network/dsniff/patches/21_msgsnarf_segfault.patch b/network/dsniff/patches/21_msgsnarf_segfault.patch new file mode 100644 index 0000000000..e60fe847e4 --- /dev/null +++ b/network/dsniff/patches/21_msgsnarf_segfault.patch @@ -0,0 +1,15 @@ +Author: +Description: Correctly 0 out the c struct. +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/msgsnarf.c ++++ b/msgsnarf.c +@@ -584,6 +584,7 @@ + if (i == 0) { + if ((c = malloc(sizeof(*c))) == NULL) + nids_params.no_mem("sniff_msgs"); ++ memset(c, 0, sizeof(*c)); + c->ip = ts->addr.saddr; + c->nick = strdup("unknown"); + SLIST_INSERT_HEAD(&client_list, c, next); diff --git a/network/dsniff/patches/22_handlepp.patch b/network/dsniff/patches/22_handlepp.patch new file mode 100644 index 0000000000..da0a49dbeb --- /dev/null +++ b/network/dsniff/patches/22_handlepp.patch @@ -0,0 +1,17 @@ +Author: Joerg Dorchain +Description: Add tcpkill support for handle ppp interfaces. +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/pcaputil.c ++++ b/pcaputil.c +@@ -52,6 +52,9 @@ + case DLT_NULL: + offset = 4; + break; ++ case DLT_LINUX_SLL: /* e.g. ppp */ ++ offset = 16; ++ break; + default: + warnx("unsupported datalink type"); + break; diff --git a/network/dsniff/patches/23_urlsnarf_timestamp.patch b/network/dsniff/patches/23_urlsnarf_timestamp.patch new file mode 100644 index 0000000000..36a8b0f277 --- /dev/null +++ b/network/dsniff/patches/23_urlsnarf_timestamp.patch @@ -0,0 +1,82 @@ +Author: Hilko Bengen +Description: urlsnarf: use timestamps from pcap file if available. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573365 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/urlsnarf.c ++++ b/urlsnarf.c +@@ -36,6 +36,7 @@ + u_short Opt_dns = 1; + int Opt_invert = 0; + regex_t *pregex = NULL; ++time_t tt = 0; + + static void + usage(void) +@@ -57,9 +58,12 @@ + { + static char tstr[32], sign; + struct tm *t, gmt; +- time_t tt = time(NULL); + int days, hours, tz, len; + ++ if (!nids_params.filename) { ++ tt = time(NULL); ++ } ++ + gmt = *gmtime(&tt); + t = localtime(&tt); + +@@ -312,9 +316,48 @@ + + nids_register_chksum_ctl(&chksum_ctl, 1); + +- nids_run(); +- +- /* NOTREACHED */ ++ pcap_t *p; ++ char pcap_errbuf[PCAP_ERRBUF_SIZE]; ++ if (nids_params.filename == NULL) { ++ /* adapted from libnids.c:open_live() */ ++ if (strcmp(nids_params.device, "all") == 0) ++ nids_params.device = "any"; ++ p = pcap_open_live(nids_params.device, 16384, ++ (nids_params.promisc != 0), ++ 0, pcap_errbuf); ++ if (!p) { ++ fprintf(stderr, "pcap_open_live(): %s\n", ++ pcap_errbuf); ++ exit(1); ++ } ++ } ++ else { ++ p = pcap_open_offline(nids_params.filename, ++ pcap_errbuf); ++ if (!p) { ++ fprintf(stderr, "pcap_open_offline(%s): %s\n", ++ nids_params.filename, pcap_errbuf); ++ } ++ } ++ ++ struct pcap_pkthdr *h; ++ u_char *d; ++ int rc; ++ while ((rc = pcap_next_ex(p, &h, &d)) == 1) { ++ tt = h->ts.tv_sec; ++ nids_pcap_handler(NULL, h, d); ++ } ++ switch (rc) { ++ case(-2): /* end of pcap file */ ++ case(0): /* timeout on live capture */ ++ break; ++ case(-1): ++ default: ++ fprintf(stderr, "rc = %i\n", rc); ++ pcap_perror(p, "pcap_read_ex()"); ++ exit(1); ++ break; ++ } + + exit(0); + } diff --git a/network/dsniff/patches/24_Fix-OpenSSL1.1.0-Build.patch b/network/dsniff/patches/24_Fix-OpenSSL1.1.0-Build.patch new file mode 100644 index 0000000000..db7739ee34 --- /dev/null +++ b/network/dsniff/patches/24_Fix-OpenSSL1.1.0-Build.patch @@ -0,0 +1,202 @@ +Description: Fix build with OpenSSL 1.1.0 +Author: Christoph Biedl +--- +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/patches/25_fix-spelling-errors.patch b/network/dsniff/patches/25_fix-spelling-errors.patch new file mode 100644 index 0000000000..febbf914e0 --- /dev/null +++ b/network/dsniff/patches/25_fix-spelling-errors.patch @@ -0,0 +1,17 @@ +Description: Fix minor spelling error in source code +Author: Marcos Fouces +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + + +--- a/remote.c ++++ b/remote.c +@@ -652,7 +652,7 @@ + if (remote_command_count > 0) + { + fprintf (stderr, +- "%s: the `-id' option must preceed all `-remote' options.\n", ++ "%s: the `-id' option must precede all `-remote' options.\n", + progname); + usage (); + exit (-1); diff --git a/network/dsniff/patches/26_arpspoof-add-r-switch-to-poison-both-directions.patch b/network/dsniff/patches/26_arpspoof-add-r-switch-to-poison-both-directions.patch new file mode 100644 index 0000000000..9a55f25051 --- /dev/null +++ b/network/dsniff/patches/26_arpspoof-add-r-switch-to-poison-both-directions.patch @@ -0,0 +1,170 @@ +>From 8fbf0ac15e5fe2df427e3e028f9aa8d96788986a Mon Sep 17 00:00:00 2001 +From: Stefan Tomanek +Date: Sun, 6 Nov 2011 22:44:54 +0100 +Subject: [PATCH 1/3] arpspoof: add -r switch to poison both directions + + +Signed-off-by: Stefan Tomanek +--- + arpspoof.8 | 5 ++++- + arpspoof.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------ + 2 files changed, 51 insertions(+), 13 deletions(-) + + --- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/arpspoof.8 ++++ b/arpspoof.8 +@@ -9,7 +9,7 @@ + .na + .nf + .fi +-\fBarpspoof\fR [\fB-i \fIinterface\fR] [\fB-t \fItarget\fR] \fIhost\fR ++\fBarpspoof\fR [\fB\-i \fIinterface\fR] [\fB\-t \fItarget\fR] [\fB\-r\fR] \fIhost\fR + .SH DESCRIPTION + .ad + .fi +@@ -26,6 +26,9 @@ + .IP "\fB-t \fItarget\fR" + Specify a particular host to ARP poison (if not specified, all hosts + on the LAN). ++.IP "\fB\-r\fR" ++Poison both hosts (host and target) to capture traffic in both directions. ++(only valid in conjuntion with \-t) + .IP \fIhost\fR + Specify the host you wish to intercept packets for (usually the local + gateway). +--- a/arpspoof.c ++++ b/arpspoof.c +@@ -7,6 +7,8 @@ + * Copyright (c) 1999 Dug Song + * + * $Id: arpspoof.c,v 1.5 2001/03/15 08:32:58 dugsong Exp $ ++ * ++ * Improved 2011 by Stefan Tomanek + */ + + #include "config.h" +@@ -31,12 +33,13 @@ + static struct ether_addr spoof_mac, target_mac; + static in_addr_t spoof_ip, target_ip; + static char *intf; ++static int poison_reverse; + + static void + usage(void) + { + fprintf(stderr, "Version: " VERSION "\n" +- "Usage: arpspoof [-i interface] [-t target] host\n"); ++ "Usage: arpspoof [-i interface] [-t target] [-r] host\n"); + exit(1); + } + +@@ -133,18 +136,30 @@ + static void + cleanup(int sig) + { ++ int fw = arp_find(spoof_ip, &spoof_mac); ++ int bw = poison_reverse && target_ip && arp_find(target_ip, &target_mac); + int i; +- +- if (arp_find(spoof_ip, &spoof_mac)) { +- for (i = 0; i < 3; i++) { +- /* XXX - on BSD, requires ETHERSPOOF kernel. */ ++ ++ fprintf(stderr, "Cleaning up and re-arping targets...\n"); ++ for (i = 0; i < 5; i++) { ++ /* XXX - on BSD, requires ETHERSPOOF kernel. */ ++ if (fw) { + arp_send(l, ARPOP_REPLY, + (u_int8_t *)&spoof_mac, spoof_ip, + (target_ip ? (u_int8_t *)&target_mac : NULL), + target_ip); ++ /* we have to wait a moment before sending the next packet */ ++ sleep(1); ++ } ++ if (bw) { ++ arp_send(l, ARPOP_REPLY, ++ (u_int8_t *)&target_mac, target_ip, ++ (u_int8_t *)&spoof_mac, ++ spoof_ip); + sleep(1); + } + } ++ + exit(0); + } + +@@ -156,11 +171,12 @@ + char pcap_ebuf[PCAP_ERRBUF_SIZE]; + char libnet_ebuf[LIBNET_ERRBUF_SIZE]; + int c; +- ++ + intf = NULL; + spoof_ip = target_ip = 0; +- +- while ((c = getopt(argc, argv, "i:t:h?V")) != -1) { ++ poison_reverse = 0; ++ ++ while ((c = getopt(argc, argv, "ri:t:h?V")) != -1) { + switch (c) { + case 'i': + intf = optarg; +@@ -169,6 +185,9 @@ + if ((target_ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1) + usage(); + break; ++ case 'r': ++ poison_reverse = 1; ++ break; + default: + usage(); + } +@@ -178,7 +197,12 @@ + + if (argc != 1) + usage(); +- ++ ++ if (poison_reverse && !target_ip) { ++ errx(1, "Spoofing the reverse path (-r) is only available when specifying a target (-t)."); ++ usage(); ++ } ++ + if ((spoof_ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1) + usage(); + +@@ -191,18 +215,29 @@ + if (target_ip != 0 && !arp_find(target_ip, &target_mac)) + errx(1, "couldn't arp for host %s", + libnet_addr2name4(target_ip, LIBNET_DONT_RESOLVE)); +- ++ ++ if (poison_reverse) { ++ if (!arp_find(spoof_ip, &spoof_mac)) { ++ errx(1, "couldn't arp for spoof host %s", ++ libnet_addr2name4(spoof_ip, LIBNET_DONT_RESOLVE)); ++ } ++ } ++ + signal(SIGHUP, cleanup); + signal(SIGINT, cleanup); + signal(SIGTERM, cleanup); +- ++ + for (;;) { + arp_send(l, ARPOP_REPLY, NULL, spoof_ip, + (target_ip ? (u_int8_t *)&target_mac : NULL), + target_ip); ++ if (poison_reverse) { ++ arp_send(l, ARPOP_REPLY, NULL, target_ip, (uint8_t *)&spoof_mac, spoof_ip); ++ } ++ + sleep(2); + } + /* NOTREACHED */ +- ++ + exit(0); + } diff --git a/network/dsniff/patches/27_arpspoof-allow-use-of-of-multiple-targets.patch b/network/dsniff/patches/27_arpspoof-allow-use-of-of-multiple-targets.patch new file mode 100644 index 0000000000..120001f7b3 --- /dev/null +++ b/network/dsniff/patches/27_arpspoof-allow-use-of-of-multiple-targets.patch @@ -0,0 +1,194 @@ +Description: [PATCH 2/3] arpspoof: allow use of multiple targets. Last hunk modified by João Salavisa +in order to fix a bug with "-t" option of arpspoof. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=706766 fo more information. +Author: Stefan Tomanek + --- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + + +--- a/arpspoof.8 ++++ b/arpspoof.8 +@@ -25,7 +25,7 @@ + Specify the interface to use. + .IP "\fB-t \fItarget\fR" + Specify a particular host to ARP poison (if not specified, all hosts +-on the LAN). ++on the LAN). Repeat to specify multiple hosts. + .IP "\fB\-r\fR" + Poison both hosts (host and target) to capture traffic in both directions. + (only valid in conjuntion with \-t) +--- a/arpspoof.c ++++ b/arpspoof.c +@@ -29,9 +29,14 @@ + + extern char *ether_ntoa(struct ether_addr *); + ++struct host { ++ in_addr_t ip; ++ struct ether_addr mac; ++}; ++ + static libnet_t *l; +-static struct ether_addr spoof_mac, target_mac; +-static in_addr_t spoof_ip, target_ip; ++static struct host spoof = {0}; ++static struct host *targets; + static char *intf; + static int poison_reverse; + +@@ -133,30 +138,46 @@ + return (0); + } + ++static int arp_find_all() { ++ struct host *target = targets; ++ while(target->ip) { ++ if (arp_find(target->ip, &target->mac)) { ++ return 1; ++ } ++ target++; ++ } ++ ++ return 0; ++} ++ + static void + cleanup(int sig) + { +- int fw = arp_find(spoof_ip, &spoof_mac); +- int bw = poison_reverse && target_ip && arp_find(target_ip, &target_mac); ++ int fw = arp_find(spoof.ip, &spoof.mac); ++ int bw = poison_reverse && targets[0].ip && arp_find_all(); + int i; + + fprintf(stderr, "Cleaning up and re-arping targets...\n"); + for (i = 0; i < 5; i++) { +- /* XXX - on BSD, requires ETHERSPOOF kernel. */ +- if (fw) { +- arp_send(l, ARPOP_REPLY, +- (u_int8_t *)&spoof_mac, spoof_ip, +- (target_ip ? (u_int8_t *)&target_mac : NULL), +- target_ip); +- /* we have to wait a moment before sending the next packet */ +- sleep(1); +- } +- if (bw) { +- arp_send(l, ARPOP_REPLY, +- (u_int8_t *)&target_mac, target_ip, +- (u_int8_t *)&spoof_mac, +- spoof_ip); +- sleep(1); ++ struct host *target = targets; ++ while(target->ip) { ++ /* XXX - on BSD, requires ETHERSPOOF kernel. */ ++ if (fw) { ++ arp_send(l, ARPOP_REPLY, ++ (u_int8_t *)&spoof.mac, spoof.ip, ++ (target->ip ? (u_int8_t *)&target->mac : NULL), ++ target->ip); ++ /* we have to wait a moment before sending the next packet */ ++ sleep(1); ++ } ++ if (bw) { ++ arp_send(l, ARPOP_REPLY, ++ (u_int8_t *)&target->mac, target->ip, ++ (u_int8_t *)&spoof.mac, ++ spoof.ip); ++ sleep(1); ++ } ++ target++; + } + } + +@@ -171,10 +192,15 @@ + char pcap_ebuf[PCAP_ERRBUF_SIZE]; + char libnet_ebuf[LIBNET_ERRBUF_SIZE]; + int c; ++ int n_targets; + ++ spoof.ip = 0; + intf = NULL; +- spoof_ip = target_ip = 0; + poison_reverse = 0; ++ n_targets = 0; ++ ++ /* allocate enough memory for target list */ ++ targets = calloc( argc+1, sizeof(struct host) ); + + while ((c = getopt(argc, argv, "ri:t:h?V")) != -1) { + switch (c) { +@@ -182,7 +208,7 @@ + intf = optarg; + break; + case 't': +- if ((target_ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1) ++ if ((targets[n_targets++].ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1) + usage(); + break; + case 'r': +@@ -198,12 +224,12 @@ + if (argc != 1) + usage(); + +- if (poison_reverse && !target_ip) { ++ if (poison_reverse && !n_targets) { + errx(1, "Spoofing the reverse path (-r) is only available when specifying a target (-t)."); + usage(); + } + +- if ((spoof_ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1) ++ if ((spoof.ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1) + usage(); + + if (intf == NULL && (intf = pcap_lookupdev(pcap_ebuf)) == NULL) +@@ -211,15 +237,19 @@ + + if ((l = libnet_init(LIBNET_LINK, intf, libnet_ebuf)) == NULL) + errx(1, "%s", libnet_ebuf); +- +- if (target_ip != 0 && !arp_find(target_ip, &target_mac)) +- errx(1, "couldn't arp for host %s", +- libnet_addr2name4(target_ip, LIBNET_DONT_RESOLVE)); ++ ++ struct host *target = targets; ++ while(target->ip) { ++ if (target->ip != 0 && !arp_find(target->ip, &target->mac)) ++ errx(1, "couldn't arp for host %s", ++ libnet_addr2name4(target->ip, LIBNET_DONT_RESOLVE)); ++ target++; ++ } + + if (poison_reverse) { +- if (!arp_find(spoof_ip, &spoof_mac)) { ++ if (!arp_find(spoof.ip, &spoof.mac)) { + errx(1, "couldn't arp for spoof host %s", +- libnet_addr2name4(spoof_ip, LIBNET_DONT_RESOLVE)); ++ libnet_addr2name4(spoof.ip, LIBNET_DONT_RESOLVE)); + } + } + +@@ -228,12 +258,20 @@ + signal(SIGTERM, cleanup); + + for (;;) { +- arp_send(l, ARPOP_REPLY, NULL, spoof_ip, +- (target_ip ? (u_int8_t *)&target_mac : NULL), +- target_ip); +- if (poison_reverse) { +- arp_send(l, ARPOP_REPLY, NULL, target_ip, (uint8_t *)&spoof_mac, spoof_ip); ++ if (!n_targets) { ++ arp_send(l, ARPOP_REPLY, my_ha, spoof.ip, brd_ha, 0, my_ha); ++ } else { ++ struct host *target = targets; ++ while(target->ip) { ++ arp_send(l, ARPOP_REPLY, NULL, spoof.ip, ++ (target->ip ? (u_int8_t *)&target->mac : NULL), ++ target->ip); ++ if (poison_reverse) { ++ arp_send(l, ARPOP_REPLY, NULL, target->ip, (uint8_t *)&spoof.mac, spoof.ip); ++ } ++ target++; + } ++ } + + sleep(2); + } diff --git a/network/dsniff/patches/28_arpspoof-allow-selection-of-source-hw-address.patch b/network/dsniff/patches/28_arpspoof-allow-selection-of-source-hw-address.patch new file mode 100644 index 0000000000..95da6a1651 --- /dev/null +++ b/network/dsniff/patches/28_arpspoof-allow-selection-of-source-hw-address.patch @@ -0,0 +1,230 @@ +>From 21773ccf18a5fc49d35e510a8797b0a1e83858c4 Mon Sep 17 00:00:00 2001 +From: Stefan Tomanek +Date: Sun, 20 Nov 2011 21:32:53 +0100 +Subject: [PATCH 3/3] arpspoof: allow selection of source hw address + +In certain networks, sending with the wrong hardware source address can +jeopardize the network connection of the host running arpspoof. This +patch makes it possible to specify whether arpspoof should use the own +hardware address or the one of the real host when resetting the arp +table of the target systems; it is also possible to use both. + +Signed-off-by: Stefan Tomanek +--- + arpspoof.8 | 9 +++++- + arpspoof.c | 90 ++++++++++++++++++++++++++++++++++++++++++----------------- + 2 files changed, 72 insertions(+), 27 deletions(-) +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/arpspoof.8 ++++ b/arpspoof.8 +@@ -9,7 +9,7 @@ + .na + .nf + .fi +-\fBarpspoof\fR [\fB\-i \fIinterface\fR] [\fB\-t \fItarget\fR] [\fB\-r\fR] \fIhost\fR ++\fBarpspoof\fR [\fB\-i \fIinterface\fR] [\fB\-c \fIown|host|both\fR] [\fB\-t \fItarget\fR] [\fB\-r\fR] \fIhost\fR + .SH DESCRIPTION + .ad + .fi +@@ -23,6 +23,13 @@ + .SH OPTIONS + .IP "\fB-i \fIinterface\fR" + Specify the interface to use. ++.IP "\fB-c \fIown|host|both\fR" ++Specify which hardware address t use when restoring the arp configuration; ++while cleaning up, packets can be send with the own address as well as with ++the address of the host. Sending packets with a fake hw address can disrupt ++connectivity with certain switch/ap/bridge configurations, however it works ++more reliably than using the own address, which is the default way arpspoof ++cleans up afterwards. + .IP "\fB-t \fItarget\fR" + Specify a particular host to ARP poison (if not specified, all hosts + on the LAN). Repeat to specify multiple hosts. +--- a/arpspoof.c ++++ b/arpspoof.c +@@ -40,37 +40,36 @@ + static char *intf; + static int poison_reverse; + ++static uint8_t *my_ha = NULL; ++static uint8_t *brd_ha = "\xff\xff\xff\xff\xff\xff"; ++ ++static int cleanup_src_own = 1; ++static int cleanup_src_host = 0; ++ + static void + usage(void) + { + fprintf(stderr, "Version: " VERSION "\n" +- "Usage: arpspoof [-i interface] [-t target] [-r] host\n"); ++ "Usage: arpspoof [-i interface] [-c own|host|both] [-t target] [-r] host\n"); + exit(1); + } + + static int +-arp_send(libnet_t *l, int op, u_int8_t *sha, +- in_addr_t spa, u_int8_t *tha, in_addr_t tpa) ++arp_send(libnet_t *l, int op, ++ u_int8_t *sha, in_addr_t spa, ++ u_int8_t *tha, in_addr_t tpa, ++ u_int8_t *me) + { + int retval; + +- if (sha == NULL && +- (sha = (u_int8_t *)libnet_get_hwaddr(l)) == NULL) { +- return (-1); +- } +- if (spa == 0) { +- if ((spa = libnet_get_ipaddr4(l)) == -1) +- return (-1); +- } +- if (tha == NULL) +- tha = "\xff\xff\xff\xff\xff\xff"; +- ++ if (!me) me = sha; ++ + libnet_autobuild_arp(op, sha, (u_int8_t *)&spa, + tha, (u_int8_t *)&tpa, l); +- libnet_build_ethernet(tha, sha, ETHERTYPE_ARP, NULL, 0, l, 0); ++ libnet_build_ethernet(tha, me, ETHERTYPE_ARP, NULL, 0, l, 0); + + fprintf(stderr, "%s ", +- ether_ntoa((struct ether_addr *)sha)); ++ ether_ntoa((struct ether_addr *)me)); + + if (op == ARPOP_REQUEST) { + fprintf(stderr, "%s 0806 42: arp who-has %s tell %s\n", +@@ -129,7 +128,7 @@ + /* XXX - force the kernel to arp. feh. */ + arp_force(ip); + #else +- arp_send(l, ARPOP_REQUEST, NULL, 0, NULL, ip); ++ arp_send(l, ARPOP_REQUEST, NULL, 0, NULL, ip, NULL); + #endif + sleep(1); + } +@@ -156,17 +155,23 @@ + int fw = arp_find(spoof.ip, &spoof.mac); + int bw = poison_reverse && targets[0].ip && arp_find_all(); + int i; ++ int rounds = (cleanup_src_own*5 + cleanup_src_host*5); + + fprintf(stderr, "Cleaning up and re-arping targets...\n"); +- for (i = 0; i < 5; i++) { ++ for (i = 0; i < rounds; i++) { + struct host *target = targets; + while(target->ip) { ++ uint8_t *src_ha = NULL; ++ if (cleanup_src_own && (i%2 || !cleanup_src_host)) { ++ src_ha = my_ha; ++ } + /* XXX - on BSD, requires ETHERSPOOF kernel. */ + if (fw) { + arp_send(l, ARPOP_REPLY, + (u_int8_t *)&spoof.mac, spoof.ip, +- (target->ip ? (u_int8_t *)&target->mac : NULL), +- target->ip); ++ (target->ip ? (u_int8_t *)&target->mac : brd_ha), ++ target->ip, ++ src_ha); + /* we have to wait a moment before sending the next packet */ + sleep(1); + } +@@ -174,7 +179,8 @@ + arp_send(l, ARPOP_REPLY, + (u_int8_t *)&target->mac, target->ip, + (u_int8_t *)&spoof.mac, +- spoof.ip); ++ spoof.ip, ++ src_ha); + sleep(1); + } + target++; +@@ -193,6 +199,7 @@ + char libnet_ebuf[LIBNET_ERRBUF_SIZE]; + int c; + int n_targets; ++ char *cleanup_src = NULL; + + spoof.ip = 0; + intf = NULL; +@@ -202,7 +209,7 @@ + /* allocate enough memory for target list */ + targets = calloc( argc+1, sizeof(struct host) ); + +- while ((c = getopt(argc, argv, "ri:t:h?V")) != -1) { ++ while ((c = getopt(argc, argv, "ri:t:c:h?V")) != -1) { + switch (c) { + case 'i': + intf = optarg; +@@ -214,6 +221,9 @@ + case 'r': + poison_reverse = 1; + break; ++ case 'c': ++ cleanup_src = optarg; ++ break; + default: + usage(); + } +@@ -229,6 +239,29 @@ + usage(); + } + ++ if (!cleanup_src || strcmp(cleanup_src, "own")==0) { /* default! */ ++ /* only use our own hw address when cleaning up, ++ * not jeopardizing any bridges on the way to our ++ * target ++ */ ++ cleanup_src_own = 1; ++ cleanup_src_host = 0; ++ } else if (strcmp(cleanup_src, "host")==0) { ++ /* only use the target hw address when cleaning up; ++ * this can screw up some bridges and scramble access ++ * for our own host, however it resets the arp table ++ * more reliably ++ */ ++ cleanup_src_own = 0; ++ cleanup_src_host = 1; ++ } else if (strcmp(cleanup_src, "both")==0) { ++ cleanup_src_own = 1; ++ cleanup_src_host = 1; ++ } else { ++ errx(1, "Invalid parameter to -c: use 'own' (default), 'host' or 'both'."); ++ usage(); ++ } ++ + if ((spoof.ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1) + usage(); + +@@ -253,6 +286,10 @@ + } + } + ++ if ((my_ha = (u_int8_t *)libnet_get_hwaddr(l)) == NULL) { ++ errx(1, "Unable to determine own mac address"); ++ } ++ + signal(SIGHUP, cleanup); + signal(SIGINT, cleanup); + signal(SIGTERM, cleanup); +@@ -263,11 +300,12 @@ + } else { + struct host *target = targets; + while(target->ip) { +- arp_send(l, ARPOP_REPLY, NULL, spoof.ip, +- (target->ip ? (u_int8_t *)&target->mac : NULL), +- target->ip); ++ arp_send(l, ARPOP_REPLY, my_ha, spoof.ip, ++ (target->ip ? (u_int8_t *)&target->mac : brd_ha), ++ target->ip, ++ my_ha); + if (poison_reverse) { +- arp_send(l, ARPOP_REPLY, NULL, target->ip, (uint8_t *)&spoof.mac, spoof.ip); ++ arp_send(l, ARPOP_REPLY, my_ha, target->ip, (uint8_t *)&spoof.mac, spoof.ip, my_ha); + } + target++; + } diff --git a/network/dsniff/patches/29_libnet_name2addr4.patch b/network/dsniff/patches/29_libnet_name2addr4.patch new file mode 100644 index 0000000000..76c8c39882 --- /dev/null +++ b/network/dsniff/patches/29_libnet_name2addr4.patch @@ -0,0 +1,144 @@ +Description: fixes possible segmentation faults of arpspoof, sshmitm, webmitm and +webspy if any non-resolving hostname is passed. Issue was introduced by +dsniff-2.4-libnet_11.patch; libnet_name_resolve() was replaced by libnet_name2addr4() +while there must be the structure libnet_t passed additionally. And if that structure is not initialized +using libnet_init() and the passed name can't be resolved (like "192.168.2."), it +causes a snprintf() to NULL and thus the segmentation fault. Note that macof isn't +affected as no resolving was involved here ever. +Author: Robert Scheck +Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1009879 +Origin: http://pkgs.fedoraproject.org/cgit/rpms/dsniff.git/tree/dsniff-2.4-libnet_name2addr4.patch +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/sshmitm.c ++++ b/sshmitm.c +@@ -45,6 +45,8 @@ + struct sockaddr_in csin, ssin; + int sig_pipe[2]; + ++static libnet_t *l; ++ + static void + usage(void) + { +@@ -364,6 +366,7 @@ + u_long ip; + u_short lport, rport; + int c; ++ char libnet_ebuf[LIBNET_ERRBUF_SIZE]; + + lport = rport = 22; + +@@ -390,12 +393,15 @@ + if (argc < 1) + usage(); + +- if ((ip = libnet_name2addr4(NULL, argv[0], LIBNET_RESOLVE)) == -1) +- usage(); +- + if (argc == 2 && (rport = atoi(argv[1])) == 0) + usage(); + ++ if ((l = libnet_init(LIBNET_LINK, NULL, libnet_ebuf)) == NULL) ++ errx(1, "%s", libnet_ebuf); ++ ++ if ((ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1) ++ usage(); ++ + record_init(NULL); + + mitm_init(lport, ip, rport); +--- a/webmitm.c ++++ b/webmitm.c +@@ -47,6 +47,8 @@ + int do_ssl, sig_pipe[2]; + in_addr_t static_host = 0; + ++static libnet_t *l; ++ + extern int decode_http(char *, int, char *, int); + + static void +@@ -242,7 +244,7 @@ + word = buf_tok(&msg, "/", 1); + vhost = buf_strdup(word); + } +- ssin.sin_addr.s_addr = libnet_name2addr4(NULL, vhost, 1); ++ ssin.sin_addr.s_addr = libnet_name2addr4(l, vhost, LIBNET_RESOLVE); + free(vhost); + + if (ssin.sin_addr.s_addr == ntohl(INADDR_LOOPBACK) || +@@ -496,6 +498,7 @@ + extern char *optarg; + extern int optind; + int c; ++ char libnet_ebuf[LIBNET_ERRBUF_SIZE]; + + while ((c = getopt(argc, argv, "dh?V")) != -1) { + switch (c) { +@@ -509,8 +512,11 @@ + argc -= optind; + argv += optind; + ++ if ((l = libnet_init(LIBNET_LINK, NULL, libnet_ebuf)) == NULL) ++ errx(1, "%s", libnet_ebuf); ++ + if (argc == 1) { +- if ((static_host = libnet_name2addr4(NULL, argv[0], 1)) == -1) ++ if ((static_host = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1) + usage(); + } + else if (argc != 0) usage(); +--- a/webspy.c ++++ b/webspy.c +@@ -33,6 +33,7 @@ + extern int mozilla_remote_commands (Display *, Window, char **); + char *expected_mozilla_version = "4.7"; + char *progname = "webspy"; ++static libnet_t *l; + + Display *dpy; + char cmd[2048], *cmdtab[2]; +@@ -183,6 +184,7 @@ + extern char *optarg; + extern int optind; + int c; ++ char libnet_ebuf[LIBNET_ERRBUF_SIZE]; + + while ((c = getopt(argc, argv, "i:p:h?V")) != -1) { + switch (c) { +@@ -205,7 +207,10 @@ + cmdtab[0] = cmd; + cmdtab[1] = NULL; + +- if ((host = libnet_name2addr4(NULL, argv[0], 1)) == -1) ++ if ((l = libnet_init(LIBNET_LINK, NULL, libnet_ebuf)) == NULL) ++ errx(1, "%s", libnet_ebuf); ++ ++ if ((host = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1) + errx(1, "unknown host"); + + if ((dpy = XOpenDisplay(NULL)) == NULL) +--- a/arpspoof.c ++++ b/arpspoof.c +@@ -208,6 +208,10 @@ + + /* allocate enough memory for target list */ + targets = calloc( argc+1, sizeof(struct host) ); ++ ++ if ((l = libnet_init(LIBNET_LINK, NULL, libnet_ebuf)) == NULL) ++ errx(1, "%s", libnet_ebuf); ++ + + while ((c = getopt(argc, argv, "ri:t:c:h?V")) != -1) { + switch (c) { +@@ -265,6 +269,8 @@ + if ((spoof.ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1) + usage(); + ++ libnet_destroy(l); ++ + if (intf == NULL && (intf = pcap_lookupdev(pcap_ebuf)) == NULL) + errx(1, "%s", pcap_ebuf); + diff --git a/network/dsniff/patches/30_pntohl_shift.patch b/network/dsniff/patches/30_pntohl_shift.patch new file mode 100644 index 0000000000..8764d69523 --- /dev/null +++ b/network/dsniff/patches/30_pntohl_shift.patch @@ -0,0 +1,19 @@ +Description: Corrects the incorrect bit-shift in pntohl(), the left-shift should be 8 bits, not 18. +Author: Matthew Boyle +Origin: http://pkgs.fedoraproject.org/cgit/rpms/dsniff.git/tree/dsniff-2.4-pntohl_shift.patch +Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=714958 +Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=850496 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/decode.h ++++ b/decode.h +@@ -35,7 +35,7 @@ + (u_short)*((u_char *)p+0)<<8)) + + #define pntohl(p) ((u_int32_t)*((u_char *)p+3)<<0| \ +- (u_int32_t)*((u_char *)p+2)<<18| \ ++ (u_int32_t)*((u_char *)p+2)<<8| \ + (u_int32_t)*((u_char *)p+1)<<16| \ + (u_int32_t)*((u_char *)p+0)<<24) + diff --git a/network/dsniff/patches/31_sysconf_clocks.patch b/network/dsniff/patches/31_sysconf_clocks.patch new file mode 100644 index 0000000000..4aa22086d9 --- /dev/null +++ b/network/dsniff/patches/31_sysconf_clocks.patch @@ -0,0 +1,31 @@ +Description: Adds a clock fix. It was improved by Robert Scheck +to work with older Linux kernel versions, too. +Author: +Origin: http://pkgs.fedoraproject.org/cgit/rpms/dsniff.git/tree/dsniff-2.4-sysconf_clocks.patch +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/sshow.c ++++ b/sshow.c +@@ -217,7 +217,9 @@ + { + clock_t delay; + int payload; +- long CLK_TCK= sysconf(_SC_CLK_TCK); ++#if defined(_SC_CLK_TCK) ++ long CLK_TCK = sysconf(_SC_CLK_TCK); ++#endif + + delay = add_history(session, 0, cipher_size, plain_range); + +@@ -266,7 +268,9 @@ + clock_t delay; + int skip; + range string_range; +- long CLK_TCK= sysconf(_SC_CLK_TCK); ++#if defined(_SC_CLK_TCK) ++ long CLK_TCK = sysconf(_SC_CLK_TCK); ++#endif + + delay = add_history(session, 1, cipher_size, plain_range); + diff --git a/network/dsniff/patches/32_rpc_segfault.patch b/network/dsniff/patches/32_rpc_segfault.patch new file mode 100644 index 0000000000..89a8d9c5af --- /dev/null +++ b/network/dsniff/patches/32_rpc_segfault.patch @@ -0,0 +1,19 @@ +Description: avoids xdrs being used without being initialised first. Without this +patch dsniff segfaults when decoding RPC packets on x86_64. +Author: Matthew Boyle +Origin: http://pkgs.fedoraproject.org/cgit/rpms/dsniff.git/tree/dsniff-2.4-rpc_segfault.patch +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/rpc.c ++++ b/rpc.c +@@ -125,6 +125,9 @@ + return (0); + } + } ++ else ++ return (0); ++ + stat = xdr_getpos(&xdrs); + xdr_destroy(&xdrs); + diff --git a/network/dsniff/patches/33_sshcrypto_DES.patch b/network/dsniff/patches/33_sshcrypto_DES.patch new file mode 100644 index 0000000000..02ff90bf09 --- /dev/null +++ b/network/dsniff/patches/33_sshcrypto_DES.patch @@ -0,0 +1,65 @@ +Description: improves 18_sshcrypto.patch + - Replace all des_ methods and structs with DES_ equivalents. + - Remove openssl/des_old.h include. + - Register dependencies on OpenSSL, glib20 and gettext. +Author: jca +Origin: OpenBSD +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/sshcrypto.c ++++ b/sshcrypto.c +@@ -30,8 +30,8 @@ + + #if 0 + struct des3_state { +- des_key_schedule k1, k2, k3; +- des_cblock iv1, iv2, iv3; ++ DES_key_schedule k1, k2, k3; ++ DES_cblock iv1, iv2, iv3; + }; + #endif + +@@ -162,13 +162,13 @@ + if ((state = malloc(sizeof(*state))) == NULL) + err(1, "malloc"); + +- des_set_key((void *)sesskey, state->k1); +- des_set_key((void *)(sesskey + 8), state->k2); ++ DES_set_key((void *)sesskey, &state->k1); ++ DES_set_key((void *)(sesskey + 8), &state->k2); + + if (len <= 16) +- des_set_key((void *)sesskey, state->k3); ++ DES_set_key((void *)sesskey, &state->k3); + else +- des_set_key((void *)(sesskey + 16), state->k3); ++ DES_set_key((void *)(sesskey + 16), &state->k3); + + memset(state->iv1, 0, 8); + memset(state->iv2, 0, 8); +@@ -184,9 +184,9 @@ + estate = (struct des3_state *)state; + memcpy(estate->iv1, estate->iv2, 8); + +- des_ncbc_encrypt(src, dst, len, estate->k1, &estate->iv1, DES_ENCRYPT); +- des_ncbc_encrypt(dst, dst, len, estate->k2, &estate->iv2, DES_DECRYPT); +- des_ncbc_encrypt(dst, dst, len, estate->k3, &estate->iv3, DES_ENCRYPT); ++ DES_ncbc_encrypt(src, dst, len, &estate->k1, &estate->iv1, DES_ENCRYPT); ++ DES_ncbc_encrypt(dst, dst, len, &estate->k2, &estate->iv2, DES_DECRYPT); ++ DES_ncbc_encrypt(dst, dst, len, &estate->k3, &estate->iv3, DES_ENCRYPT); + } + + void +@@ -197,8 +197,8 @@ + dstate = (struct des3_state *)state; + memcpy(dstate->iv1, dstate->iv2, 8); + +- des_ncbc_encrypt(src, dst, len, dstate->k3, &dstate->iv3, DES_DECRYPT); +- des_ncbc_encrypt(dst, dst, len, dstate->k2, &dstate->iv2, DES_ENCRYPT); +- des_ncbc_encrypt(dst, dst, len, dstate->k1, &dstate->iv1, DES_DECRYPT); ++ DES_ncbc_encrypt(src, dst, len, &dstate->k3, &dstate->iv3, DES_DECRYPT); ++ 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/patches/34_fix-parallel-FTBFS.patch b/network/dsniff/patches/34_fix-parallel-FTBFS.patch new file mode 100644 index 0000000000..00fbb96c13 --- /dev/null +++ b/network/dsniff/patches/34_fix-parallel-FTBFS.patch @@ -0,0 +1,109 @@ +Description: Fix parallel FTBFS problems + * Add libmissing.a as a dependency to each of the PROGS to ensure it is + built before them. + * Ensure mount.h is created before decode_mountd.o gets built. + * Ensure nfs_prot.h is created before filesnarf.o gets built. +Author: Lukas Schwaighofer +Author: Adrian Bunk +Bug-Debian: https://bugs.debian.org/860611 +Bug-Debian: https://bugs.debian.org/869086 + +--- a/Makefile.in ++++ b/Makefile.in +@@ -75,16 +75,28 @@ + .c.o: + $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c + +-all: libmissing.a $(PROGS) ++all: $(PROGS) + +-mount.c: mount.x ++mount.h: mount.x + rpcgen -h mount.x -o mount.h ++ ++mount.c: mount.x + rpcgen -c mount.x -o mount.c + +-nfs_prot.c: nfs_prot.x ++mount.o: mount.h ++ ++decode_mountd.o: mount.h ++ ++nfs_prot.h: nfs_prot.x + rpcgen -h nfs_prot.x -o nfs_prot.h ++ ++nfs_prot.c: nfs_prot.x + rpcgen -c nfs_prot.x -o nfs_prot.c + ++nfs_prot.o: nfs_prot.h ++ ++filesnarf.o: nfs_prot.h ++ + $(LIBOBJS): + $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/missing/$*.c + +@@ -92,49 +104,49 @@ + ar -cr $@ $(LIBOBJS) + $(RANLIB) $@ + +-dsniff: $(HDRS) $(SRCS) $(OBJS) ++dsniff: $(HDRS) $(SRCS) $(OBJS) libmissing.a + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB) + +-arpspoof: arpspoof.o arp.o ++arpspoof: arpspoof.o arp.o libmissing.a + $(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB) + +-dnsspoof: dnsspoof.o pcaputil.o ++dnsspoof: dnsspoof.o pcaputil.o libmissing.a + $(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB) + +-filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o ++filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o libmissing.a + $(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) + +-macof: macof.o ++macof: macof.o libmissing.a + $(CC) $(LDFLAGS) -o $@ macof.o $(LIBS) $(PCAPLIB) $(LNETLIB) + +-mailsnarf: mailsnarf.o buf.o pcaputil.o ++mailsnarf: mailsnarf.o buf.o pcaputil.o libmissing.a + $(CC) $(LDFLAGS) -o $@ mailsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) + +-msgsnarf: msgsnarf.o buf.o pcaputil.o ++msgsnarf: msgsnarf.o buf.o pcaputil.o libmissing.a + $(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) + +-sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o ++sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o libmissing.a + $(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB) + +-sshow: sshow.o pcaputil.o ++sshow: sshow.o pcaputil.o libmissing.a + $(CC) $(LDFLAGS) -o $@ sshow.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) + +-tcpkill: tcpkill.o pcaputil.o ++tcpkill: tcpkill.o pcaputil.o libmissing.a + $(CC) $(LDFLAGS) -o $@ tcpkill.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB) + +-tcpnice: tcpnice.o pcaputil.o ++tcpnice: tcpnice.o pcaputil.o libmissing.a + $(CC) $(LDFLAGS) -o $@ tcpnice.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB) + +-tcphijack: tcphijack.o pcaputil.o ++tcphijack: tcphijack.o pcaputil.o libmissing.a + $(CC) $(LDFLAGS) -o $@ tcphijack.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB) + +-urlsnarf: urlsnarf.o base64.o buf.o pcaputil.o ++urlsnarf: urlsnarf.o base64.o buf.o pcaputil.o libmissing.a + $(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) + +-webmitm: webmitm.o base64.o buf.o decode_http.o record.o ++webmitm: webmitm.o base64.o buf.o decode_http.o record.o libmissing.a + $(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB) + +-webspy: webspy.o base64.o buf.o remote.o ++webspy: webspy.o base64.o buf.o remote.o libmissing.a + $(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB) + + install: diff --git a/network/dsniff/patches/35_Add_CPPFLAGS.patch b/network/dsniff/patches/35_Add_CPPFLAGS.patch new file mode 100644 index 0000000000..3ea8eb94d7 --- /dev/null +++ b/network/dsniff/patches/35_Add_CPPFLAGS.patch @@ -0,0 +1,50 @@ +Description: import CPPFLAGS in order to build an ELF binary that uses fortified libc functions. Now it is built with all default Debian compiler flags. +Author: Marcos Fouces +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/Makefile.in ++++ b/Makefile.in +@@ -11,12 +11,13 @@ + install_prefix = + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-libdir = $(prefix)/share/dsniff ++libdir = @libdir@ + sbindir = @sbindir@ + mandir = @mandir@ + + CC = @CC@ + CFLAGS = @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\" ++CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + + PCAPINC = @PCAPINC@ +@@ -37,7 +38,8 @@ + X11INC = @X_CFLAGS@ + X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@ + +-INCS = -I. $(X11INC) -I$(srcdir)/missing ++INCS = -I. $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \ ++ -I$(srcdir)/missing + LIBS = @LIBS@ -L$(srcdir) -lmissing + + INSTALL = @INSTALL@ +@@ -73,7 +75,7 @@ + CONFIGS = dsniff.magic dsniff.services dnsspoof.hosts + + .c.o: +- $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $(srcdir)/$*.c + + all: $(PROGS) + +@@ -98,7 +100,7 @@ + filesnarf.o: nfs_prot.h + + $(LIBOBJS): +- $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/missing/$*.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $(srcdir)/missing/$*.c + + libmissing.a: $(LIBOBJS) + ar -cr $@ $(LIBOBJS) diff --git a/network/dsniff/patches/36_implicit_declarations.patch b/network/dsniff/patches/36_implicit_declarations.patch new file mode 100644 index 0000000000..159f7c2b32 --- /dev/null +++ b/network/dsniff/patches/36_implicit_declarations.patch @@ -0,0 +1,59 @@ +Description: fix implicit declarations compiler warning + * switch to C99 uint64_t, remove now unnecessary xdr_u_int64_t function + * include missing string.h for memset +Author: Lukas Schwaighofer + +--- a/filesnarf.c ++++ b/filesnarf.c +@@ -55,30 +55,6 @@ + exit(1); + } + +-/* XXX - for nfs_prot_xdr.c */ +-bool_t +-xdr_u_int64_t(XDR *xdrs, u_int64_t *nump) +-{ +- int i = 1; +- u_char *p = (u_char *)nump; +- +- if (*(char *)&i == 1) { /* endian haack. */ +- if (xdr_u_long(xdrs, (u_long *)(p + 4))) +- return (xdr_u_long(xdrs, (u_long *)p)); +- } +- else { +- if (xdr_u_long(xdrs, (u_long *)p)) +- return (xdr_u_long(xdrs, (u_long *)(p + 4))); +- } +- return (FALSE); +-} +- +-bool_t +-xdr_int64_t(XDR *xdrs, int64_t *nump) +-{ +- return (xdr_u_int64_t(xdrs, (u_int64_t *)nump)); +-} +- + static void + fh_map_init(void) + { +--- a/nfs_prot.x ++++ b/nfs_prot.x +@@ -190,7 +190,7 @@ + /* + * Basic data types + */ +-typedef u_int64_t uint64; ++typedef uint64_t uint64; + typedef int64_t int64; + typedef unsigned int uint32; + typedef int int32; +--- a/sshcrypto.c ++++ b/sshcrypto.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "sshcrypto.h" + diff --git a/network/dsniff/patches/37_fix-lib-and-share-dirs.patch b/network/dsniff/patches/37_fix-lib-and-share-dirs.patch new file mode 100644 index 0000000000..f384b7ced0 --- /dev/null +++ b/network/dsniff/patches/37_fix-lib-and-share-dirs.patch @@ -0,0 +1,14 @@ +Description: Fix directory location for data files. They were wrongly set to lib dirs. +Author: Hank Leininger + +--- a/Makefile.in ++++ b/Makefile.in +@@ -11,7 +11,7 @@ + install_prefix = + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-libdir = @libdir@ ++libdir = $(prefix)/share/dsniff + sbindir = @sbindir@ + mandir = @mandir@ + diff --git a/network/dsniff/patches/38_fix-pcap_init.patch b/network/dsniff/patches/38_fix-pcap_init.patch new file mode 100644 index 0000000000..5a91c2b40a --- /dev/null +++ b/network/dsniff/patches/38_fix-pcap_init.patch @@ -0,0 +1,63 @@ +Description: Resolve naming collision due to libpcap API changes + dsniff was written with a function named pcap_init() that predates + the one in libpcap and is entirely different. This patch renames it + out of the way. +Author: Dennis Filder +Bug-Debian: https://bugs.debian.org/980588 +Last-Update: 2021-02-10 +--- +--- a/tcpnice.c ++++ b/tcpnice.c +@@ -204,7 +204,7 @@ + + filter = copy_argv(argv); + +- if ((pd = pcap_init(intf, filter, 128)) == NULL) ++ if ((pd = pcap_init_dsniff(intf, filter, 128)) == NULL) + errx(1, "couldn't initialize sniffing"); + + if ((pcap_off = pcap_dloff(pd)) < 0) +--- a/dnsspoof.c ++++ b/dnsspoof.c +@@ -309,7 +309,7 @@ + else snprintf(buf, sizeof(buf), "udp dst port 53 and not src %s", + libnet_addr2name4(lnet_ip, LIBNET_DONT_RESOLVE)); + +- if ((pcap_pd = pcap_init(dev, buf, 128)) == NULL) ++ if ((pcap_pd = pcap_init_dsniff(dev, buf, 128)) == NULL) + errx(1, "couldn't initialize sniffing"); + + if ((pcap_off = pcap_dloff(pcap_pd)) < 0) +--- a/pcaputil.h ++++ b/pcaputil.h +@@ -11,7 +11,7 @@ + #ifndef PCAPUTIL_H + #define PCAPUTIL_H + +-pcap_t *pcap_init(char *intf, char *filter, int snaplen); ++pcap_t *pcap_init_dsniff(char *intf, char *filter, int snaplen); + + int pcap_dloff(pcap_t *pd); + +--- a/tcpkill.c ++++ b/tcpkill.c +@@ -130,7 +130,7 @@ + + filter = copy_argv(argv); + +- if ((pd = pcap_init(intf, filter, 64)) == NULL) ++ if ((pd = pcap_init_dsniff(intf, filter, 64)) == NULL) + errx(1, "couldn't initialize sniffing"); + + if ((pcap_off = pcap_dloff(pd)) < 0) +--- a/pcaputil.c ++++ b/pcaputil.c +@@ -63,7 +63,7 @@ + } + + pcap_t * +-pcap_init(char *intf, char *filter, int snaplen) ++pcap_init_dsniff(char *intf, char *filter, int snaplen) + { + pcap_t *pd; + u_int net, mask; diff --git a/network/dsniff/patches/39_libtirpc.patch b/network/dsniff/patches/39_libtirpc.patch new file mode 100644 index 0000000000..9f46666826 --- /dev/null +++ b/network/dsniff/patches/39_libtirpc.patch @@ -0,0 +1,51 @@ +Author: Robert Scheck +Description: allows building against libtirpc (as a separate library) given the Sun RPC +support in glibc has been deprecated for a long time. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -16,7 +16,7 @@ + mandir = @mandir@ + + CC = @CC@ +-CFLAGS = @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\" ++CFLAGS = @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\" -I/usr/include/tirpc + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + +@@ -107,7 +107,7 @@ + $(RANLIB) $@ + + dsniff: $(HDRS) $(SRCS) $(OBJS) libmissing.a +- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB) ++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB) -ltirpc + + arpspoof: arpspoof.o arp.o libmissing.a + $(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB) +@@ -116,7 +116,7 @@ + $(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB) + + filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o libmissing.a +- $(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) ++ $(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) -ltirpc + + macof: macof.o libmissing.a + $(CC) $(LDFLAGS) -o $@ macof.o $(LIBS) $(PCAPLIB) $(LNETLIB) +@@ -128,7 +128,7 @@ + $(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) + + sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o libmissing.a +- $(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB) ++ $(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB) -ltirpc + + sshow: sshow.o pcaputil.o libmissing.a + $(CC) $(LDFLAGS) -o $@ sshow.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) +@@ -146,7 +146,7 @@ + $(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) + + webmitm: webmitm.o base64.o buf.o decode_http.o record.o libmissing.a +- $(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB) ++ $(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB) -ltirpc + + webspy: webspy.o base64.o buf.o remote.o libmissing.a + $(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB) 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 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 bank_added; ++ boost::signals2::signal bank_added; + + /** This signal is emitted when a bank has been removed from the core + */ +- boost::signal1 bank_removed; ++ boost::signals2::signal bank_removed; + + /** This signal is emitted when a account has been added to one of + * the banks + */ +- boost::signal2 account_added; ++ boost::signals2::signal account_added; + + /** This signal is emitted when a account has been removed from one of + * the banks + */ +- boost::signal2 account_removed; ++ boost::signals2::signal account_removed; + + /** This signal is emitted when a account has been updated in one of + * the banks + */ +- boost::signal2 account_updated; ++ boost::signals2::signal account_updated; + + private: + +@@ -147,7 +147,7 @@ + /** This signal is emitted when the AccountCore Service has been + * updated. + */ +- boost::signal0 updated; ++ boost::signals2::signal 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 account_added; ++ boost::signals2::signal account_added; + + /** This signal is emitted when a account has been removed. + */ +- boost::signal1 account_removed; ++ boost::signals2::signal account_removed; + + /** This signal is emitted when a account has been updated. + */ +- boost::signal1 account_updated; ++ boost::signals2::signal 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 BankImpl: + public Bank, +- public boost::signals::trackable, ++ public boost::signals2::trackable, + protected RefLister + { + +--- 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 contact_added; ++ boost::signals2::signal contact_added; + + + /** This signal is emitted when a Contact has been removed from the Book. + */ +- boost::signal1 contact_removed; ++ boost::signals2::signal contact_removed; + + + /** This signal is emitted when a Contact has been updated in the Book. + */ +- boost::signal1 contact_updated; ++ boost::signals2::signal contact_updated; + }; + + typedef boost::shared_ptr 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::iterator iter = conns.begin (); iter != conns.end (); ++iter) ++ for (std::list::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 source_added; ++ boost::signals2::signal source_added; + + /** This signal is emitted when a book has been added to one of + * the sources + */ +- boost::signal2 book_added; ++ boost::signals2::signal book_added; + + /** This signal is emitted when a book has been removed from one of + * the sources + */ +- boost::signal2 book_removed; ++ boost::signals2::signal book_removed; + + /** This signal is emitted when a book has been updated in one of + * the sources + */ +- boost::signal2 book_updated; ++ boost::signals2::signal book_updated; + + /** This signal is emitted when a contact has been added to one of + * the book of one of the sources + */ +- boost::signal3 contact_added; ++ boost::signals2::signal contact_added; + + /** This signal is emitted when a contact has been removed from one of + * the book of one of the sources + */ +- boost::signal3 contact_removed; ++ boost::signals2::signal contact_removed; + + /** This signal is emitted when a contact has been updated in one of + * the book of one of the sources + */ +- boost::signal3 contact_updated; ++ boost::signals2::signal contact_updated; + + private: + +@@ -174,7 +174,7 @@ + std::list > contact_decorators; + + /*** Misc stuff ***/ +- std::list conns; ++ std::list 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 book_added; ++ boost::signals2::signal book_added; + + + /** This signal is emitted when a Book has been updated in the Source. + */ +- boost::signal1 book_updated; ++ boost::signals2::signal book_updated; + + + /** This signal is emitted when a Book has been removed in the Source. + */ +- boost::signal1 book_removed; ++ boost::signals2::signal book_removed; + + /** This signal is emitted when a Contact has been added to a book in + * this source. + */ +- boost::signal2 contact_added; ++ boost::signals2::signal contact_added; + + /** This signal is emitted when a Contact has been removed from a book in + * this source. + */ +- boost::signal2 contact_removed; ++ boost::signals2::signal contact_removed; + + /** This signal is emitted when a Contact has been updated in a book in + * this source + */ +- boost::signal2 contact_updated; ++ boost::signals2::signal contact_updated; + }; + + typedef boost::shared_ptr 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 manager_added; ++ boost::signals2::signal manager_added; + + + /*** AudioInput Device Management ***/ +@@ -254,23 +254,23 @@ + + /** See audioinput-manager.h for the API + */ +- boost::signal3 device_opened; +- boost::signal2 device_closed; +- boost::signal3 device_error; ++ boost::signals2::signal device_opened; ++ boost::signals2::signal device_closed; ++ boost::signals2::signal 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 device_added; ++ boost::signals2::signal 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 device_removed; ++ boost::signals2::signal 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 +-#include ++#include + #include + + #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 device_opened; ++ boost::signals2::signal device_opened; + + /** This signal is emitted when an audio input device is closed. + * @param device the audio input device that was closed. + */ +- boost::signal1 device_closed; ++ boost::signals2::signal 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 device_error; ++ boost::signals2::signal 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 manager_added; ++ boost::signals2::signal 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 device_opened; +- boost::signal3 device_closed; +- boost::signal4 device_error; ++ boost::signals2::signal device_opened; ++ boost::signals2::signal device_closed; ++ boost::signals2::signal 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 device_added; ++ boost::signals2::signal 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 device_removed; ++ boost::signals2::signal 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 +-#include ++#include + #include + + #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 device_opened; ++ boost::signals2::signal 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 device_closed; ++ boost::signals2::signal 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 device_error; ++ boost::signals2::signal 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 dialect_added; ++ boost::signals2::signal dialect_added; + + private: + +@@ -116,7 +116,7 @@ + + /** This signal is emitted when the ChatCore service has been updated. + */ +- boost::signal0 updated; ++ boost::signals2::signal 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 +-#include ++#include + #include + + #include +@@ -113,15 +113,15 @@ + + /** This signal is emitted when the Chat has been updated. + */ +- boost::signal0 updated; ++ boost::signals2::signal updated; + + /** This signal is emitted when the user requested to see this Chat + */ +- boost::signal0 user_requested; ++ boost::signals2::signal user_requested; + + /** This signal is emitted when the Chat has been removed. + */ +- boost::signal0 removed; ++ boost::signals2::signal 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 simple_chat_added; ++ boost::signals2::signal simple_chat_added; + + /** This signal is emitted when an Ekiga::MultipleChat has been added to + * the dialect. + */ +- boost::signal1 multiple_chat_added; ++ boost::signals2::signal 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::list > > simple_iterator; +- typedef typename Ekiga::map_key_const_iterator, std::list > > simple_const_iterator; +- typedef typename Ekiga::map_key_iterator, std::list > > multiple_iterator; +- typedef typename Ekiga::map_key_const_iterator, std::list > > multiple_const_iterator; ++ typedef typename Ekiga::map_key_iterator, std::list > > simple_iterator; ++ typedef typename Ekiga::map_key_const_iterator, std::list > > simple_const_iterator; ++ typedef typename Ekiga::map_key_iterator, std::list > > multiple_iterator; ++ typedef typename Ekiga::map_key_const_iterator, std::list > > multiple_const_iterator; + + simple_iterator simple_begin (); + simple_iterator simple_end (); +@@ -116,8 +116,8 @@ + + private: + +- std::map, std::list > simple_chats; +- std::map, std::list > multiple_chats; ++ std::map, std::list > simple_chats; ++ std::map, std::list > multiple_chats; + + void on_simple_chat_removed (boost::shared_ptr chat); + +@@ -133,22 +133,22 @@ + template + Ekiga::DialectImpl::~DialectImpl () + { +- for (typename std::map,std::list >::iterator iter = simple_chats.begin (); ++ for (typename std::map,std::list >::iterator iter = simple_chats.begin (); + iter != simple_chats.end (); + iter++) { + +- for (std::list::iterator conn_iter = iter->second.begin (); ++ for (std::list::iterator conn_iter = iter->second.begin (); + conn_iter != iter->second.end (); + ++conn_iter) { + + conn_iter->disconnect (); + } + } +- for (typename std::map,std::list >::iterator iter = multiple_chats.begin (); ++ for (typename std::map,std::list >::iterator iter = multiple_chats.begin (); + iter != multiple_chats.end (); + iter++) { + +- for (std::list::iterator conn_iter = iter->second.begin (); ++ for (std::list::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,std::list >::const_iterator iter = simple_chats.begin (); ++ for (typename std::map,std::list >::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,std::list >::const_iterator iter = multiple_chats.begin (); ++ for (typename std::map,std::list >::const_iterator iter = multiple_chats.begin (); + go_on && iter != multiple_chats.end (); + iter++) { + +@@ -275,7 +275,7 @@ + void + Ekiga::DialectImpl::on_simple_chat_removed (boost::shared_ptr chat) + { +- for (typename std::list::iterator iter = simple_chats[chat].begin (); ++ for (typename std::list::iterator iter = simple_chats[chat].begin (); + iter != simple_chats[chat].end (); + ++iter) { + +@@ -288,7 +288,7 @@ + void + Ekiga::DialectImpl::on_multiple_chat_removed (boost::shared_ptr chat) + { +- for (typename std::list::iterator iter = multiple_chats[chat].begin (); ++ for (typename std::list::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 cleared; ++ boost::signals2::signal 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, + 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 trigger_saving; ++ boost::signals2::signal 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 trigger_saving; ++ boost::signals2::signal 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 +-#include ++#include + #include + + #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 ++#include + #include + + /* This code uses boost signals to implement the "chain of responsibility" +@@ -117,9 +117,8 @@ + + template + struct ChainOfResponsibility: +- public boost::signal1 ++ public boost::signals2::signal + { + }; + }; +--- 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 ++#include + #include + + #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 +-#include ++#include + #include + + #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 property_changed; ++ boost::signals2::signal 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 updated; ++ boost::signals2::signal updated; + + + /** This signal is emitted when the object has been removed. + */ +- boost::signal0 removed; ++ boost::signals2::signal 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 +-#include ++#include + #include + + +--- 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 +-#include ++#include + #include + + #include "services.h" +@@ -66,7 +66,7 @@ + virtual void set_presence_info (const std::string presence, + const std::string status) = 0; + +- boost::signal0 updated; ++ boost::signals2::signal 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 ++#include + #include + #include + +@@ -55,7 +55,7 @@ + { + protected: + +- typedef std::map,std::list > container_type; ++ typedef std::map,std::list > container_type; + typedef Ekiga::map_key_iterator iterator; + typedef Ekiga::map_key_const_iterator const_iterator; + +@@ -66,7 +66,7 @@ + void add_object (boost::shared_ptr obj); + + void add_connection (boost::shared_ptr obj, +- boost::signals::connection connection); ++ boost::signals2::connection connection); + + void remove_object (boost::shared_ptr obj); + +@@ -78,9 +78,9 @@ + const_iterator begin () const; + const_iterator end () const; + +- boost::signal1 > object_added; +- boost::signal1 > object_removed; +- boost::signal1 > object_updated; ++ boost::signals2::signal)> object_added; ++ boost::signals2::signal)> object_removed; ++ boost::signals2::signal)> object_updated; + + private: + container_type objects; +@@ -95,7 +95,7 @@ + iter != objects.end (); + ++iter) { + +- for (std::list::iterator conn_iter = iter->second.begin (); ++ for (std::list::iterator conn_iter = iter->second.begin (); + conn_iter != iter->second.end (); + ++conn_iter) { + +@@ -130,7 +130,7 @@ + template + void + Ekiga::RefLister::add_connection (boost::shared_ptr obj, +- boost::signals::connection connection) ++ boost::signals2::connection connection) + { + objects[obj].push_back (connection); + } +@@ -139,8 +139,8 @@ + void + Ekiga::RefLister::remove_object (boost::shared_ptr obj) + { +- std::list connections = objects[obj]; +- for (std::list::iterator iter = connections.begin (); ++ std::list connections = objects[obj]; ++ for (std::list::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 ++#include + #include + + #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 + #include +-#include ++#include + #include + + namespace Ekiga +@@ -101,7 +101,7 @@ + + void dump (std::ostream &stream) const; + +- boost::signal1 service_added; ++ boost::signals2::signal 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 ++ + #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 connections; ++ std::vector connections; + + std::string presence; + +@@ -502,7 +502,7 @@ + { + AccountsWindow *self = ACCOUNTS_WINDOW (obj); + +- for (std::vector::iterator iter ++ for (std::vector::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 connections; ++ std::vector connections; + GtkWidget *tree_view; + GtkWidget *notebook; + GtkTreeSelection *selection; +@@ -579,7 +579,7 @@ + { + AddressBookWindow *self = ADDRESSBOOK_WINDOW (obj); + +- for (std::vector::iterator iter ++ for (std::vector::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 connections; ++ std::list connections; + }; + + +@@ -447,7 +447,7 @@ + + view = BOOK_VIEW_GTK (obj); + +- for (std::list::iterator iter ++ for (std::list::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 book; + GtkListStore* store; + GtkTreeView* tree; +- std::vector connections; ++ std::vector connections; + }; + + /* this is what we put in the view */ +@@ -229,7 +229,7 @@ + + view = CALL_HISTORY_VIEW_GTK (obj); + +- for (std::vector::iterator iter ++ for (std::vector::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 connections; ++ std::vector 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 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 connections; ++ std::list connections; + + GtkWidget* notebook; + }; +@@ -405,7 +405,7 @@ + + self = CHAT_WINDOW (obj); + +- for (std::list::iterator iter ++ for (std::list::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 connections; ++ std::vector connections; + + GtkTreeStore* store; + GtkTreeView* view; +@@ -454,7 +454,7 @@ + { + if (self->priv->heap) { + +- for (std::vector::iterator iter ++ for (std::vector::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 connections; ++ std::vector 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 videoinput_core = core.get ("videoinput-core"); + boost::shared_ptr audioinput_core = core.get ("audioinput-core"); + boost::shared_ptr audiooutput_core = core.get ("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 core; + +- std::vector connections; ++ std::vector connections; + GtkTreeStore *store; + GtkTreeView *tree_view; + GSList *folded_groups; +@@ -1382,7 +1382,7 @@ + { + if (self->priv->core) { + +- for (std::vector::iterator iter ++ for (std::vector::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 connections; ++ std::vector 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::iterator iter = self->priv->connections.begin () ; ++ for (std::vector::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 + +-#include ++#include + #include + + 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 ++#include + #include + + #include +@@ -114,24 +114,24 @@ + /** This signal is emitted when an Ekiga::HalManager has been + * added to the HalCore Service. + */ +- boost::signal1 manager_added; ++ boost::signals2::signal manager_added; + + + /*** API to act on HAL events ***/ + + /** See hal-manager.h for the API + */ +- boost::signal4 videoinput_device_added; +- boost::signal4 videoinput_device_removed; ++ boost::signals2::signal videoinput_device_added; ++ boost::signals2::signal videoinput_device_removed; + +- boost::signal3 audioinput_device_added; +- boost::signal3 audioinput_device_removed; ++ boost::signals2::signal audioinput_device_added; ++ boost::signals2::signal audioinput_device_removed; + +- boost::signal3 audiooutput_device_added; +- boost::signal3 audiooutput_device_removed; ++ boost::signals2::signal audiooutput_device_added; ++ boost::signals2::signal audiooutput_device_removed; + +- boost::signal3 network_interface_up; +- boost::signal3 network_interface_down; ++ boost::signals2::signal network_interface_up; ++ boost::signals2::signal 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 videoinput_device_added; ++ boost::signals2::signal 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 videoinput_device_removed; ++ boost::signals2::signal 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 audioinput_device_added; ++ boost::signals2::signal 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 audioinput_device_removed; ++ boost::signals2::signal 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 audiooutput_device_added; ++ boost::signals2::signal 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 audiooutput_device_removed; ++ boost::signals2::signal 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 network_interface_up; ++ boost::signals2::signal 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 network_interface_down; ++ boost::signals2::signal 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 removed; ++ boost::signals2::signal removed; + + private: + +@@ -109,7 +109,7 @@ + void push_notification (boost::shared_ptr notification) + { notification_added (notification); } + +- boost::signal1 > notification_added; ++ boost::signals2::signal)> 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 heap_added; +- boost::signal1 heap_removed; ++ boost::signals2::signal heap_added; ++ boost::signals2::signal heap_removed; + + /** Those signals are forwarded from the given Heap + * @param The Heap in question. + */ +- boost::signal1 heap_updated; +- boost::signal2 presentity_added; +- boost::signal2 presentity_updated; +- boost::signal2 presentity_removed; ++ boost::signals2::signal heap_updated; ++ boost::signals2::signal presentity_added; ++ boost::signals2::signal presentity_updated; ++ boost::signals2::signal presentity_removed; + }; + + typedef boost::shared_ptr 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 presentity_added; ++ boost::signals2::signal presentity_added; + + /** This signal is emitted when a Presentity has been updated in the Heap. + */ +- boost::signal1 presentity_updated; ++ boost::signals2::signal presentity_updated; + + /** This signal is emitted when a Presentity has been removed from the Heap. + */ +- boost::signal1 presentity_removed; ++ boost::signals2::signal presentity_removed; + }; + + typedef boost::shared_ptr 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::iterator iter = conns.begin (); iter != conns.end (); ++iter) ++ for (std::list::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 presence_received; +- boost::signal2 status_received; ++ boost::signals2::signal presence_received; ++ boost::signals2::signal 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 cluster_added; ++ boost::signals2::signal cluster_added; + + /** Those signals are forwarding the heap_added, heap_updated + * and heap_removed from the given Cluster. + * + */ +- boost::signal2 heap_added; +- boost::signal2 heap_updated; +- boost::signal2 heap_removed; ++ boost::signals2::signal heap_added; ++ boost::signals2::signal heap_updated; ++ boost::signals2::signal heap_removed; + + /** Those signals are forwarding the presentity_added, presentity_updated + * and presentity_removed from the given Heap of the given Cluster. + */ +- boost::signal3 presentity_added; +- boost::signal3 presentity_updated; +- boost::signal3 presentity_removed; ++ boost::signals2::signal presentity_added; ++ boost::signals2::signal presentity_updated; ++ boost::signals2::signal 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 presence_received; +- boost::signal2 status_received; ++ boost::signals2::signal presence_received; ++ boost::signals2::signal status_received; + + private: + +@@ -321,7 +321,7 @@ + + private: + +- std::list conns; ++ std::list 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::iterator iter = manager_connections.begin (); ++ for (std::list::iterator iter = manager_connections.begin (); + iter != manager_connections.end (); + ++iter) + iter->disconnect (); +@@ -103,7 +103,7 @@ + + void CallCore::add_call (boost::shared_ptr call, boost::shared_ptr manager) + { +- std::list conns; ++ std::list 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) + { +- for (std::list::iterator iter2 = call_connections [call->get_id ()].begin (); ++ for (std::list::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 + +-#include ++#include + #include + #include + #include +@@ -126,7 +126,7 @@ + /** This signal is emitted when a Ekiga::CallManager has been + * added to the CallCore Service. + */ +- boost::signal1 > manager_added; ++ boost::signals2::signal)> manager_added; + + + /*** Call Management ***/ +@@ -141,21 +141,21 @@ + + /** See call.h for the API + */ +- boost::signal2 , boost::shared_ptr > ringing_call; +- boost::signal2 , boost::shared_ptr > setup_call; +- boost::signal2 , boost::shared_ptr > missed_call; +- boost::signal3 , boost::shared_ptr, std::string> cleared_call; +- boost::signal2 , boost::shared_ptr > established_call; +- boost::signal2 , boost::shared_ptr > held_call; +- boost::signal2 , boost::shared_ptr > retrieved_call; +- boost::signal5 , boost::shared_ptr, std::string, Call::StreamType, bool> stream_opened; +- boost::signal5 , boost::shared_ptr, std::string, Call::StreamType, bool> stream_closed; +- boost::signal4 , boost::shared_ptr, std::string, Call::StreamType> stream_paused; +- boost::signal4 , boost::shared_ptr, std::string, Call::StreamType> stream_resumed; ++ boost::signals2::signal, boost::shared_ptr)> ringing_call; ++ boost::signals2::signal, boost::shared_ptr)> setup_call; ++ boost::signals2::signal, boost::shared_ptr)> missed_call; ++ boost::signals2::signal, boost::shared_ptr, std::string)> cleared_call; ++ boost::signals2::signal, boost::shared_ptr)> established_call; ++ boost::signals2::signal, boost::shared_ptr)> held_call; ++ boost::signals2::signal, boost::shared_ptr)> retrieved_call; ++ boost::signals2::signal, boost::shared_ptr, std::string, Call::StreamType, bool)> stream_opened; ++ boost::signals2::signal, boost::shared_ptr, std::string, Call::StreamType, bool)> stream_closed; ++ boost::signals2::signal, boost::shared_ptr, std::string, Call::StreamType)> stream_paused; ++ boost::signals2::signal, boost::shared_ptr, std::string, Call::StreamType)> stream_resumed; + + /*** Misc ***/ +- boost::signal1 > manager_ready; +- boost::signal0 ready; ++ boost::signals2::signal)> manager_ready; ++ boost::signals2::signal ready; + + /** This chain allows the CallCore to report errors to the user + */ +@@ -186,8 +186,8 @@ + + + std::set > managers; +- std::list manager_connections; +- std::map > call_connections; ++ std::list manager_connections; ++ std::map > 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 ++#include + #include + #include + +@@ -198,69 +198,69 @@ + + /* Signal emitted when the call is established + */ +- boost::signal0 established; ++ boost::signals2::signal established; + + /* Signal emitted when an established call is cleared + * @param: a string describing why the call was cleared + */ +- boost::signal1 cleared; ++ boost::signals2::signal cleared; + + /* Signal emitted when the call is missed, ie cleared + * without having been established + */ +- boost::signal0 missed; ++ boost::signals2::signal missed; + + /* Signal emitted when the call is forwarded + */ +- boost::signal0 forwarded; ++ boost::signals2::signal forwarded; + + /* Signal emitted when the call is held + */ +- boost::signal0 held; ++ boost::signals2::signal held; + + /* Signal emitted when the call is retrieved + */ +- boost::signal0 retrieved; ++ boost::signals2::signal retrieved; + + /* Signal emitted when the call is being setup + */ +- boost::signal0 setup; ++ boost::signals2::signal setup; + + /* Signal emitted when the remote party is ringing + */ +- boost::signal0 ringing; ++ boost::signals2::signal ringing; + + /* Signal emitted when a stream is opened + * @param the stream name + * @param the stream type + * @param transmission or reception + */ +- boost::signal3 stream_opened; ++ boost::signals2::signal stream_opened; + + /* Signal emitted when a stream is closed + * @param the stream name + * @param the stream type + * @param transmission or reception + */ +- boost::signal3 stream_closed; ++ boost::signals2::signal stream_closed; + + /* Signal emitted when a transmitted stream is paused + * @param the stream name + * @param the stream type + * @param transmission or reception + */ +- boost::signal2 stream_paused; ++ boost::signals2::signal stream_paused; + + /* Signal emitted when a transmitted stream is resumed + * @param the stream name + * @param the stream type + * @param transmission or reception + */ +- boost::signal2 stream_resumed; ++ boost::signals2::signal stream_resumed; + + /** This signal is emitted when the Call is removed. + */ +- boost::signal0 removed; ++ boost::signals2::signal 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 +-#include ++#include + #include + + #include +@@ -99,7 +99,7 @@ + /** This signal is emitted when a Ekiga::CallProtocolManager has been + * added to the CallManager. + */ +- boost::signal1 > manager_added; ++ boost::signals2::signal)> manager_added; + + + /* +@@ -213,7 +213,7 @@ + /* + * MISC + */ +- boost::signal0 ready; ++ boost::signals2::signal ready; + + private: + std::set > 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 ++#include + #include + #include + #include +@@ -146,7 +146,7 @@ + /** This signal is emitted when a Ekiga::VideoInputManager has been + * added to the VideoInputCore Service. + */ +- boost::signal1 manager_added; ++ boost::signals2::signal manager_added; + + + /*** VideoInput Device Management ***/ +@@ -277,23 +277,23 @@ + + /** See videoinput-manager.h for the API + */ +- boost::signal3 device_opened; +- boost::signal2 device_closed; +- boost::signal3 device_error; ++ boost::signals2::signal device_opened; ++ boost::signals2::signal device_closed; ++ boost::signals2::signal 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 device_added; ++ boost::signals2::signal 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 device_removed; ++ boost::signals2::signal 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 +-#include ++#include + #include + + #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 device_opened; ++ boost::signals2::signal device_opened; + + /** This signal is emitted when a video input device is closed. + * @param device the video input device that was closed. + */ +- boost::signal1 device_closed; ++ boost::signals2::signal 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 device_error; ++ boost::signals2::signal 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 ++#include + #include + #include + #include +@@ -116,7 +116,7 @@ + /** This signal is emitted when a Ekiga::VideoOutputManager has been + * added to the VideoOutputCore Service. + */ +- boost::signal1 manager_added; ++ boost::signals2::signal manager_added; + + + /*** Videooutput Management ***/ +@@ -165,11 +165,11 @@ + + /** See videooutput-manager.h for the API + */ +- boost::signal6 device_opened; +- boost::signal1 device_closed; +- boost::signal2 device_error; +- boost::signal2 fullscreen_mode_changed; +- boost::signal3 size_changed; ++ boost::signals2::signal device_opened; ++ boost::signals2::signal device_closed; ++ boost::signals2::signal device_error; ++ boost::signals2::signal fullscreen_mode_changed; ++ boost::signals2::signal 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 ++#include + #include + + #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 device_opened; ++ boost::signals2::signal device_opened; + + /** This signal is emitted when a video output device is closed. + */ +- boost::signal0 device_closed; ++ boost::signals2::signal 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 device_error; ++ boost::signals2::signal 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 fullscreen_mode_changed; ++ boost::signals2::signal 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 size_changed; ++ boost::signals2::signal 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, +- 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, +- 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 trigger_saving; ++ boost::signals2::signal 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 call); + void on_call_notification_closed (gpointer self); + +- typedef std::map, std::pair > > container_type; ++ typedef std::map, std::pair > > 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 > (conn, boost::shared_ptr (notif, g_object_unref)); ++ live[notification] = std::pair > (conn, boost::shared_ptr (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 trigger_saving; ++ boost::signals2::signal 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, + 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 +-#include ++#include + + #include + +--- 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 chat_requested; ++ boost::signals2::signal 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 >::const_iterator ++ for (std::map >::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::const_iterator iter2 ++ for (std::list::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 conns; ++ std::list 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 >::const_iterator ++ for (std::map >::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 >::const_iterator ++ for (std::map >::const_iterator + iter = presentities.begin (); + iter != presentities.end (); + ++iter) { +@@ -514,7 +514,7 @@ + "contact on a remote server")); + + std::set all_groups; +- for (std::map >::const_iterator ++ for (std::map >::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 trigger_saving; ++ boost::signals2::signal trigger_saving; + + private: + +@@ -106,7 +106,7 @@ + boost::shared_ptr doc; + xmlNodePtr list_node; + +- std::map > presentities; ++ std::map > 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 > entry_added; +- boost::signal1 > entry_updated; +- boost::signal1 > entry_removed; ++ boost::signals2::signal)> entry_added; ++ boost::signals2::signal)> entry_updated; ++ boost::signals2::signal)> entry_removed; + + + /* data for its children */ +@@ -104,7 +104,7 @@ + + std::list ordering; + std::list > lists; +- std::list, std::list > > entries; ++ std::list, std::list > > entries; + }; + + +@@ -235,12 +235,12 @@ + (*iter)->flush (); + lists.clear (); + +- for (std::list, std::list > >::iterator iter = entries.begin (); ++ for (std::list, std::list > >::iterator iter = entries.begin (); + iter != entries.end (); + ++iter) { + + iter->first->removed (); +- for (std::list::iterator conn_iter ++ for (std::list::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 conns; ++ std::list 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, std::list > (entry, conns)); ++ entries.push_back (std::pair, std::list > (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::list > >::const_iterator iter = entries.begin (); ++ for (std::list, std::list > >::const_iterator iter = entries.begin (); + iter != entries.end (); + ++iter) { + +@@ -381,7 +381,7 @@ + ++iter) + (*iter)->push_status (uri_, status); + +- for (std::list, std::list > >::const_iterator iter = entries.begin (); ++ for (std::list, std::list > >::const_iterator iter = entries.begin (); + iter != entries.end (); + ++iter) { + +@@ -400,7 +400,7 @@ + ++iter) + go_on = (*iter)->visit_presentities (visitor); + +- for (std::list, std::list > >::const_iterator iter = entries.begin (); ++ for (std::list, std::list > >::const_iterator iter = entries.begin (); + go_on && iter != entries.end (); + ++iter) { + +@@ -418,7 +418,7 @@ + ++iter) + (*iter)->publish (); + +- for (std::list, std::list > >::const_iterator iter = entries.begin (); ++ for (std::list, std::list > >::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 > entry_added; +- boost::signal1 > entry_updated; +- boost::signal1 > entry_removed; ++ boost::signals2::signal)> entry_added; ++ boost::signals2::signal)> entry_updated; ++ boost::signals2::signal)> 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 trigger_reload; ++ boost::signals2::signal 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 connections; ++ std::vector 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 ("videoinput-core"); + assistant->priv->audioinput_core = service_core.get ("audioinput-core"); + assistant->priv->audiooutput_core = service_core.get ("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 connections; ++ std::vector 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 personal_details; +- std::vector connections; ++ std::vector 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/README b/network/falkon/README deleted file mode 100644 index 3e46f00e6c..0000000000 --- a/network/falkon/README +++ /dev/null @@ -1,11 +0,0 @@ -Falkon is a KDE web browser using QtWebEngine rendering engine, -previously known as QupZilla. It aims to be a lightweight web browser -available through all major platforms. -This project has been originally started only for educational -purposes, but from its start, Falkon has grown into a feature-rich -browser. - -Falkon has all standard functions you expect from a web browser. -It includes bookmarks, history (both also in sidebar) and tabs. -Above that, it has by default enabled blocking ads with a built-in -AdBlock plugin. diff --git a/network/falkon/doinst.sh b/network/falkon/doinst.sh deleted file mode 100644 index 65c7e2eeb9..0000000000 --- a/network/falkon/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/network/falkon/falkon.SlackBuild b/network/falkon/falkon.SlackBuild deleted file mode 100644 index df6df2e5ae..0000000000 --- a/network/falkon/falkon.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -# Slackware build script for falkon - -# Copyright 2018 Matteo Bernardini , 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=falkon -VERSION=${VERSION:-3.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.?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 {} \; - -# Handling this directory requires the KDE5 Framework -rm -fR po - -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG 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/network/falkon/falkon.info b/network/falkon/falkon.info deleted file mode 100644 index 39afba46f1..0000000000 --- a/network/falkon/falkon.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="falkon" -VERSION="3.0.1" -HOMEPAGE="https://www.falkon.org" -DOWNLOAD="https://download.kde.org/stable/falkon/3.0.1/falkon-3.0.1.tar.xz" -MD5SUM="c6fb6433ac0f228667e2f763c02317c5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="extra-cmake-modules qt5" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/network/falkon/slack-desc b/network/falkon/slack-desc deleted file mode 100644 index f2d05d57bf..0000000000 --- a/network/falkon/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------------------------------------------------------| -falkon: falkon (lightweight web browser) -falkon: -falkon: Falkon is a KDE web browser using QtWebEngine rendering engine, -falkon: previously known as QupZilla. It aims to be a lightweight web browser -falkon: available through all major platforms. -falkon: This project has been originally started only for educational -falkon: purposes, but from its start, Falkon has grown into a feature-rich -falkon: browser. -falkon: -falkon: Homepage: https://www.falkon.org -falkon: 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..52b4b65876 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.51.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..c6653c5182 100644 --- a/network/filezilla/filezilla.info +++ b/network/filezilla/filezilla.info @@ -1,8 +1,8 @@ PRGNAM="filezilla" -VERSION="3.42.1" +VERSION="3.51.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.51.0_src.tar.bz2" +MD5SUM="d8e9abde7a0b0a64d6896b6e6732ef96" 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 + #include + + #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 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/freeradius-server/freeradius-server.SlackBuild b/network/freeradius-server/freeradius-server.SlackBuild index e72487437e..fae2fc93f4 100644 --- a/network/freeradius-server/freeradius-server.SlackBuild +++ b/network/freeradius-server/freeradius-server.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=freeradius-server -VERSION=${VERSION:-2.2.9} +VERSION=${VERSION:-3.0.21} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -84,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make -make install R=$PKG +make -j1 install R=$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 diff --git a/network/freeradius-server/freeradius-server.info b/network/freeradius-server/freeradius-server.info index 98b1a931e0..57ca94bf53 100644 --- a/network/freeradius-server/freeradius-server.info +++ b/network/freeradius-server/freeradius-server.info @@ -1,8 +1,8 @@ PRGNAM="freeradius-server" -VERSION="2.2.9" +VERSION="3.0.21" HOMEPAGE="http://www.freeradius.org/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/freeradius-server-2.2.9.tar.bz2" -MD5SUM="d1398327ba4e23c75da06d8a0e01096b" +DOWNLOAD="ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.0.21.tar.bz2" +MD5SUM="8b7f794f2ac0d686d9aecfa083a63614" 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/glusterfs/glusterfs.SlackBuild b/network/glusterfs/glusterfs.SlackBuild index 099eb7f2ee..ffc71919d3 100644 --- a/network/glusterfs/glusterfs.SlackBuild +++ b/network/glusterfs/glusterfs.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; ./autogen.sh -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ 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 ' -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 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 - #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 - #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 - #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 - #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 - #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 - #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 + #include + #include + #include + #include +-#include + #include + #include + + #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 ++#include + #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 + * + * ________________________________________________________________ */ + ++#include + #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 + * + * ________________________________________________________________ */ + ++#include + #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 + #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 -# 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/konversation/README b/network/konversation/README deleted file mode 100644 index bdf71648f9..0000000000 --- a/network/konversation/README +++ /dev/null @@ -1,7 +0,0 @@ -Konversation is an Internet Relay Chat (IRC) client for KDE. - -Konversation features include: -* integration of Konsole (using the KPart technology) -* interaction with KAddressBook * themable nicklist icons -* OSD (On Screen Display) * IPv6 support -* multiserver support * [Secure Sockets Layer|SSL]] diff --git a/network/konversation/doinst.sh b/network/konversation/doinst.sh deleted file mode 100644 index 4a25de5e6f..0000000000 --- a/network/konversation/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/konversation/konversation.SlackBuild b/network/konversation/konversation.SlackBuild deleted file mode 100644 index 7a93fff79f..0000000000 --- a/network/konversation/konversation.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -# SlackBuild script for konversation - -# Copyright 2007-2014 Michiel van Wessem, Leicester, United Kingdom -# Copyright 2020 Gregory Tourte -# 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=konversation -VERSION=${VERSION:-1.5.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} - -SRC_VERSION=$(echo $VERSION | tr _ -) - -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-$SRC_VERSION -tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.xz -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 {} \; - -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 -) || 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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING* ChangeLog INSTALL README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir $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/konversation/konversation.info b/network/konversation/konversation.info deleted file mode 100644 index 5e4faf679e..0000000000 --- a/network/konversation/konversation.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="konversation" -VERSION="1.5.1" -HOMEPAGE="https://konversation.kde.org" -DOWNLOAD="https://download.kde.org/stable/konversation/1.5.1/src/konversation-1.5.1.tar.xz" -MD5SUM="66731bbfa34e36bd3f7b723c63a492e7" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="ArTourter" -EMAIL="artourter@gmail.com" diff --git a/network/konversation/slack-desc b/network/konversation/slack-desc deleted file mode 100644 index a353822169..0000000000 --- a/network/konversation/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------------------------------------------------------| -konversation: konversation (KDE IRC client) -konversation: -konversation: Konversation is a user-friendly and highly configurable -konversation: Internet Relay Chat client for KDE. -konversation: -konversation: Konversation has support for standard IRC features, SSL server -konversation: support, bookmarking support, multiple identities for different -konversation: servers, theme support, and much more. -konversation: -konversation: Homepage: http://konversation.kde.org/ -konversation: 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 4f1fb3c106..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-2021 Willy Sudiarto Raharjo -# 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.19.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 - -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 ec91e88bd1..0000000000 --- a/network/krb5/krb5.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="krb5" -VERSION="1.19.1" -HOMEPAGE="http://web.mit.edu/kerberos/" -DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.19/krb5-1.19.1.tar.gz" -MD5SUM="81257292f8243f735654d4fd5d1fef6a" -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 -# - -# 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 -# - -# 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/lighttpd/lighttpd.SlackBuild b/network/lighttpd/lighttpd.SlackBuild index 7c48640ad5..55c9a0028c 100644 --- a/network/lighttpd/lighttpd.SlackBuild +++ b/network/lighttpd/lighttpd.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lighttpd -VERSION=${VERSION:-1.4.58} +VERSION=${VERSION:-1.4.59} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/lighttpd/lighttpd.info b/network/lighttpd/lighttpd.info index 49924d8729..cf867fea71 100644 --- a/network/lighttpd/lighttpd.info +++ b/network/lighttpd/lighttpd.info @@ -1,8 +1,8 @@ PRGNAM="lighttpd" -VERSION="1.4.58" +VERSION="1.4.59" HOMEPAGE="http://www.lighttpd.net/" -DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.58.tar.xz" -MD5SUM="8d12a31bd3fdd7eab85cf9a6d2cfa92e" +DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.59.tar.xz" +MD5SUM="a8838dac90fcddbcc05c0d1877bd8cdf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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..7124b94326 100644 --- a/network/memcached/memcached.SlackBuild +++ b/network/memcached/memcached.SlackBuild @@ -29,7 +29,7 @@ # Added rc startup script contributed by Miguel De Anda PRGNAM="memcached" -VERSION=${VERSION:-1.4.37} +VERSION=${VERSION:-1.6.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/memcached/memcached.info b/network/memcached/memcached.info index 3be16c1c65..76d908aabf 100644 --- a/network/memcached/memcached.info +++ b/network/memcached/memcached.info @@ -1,8 +1,8 @@ PRGNAM="memcached" -VERSION="1.4.37" +VERSION="1.6.9" HOMEPAGE="http://memcached.org/" -DOWNLOAD="http://www.memcached.org/files/memcached-1.4.37.tar.gz" -MD5SUM="5080f9e984486380f628a743dcadf1dc" +DOWNLOAD="http://www.memcached.org/files/memcached-1.6.9.tar.gz" +MD5SUM="ee802a316d7d622aaaec22382ca65004" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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 # Copyright 2009-2011 Pierre Cazenave # Copyright 2012-2013 Roberto Neri, Palermo, Italy -# Copyright 2013-2016 Matteo Bernardini , Pisa, Italy +# Copyright 2013-2019 Matteo Bernardini , 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 -# Currently maintained by B. Watson - -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/nagios/nagios.SlackBuild b/network/nagios/nagios.SlackBuild index d19ea44f60..97fa049904 100644 --- a/network/nagios/nagios.SlackBuild +++ b/network/nagios/nagios.SlackBuild @@ -105,7 +105,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 -w -Wl,--allow-multiple-definition" \ ./configure \ --prefix=/usr \ --sbindir=/usr/sbin/$PRGNAM \ 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/netsurf/enable-deprecated.diff b/network/netsurf/enable-deprecated.diff deleted file mode 100644 index 3378406e85..0000000000 --- a/network/netsurf/enable-deprecated.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- a/netsurf/gtk/Makefile.target 2015-03-21 20:50:22.018730471 +0300 -+++ b/netsurf/gtk/Makefile.target 2015-03-22 11:38:07.809544850 +0300 -@@ -34,7 +34,6 @@ - - # GTK and GLIB flags to disable depricated usage - GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \ -- -DG_DISABLE_DEPRECATED \ - -DGTK_DISABLE_SINGLE_INCLUDES \ - -DGTK_DISABLE_DEPRECATED \ - -DGTK_MULTIHEAD_SAFE \ diff --git a/network/netsurf/netsurf.SlackBuild b/network/netsurf/netsurf.SlackBuild index 649dd16b9a..05bb96ae3f 100644 --- a/network/netsurf/netsurf.SlackBuild +++ b/network/netsurf/netsurf.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=netsurf -VERSION=${VERSION:-3.8} +VERSION=${VERSION:-3.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/netsurf/netsurf.info b/network/netsurf/netsurf.info index a63840e0a4..76745e7077 100644 --- a/network/netsurf/netsurf.info +++ b/network/netsurf/netsurf.info @@ -1,8 +1,8 @@ PRGNAM="netsurf" -VERSION="3.8" +VERSION="3.10" HOMEPAGE="http://www.netsurf-browser.org" -DOWNLOAD="https://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.8.tar.gz" -MD5SUM="cf3e00b98b630d552ae694be52e23c8a" +DOWNLOAD="https://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.10.tar.gz" +MD5SUM="f5b2ea34c85775941ab3c2144783d396" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-html-parser" 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 -# 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 +Last-Update: + +--- 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 ]], ++ [[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 -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 - #ifdef HAVE_CRYPT_H - #include -@@ -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 $/a #include ' 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 , Pisa, Italy +# Copyright 2016-2019 Matteo Bernardini , 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 -postfix: and the SlackBuilds.org Team -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 aca498cc4f..49c05827e3 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/quassel-qt5/quassel-0.13.1-qt5.14.patch b/network/quassel-qt5/quassel-0.13.1-qt5.14.patch new file mode 100644 index 0000000000..f0305ea53c --- /dev/null +++ b/network/quassel-qt5/quassel-0.13.1-qt5.14.patch @@ -0,0 +1,118 @@ +commit c90702bdbc43fc542d7df6d5ec4b321912ca0035 +Author: Manuel Nickschas +Date: Tue Jan 7 18:34:54 2020 +0100 + + common: Disable enum type stream operators for Qt >= 5.14 + + Starting from version 5.14, Qt provides stream operators for enum + types, which collide with the ones we ship in types.h. Disable + Quassel's stream operators when compiling against Qt 5.14 or later. + + Add a unit test that ensures that enum serialization honors the width + of the underlying type. + +diff --git a/src/common/types.h b/src/common/types.h +index 467d9fb2..c4b9f364 100644 +--- a/src/common/types.h ++++ b/src/common/types.h +@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress) + typedef QList MsgIdList; + typedef QList BufferIdList; + ++#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + /** + * Catch-all stream serialization operator for enum types. + * +@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) { + value = static_cast(v); + return in; + } ++#endif + + // Exceptions + +diff --git a/src/common/typestest.cpp b/src/common/typestest.cpp +new file mode 100644 +index 00000000..04031c29 +--- /dev/null ++++ b/src/common/typestest.cpp +@@ -0,0 +1,79 @@ ++/*************************************************************************** ++ * Copyright (C) 2005-2020 by the Quassel Project * ++ * devel@quassel-irc.org * ++ * * ++ * 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 2 of the License, or * ++ * (at your option) version 3. * ++ * * ++ * 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, write to the * ++ * Free Software Foundation, Inc., * ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ++ ***************************************************************************/ ++ ++#include ++ ++#include ++#include ++#include ++ ++#include "testglobal.h" ++#include "types.h" ++ ++using namespace ::testing; ++ ++class EnumHolder ++{ ++ Q_GADGET ++ ++public: ++ enum class Enum16 : uint16_t {}; ++ enum class Enum32 : uint32_t {}; ++ ++ enum class EnumQt16 : uint16_t {}; ++ Q_ENUM(EnumQt16) ++ enum class EnumQt32 : uint32_t {}; ++ Q_ENUM(EnumQt32) ++}; ++ ++// Verify that enums are (de)serialized as their underlying type ++TEST(TypesTest, enumSerialization) ++{ ++ QByteArray data; ++ QDataStream out(&data, QIODevice::WriteOnly); ++ ++ // Serialize ++ out << EnumHolder::Enum16(0xabcd); ++ ASSERT_THAT(data.size(), Eq(2)); ++ out << EnumHolder::Enum32(0x123456); ++ ASSERT_THAT(data.size(), Eq(6)); ++ out << EnumHolder::EnumQt16(0x4321); ++ ASSERT_THAT(data.size(), Eq(8)); ++ out << EnumHolder::Enum32(0xfedcba); ++ ASSERT_THAT(data.size(), Eq(12)); ++ ASSERT_THAT(out.status(), Eq(QDataStream::Status::Ok)); ++ ++ // Deserialize ++ QDataStream in(data); ++ EnumHolder::Enum16 enum16; ++ EnumHolder::Enum32 enum32; ++ EnumHolder::EnumQt16 enumQt16; ++ EnumHolder::EnumQt32 enumQt32; ++ in >> enum16 >> enum32 >> enumQt16 >> enumQt32; ++ ASSERT_THAT(in.status(), Eq(QDataStream::Status::Ok)); ++ EXPECT_TRUE(in.atEnd()); ++ ++ EXPECT_THAT((int)enum16, Eq(0xabcd)); ++ EXPECT_THAT((int)enum32, Eq(0x123456)); ++ EXPECT_THAT((int)enumQt16, Eq(0x4321)); ++ EXPECT_THAT((int)enumQt32, Eq(0xfedcba)); ++} ++ ++#include "typestest.moc" diff --git a/network/quassel-qt5/quassel-qt5.SlackBuild b/network/quassel-qt5/quassel-qt5.SlackBuild index c136a341d9..72093342f6 100644 --- a/network/quassel-qt5/quassel-qt5.SlackBuild +++ b/network/quassel-qt5/quassel-qt5.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/quassel-0.13.1-qt5.14.patch + 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/retroshare/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch b/network/retroshare/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch new file mode 100644 index 0000000000..732984645d --- /dev/null +++ b/network/retroshare/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch @@ -0,0 +1,65 @@ +backport of + +From bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc Mon Sep 17 00:00:00 2001 +From: Phenom +Date: Mon, 1 Jun 2020 13:44:43 +0200 +Subject: [PATCH] Fix build with Qt 5.15+ + +--- + retroshare-gui/src/gui/elastic/elnode.h | 8 +++++--- + .../src/gui/gxs/GxsCommentTreeWidget.cpp | 16 +++++++++------- + retroshare-gui/src/gui/gxs/GxsIdDetails.cpp | 18 ++++++++++-------- + 3 files changed, 24 insertions(+), 18 deletions(-) + +diff --git a/retroshare-gui/src/gui/elastic/elnode.h b/retroshare-gui/src/gui/elastic/elnode.h +index 1e0edd1a8..b881baed6 100644 +--- a/retroshare-gui/src/gui/elastic/elnode.h ++++ b/retroshare-gui/src/gui/elastic/elnode.h +@@ -34,6 +34,8 @@ + #include + #include "graphwidget.h" + ++#include ++ + class Edge; + QT_BEGIN_NAMESPACE + class QGraphicsSceneMouseEvent; +diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp +index e5d714860..a3187d4d9 100644 +--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp ++++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp +@@ -18,6 +18,14 @@ + * * + *******************************************************************************/ + ++#include "GxsCommentTreeWidget.h" ++ ++#include "gui/common/FilesDefs.h" ++#include "gui/common/RSElidedItemDelegate.h" ++#include "gui/common/RSTreeWidgetItem.h" ++#include "gui/gxs/GxsCreateCommentDialog.h" ++#include "gui/gxs/GxsIdTreeWidgetItem.h" ++ + #include + #include + #include +@@ -25,6 +33,7 @@ + #include + #include + #include ++#include + #include + + #include "gui/common/RSElidedItemDelegate.h" +diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp +index 6168090eb..1bbab7f82 100644 +--- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp ++++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp +@@ -31,6 +31,7 @@ + + #include + #include ++#include + + /* Images for tag icons */ + #define IMAGE_LOADING ":/images/folder-draft.png" diff --git a/network/retroshare/retroshare.SlackBuild b/network/retroshare/retroshare.SlackBuild index 1861c03e25..e333491dec 100644 --- a/network/retroshare/retroshare.SlackBuild +++ b/network/retroshare/retroshare.SlackBuild @@ -18,7 +18,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. PRGNAM=retroshare -VERSION=${VERSION:-0.6.4} +VERSION=${VERSION:-0.6.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -47,13 +47,14 @@ 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 cd $SRCNAM-$VERSION - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -61,6 +62,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 qt5 >= 5.14.x +patch -p1 < $CWD/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch + RETROTOR=${RETROTOR:-no} if [ $RETROTOR = yes ]; then qmake-qt5 PREFIX=/usr LIB_DIR=/usr/lib${LIBDIRSUFFIX} "CONFIG-=debug" "CONFIG+=release" "CONFIG+=retrotor" diff --git a/network/retroshare/retroshare.info b/network/retroshare/retroshare.info index 307a748169..b11446bfec 100644 --- a/network/retroshare/retroshare.info +++ b/network/retroshare/retroshare.info @@ -1,8 +1,8 @@ PRGNAM="retroshare" -VERSION="0.6.4" +VERSION="0.6.5" HOMEPAGE="http://retroshare.net" -DOWNLOAD="https://github.com/RetroShare/RetroShare/archive/v0.6.4/RetroShare-0.6.4.tar.gz" -MD5SUM="392c36bb3171fa26b8702e0a984d5bd6" +DOWNLOAD="https://github.com/RetroShare/RetroShare/archive/v0.6.5/RetroShare-0.6.5.tar.gz" +MD5SUM="577fa867e24fc30b4c690e7956ff43c9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5 libmicrohttpd libupnp-legacy speex protobuf sqlcipher" diff --git a/network/rspamd/rspamd.SlackBuild b/network/rspamd/rspamd.SlackBuild index 60ff15d91d..b1e50c4053 100644 --- a/network/rspamd/rspamd.SlackBuild +++ b/network/rspamd/rspamd.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rspamd -VERSION=${VERSION:-2.5} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.6} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/network/rspamd/rspamd.info b/network/rspamd/rspamd.info index 8b978a1de4..8fc4c49c3d 100644 --- a/network/rspamd/rspamd.info +++ b/network/rspamd/rspamd.info @@ -1,8 +1,8 @@ PRGNAM="rspamd" -VERSION="2.5" +VERSION="2.6" HOMEPAGE="https://rspamd.com" -DOWNLOAD="https://github.com/rspamd/rspamd/archive/2.5/rspamd-2.5.tar.gz" -MD5SUM="9b70be38ca7e17ee89373b764fef1ea7" +DOWNLOAD="https://github.com/rspamd/rspamd/archive/2.6/rspamd-2.6.tar.gz" +MD5SUM="e3fc425af0e2e584d8b4d264564706e3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ragel luajit redis hyperscan cmake-202x libsodium" 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/README b/network/seafile-client/README deleted file mode 100644 index 937324eae1..0000000000 --- a/network/seafile-client/README +++ /dev/null @@ -1,15 +0,0 @@ -Seafile is a next-generation open source cloud storage system with -advanced support for file syncing, privacy protection and teamwork. - -Collections of files are called libraries, and each library can be -synced separately. A library can be encrypted with a user chosen -password. This password is not stored on the server, so even the -server admin cannot view a file's contents. - -Seafile allows users to create groups with file syncing, wiki, and -discussion to enable easy collaboration around documents within a -team. - -Note: -This package conflicts with seafile-server. Install just one of -them at the same time. 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 -# 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/README b/network/seafile/README new file mode 100644 index 0000000000..937324eae1 --- /dev/null +++ b/network/seafile/README @@ -0,0 +1,15 @@ +Seafile is a next-generation open source cloud storage system with +advanced support for file syncing, privacy protection and teamwork. + +Collections of files are called libraries, and each library can be +synced separately. A library can be encrypted with a user chosen +password. This password is not stored on the server, so even the +server admin cannot view a file's contents. + +Seafile allows users to create groups with file syncing, wiki, and +discussion to enable easy collaboration around documents within a +team. + +Note: +This package conflicts with seafile-server. Install just one of +them at the same time. 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 +# 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/snort/snort.SlackBuild b/network/snort/snort.SlackBuild index 37e1b34f99..2bc47b6a56 100644 --- a/network/snort/snort.SlackBuild +++ b/network/snort/snort.SlackBuild @@ -26,13 +26,13 @@ # Maintained by David Spencer PRGNAM=snort -VERSION=${VERSION:-2.9.11.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.9.17} +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 @@ -43,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" @@ -87,6 +87,7 @@ if [ "${NON_ETHER:-yes}" = 'no' ]; then NON_ETHERNET_DECODERS='' fi +CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc/" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -98,7 +99,6 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-pthread \ --enable-linux-smp-stats \ - --enable-zlib \ ${NON_ETHERNET_DECODERS} \ --build=$ARCH-slackware-linux diff --git a/network/snort/snort.info b/network/snort/snort.info index 38c8c4110f..3bcb6aa954 100644 --- a/network/snort/snort.info +++ b/network/snort/snort.info @@ -1,10 +1,10 @@ PRGNAM="snort" -VERSION="2.9.11.1" +VERSION="2.9.17" HOMEPAGE="https://www.snort.org/" -DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/snort/snort-2.9.11.1.tar.gz" -MD5SUM="378e3938b2b5c8e358f942d0ffce18cc" +DOWNLOAD="https://www.snort.org/downloads/snort/snort-2.9.17.tar.gz" +MD5SUM="3fe89f22def4e9ffda01f07f816e666d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="daq" +REQUIRES="daq luajit" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" 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 -# Copyright 2011 Grigorios Bouzakis -# Copyright 2014-2019 Larry Hajali -# 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..01e681fec7 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 Pisa, Italy + +# Copyright 2013-2019 Matteo Bernardini 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.39} 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 @@ -67,7 +68,7 @@ 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 . find -L . \ @@ -76,37 +77,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 {} \; -# Disable broken tests -sed -i 's/ tests//' Makefile.am Makefile.in - -export VALAC=$(which valac) -export VAPIGEN=$(which vapigen) - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --sysconfdir=/etc \ --localstatedir=/var \ - --disable-static \ - --enable-shared \ - --with-gtk=3.0 \ - --enable-gstaudio=yes \ - --enable-gstvideo=yes \ - --disable-maintainer-mode \ - --enable-vala \ - --disable-celt051 \ - --enable-dbus=yes \ - --${usbredir}able-usbredir \ - --${cacard}able-smartcard \ - --${phodav}able-webdav \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG + --buildtype=release \ + -D gtk_doc=enabled \ + -D usb-ids-path=/usr/share/hwdata/usb.ids \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +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 @@ -120,6 +113,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +echo "/sbin/setcap CAP_FOWNER=+ep usr/libexec/spice-client-glib-usb-acl-helper" \ + >> $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/spice-gtk/spice-gtk.info b/network/spice-gtk/spice-gtk.info index e17de616e8..06d18c54e2 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.39" 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.39.tar.xz" +MD5SUM="5bdc76d5105d2b4b4472063fe04ef033" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="opus spice vala" diff --git a/network/spice/spice.SlackBuild b/network/spice/spice.SlackBuild index e887c96ddf..1d0c0bfdcc 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.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,7 +53,7 @@ else LIBDIRSUFFIX="" fi -DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README" +DOCS="AUTHORS CHANGELOG.md COPYING README" # check if libcacard is there if pkg-config --exists libcacard ; then diff --git a/network/spice/spice.info b/network/spice/spice.info index 04a4e89706..83d4a77c59 100644 --- a/network/spice/spice.info +++ b/network/spice/spice.info @@ -1,8 +1,8 @@ PRGNAM="spice" -VERSION="0.14.1" +VERSION="0.14.3" 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.3.tar.bz2" +MD5SUM="a776650f7c4dc22681d76308475a9190" 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/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 c473ebeec4..0000000000 --- a/network/sshfs-fuse/sshfs-fuse.SlackBuild +++ /dev/null @@ -1,115 +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 - -# 20201208 bkw: update for v3.7.1. -# 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.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 $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 54bb56b52e..0000000000 --- a/network/sshfs-fuse/sshfs-fuse.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sshfs-fuse" -VERSION="3.7.1" -HOMEPAGE="https://github.com/libfuse/sshfs" -DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs-3.7.1/sshfs-3.7.1.tar.xz" -MD5SUM="22ac23d05ca7c56fb568627f086374d0" -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 Binary files a/network/sshfs-fuse/sshfs.1.gz and /dev/null 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/transmission-remote-gtk/gcc10.patch b/network/transmission-remote-gtk/gcc10.patch new file mode 100644 index 0000000000..1c445b5085 --- /dev/null +++ b/network/transmission-remote-gtk/gcc10.patch @@ -0,0 +1,25 @@ +From b20655081332847426a7d10189bb1e2369efea42 Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Fri, 20 Mar 2020 20:30:24 +0100 +Subject: [PATCH] Fix building under GCC 10 / -fno-common + +* Add a `typedef` to avoid defining a variable. + +Bug: https://bugs.gentoo.org/706980 +--- + src/trg-tree-view.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/trg-tree-view.h b/src/trg-tree-view.h +index 435848f..78cd76e 100644 +--- a/src/trg-tree-view.h ++++ b/src/trg-tree-view.h +@@ -51,7 +51,7 @@ GtkWidget *trg_tree_view_new(void); + + G_END_DECLS GList *trg_tree_view_get_selected_refs_list(GtkTreeView * tv); + +-enum { ++typedef enum { + TRG_COLTYPE_ICONTEXT, + TRG_COLTYPE_FILEICONTEXT, + TRG_COLTYPE_WANTED, diff --git a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild index 4daa00e722..5cb0d45cf4 100644 --- a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild +++ b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild @@ -89,6 +89,8 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ [ "${NOTIFY:-yes}" = "no" ] && NOTIFYOPT="--without-libnotify" +patch -p1 < $CWD/gcc10.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/transmission/transmission.SlackBuild b/network/transmission/transmission.SlackBuild index e29bb915e2..73e2171088 100644 --- a/network/transmission/transmission.SlackBuild +++ b/network/transmission/transmission.SlackBuild @@ -129,9 +129,6 @@ sed -i -e 's%-ggdb3 %%g' configure.ac # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13b5e88c6e9c7bd2698d844cb5ed127ed809f7e rm -f m4/glib-gettext.m4 -# Thanks Larry Hajali -autoreconf -ivf - CC=gcc CXX=g++ \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/network/trojita/trojita.SlackBuild b/network/trojita/trojita.SlackBuild index 0b9f72d426..c62198bbe6 100644 --- a/network/trojita/trojita.SlackBuild +++ b/network/trojita/trojita.SlackBuild @@ -4,7 +4,7 @@ # Written by Chris Farrell PRGNAM=trojita -VERSION=${VERSION:-0.7} +VERSION=${VERSION:-20201106_b4f24d7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -52,6 +52,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 {} \; +# Building with ragel 7 is broken ATM, see https://bugs.kde.org/show_bug.cgi?id=426061 cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -59,6 +60,7 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DWITH_RAGEL=OFF \ . make VERBOSE=1 make install DESTDIR=$PKG diff --git a/network/trojita/trojita.info b/network/trojita/trojita.info index 20fda82343..4ba0674314 100644 --- a/network/trojita/trojita.info +++ b/network/trojita/trojita.info @@ -1,8 +1,8 @@ PRGNAM="trojita" -VERSION="0.7" +VERSION="20201106_b4f24d7" HOMEPAGE="http://trojita.flaska.net/index.html" -DOWNLOAD="http://downloads.sourceforge.net/trojita/trojita-0.7.tar.xz" -MD5SUM="b2b5720be888ec6298a88798b113ad5f" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/trojita-20201106_b4f24d7.tar.xz" +MD5SUM="a1c8978a37ebd817ce0f12a92994986a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5-webkit" 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/webalizer/gcc10.patch b/network/webalizer/gcc10.patch new file mode 100644 index 0000000000..66f4363d5d --- /dev/null +++ b/network/webalizer/gcc10.patch @@ -0,0 +1,19 @@ +diff -Naur webalizer-2.23-08.orig/dns_resolv.c webalizer-2.23-08/dns_resolv.c +--- webalizer-2.23-08.orig/dns_resolv.c 2013-02-26 06:37:27.000000000 +0100 ++++ webalizer-2.23-08/dns_resolv.c 2021-03-23 20:18:10.825092000 +0100 +@@ -78,11 +78,11 @@ + + struct dns_child child[MAXCHILD]; /* DNS child pipe data */ + +-DNODEPTR host_table[MAXHASH]; /* hostname/ip hash table */ ++extern DNODEPTR host_table[MAXHASH]; /* hostname/ip hash table */ + +-char buffer[BUFSIZE]; /* log file record buffer */ +-char tmp_buf[BUFSIZE]; /* used to temp save above */ +-struct utsname system_info; /* system info structure */ ++extern char buffer[BUFSIZE]; /* log file record buffer */ ++extern char tmp_buf[BUFSIZE]; /* used to temp save above */ ++extern struct utsname system_info; /* system info structure */ + + int raiseSigChild = 1; + diff --git a/network/webalizer/webalizer.SlackBuild b/network/webalizer/webalizer.SlackBuild index a4fa981af5..f97bb97d98 100644 --- a/network/webalizer/webalizer.SlackBuild +++ b/network/webalizer/webalizer.SlackBuild @@ -71,6 +71,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 + CFLAGS="$SLKCFLAGS" \ CXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/wireguard-tools/README b/network/wireguard-tools/README deleted file mode 100644 index 4769a806fe..0000000000 --- a/network/wireguard-tools/README +++ /dev/null @@ -1,20 +0,0 @@ -WireGuard is a VPN that uses state-of-the-art cryptography. It is -designed as a general purpose VPN for running on embedded interfaces -and super computers alike, fit for many different circumstances. - -WireGuard userspace tools require WireGuard support in the kernel (or -as a kernel module). Refer to the wireguard-linux-compat script on -Slackbuilds to build the associated kernel module package. - -openresolv is an optional runtime dependency -- you need it if you want -to use to use wg-quick's DNS option. - -The wg-quick script needs at least nft 0.7 installed, if using nft. -Slackware 14.2 ships with nftables 0.6. As such the build script -will patch wg-quick to always fall back to iptables. - -If you have nftables 0.7 or newer installed (i.e. you are running --current or a modified 14.2 installation), you may want to leave -wg-quick unpatched by setting NEW_NFT as follows -: - -NEW_NFT=yes ./wireguard-tools.SlackBuild diff --git a/network/wireguard-tools/slack-desc b/network/wireguard-tools/slack-desc deleted file mode 100644 index 987bf40a55..0000000000 --- a/network/wireguard-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------------------------------------------------------| -wireguard-tools: wireguard-tools (Userspace tools to configure and use WireGuard) -wireguard-tools: -wireguard-tools: WireGuard is a VPN that uses state-of-the-art cryptography. It is -wireguard-tools: designed as a general purpose VPN for running on embedded interfaces -wireguard-tools: and super computers alike, fit for many different circumstances. -wireguard-tools: -wireguard-tools: https://www.wireguard.com/ -wireguard-tools: -wireguard-tools: -wireguard-tools: -wireguard-tools: diff --git a/network/wireguard-tools/wireguard-tools.SlackBuild b/network/wireguard-tools/wireguard-tools.SlackBuild deleted file mode 100644 index 14099a1bd2..0000000000 --- a/network/wireguard-tools/wireguard-tools.SlackBuild +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh - -# Slackware build script for WireGuard userspace tools - -# Copyright 2017-2019 David Spencer, Baildon, West Yorkshire, U.K. -# Copyright 2020-2021 Anj Duvnjak -# 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=wireguard-tools -VERSION=${VERSION:-1.0.20210315} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -PKGVER="$(printf %s "${VERSION}" | tr - _)" - -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 {} \; - - -NEW_NFT=${NEW_NFT:-no} -[[ $NEW_NFT != "no" ]] || sed -i 's/type -p nft/false/g' src/wg-quick/linux.bash ; - - -# If you want this, you can have it :) -SYSTEMD="${SYSTEMD:-no}" - -cd src - env -u ARCH CFLAGS="$SLKCFLAGS" make - env -u ARCH make install \ - MANDIR=/usr/man \ - DESTDIR=$PKG \ - WITH_WGQUICK=yes \ - WITH_SYSTEMDUNITS="$SYSTEMD" -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-$PKGVER -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/wireguard-tools/wireguard-tools.info b/network/wireguard-tools/wireguard-tools.info deleted file mode 100644 index 3200d7dd29..0000000000 --- a/network/wireguard-tools/wireguard-tools.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wireguard-tools" -VERSION="1.0.20210315" -HOMEPAGE="https://www.wireguard.com/" -DOWNLOAD="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20210315.tar.xz" -MD5SUM="d6663d322ee5e5c4353838c6e9f98a1a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="wireguard-linux-compat" -MAINTAINER="Anj Duvnjak" -EMAIL="alvind11@hotmail.com" 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 , 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/x11vnc/gcc10.patch b/network/x11vnc/gcc10.patch new file mode 100644 index 0000000000..4934633860 --- /dev/null +++ b/network/x11vnc/gcc10.patch @@ -0,0 +1,42 @@ +From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Tue, 28 Jan 2020 22:21:01 +0300 +Subject: [PATCH] Fix build with -fno-common + +GCC 10 defaults to -fno-common +--- + src/util.c | 3 +++ + src/util.h | 6 +++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/util.c b/src/util.c +index a82a1a4..6a52ebf 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -47,6 +47,9 @@ int hxl = 0; + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD + MUTEX(x11Mutex); + MUTEX(scrollMutex); ++MUTEX(clientMutex); ++MUTEX(inputMutex); ++MUTEX(pointerMutex); + #endif + + int nfix(int i, int n); +diff --git a/src/util.h b/src/util.h +index 35c1afd..99b5dd1 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -102,9 +102,9 @@ extern struct timeval _mysleep; + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD + extern MUTEX(x11Mutex); + extern MUTEX(scrollMutex); +-MUTEX(clientMutex); +-MUTEX(inputMutex); +-MUTEX(pointerMutex); ++extern MUTEX(clientMutex); ++extern MUTEX(inputMutex); ++extern MUTEX(pointerMutex); + #endif + + #define X_INIT INIT_MUTEX(x11Mutex) diff --git a/network/x11vnc/x11vnc.SlackBuild b/network/x11vnc/x11vnc.SlackBuild index 53048bb837..c643e01d0f 100644 --- a/network/x11vnc/x11vnc.SlackBuild +++ b/network/x11vnc/x11vnc.SlackBuild @@ -78,6 +78,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/gcc10.patch + autoreconf -i CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/x2goclient/x2goclient.SlackBuild b/network/x2goclient/x2goclient.SlackBuild index 488474a305..a419b479fe 100644 --- a/network/x2goclient/x2goclient.SlackBuild +++ b/network/x2goclient/x2goclient.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=x2goclient -VERSION=${VERSION:-4.1.2.1} +VERSION=${VERSION:-4.1.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/x2goclient/x2goclient.info b/network/x2goclient/x2goclient.info index 699c3abc5d..c360e03d0d 100644 --- a/network/x2goclient/x2goclient.info +++ b/network/x2goclient/x2goclient.info @@ -1,8 +1,8 @@ PRGNAM="x2goclient" -VERSION="4.1.2.1" +VERSION="4.1.2.2" HOMEPAGE="http://www.x2go.org" -DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.1.tar.gz" -MD5SUM="0ed3b974ffec4e3bb1db40fb0be7b6d0" +DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.2.tar.gz" +MD5SUM="1390b794b0a10f0a885dd7cf00f2acef" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="nx-libs" diff --git a/network/x2goserver/x2goserver.SlackBuild b/network/x2goserver/x2goserver.SlackBuild index ba82397547..2086829f76 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:-20201227_08aa5e6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/x2goserver/x2goserver.info b/network/x2goserver/x2goserver.info index 9e20cd4df2..7dfbf73d3a 100644 --- a/network/x2goserver/x2goserver.info +++ b/network/x2goserver/x2goserver.info @@ -1,8 +1,8 @@ PRGNAM="x2goserver" -VERSION="20190625_b3ec119" +VERSION="20201227_08aa5e6" 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-20201227_08aa5e6.tar.xz" +MD5SUM="46aad829313b85218841e1f818244a06" 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/xaric/xaric.SlackBuild b/network/xaric/xaric.SlackBuild index c729e5fbd8..e80a1ad274 100644 --- a/network/xaric/xaric.SlackBuild +++ b/network/xaric/xaric.SlackBuild @@ -54,7 +54,7 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ sed -i 's,/usr/local,/usr,' $PRGNAM.1 -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index 14fd0f2042..e22bc2254e 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-2021 Christoph Willing Brisbane, Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,11 +26,10 @@ PRGNAM=LibreOffice SRCNAM=libreoffice -VERSION=${VERSION:-6.2.8.2} +VERSION=${VERSION:-7.0.4.2} SHORT_VERSION=${VERSION%.*.*} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -PACKAGER=${PACKAGER:-"AnonymousCoward"} HAVE_SRCS_TARBALL=${HAVE_SRCS_TARBALL:-1} @@ -91,16 +90,22 @@ 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} -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 - use_java="--with-java=java" +JAVA=${JAVA:-jdk11} +if [ "$JAVA" = "jdk11" ]; then + . /etc/profile.d/jdk11.sh + use_java="--with-jdk-home=$JAVA_HOME" +elif [ "$JAVA" = "jdk12" ]; then + . /etc/profile.d/jdk12.sh + use_java="--with-jdk-home=$JAVA_HOME" +elif [ "$JAVA" = "jdk13" ]; then + . /etc/profile.d/jdk13.sh + use_java="--with-jdk-home=$JAVA_HOME" +elif [ "$JAVA" = "jdk14" ]; then + . /etc/profile.d/jdk14.sh + use_java="--with-jdk-home=$JAVA_HOME" +elif [ "$JAVA" = "jdk15" ]; then + . /etc/profile.d/jdk15.sh + use_java="--with-jdk-home=$JAVA_HOME" elif [ "$JAVA" = "no" ]; then use_java="--with-java=no" fi @@ -154,7 +159,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 @@ -175,7 +179,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] & --libdir=/usr/lib$LIBDIRSUFFIX \ --sysconfdir=/etc \ --build=$ARCH-slackware-linux \ - --with-build-version="SlackBuild for $PRGNAM-$VERSION by $PACKAGER" \ --with-vendor="Just Another Slacker" \ --with-lang="$LOLANGS" \ --enable-release-build=yes \ @@ -188,7 +191,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] & $avahi \ $Python3 \ $vlc \ - $kde4 \ $use_ccache \ $use_java \ $parallel \ @@ -225,7 +227,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] & --with-system-openldap \ --with-system-openssl \ --with-system-poppler \ - --with-system-redland \ --with-system-sane \ --with-system-zlib \ $coinmp \ @@ -273,6 +274,13 @@ fi patch -p0 < $CWD/no-check-if-root.diff +# GCC10 requirements (Tx alienBOB) +sed -i external/libcdr/ExternalProject_libcdr.mk \ + -e '/configure /i \\t\t&& sed -i "s/TRUE/true/g" src/lib/libcdr_utils.cpp \\' +sed -i external/libebook/ExternalProject_libebook.mk \ + -e '/configure /i \\t\t&& sed -i "s/TRUE/true/g" src/lib/EBOOKCharsetConverter.cpp \\' +sed -i i18npool/source/calendar/calendar_gregorian.cxx -e 's/TRUE/true/' + export LDFLAGS="-lboost_system" make build-nocheck make distro-pack-install DESTDIR=$PKG diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info index fc9a4c48ec..86353e6ff0 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.4.2" 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.4/libreoffice-7.0.4.2.tar.xz \ + https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-7.0.4.2-srcs.tar.xz" +MD5SUM="cad93ef2c87928b5a2971ae7e6474fe1 \ + 8feafe9258f58323ee81156e0734b5b1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3 openjdk7 apache-ant perl-Archive-Zip" +REQUIRES="jdk11 apache-ant perl-Archive-Zip" MAINTAINER="Christoph Willing" EMAIL="chris.willing@linux.com" diff --git a/office/LibreOffice/README b/office/LibreOffice/README index dc7ee5981e..1d0aa001af 100644 --- a/office/LibreOffice/README +++ b/office/LibreOffice/README @@ -20,7 +20,7 @@ internal versions. Packages from SBo that will be use in this way are: libexttextcat libfreehand libmspub libmwaw libnumbertext liborcus libpagemaker libqxp libnumbertext libstaroffice libtommath libwps libzmf lpsolve mythes postgresql qt5 valgrind ucpp unixODBC avahi - libetonyek xmlsec vlc + libetonyek xmlsec Remember, these packages are not essential but entirely optional. If not found, LibreOffice will simply build its own internal versions. @@ -31,34 +31,26 @@ e.g. if avahi is detected and used at build time, it will also need to be installed at run time. Build time environment variables that may be set to vary features are as follows: -1. enable the experimental VLC avmedia backend (disabled by default) with: - 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 +1. 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. +2. A number of Java Development Kits are suitable for building LibreOffice. + At the moment (since, at least, LO version 7.0.0.3) the default JDK is the + latest LTS release, jdk11. Other JDK's supported by the SlackBuild are jdk12, + jdk13, jdk14 & jdk15 but these non-default JDK's must be explicitly specified + when running the SlackBuild using the JAVA environment variable e.g. + JAVA=jdk15 sh LibreOffice.SlackBuild + + It is also possible to build LibreOffice without any JAVA support (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 +3. 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 +4. 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..946526c69c 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-12-13 08:04:37.172000000 +1000 ++++ Makefile 2020-12-13 08:04:58.538000000 +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/abook/abook.SlackBuild b/office/abook/abook.SlackBuild index 45031e240b..5f8fef6ccf 100644 --- a/office/abook/abook.SlackBuild +++ b/office/abook/abook.SlackBuild @@ -75,7 +75,7 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ aclocal && automake --add-missing && autoconf -sed 's/0.18/0.19/g' -i po/Makefile.in.in +sed 's/0.18/0.20/g' -i po/Makefile.in.in # thanks to the archers for this patch ;) patch -p1 -i $CWD/gcc5.patch 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..4a28ee876b 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.70} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/asymptote/asymptote.info b/office/asymptote/asymptote.info index 2d7de25278..26d4a4f763 100644 --- a/office/asymptote/asymptote.info +++ b/office/asymptote/asymptote.info @@ -1,10 +1,10 @@ PRGNAM="asymptote" -VERSION="2.44" +VERSION="2.70" 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.70.src.tgz" +MD5SUM="b57e685568a7cca69024a86c7276eb6d" 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..ef72f00a09 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,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 {} \; +# Patch for the newer icu4c +patch -p1 < $CWD/patches/icu.patch +# 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 +83,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/icu.patch b/office/calibre/patches/icu.patch new file mode 100644 index 0000000000..498691e90a --- /dev/null +++ b/office/calibre/patches/icu.patch @@ -0,0 +1,31 @@ +diff -Naur calibre-3.48.0.orig/src/calibre/utils/icu.c calibre-3.48.0/src/calibre/utils/icu.c +--- calibre-3.48.0.orig/src/calibre/utils/icu.c 2019-09-13 04:46:46.000000000 +0200 ++++ calibre-3.48.0/src/calibre/utils/icu.c 2020-12-05 09:20:59.063932000 +0100 +@@ -243,14 +243,14 @@ + + a = python_to_icu(a_, &asz); + if (a == NULL) goto end; +- if (asz == 0) { found = TRUE; goto end; } ++ if (asz == 0) { found = true; goto end; } + b = python_to_icu(b_, &bsz); + if (b == NULL) goto end; + + search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status); + if (U_SUCCESS(status)) { + pos = usearch_first(search, &status); +- if (pos != USEARCH_DONE) found = TRUE; ++ if (pos != USEARCH_DONE) found = true; + } + end: + if (search != NULL) usearch_close(search); +diff -Naur calibre-3.48.0.orig/src/calibre/utils/matcher.c calibre-3.48.0/src/calibre/utils/matcher.c +--- calibre-3.48.0.orig/src/calibre/utils/matcher.c 2019-09-13 04:46:46.000000000 +0200 ++++ calibre-3.48.0/src/calibre/utils/matcher.c 2020-12-05 09:26:57.800932000 +0100 +@@ -15,7 +15,6 @@ + #define inline + #endif + +-typedef unsigned char bool; + #define TRUE 1 + #define FALSE 0 + #define MAX(x, y) ((x > y) ? x : y) 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 +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/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-qt5.patch b/office/fbreader/fbreader-qt5.patch new file mode 100644 index 0000000000..e0f0a5235a --- /dev/null +++ b/office/fbreader/fbreader-qt5.patch @@ -0,0 +1,510 @@ +diff -r -U2 fbreader-0.99.4.orig/fbreader/Makefile fbreader-0.99.4/fbreader/Makefile +--- fbreader-0.99.4.orig/fbreader/Makefile 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/fbreader/Makefile 2018-01-11 22:18:18.000208200 +0700 +@@ -23,5 +23,5 @@ + done; + @echo -n 'Linking $(TARGET) ...' +- @$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3 ++ @$(LD) -fuse-ld=bfd $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3 + @echo ' OK' + +diff -r -U2 fbreader-0.99.4.orig/makefiles/arch/desktop.mk fbreader-0.99.4/makefiles/arch/desktop.mk +--- fbreader-0.99.4.orig/makefiles/arch/desktop.mk 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/makefiles/arch/desktop.mk 2018-01-11 22:18:40.119207269 +0700 +@@ -15,27 +15,9 @@ + CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG + LDFLAGS = +-EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) ++EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) + +-ifeq "$(UI_TYPE)" "qt" +- MOC = moc-qt3 +- QTINCLUDE = -I /usr/include/qt3 +-else +- MOC = $(shell pkg-config QtCore --variable=moc_location) +- QTINCLUDE = -I $(shell pkg-config --cflags QtCore) +-endif +- +-GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft) +- +-ifeq "$(UI_TYPE)" "qt" +- UILIBS = -lqt-mt +-endif +- +-ifeq "$(UI_TYPE)" "qt4" +- UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork) +-endif +- +-ifeq "$(UI_TYPE)" "gtk" +- UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg +-endif ++MOC = "$(shell pkg-config --variable=host_bins Qt5Core)/moc" ++QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network) ++UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network) + + RM = rm -rvf +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp 2018-01-11 22:18:40.120207269 +0700 +@@ -18,7 +18,7 @@ + */ + +-#include +-#include +-#include ++#include ++#include ++#include + #include + +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp 2018-01-11 22:18:40.120207269 +0700 +@@ -18,15 +18,15 @@ + */ + +-#include ++#include + #include + #include + #include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + #include +-#include ++#include + #include + +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h 2018-01-11 22:18:40.120207269 +0700 +@@ -23,6 +23,6 @@ + #include + +-#include +-#include ++#include ++#include + #include + +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp 2018-01-11 22:18:40.120207269 +0700 +@@ -18,6 +18,6 @@ + */ + +-#include +-#include ++#include ++#include + + #include +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h 2018-01-11 22:18:40.120207269 +0700 +@@ -21,6 +21,6 @@ + #define __ZLQTDIALOG_H__ + +-#include +-#include ++#include ++#include + + #include +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp 2018-01-11 22:18:40.120207269 +0700 +@@ -18,8 +18,8 @@ + */ + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #include "ZLQtDialogContent.h" +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp 2018-01-11 22:18:40.120207269 +0700 +@@ -18,9 +18,9 @@ + */ + +-#include +-#include +-#include ++#include ++#include ++#include + #include +-#include ++#include + + #include "ZLQtDialogManager.h" +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp 2018-01-11 22:18:40.120207269 +0700 +@@ -18,5 +18,5 @@ + */ + +-#include ++#include + + #include "ZLQtOpenFileDialog.h" +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp 2018-01-11 22:18:40.121207269 +0700 +@@ -20,14 +20,14 @@ + #include + +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + #include +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp 2018-01-11 22:18:40.121207269 +0700 +@@ -18,9 +18,9 @@ + */ + +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + #include + +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h 2018-01-11 22:18:40.121207269 +0700 +@@ -21,7 +21,7 @@ + #define __ZLQTOPTIONSDIALOG_H__ + +-#include +-#include +-#include ++#include ++#include ++#include + + #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h" +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp 2018-01-11 22:18:40.121207269 +0700 +@@ -20,9 +20,9 @@ + #include + +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + #include + +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h 2018-01-11 22:18:40.121207269 +0700 +@@ -23,9 +23,9 @@ + #include + +-#include ++#include + #include +-#include +-#include +-#include ++#include ++#include ++#include + #include + +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp 2018-01-11 22:18:40.120207269 +0700 +@@ -20,10 +20,10 @@ + #include + +-#include +-#include +-#include +-#include + #include + #include ++#include ++#include ++#include ++#include + + #include +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h 2018-01-11 22:18:40.121207269 +0700 +@@ -25,10 +25,10 @@ + #include + +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include + + #include +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h 2018-01-11 22:18:40.121207269 +0700 +@@ -21,5 +21,5 @@ + #define __ZLQAPPLICATION_H__ + +-#include ++#include + + class ZLQApplication : public QApplication { +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp 2018-01-11 22:18:40.121207269 +0700 +@@ -20,5 +20,5 @@ + #include + #include +-#include ++#include + #include + +@@ -73,5 +73,5 @@ + new ZLQApplication(argc, argv); + +- QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8")); ++ QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8")); + + ZLibrary::parseArguments(argc, argv); +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp 2018-01-11 22:18:40.120207269 +0700 +@@ -25,5 +25,7 @@ + #include + #include ++#include + ++#include + #include + #include +@@ -150,10 +152,10 @@ + if (!scope.request->postParameters().empty()) { + QByteArray data; +- QUrl tmp; ++ QUrlQuery tmp; + typedef std::pair string_pair; + foreach (const string_pair &pair, scope.request->postParameters()) { + tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second)); + } +- data = tmp.encodedQuery(); ++ data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery(); + reply = const_cast(myManager).post(networkRequest, data); + } else { +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2018-01-11 22:13:39.639219906 +0700 +@@ -87,5 +87,5 @@ + + void QtWaitingSpinner::setRoundness(qreal roundness) { +- myRoundness = std::max(0.0, std::min(100.0, roundness)); ++ myRoundness = std::max(static_cast(0.0), std::min(static_cast(100.0), roundness)); + } + +@@ -149,5 +149,5 @@ + qreal gradation = alphaDiff / (qreal)(distanceThreshold + 1); + qreal resultAlpha = color.alphaF() - gradation * distance; +- resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds ++ resultAlpha = std::min(static_cast(1.0), std::max(static_cast(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds + color.setAlphaF(resultAlpha); + return color; +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h 2018-01-11 22:18:40.121207269 +0700 +@@ -4,5 +4,5 @@ + #include + +-#include ++#include + #include + +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp 2018-01-11 22:18:40.120207269 +0700 +@@ -18,12 +18,12 @@ + */ + +-#include +-#include + #include + #include + #include + #include +-#include + #include ++#include ++#include ++#include + + #include +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h 2018-01-11 22:18:40.120207269 +0700 +@@ -21,10 +21,10 @@ + #define __ZLQTITEMSLISTWIDGET_H__ + +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include + + #include +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp 2018-01-11 22:18:40.120207269 +0700 +@@ -18,8 +18,8 @@ + */ + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #include +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h 2018-01-11 22:18:40.121207269 +0700 +@@ -21,9 +21,9 @@ + #define __ZLQTPREVIEWWIDGET_H__ + +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + #include + +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp 2018-01-11 22:18:40.120207269 +0700 +@@ -19,7 +19,7 @@ + + #include +-#include +-#include +-#include ++#include ++#include ++#include + + #include +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h 2018-01-11 22:18:40.121207269 +0700 +@@ -22,6 +22,6 @@ + + #include +-#include +-#include ++#include ++#include + + #include "QtWaitingSpinner.h" +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp 2018-01-11 22:18:40.121207269 +0700 +@@ -20,6 +20,6 @@ + #include + +-#include +-#include ++#include ++#include + #include + #include +@@ -186,9 +186,9 @@ + void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) { + if (direction == ZLView::VERTICAL) { +- myRightScrollBar->setShown(enabled && myShowScrollBarAtRight); +- myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight); ++ myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight); ++ myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight); + } else { +- myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom); +- myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom); ++ myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom); ++ myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom); + } + } +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h 2018-01-11 22:18:40.121207269 +0700 +@@ -21,5 +21,5 @@ + #define __ZLQTVIEWWIDGET_H__ + +-#include ++#include + + #include "../../../../core/src/view/ZLViewWidget.h" diff --git a/office/fbreader/fbreader.SlackBuild b/office/fbreader/fbreader.SlackBuild index d5c54adeac..bef54c8b35 100644 --- a/office/fbreader/fbreader.SlackBuild +++ b/office/fbreader/fbreader.SlackBuild @@ -56,14 +56,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 {} \; +# Needed for gcc >= 6.x +sed -i "s|-Wall|-Wall -Wno-narrowing|" makefiles/arch/desktop.mk patch -p1 < $CWD/fbreader-0.99.4.patch +# Port to qt5 - patch from gentoo +patch -p1 < $CWD/fbreader-qt5.patch export TARGET_ARCH=desktop -export UI_TYPE=qt4 +export UI_TYPE=qt4 # this hasn't changed export TARGET_STATUS=release -make LIBDIR=/usr/lib${LIBDIRSUFFIX} ZLSHARED=no MOC=/usr/bin/moc -make install LIBDIR=/usr/lib${LIBDIRSUFFIX} ZLSHARED=no DESTDIR=$PKG +make LIBDIR=/usr/lib${LIBDIRSUFFIX} +make install LIBDIR=/usr/lib${LIBDIRSUFFIX} 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 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 +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 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 1257563bab..eb1ad38ec2 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.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/gnucash/gnucash.info b/office/gnucash/gnucash.info index c899627c28..ba2de04591 100644 --- a/office/gnucash/gnucash.info +++ b/office/gnucash/gnucash.info @@ -1,8 +1,8 @@ PRGNAM="gnucash" -VERSION="3.11" +VERSION="4.4" 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.4.tar.bz2" +MD5SUM="5a1a1703c1e887074be695a10b7aee02" 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/goldendict/goldendict.SlackBuild b/office/goldendict/goldendict.SlackBuild index 2d1e6b478f..71a698c559 100644 --- a/office/goldendict/goldendict.SlackBuild +++ b/office/goldendict/goldendict.SlackBuild @@ -53,9 +53,16 @@ cd $TMP rm -rf $PRGNAM-$SRCVER tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz cd $PRGNAM-$SRCVER -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 {} \; -$(type -p qmake-qt5 || echo qmake) PREFIX=/usr \ +# archlinux, thanks for all the patches! +for i in $CWD/patches/* ; do patch -p1 < $i ; done + +qmake-qt5 PREFIX=/usr \ CONFIG+=no_epwing_support \ CONFIG+=zim_support \ DISABLE_INTERNAL_PLAYER=$DISABLE_INTERNAL_PLAYER diff --git a/office/goldendict/patches/goldendict-ffmpeg4.patch b/office/goldendict/patches/goldendict-ffmpeg4.patch new file mode 100644 index 0000000000..6e6d03675a --- /dev/null +++ b/office/goldendict/patches/goldendict-ffmpeg4.patch @@ -0,0 +1,167 @@ +From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001 +From: Abs62 +Date: Fri, 30 Mar 2018 22:53:24 +0300 +Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978) + +--- + ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 62 insertions(+), 6 deletions(-) + +diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc +index ed1172bd..56e8f788 100644 +--- a/ffmpegaudio.cc ++++ b/ffmpegaudio.cc +@@ -91,6 +91,7 @@ struct DecoderContext + QByteArray audioData_; + QDataStream audioDataStream_; + AVFormatContext * formatContext_; ++ AVCodec * codec_; + AVCodecContext * codecContext_; + AVIOContext * avioContext_; + AVStream * audioStream_; +@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan + audioData_( audioData ), + audioDataStream_( audioData_ ), + formatContext_( NULL ), ++ codec_( NULL ), + codecContext_( NULL ), + avioContext_( NULL ), + audioStream_( NULL ), +@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString ) + return false; + } + ++#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 ) + unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE ); ++#else ++ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE ); ++#endif + if ( !avioBuffer ) + { + errorString = QObject::tr( "av_malloc() failed." ); +@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString ) + // Find audio stream, use the first audio stream if available + for ( unsigned i = 0; i < formatContext_->nb_streams; i++ ) + { ++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 ) + if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO ) ++#else ++ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ) ++#endif + { + audioStream_ = formatContext_->streams[i]; + break; +@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString ) + return false; + } + ++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 ) + codecContext_ = audioStream_->codec; +- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id ); +- if ( !codec ) ++ codec_ = avcodec_find_decoder( codecContext_->codec_id ); ++ if ( !codec_ ) + { + errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id ); + return false; + } ++#else ++ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id ); ++ if ( !codec_ ) ++ { ++ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id ); ++ return false; ++ } ++ codecContext_ = avcodec_alloc_context3( codec_ ); ++ if ( !codecContext_ ) ++ { ++ errorString = QObject::tr( "avcodec_alloc_context3() failed." ); ++ return false; ++ } ++ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar ); ++#endif + +- ret = avcodec_open2( codecContext_, codec, NULL ); ++ ret = avcodec_open2( codecContext_, codec_, NULL ); + if ( ret < 0 ) + { + errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) ); + return false; + } + +- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name, ++ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name, + codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) ); + return true; + } +@@ -252,10 +278,13 @@ void DecoderContext::closeCodec() + + // Closing a codec context without prior avcodec_open2() will result in + // a crash in ffmpeg +- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec ) ++ if ( audioStream_ && codecContext_ && codec_ ) + { + audioStream_->discard = AVDISCARD_ALL; +- avcodec_close( audioStream_->codec ); ++ avcodec_close( codecContext_ ); ++#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 ) ++ avcodec_free_context( &codecContext_ ); ++#endif + } + + avformat_close_input( &formatContext_ ); +@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString ) + if ( packet.stream_index == audioStream_->index ) + { + AVPacket pack = packet; ++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 ) + int gotFrame = 0; + do + { +@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString ) + pack.data += len; + } + while( pack.size > 0 ); ++#else ++ int ret = avcodec_send_packet( codecContext_, &pack ); ++ /* read all the output frames (in general there may be any number of them) */ ++ while( ret >= 0 ) ++ { ++ ret = avcodec_receive_frame( codecContext_, frame); ++ ++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 ) ++ break; ++ ++ playFrame( frame ); ++ } ++#endif + } + // av_free_packet() must be called after each call to av_read_frame() + #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 ) +@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString ) + #endif + } + ++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 ) + if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) && + codecContext_->codec->capabilities & CODEC_CAP_DELAY ) + { +@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString ) + playFrame( frame ); + } + } ++#else ++ /* flush the decoder */ ++ av_init_packet( &packet ); ++ int ret = avcodec_send_packet(codecContext_, &packet ); ++ while( ret >= 0 ) ++ { ++ ret = avcodec_receive_frame(codecContext_, frame); ++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 ) ++ break; ++ playFrame( frame ); ++ } ++#endif + + #if LIBAVCODEC_VERSION_MAJOR < 54 + av_free( frame ); diff --git a/office/goldendict/patches/goldendict-qt-5.11-1.patch b/office/goldendict/patches/goldendict-qt-5.11-1.patch new file mode 100644 index 0000000000..feb1b26e0b --- /dev/null +++ b/office/goldendict/patches/goldendict-qt-5.11-1.patch @@ -0,0 +1,34 @@ +From 3d4a468b6c8cb154c88cf4592a5845973999dc29 Mon Sep 17 00:00:00 2001 +From: Abs62 +Date: Tue, 10 Apr 2018 18:44:43 +0300 +Subject: [PATCH] Qt5: Fix compilation with Qt 5.11 (issue #991) + +--- + fulltextsearch.hh | 1 + + initializing.cc | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/fulltextsearch.hh b/fulltextsearch.hh +index da7e2943..adf9619f 100644 +--- a/fulltextsearch.hh ++++ b/fulltextsearch.hh +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + #include "dictionary.hh" + #include "ui_fulltextsearch.h" +diff --git a/initializing.cc b/initializing.cc +index 0db6909b..59e605d6 100644 +--- a/initializing.cc ++++ b/initializing.cc +@@ -1,6 +1,7 @@ + /* This file is (c) 2008-2012 Konstantin Isakov + * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */ + ++#include + #include "initializing.hh" + #include + diff --git a/office/goldendict/patches/goldendict-qt-5.11-2.patch b/office/goldendict/patches/goldendict-qt-5.11-2.patch new file mode 100644 index 0000000000..7410021651 --- /dev/null +++ b/office/goldendict/patches/goldendict-qt-5.11-2.patch @@ -0,0 +1,22 @@ +From a65967805ab424b299bdfa1d1f9c7ebb8a7fd517 Mon Sep 17 00:00:00 2001 +From: Perfect Gentleman +Date: Wed, 11 Apr 2018 00:04:12 +0700 +Subject: [PATCH] Update groups_widgets.hh + +fixes https://github.com/goldendict/goldendict/issues/991 +--- + groups_widgets.hh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/groups_widgets.hh b/groups_widgets.hh +index ce442fa2..2064e3bb 100644 +--- a/groups_widgets.hh ++++ b/groups_widgets.hh +@@ -8,6 +8,7 @@ + + #include + ++#include + #include + #include + 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/doinst.sh b/office/juffed/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/office/juffed/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/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 , 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/kbibtex/README b/office/kbibtex/README index 5cbb1f1cb9..ab74bceefc 100644 --- a/office/kbibtex/README +++ b/office/kbibtex/README @@ -1,8 +1,7 @@ -KBibTeX is a BibTeX editor for KDE to edit bibliographies used with -LaTeX. KBibTeX is released under the GNU Public License (GPL) version 2 -or any later version. +The program KBibTeX is a bibliography editor by KDE. Its main purpose is +to provide a user-friendly interface to BibTeX files. -KBibTeX for KDE 4 is currently under development. KBibTeX for KDE 4 is -mature for most daily tasks, but still lacks some features. It is -recommended that you make backups of all your files before editing -them with KBibTeX for KDE 4. +This software, unless noted differently for individual files, materials, +or contributions, is licensed under the terms of the GNU General Public +License as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. diff --git a/office/kbibtex/kbibtex.SlackBuild b/office/kbibtex/kbibtex.SlackBuild index 712fd85897..adb5694393 100644 --- a/office/kbibtex/kbibtex.SlackBuild +++ b/office/kbibtex/kbibtex.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=kbibtex -VERSION=${VERSION:-0.7} +VERSION=${VERSION:-0.9.81} 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.xz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -73,12 +73,11 @@ find -L . \ mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DMANDIR=/usr/man \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release \ + -DKDE_INSTALL_DOCBUNDLEDIR=/usr/doc/HTML \ -Wno-dev \ .. @@ -92,7 +91,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README LICENSE TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.md LICENSE TODO.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/kbibtex/kbibtex.info b/office/kbibtex/kbibtex.info index ce1fa76722..fa5b806cb5 100644 --- a/office/kbibtex/kbibtex.info +++ b/office/kbibtex/kbibtex.info @@ -1,8 +1,8 @@ PRGNAM="kbibtex" -VERSION="0.7" +VERSION="0.9.81" HOMEPAGE="https://userbase.kde.org/KBibTeX" -DOWNLOAD="https://github.com/KDE/kbibtex/archive/v0.7/kbibtex-0.7.tar.gz" -MD5SUM="db8f045be7fdb7fdb3101b47dd9b1bd3" +DOWNLOAD="https://download.kde.org/unstable/KBibTeX/kbibtex-0.9.81.tar.xz" +MD5SUM="b8df8ebf61d4b2f75bbc9a764d8f8041" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/kbibtex/slack-desc b/office/kbibtex/slack-desc index 9899f6105c..5357a566da 100644 --- a/office/kbibtex/slack-desc +++ b/office/kbibtex/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| kbibtex: kbibtex (A BibTeX editor for KDE) kbibtex: -kbibtex: KBibTeX is a BibTeX editor for KDE to edit bibliographies used with -kbibtex: LaTeX. KBibTeX is released under the GNU Public License (GPL) version -kbibtex: 2 or any later version. -kbibtex: -kbibtex: KBibTeX for KDE 4 is currently under development. KBibTeX for KDE 4 -kbibtex: is mature for most daily tasks, but still lacks some features. It is -kbibtex: recommended that you make backups of all your files before editing -kbibtex: them with KBibTeX for KDE 4. +kbibtex: The program KBibTeX is a bibliography editor by KDE. Its main purpose +kbibtex: is to provide a user-friendly interface to BibTeX files. +kbibtex: +kbibtex: This software, unless noted differently for individual files, +kbibtex: materials, or contributions, is licensed under the terms of the GNU +kbibtex: General Public License as published by the Free Software Foundation; +kbibtex: either version 2 of the License, or (at your option) any later +kbibtex: version. kbibtex: diff --git a/office/kmymoney/README b/office/kmymoney/README deleted file mode 100644 index 81bc1e7bdd..0000000000 --- a/office/kmymoney/README +++ /dev/null @@ -1,6 +0,0 @@ -KmyMoney is a simple financial accounting manager for KDE for personal or -small-business use. It is a full double-entry accounting software package. -libofx 0.9.4+ is an optional dependency to support ofxbanking. -agbanking and gwenhywfar are optional dependencies to support Kbanking. - -p7zip is a build-time dependency. It is required to decompress the source file. diff --git a/office/kmymoney/doinst.sh b/office/kmymoney/doinst.sh deleted file mode 100644 index 4f59bd45f1..0000000000 --- a/office/kmymoney/doinst.sh +++ /dev/null @@ -1,13 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database 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 [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 -fi diff --git a/office/kmymoney/kmymoney.SlackBuild b/office/kmymoney/kmymoney.SlackBuild deleted file mode 100644 index 378a846bbb..0000000000 --- a/office/kmymoney/kmymoney.SlackBuild +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -# SlackBuild script for kmymoney - -# Copyright 2016-2019 Christophe Nguyen, France -# Copyright 2010-2014 Gilcio Amaral -# Copyright 2007-2008 Michiel van Wessem, Manchester, United Kingdom -# 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=kmymoney -VERSION=${VERSION:-4.8.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 -rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP -7z x $CWD/$PRGNAM-$VERSION-src.7z -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 VERBOSE=1 - make install VERBOSE=1 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 AUTHORS BUGS COPYING ChangeLog* INSTALL README* TODO $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir $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/kmymoney/kmymoney.info b/office/kmymoney/kmymoney.info deleted file mode 100644 index f2c8ebc877..0000000000 --- a/office/kmymoney/kmymoney.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kmymoney" -VERSION="4.8.4" -HOMEPAGE="http://www.kmymoney.org" -DOWNLOAD="https://download.kde.org/stable/kmymoney/4.8.4/src/kmymoney-4.8.4-src.7z" -MD5SUM="b18a5714db7a098155f2c29dbf31b458" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="p7zip libalkimia" -MAINTAINER="Christophe Nguyen" -EMAIL="cnguyenminhtan@free.fr" diff --git a/office/kmymoney/slack-desc b/office/kmymoney/slack-desc deleted file mode 100644 index 28064f3829..0000000000 --- a/office/kmymoney/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------------------------------------------------------| -kmymoney: kmymoney (simple financial accounting manager) -kmymoney: -kmymoney: KmyMoney is a simple financial accounting manager for KDE for -kmymoney: personal or small-business use. It is a complete and full -kmymoney: double-entry accounting software package. -kmymoney: -kmymoney: -kmymoney: Homepage: http://kmymoney.org -kmymoney: -kmymoney: -kmymoney: 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/pdfpc/pdfpc.SlackBuild b/office/pdfpc/pdfpc.SlackBuild index 1db71999b5..005831788f 100644 --- a/office/pdfpc/pdfpc.SlackBuild +++ b/office/pdfpc/pdfpc.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=pdfpc -VERSION=${VERSION:-4.1.2} +VERSION=${VERSION:-4.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -76,8 +76,8 @@ cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc \ - -DMANDIR=/usr/man \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release \ .. make diff --git a/office/pdfpc/pdfpc.info b/office/pdfpc/pdfpc.info index ebe589cb97..8b7a1cf2dd 100644 --- a/office/pdfpc/pdfpc.info +++ b/office/pdfpc/pdfpc.info @@ -1,8 +1,8 @@ PRGNAM="pdfpc" -VERSION="4.1.2" +VERSION="4.4.1" HOMEPAGE="https://pdfpc.github.io/" -DOWNLOAD="https://github.com/pdfpc/pdfpc/archive/v4.1.2/pdfpc-4.1.2.tar.gz" -MD5SUM="5b5fd7e78966ae604081631f38c6b1a1" +DOWNLOAD="https://github.com/pdfpc/pdfpc/archive/v4.4.1/pdfpc-4.4.1.tar.gz" +MD5SUM="76f0b9f1000ae77ca301011daa25ab4f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libgee" 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 GRME) + 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/qpdfview-qt5/qpdfview-qt5.SlackBuild b/office/qpdfview-qt5/qpdfview-qt5.SlackBuild index 9740486397..6665bfff69 100644 --- a/office/qpdfview-qt5/qpdfview-qt5.SlackBuild +++ b/office/qpdfview-qt5/qpdfview-qt5.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/qt-5.15.patch + sed -i "s|/usr/lib/qpdfview|/usr/lib${LIBDIRSUFFIX}/qpdfview|" qpdfview.pri # From Arch pkgbuild. Fix build with texlive in Slackware current. diff --git a/office/qpdfview-qt5/qt-5.15.patch b/office/qpdfview-qt5/qt-5.15.patch new file mode 100644 index 0000000000..ca48432b85 --- /dev/null +++ b/office/qpdfview-qt5/qt-5.15.patch @@ -0,0 +1,24 @@ +Index: qpdfview-0.4.18/sources/djvumodel.cpp +=================================================================== +--- qpdfview-0.4.18.orig/sources/djvumodel.cpp ++++ qpdfview-0.4.18/sources/djvumodel.cpp +@@ -29,6 +29,7 @@ along with qpdfview. If not, see + + #include ++#include + #include + + #if defined(Q_OS_WIN) && defined(DJVU_STATIC) +Index: qpdfview-0.4.18/sources/model.h +=================================================================== +--- qpdfview-0.4.18.orig/sources/model.h ++++ qpdfview-0.4.18/sources/model.h +@@ -27,6 +27,7 @@ along with qpdfview. If not, see + #include + #include ++#include + + class QAbstractItemModel; + class QColor; 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 -# 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/README b/office/scribus/README index 2add995c89..8a9f355ec7 100644 --- a/office/scribus/README +++ b/office/scribus/README @@ -2,4 +2,5 @@ Scribus is an open-source program that brings award-winning professional page layout to Linux/Unix, MacOS X and Windows desktops with a combination of "press-ready" output and new approaches to page layout. -podofo is an optional dependency used for embedded pdfs in AI files. +podofo, libpagemaker, libfreehand, libcdr, libzmf, libqxp and libmspub are +optional dependencies. diff --git a/office/scribus/poppler-21.3.0.patch b/office/scribus/poppler-21.3.0.patch new file mode 100644 index 0000000000..400ae7e62e --- /dev/null +++ b/office/scribus/poppler-21.3.0.patch @@ -0,0 +1,81 @@ +From 7ce0ac16fd42d61ef9082b27822c7d9d79c7fef7 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Mon, 1 Mar 2021 21:52:54 +0000 +Subject: [PATCH 1/2] Attempt to fix build of pdf import plugin with poppler + 21.03.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@24537 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 12 +++++++++++- + scribus/plugins/import/pdf/slaoutput.h | 4 ++++ + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 7cbc73e..d1b37a0 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -2292,9 +2292,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *sh + return gTrue; + } + +-GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) ++#else ++GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) ++#endif + { + // qDebug() << "SlaOutputDev::tilingPatternFill"; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++ const double *bbox = tPat->getBBox(); ++ const double *pmat = tPat->getMatrix(); ++ Dict *resDict = tPat->getResDict(); ++#endif ++ + PDFRectangle box; + Gfx *gfx; + QString id; +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index 5149f19..66c3420 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -197,7 +197,11 @@ public: + void stroke(GfxState *state) override; + void fill(GfxState *state) override; + void eoFill(GfxState *state) override; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override; ++#else + GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) override; ++#endif + GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) override { qDebug() << "Function Shaded Fill"; return gFalse; } + GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override; + GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) override { return (shading->getExtend0() == shading->getExtend1()); } + +From 6b9ff916959bcb941866f0bd86da639a421337f8 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Mon, 1 Mar 2021 22:00:02 +0000 +Subject: [PATCH 2/2] Attempt to fix build of pdf import plugin with poppler + 21.03.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@24538 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index d1b37a0..de0a414 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -2336,7 +2336,11 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *c + // Unset the clip path as it is unrelated to the pattern's coordinate space. + QPainterPath savedClip = m_currentClipPath; + m_currentClipPath = QPainterPath(); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++ gfx->display(tPat->getContentStream()); ++#else + gfx->display(str); ++#endif + m_currentClipPath = savedClip; + inPattern--; + gElements = m_groupStack.pop(); diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild index 5842344c68..bcc47cea40 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.5.6.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 @@ -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" @@ -73,12 +73,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 {} \; +patch -p1 < $CWD/poppler-21.3.0.patch + cmake \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DRENDER_LIB=CAIRO + -DLIB_SUFFIX=${LIBDIRSUFFIX} make make install DESTDIR=$PKG diff --git a/office/scribus/scribus.info b/office/scribus/scribus.info index 10e5f6a05f..b5f450fb1e 100644 --- a/office/scribus/scribus.info +++ b/office/scribus/scribus.info @@ -1,8 +1,8 @@ PRGNAM="scribus" -VERSION="1.4.6" +VERSION="1.5.6.1" 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.5.6.1.tar.xz" +MD5SUM="12700cd8c6f08ef02f50495d2ef2d3ce" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/teapot/teapot.SlackBuild b/office/teapot/teapot.SlackBuild index e08caeb0cc..923d902c42 100644 --- a/office/teapot/teapot.SlackBuild +++ b/office/teapot/teapot.SlackBuild @@ -98,7 +98,7 @@ sed -i "s,/usr/share/doc/$PRGNAM,/usr/doc/$PRGNAM-$VERSION,g" $PRGNAM.1 mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -I/usr/include/tirpc -Wl,-ltirpc" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DENABLE_HELP=OFF \ 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 - - - - $TEXMFROOT/texmf-dist/fonts/opentype - $TEXMFROOT/texmf-dist/fonts/truetype - -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 -# Copyright 2015-2017 Willy Sudiarto Raharjo -# 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 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 $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 -# 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 137494054c..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 -# Copyright 2015-2021 Willy Sudiarto Raharjo -# 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.070} -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 212108fe79..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.070" -HOMEPAGE="https://metacpan.org/pod/IO::Socket::SSL" -DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SU/SULLR/IO-Socket-SSL-2.070.tar.gz" -MD5SUM="3c8df96b5249c02025e2eb48596c213b" -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/README b/perl/perl-Module-Runtime/README deleted file mode 100644 index 6d3996d90c..0000000000 --- a/perl/perl-Module-Runtime/README +++ /dev/null @@ -1,2 +0,0 @@ -perl-Module-Runtime (perl module) -Runtime module handling. diff --git a/perl/perl-Module-Runtime/perl-Module-Runtime.SlackBuild b/perl/perl-Module-Runtime/perl-Module-Runtime.SlackBuild deleted file mode 100644 index d2d11f4a18..0000000000 --- a/perl/perl-Module-Runtime/perl-Module-Runtime.SlackBuild +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh - -# Slackware build script for perl-Module-Runtime -# Written by David Somero -# Derived from Slackware's Slackbuilds. - -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA -# Copyright 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=perl-Module-Runtime -VERSION=${VERSION:-0.015} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -SRCNAM=Module-Runtime - -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 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 | 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 - -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 \ - 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/perl/perl-Module-Runtime/perl-Module-Runtime.info b/perl/perl-Module-Runtime/perl-Module-Runtime.info deleted file mode 100644 index ec5bdacb61..0000000000 --- a/perl/perl-Module-Runtime/perl-Module-Runtime.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="perl-Module-Runtime" -VERSION="0.015" -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_x86_64="" -MD5SUM_x86_64="" -REQUIRES="perl-Module-Build" -MAINTAINER="David Somero" -EMAIL="dsomero@hotmail.com" diff --git a/perl/perl-Module-Runtime/slack-desc b/perl/perl-Module-Runtime/slack-desc deleted file mode 100644 index 579ac88228..0000000000 --- a/perl/perl-Module-Runtime/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-Module-Runtime: perl-Module-Runtime (perl module) -perl-Module-Runtime: -perl-Module-Runtime: Runtime module handling. -perl-Module-Runtime: -perl-Module-Runtime: -perl-Module-Runtime: -perl-Module-Runtime: -perl-Module-Runtime: -perl-Module-Runtime: -perl-Module-Runtime: -perl-Module-Runtime: diff --git a/perl/perl-Moo/README b/perl/perl-Moo/README deleted file mode 100644 index fedb018c0c..0000000000 --- a/perl/perl-Moo/README +++ /dev/null @@ -1,2 +0,0 @@ -This module is an extremely light-weight subset of Moose optimised -for rapid startup and "pay only for what you use". diff --git a/perl/perl-Moo/perl-Moo.SlackBuild b/perl/perl-Moo/perl-Moo.SlackBuild deleted file mode 100644 index 29fc859cf4..0000000000 --- a/perl/perl-Moo/perl-Moo.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -# Slackware build script for perl-Moo - -# Copyright 2013-2021 Willy Sudiarto Raharjo -# 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-Moo -VERSION=${VERSION:-2.004004} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -SRCNAM="$(printf $PRGNAM | cut -d- -f2-)" - -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 -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 Changes 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/perl/perl-Moo/perl-Moo.info b/perl/perl-Moo/perl-Moo.info deleted file mode 100644 index eb23e3ec3c..0000000000 --- a/perl/perl-Moo/perl-Moo.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="perl-Moo" -VERSION="2.004004" -HOMEPAGE="https://metacpan.org/pod/Moo" -DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Moo-2.004004.tar.gz" -MD5SUM="51f3732e043a1e856ab6cdc260d2814c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="perl-Role-Tiny perl-strictures perl-Dist-CheckConflicts perl-Class-Method-Modifiers perl-Devel-GlobalDestruction perl-Module-Runtime perl-Import-Into perl-Sub-Quote" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/perl/perl-Moo/slack-desc b/perl/perl-Moo/slack-desc deleted file mode 100644 index 1f8c61358f..0000000000 --- a/perl/perl-Moo/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-Moo: perl-Moo (Minimalist Object Orientation) -perl-Moo: -perl-Moo: This module is an extremely light-weight subset of Moose optimised -perl-Moo: for rapid startup and "pay only for what you use". -perl-Moo: -perl-Moo: -perl-Moo: -perl-Moo: -perl-Moo: -perl-Moo: -perl-Moo: diff --git a/perl/perl-Path-Tiny/README b/perl/perl-Path-Tiny/README deleted file mode 100644 index 04f27124f5..0000000000 --- a/perl/perl-Path-Tiny/README +++ /dev/null @@ -1 +0,0 @@ -This module provides a small, fast utility for working with file paths diff --git a/perl/perl-Path-Tiny/perl-Path-Tiny.SlackBuild b/perl/perl-Path-Tiny/perl-Path-Tiny.SlackBuild deleted file mode 100644 index d0b305c91c..0000000000 --- a/perl/perl-Path-Tiny/perl-Path-Tiny.SlackBuild +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -# Slackware build script for perl-Path-Tiny - -# Copyright 2017-2021 Willy Sudiarto Raharjo -# 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-Path-Tiny -VERSION=${VERSION:-0.118} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -SRCNAM="$(printf $PRGNAM | cut -d- -f2-)" - -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/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 Changes 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/perl/perl-Path-Tiny/perl-Path-Tiny.info b/perl/perl-Path-Tiny/perl-Path-Tiny.info deleted file mode 100644 index 580ae7ccb2..0000000000 --- a/perl/perl-Path-Tiny/perl-Path-Tiny.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="perl-Path-Tiny" -VERSION="0.118" -HOMEPAGE="https://metacpan.org/pod/Path::Tiny" -DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.118.tar.gz" -MD5SUM="cb34fd356725ec12b78e88ddac37db08" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/perl/perl-Path-Tiny/slack-desc b/perl/perl-Path-Tiny/slack-desc deleted file mode 100644 index 7f6939e491..0000000000 --- a/perl/perl-Path-Tiny/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-Path-Tiny: perl-Path-Tiny (perl module) -perl-Path-Tiny: -perl-Path-Tiny: This module provides a small, fast utility for working with file paths -perl-Path-Tiny: -perl-Path-Tiny: -perl-Path-Tiny: -perl-Path-Tiny: -perl-Path-Tiny: -perl-Path-Tiny: -perl-Path-Tiny: -perl-Path-Tiny: 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 +# 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-Sub-Quote/README b/perl/perl-Sub-Quote/README deleted file mode 100644 index 976ea69ac9..0000000000 --- a/perl/perl-Sub-Quote/README +++ /dev/null @@ -1 +0,0 @@ -efficient generation of subroutines via string eval diff --git a/perl/perl-Sub-Quote/perl-Sub-Quote.SlackBuild b/perl/perl-Sub-Quote/perl-Sub-Quote.SlackBuild deleted file mode 100644 index cbed1816c0..0000000000 --- a/perl/perl-Sub-Quote/perl-Sub-Quote.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -# Slackware build script for perl-Sub-Quote - -# Copyright 2017-2019 Willy Sudiarto Raharjo -# 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-Sub-Quote -VERSION=${VERSION:-2.006006} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -SRCNAM="$(printf $PRGNAM | cut -d- -f2-)" - -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 -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 Changes 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/perl/perl-Sub-Quote/perl-Sub-Quote.info b/perl/perl-Sub-Quote/perl-Sub-Quote.info deleted file mode 100644 index 15e9a86e7b..0000000000 --- a/perl/perl-Sub-Quote/perl-Sub-Quote.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="perl-Sub-Quote" -VERSION="2.006006" -HOMEPAGE="https://metacpan.org/pod/Sub::Quote" -DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Sub-Quote-2.006006.tar.gz" -MD5SUM="1bb9caee697bcfa738f419d40505e506" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="perl-Test-Fatal" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/perl/perl-Sub-Quote/slack-desc b/perl/perl-Sub-Quote/slack-desc deleted file mode 100644 index 0739d7950f..0000000000 --- a/perl/perl-Sub-Quote/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-Sub-Quote: perl-Sub-Quote (perl module) -perl-Sub-Quote: -perl-Sub-Quote: efficient generation of subroutines via string eval -perl-Sub-Quote: -perl-Sub-Quote: -perl-Sub-Quote: -perl-Sub-Quote: -perl-Sub-Quote: -perl-Sub-Quote: -perl-Sub-Quote: -perl-Sub-Quote: diff --git a/perl/perl-Template-Toolkit/README b/perl/perl-Template-Toolkit/README deleted file mode 100644 index ebcc4d6ed8..0000000000 --- a/perl/perl-Template-Toolkit/README +++ /dev/null @@ -1,6 +0,0 @@ -The Template Toolkit is a collection of Perl modules which implement a -fast, flexible, powerful and extensible template processing system. - -It is "input-agnostic" and can be used equally well for processing any -kind of text documents: HTML, XML, CSS, Javascript, Perl code, plain text, -and so on. diff --git a/perl/perl-Template-Toolkit/perl-Template-Toolkit.SlackBuild b/perl/perl-Template-Toolkit/perl-Template-Toolkit.SlackBuild deleted file mode 100644 index fb764c6130..0000000000 --- a/perl/perl-Template-Toolkit/perl-Template-Toolkit.SlackBuild +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh - -# Slackware build script for perl-Template-Toolkit -# Written by Thomas Morper - -PRGNAM=perl-Template-Toolkit -VERSION=${VERSION:-3.009} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -SRCNAM="$(printf $PRGNAM | cut -d- -f2-)" - -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 \ - TT_ACCEPT=y \ - 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" -empty | xargs rm -f || true -find $PKG -depth -type d -empty -delete || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Changes HACKING INSTALL MANIFEST 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/perl/perl-Template-Toolkit/perl-Template-Toolkit.info b/perl/perl-Template-Toolkit/perl-Template-Toolkit.info deleted file mode 100644 index 0ef0548766..0000000000 --- a/perl/perl-Template-Toolkit/perl-Template-Toolkit.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="perl-Template-Toolkit" -VERSION="3.009" -HOMEPAGE="https://metacpan.org/release/Template-Toolkit" -DOWNLOAD="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.009.tar.gz" -MD5SUM="f1c401067b728337a8a8c0d4ae642af8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="perl-AppConfig" -MAINTAINER="Thomas Morper" -EMAIL="thomas@beingboiled.info" diff --git a/perl/perl-Template-Toolkit/slack-desc b/perl/perl-Template-Toolkit/slack-desc deleted file mode 100644 index acbdde3f82..0000000000 --- a/perl/perl-Template-Toolkit/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-Template-Toolkit: perl-Template-Toolkit (comprehensive template processing system) -perl-Template-Toolkit: -perl-Template-Toolkit: The Template Toolkit is a collection of Perl modules which implement -perl-Template-Toolkit: a fast, flexible, powerful and extensible template processing system. -perl-Template-Toolkit: -perl-Template-Toolkit: It is "input-agnostic" and can be used equally well for processing -perl-Template-Toolkit: any kind of text documents: HTML, XML, CSS, Javascript, Perl code, -perl-Template-Toolkit: plain text, and so on. -perl-Template-Toolkit: -perl-Template-Toolkit: -perl-Template-Toolkit: diff --git a/perl/perl-Tk-TableMatrix/pTk-1.22.patch b/perl/perl-Tk-TableMatrix/pTk-1.22.patch deleted file mode 100644 index ff9938535b..0000000000 --- a/perl/perl-Tk-TableMatrix/pTk-1.22.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- pTk/Makefile.PL.old 2006-05-01 18:09:31.000000000 -0400 -+++ pTk/Makefile.PL 2006-05-01 18:10:05.000000000 -0400 -@@ -234,11 +234,11 @@ sub MY::postamble { - my $self = shift; - my $dep = $self->Tk::MMutil::mTk_postamble; - --$dep .= $self->dir_target(@{$self->{'dir_targets'}}); -- --$dep .= "config :: " . join(" \\\n\t",map($self->catfile($_,".exists"),@{$self->{'dir_targets'}})) . -- "\n\t".$self->{NOECHO}."\$(NOOP)\n"; - -+if ($Tk::MMutil::IsWin32 or ($win_arch eq 'MSWin32' and $^O eq 'cygwin')) -+ { -+ my $cc = $Config{'cc'}; -+ } - - $dep . ' - diff --git a/perl/perl-Tk-TableMatrix/perl-Tk-TableMatrix.SlackBuild b/perl/perl-Tk-TableMatrix/perl-Tk-TableMatrix.SlackBuild index 76b6f4c997..cdcec4fb3a 100644 --- a/perl/perl-Tk-TableMatrix/perl-Tk-TableMatrix.SlackBuild +++ b/perl/perl-Tk-TableMatrix/perl-Tk-TableMatrix.SlackBuild @@ -26,7 +26,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=perl-Tk-TableMatrix -VERSION=${VERSION:-1.23} +VERSION=${VERSION:-20201024_2c4c333} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -34,7 +34,7 @@ SRCNAM=Tk-TableMatrix 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" @@ -65,7 +65,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z cd $SRCNAM-$VERSION chown -R root:root . find -L . \ @@ -74,19 +74,16 @@ 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/pTk-1.22.patch - perl Makefile.PL \ PREFIX=/usr \ INSTALLDIRS=vendor \ INSTALLVENDORMAN1DIR=/usr/man/man1 \ INSTALLVENDORMAN3DIR=/usr/man/man3 make -make test make install DESTDIR=$PKG # This file is part of perl-tk so nuke it. -rm $PKG/usr/lib$LIBDIRSUFFIX/perl5/vendor_perl/auto/Tk/pTk/extralibs.ld +rm $PKG/usr/lib$LIBDIRSUFFIX/perl5/vendor_perl/auto/Tk/pTk/extralibs.ld || 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/perl/perl-Tk-TableMatrix/perl-Tk-TableMatrix.info b/perl/perl-Tk-TableMatrix/perl-Tk-TableMatrix.info index 10c04a8be7..2070d483f4 100644 --- a/perl/perl-Tk-TableMatrix/perl-Tk-TableMatrix.info +++ b/perl/perl-Tk-TableMatrix/perl-Tk-TableMatrix.info @@ -1,8 +1,8 @@ PRGNAM="perl-Tk-TableMatrix" -VERSION="1.23" +VERSION="20201024_2c4c333" HOMEPAGE="https://metacpan.org/pod/Tk::TableMatrix" -DOWNLOAD="https://cpan.metacpan.org/authors/id/C/CE/CERNEY/Tk-TableMatrix-1.23.tar.gz" -MD5SUM="6b7653d129bf1a8327054a88b58d6364" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/Tk-TableMatrix-20201024_2c4c333.tar.xz" +MD5SUM="456a715c97e2147dcdae0da49a477e6d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-tk" 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?= -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. - - - -Signed-off-by: Petr Písař ---- - 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 , 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 -# 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/Markdown/Markdown.SlackBuild b/python/Markdown/Markdown.SlackBuild index 5441fcdfad..afb7192203 100644 --- a/python/Markdown/Markdown.SlackBuild +++ b/python/Markdown/Markdown.SlackBuild @@ -72,11 +72,6 @@ find -L . \ 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 diff --git a/python/Pygments/Pygments.SlackBuild b/python/Pygments/Pygments.SlackBuild deleted file mode 100644 index 6d8e73aab7..0000000000 --- a/python/Pygments/Pygments.SlackBuild +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -# Slackware build script for Pygments - -# Copyright 2009 Grissiom -# Copyright 2009-2015 LukenShiro, Italy -# Copyright 2017-2020 Benjamin Trigona-Harany -# 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.7.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 c0b5c9ab81..0000000000 --- a/python/Pygments/Pygments.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="Pygments" -VERSION="2.7.2" -HOMEPAGE="https://pygments.org/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-2.7.2.tar.gz" -MD5SUM="cc5a6c0f34a958f879852d957a417742" -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 , 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 +# 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/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/dnspython/README b/python/dnspython/README index 2a208d072f..983875ac1e 100644 --- a/python/dnspython/README +++ b/python/dnspython/README @@ -6,6 +6,3 @@ dnspython provides both high and low level access to DNS. The high level classes perform queries for data of a given name, type, and class, and return an answer set. The low level classes allow direct manipulation of DNS zones, messages, names, and records. - -python3, pycrypto, pycryptodomex and ecdsa are optional dependencies for DNSSEC -functionality. diff --git a/python/dnspython/dnspython.SlackBuild b/python/dnspython/dnspython.SlackBuild index 65c379b04e..d00088abfa 100644 --- a/python/dnspython/dnspython.SlackBuild +++ b/python/dnspython/dnspython.SlackBuild @@ -57,10 +57,6 @@ find -L . \ 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 diff --git a/python/dulwich/dulwich.SlackBuild b/python/dulwich/dulwich.SlackBuild index 714e5bf381..4c07ddc556 100644 --- a/python/dulwich/dulwich.SlackBuild +++ b/python/dulwich/dulwich.SlackBuild @@ -57,6 +57,11 @@ find -L . \ 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 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 +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 +Signed-off-by: Adam Duskett +--- + 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/hg-git/hg-git.SlackBuild b/python/hg-git/hg-git.SlackBuild index 9192bd83e9..bed9f38ad1 100644 --- a/python/hg-git/hg-git.SlackBuild +++ b/python/hg-git/hg-git.SlackBuild @@ -55,7 +55,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 {} \; -python setup.py install --root=$PKG +python3 setup.py install --root=$PKG mkdir -p $PKG/etc/mercurial/hgrc.d cat > $PKG/etc/mercurial/hgrc.d/hggit.rc.new << EOF 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/llfuse/llfuse.SlackBuild b/python/llfuse/llfuse.SlackBuild index c0a50fdccd..9a83fdd9df 100644 --- a/python/llfuse/llfuse.SlackBuild +++ b/python/llfuse/llfuse.SlackBuild @@ -26,13 +26,13 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=llfuse -VERSION=${VERSION:-1.1} +VERSION=${VERSION:-1.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 @@ -43,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" @@ -63,7 +63,7 @@ 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 . find -L . \ @@ -72,21 +72,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 {} \; -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 +python3 setup.py build_cython +python3 setup.py build_ext --inplace +python3 setup.py install --root=$PKG --optimize=1 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 -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html cp -a examples Changes.rst LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cp -a doc/html/*.html doc/html/searchindex.js doc/html/_static \ - $PKG/usr/doc/$PRGNAM-$VERSION/html cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/llfuse/llfuse.info b/python/llfuse/llfuse.info index d0966bdd64..8b7c2bda8a 100644 --- a/python/llfuse/llfuse.info +++ b/python/llfuse/llfuse.info @@ -1,10 +1,10 @@ PRGNAM="llfuse" -VERSION="1.1" -HOMEPAGE="https://bitbucket.org/nikratio/python-llfuse/" -DOWNLOAD="https://bitbucket.org/nikratio/python-llfuse/downloads/llfuse-1.1.tar.bz2" -MD5SUM="a11a1bc606511fe0933c3e3d41237f0e" +VERSION="1.4.1" +HOMEPAGE="https://github.com/python-llfuse/python-llfuse" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/llfuse-1.4.1.tar.xz" +MD5SUM="0d1668468601c1a927fa162b99c5c6e8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3" MAINTAINER="Andrzej Telszewski" EMAIL="atelszewski@gmail.com" diff --git a/python/llfuse/slack-desc b/python/llfuse/slack-desc index c34c16103c..574ab75f76 100644 --- a/python/llfuse/slack-desc +++ b/python/llfuse/slack-desc @@ -11,7 +11,7 @@ llfuse: llfuse: LLFUSE is a set of Python bindings for the low level FUSE API. llfuse: It requires at least FUSE 2.8.0 and supports both Python 2.x and 3.x. llfuse: -llfuse: Homepage: https://bitbucket.org/nikratio/python-llfuse/ +llfuse: Homepage: https://github.com/python-llfuse/python-llfuse llfuse: llfuse: llfuse: 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 -# 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 , 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="bgrundylinuxleo.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/pypoppler/pypoppler.SlackBuild b/python/pypoppler/pypoppler.SlackBuild index 0195cb53b9..5f517cea58 100644 --- a/python/pypoppler/pypoppler.SlackBuild +++ b/python/pypoppler/pypoppler.SlackBuild @@ -56,7 +56,7 @@ patch -p0 < $CWD/patches/python-poppler-0.12.1-poppler-0.39.0-changes.patch autoreconf -ivf -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ 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 5f8c639a43..0000000000 --- a/python/python-certifi/python-certifi.SlackBuild +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh - -# Slackware build script for python-certifi - -# Copyright 2014-2021 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:-2020.12.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 {} \; - -python 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 - -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 c46903f08c..0000000000 --- a/python/python-certifi/python-certifi.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python-certifi" -VERSION="2020.12.5" -HOMEPAGE="https://certifi.io/en/latest/" -DOWNLOAD="https://files.pythonhosted.org/packages/06/a9/cd1fd8ee13f73a4d4f491ee219deeeae20afefa914dfb4c130cfc9dc397a/certifi-2020.12.5.tar.gz" -MD5SUM="522f9abe26e5d603a668d812aa6accca" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3" -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/doinst.sh b/python/python-future/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/python/python-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/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 +--- +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 c86375ee6e..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.25.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 3e86ad5698..0000000000 --- a/python/python-requests/python-requests.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python-requests" -VERSION="2.25.0" -HOMEPAGE="https://requests.kennethreitz.org/en/master/" -DOWNLOAD="https://github.com/kennethreitz/requests/archive/v2.25.0/requests-2.25.0.tar.gz" -MD5SUM="17d9f83904bd2ef687d3c89e762623fd" -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 5aee2720b6..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-2021 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.26.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/$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 21d0de0eed..0000000000 --- a/python/python-urllib3/python-urllib3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python-urllib3" -VERSION="1.26.2" -HOMEPAGE="https://urllib3.readthedocs.io/en/latest/" -DOWNLOAD="https://files.pythonhosted.org/packages/29/e6/d1a1d78c439cad688757b70f26c50a53332167c364edb0134cadd280e234/urllib3-1.26.2.tar.gz" -MD5SUM="2233256ccfe140a915f68703f8c2cc1f" -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 , 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/python2-sip/README b/python/python2-sip/README deleted file mode 100644 index 10c01de44b..0000000000 --- a/python/python2-sip/README +++ /dev/null @@ -1,15 +0,0 @@ -SIP is a tool that makes it very easy to create Python bindings for -C and C++ libraries. It was originally developed to create PyQt, -the Python bindings for the Qt toolkit, but can be used to create -bindings for any C or C++ library. - -This is an updated version of the stock slackware package. It should not -interfere with the stock version. - -To build against this library in your python2 applications you will need to -tell your application the binary name and/or include path: - -/usr/bin/python2-sip -/usr/include/python2.7/python2-sip/ - -To use the module in your python2 projects, it is named PyQt5.sip. diff --git a/python/python2-sip/python2-sip.SlackBuild b/python/python2-sip/python2-sip.SlackBuild deleted file mode 100644 index 5ffe8425f3..0000000000 --- a/python/python2-sip/python2-sip.SlackBuild +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh - -# Copyright 2008 Aleksandar Samardzic -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2016 Marcel Saegebarth -# Copyright 2018 Dave Woodfall -# 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 -# Modified by Eric Hameleers -# Adapted by Marcel Saegebarth -# Modified by Dave Woodfall - -PRGNAM=python2-sip -SRCNAM=sip -VERSION=${VERSION:-4.19.20} -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 - -PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) -PYTHONLIB=/usr/lib$LIBDIRSUFFIX/python$PYTHONVER/site-packages - -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 configure.py \ - -b "/usr/bin" \ - -d "$PYTHONLIB" \ - -e "/usr/include/python$PYTHONVER" \ - --sip-module "PyQt5.sip" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" - -make -make install DESTDIR=$PKG - -mv $PKG/usr/bin/sip $PKG/usr/bin/python2-sip - -mkdir -p $PKG/usr/include/python$PYTHONVER/python2-sip - -mv $PKG/usr/include/python$PYTHONVER/sip.h \ - $PKG/usr/include/python$PYTHONVER/python2-sip/sip.h \ - -for oldf in sipdistutils.py sipconfig.py; do - mv $PKG/usr/lib$LIBDIRSUFFIX/python$PYTHONVER/site-packages/$oldf \ - $PKG/usr/lib$LIBDIRSUFFIX/python$PYTHONVER/site-packages/PyQt5_$oldf -done - -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/python/python2-sip/python2-sip.info b/python/python2-sip/python2-sip.info deleted file mode 100644 index 7ec2b796d2..0000000000 --- a/python/python2-sip/python2-sip.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python2-sip" -VERSION="4.19.20" -HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/sip-4.19.20.tar.gz" -MD5SUM="b91e29300cbee7b8e3b1f4412eac615c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dave Woodfall" -EMAIL="dave@slackbuilds.org" diff --git a/python/python2-sip/slack-desc b/python/python2-sip/slack-desc deleted file mode 100644 index 63174564c9..0000000000 --- a/python/python2-sip/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------------------------------------------------------| -python2-sip: python2-sip (Tool to generate Python bindings) -python2-sip: -python2-sip: SIP is a tool that makes it very easy to create Python bindings for -python2-sip: C and C++ libraries. It was originally developed to create PyQt, -python2-sip: the Python bindings for the Qt toolkit, but can be used to create -python2-sip: bindings for any C or C++ library. -python2-sip: -python2-sip: This is an updated version of the stock slackware package. -python2-sip: -python2-sip: Homepage: http://www.riverbankcomputing.com/software/sip/intro/ -python2-sip: 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 -# 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-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 -# 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 (bgrundylinuxleo.com) -# Copyright 2017-2018 Jeremy Hansen -# 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-sip/README b/python/python3-sip/README deleted file mode 100644 index 73272f0e41..0000000000 --- a/python/python3-sip/README +++ /dev/null @@ -1,4 +0,0 @@ -SIP is a tool that makes it very easy to create Python bindings for -C and C++ libraries. It was originally developed to create PyQt, -the Python bindings for the Qt toolkit, but can be used to create -bindings for any C or C++ library. diff --git a/python/python3-sip/python3-sip.SlackBuild b/python/python3-sip/python3-sip.SlackBuild deleted file mode 100644 index 349461061f..0000000000 --- a/python/python3-sip/python3-sip.SlackBuild +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh - -# Now maintained by Dave Woodfall (2020-04-24 14:13:15 +0100) -# -# Copyright 2008 Aleksandar Samardzic -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2016 Marcel Saegebarth -# 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 -# Modified by Eric Hameleers -# Adapted by Marcel Saegebarth - -PRGNAM=python3-sip -SRCNAM=sip -VERSION=${VERSION:-4.19.20} -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 - -PYTHONVER=$(python3 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) -PYTHONLIB=/usr/lib$LIBDIRSUFFIX/python$PYTHONVER/site-packages - -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 configure.py \ - -b "/usr/bin" \ - -d "$PYTHONLIB" \ - -e $(pkg-config --cflags-only-I python3 | sed -e 's/^-I//') \ - --sip-module "PyQt5.sip" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" - -make -make install DESTDIR=$PKG - -( - cd $PKG/usr/bin - mv sip python3-sip -) - -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/python/python3-sip/python3-sip.info b/python/python3-sip/python3-sip.info deleted file mode 100644 index f5aa9cd8c1..0000000000 --- a/python/python3-sip/python3-sip.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-sip" -VERSION="4.19.20" -HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/sip-4.19.20.tar.gz" -MD5SUM="b91e29300cbee7b8e3b1f4412eac615c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3" -MAINTAINER="Dave Woodfall" -EMAIL="dave@slackbuilds.org" diff --git a/python/python3-sip/slack-desc b/python/python3-sip/slack-desc deleted file mode 100644 index 4fd2920a80..0000000000 --- a/python/python3-sip/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-sip: python3-sip (Tool to generate Python bindings) -python3-sip: -python3-sip: SIP is a tool that makes it very easy to create Python bindings for -python3-sip: C and C++ libraries. It was originally developed to create PyQt, -python3-sip: the Python bindings for the Qt toolkit, but can be used to create -python3-sip: bindings for any C or C++ library. -python3-sip: -python3-sip: Homepage: http://www.riverbankcomputing.com/software/sip/intro/ -python3-sip: -python3-sip: -python3-sip: 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 -# Copyright 2017-2019 Benjamin Trigona-Harany -# 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 - (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 - #include - -+/* 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 \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 -# 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 -# 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 -# 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/ruby/rubygem-bundler/README b/ruby/rubygem-bundler/README deleted file mode 100644 index f136d1c317..0000000000 --- a/ruby/rubygem-bundler/README +++ /dev/null @@ -1,6 +0,0 @@ -Bundler provides a consistent environment for Ruby projects by tracking and -installing the exact gems and versions that are needed. - -Bundler is an exit from dependency hell, and ensures that the gems you need -are present in development, staging, and production. Starting work on a -project is as simple as bundle install. diff --git a/ruby/rubygem-bundler/rubygem-bundler.SlackBuild b/ruby/rubygem-bundler/rubygem-bundler.SlackBuild deleted file mode 100644 index 864dbfb7ef..0000000000 --- a/ruby/rubygem-bundler/rubygem-bundler.SlackBuild +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/sh - -# Slackware build script for rubygem-bundler - -# Copyright 2016-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=rubygem-bundler -VERSION=${VERSION:-1.17.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -SRCNAM=bundler - -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 - -DESTDIR=$( ruby -r rbconfig -e ' -include RbConfig -printf("%s/%s/gems/%s\n", - CONFIG["libdir"], - CONFIG["RUBY_INSTALL_NAME"], - CONFIG["ruby_version"] - ) -') - -gem specification $CWD/$SRCNAM-$VERSION.gem | \ - ruby -r yaml -r rbconfig -e ' -c = RbConfig::CONFIG -path = sprintf("%s/%s/gems/%s", - c["libdir"], - c["RUBY_INSTALL_NAME"], - c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } -obj = Gem::Specification.from_yaml($stdin) -obj.dependencies.each {|dep| - if not(dep.type == :runtime) - next - end - if not(sys_gemspecs.include?(dep.name)) - $stderr.write("WARNING: #{dep.name} gem not found\n") - sleep 0.5 - end - -}' - -gem install \ - --local \ - --no-update-sources \ - --ignore-dependencies \ - --backtrace \ - --install-dir $PKG/$DESTDIR \ - --bindir $PKG/usr/bin \ - $CWD/$SRCNAM-$VERSION.gem - -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/ruby/rubygem-bundler/rubygem-bundler.info b/ruby/rubygem-bundler/rubygem-bundler.info deleted file mode 100644 index 391e93a066..0000000000 --- a/ruby/rubygem-bundler/rubygem-bundler.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="rubygem-bundler" -VERSION="1.17.3" -HOMEPAGE="https://bundler.io/" -DOWNLOAD="https://rubygems.org/downloads/bundler-1.17.3.gem" -MD5SUM="492daae203ca93d8783a57e7b63daea4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/ruby/rubygem-bundler/slack-desc b/ruby/rubygem-bundler/slack-desc deleted file mode 100644 index d9e2bacf47..0000000000 --- a/ruby/rubygem-bundler/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------------------------------------------------------| -rubygem-bundler: rubygem-bundler (Manage gem dependencies) -rubygem-bundler: -rubygem-bundler: Bundler provides a consistent environment for Ruby projects by -rubygem-bundler: tracking and installing the exact gems and versions that are needed. -rubygem-bundler: Bundler is an exit from dependency hell, and ensures that the gems -rubygem-bundler: you need are present in development, staging, and production. -rubygem-bundler: Starting work on a project is as simple as bundle install. -rubygem-bundler: -rubygem-bundler: Homepage: https://bundler.io/ -rubygem-bundler: -rubygem-bundler: diff --git a/system/acpi_call/acpi_call.SlackBuild b/system/acpi_call/acpi_call.SlackBuild index cbba19ee17..61e7be7220 100644 --- a/system/acpi_call/acpi_call.SlackBuild +++ b/system/acpi_call/acpi_call.SlackBuild @@ -67,6 +67,9 @@ find -L . \ patch -p0 < $CWD/fix-acpi-include.patch patch -p0 < $CWD/fix-5.x-kernel.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/afpfs-ng/afpfs-ng.SlackBuild b/system/afpfs-ng/afpfs-ng.SlackBuild index 99ca7c533a..0f2b3ee3c9 100644 --- a/system/afpfs-ng/afpfs-ng.SlackBuild +++ b/system/afpfs-ng/afpfs-ng.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 -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/aterm/aterm.SlackBuild b/system/aterm/aterm.SlackBuild index 9e8240abca..833033ab0e 100644 --- a/system/aterm/aterm.SlackBuild +++ b/system/aterm/aterm.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%%%;s%I_PUSH,%TIOCPKT,%' src/command.c + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/audit/audit.SlackBuild b/system/audit/audit.SlackBuild index c18f98a8b8..891db20302 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:-3.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -81,6 +81,9 @@ CFLAGS="$SLKCFLAGS" \ --program-suffix= \ --sbindir=/sbin \ --enable-static=no \ + --enable-systemd=no \ + --with-libcap-ng=yes \ + --enable-gssapi-krb5=yes \ --build=$ARCH-slackware-linux make @@ -89,21 +92,15 @@ make 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 -# audispd must be 0750 to run -chmod 0750 $PKG/sbin/audispd - mkdir -p $PKG/etc/rc.d mv $PKG/etc/sysconfig/auditd $PKG/etc/rc.d/rc.auditd.conf.new mv $PKG/etc/rc.d/init.d/auditd $PKG/etc/rc.d/rc.auditd.new rm -rf $PKG/etc/rc.d/init.d $PKG/etc/sysconfig -# Change config files to .new: -for i in $(find $PKG/etc -type f -name "*.rules" -o -name "*.conf") ; do mv $i $i.new; done - 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 @@ -115,7 +112,14 @@ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc + cat $CWD/doinst.sh > $PKG/install/doinst.sh +# Change config files to .new: +( cd $PKG + for i in $(find etc -type f -name "*.rules" -o -name "*.conf") ; do + mv $i $i.new + echo "config $i.new" >> $PKG/install/doinst.sh + done ) cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/audit/audit.info b/system/audit/audit.info index 809f0561eb..99fa5168ad 100644 --- a/system/audit/audit.info +++ b/system/audit/audit.info @@ -1,8 +1,8 @@ PRGNAM="audit" -VERSION="2.3.6" +VERSION="3.0.1" 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-3.0.1.tar.gz" +MD5SUM="6a3cfa0dcccb98a85685029236528177" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/audit/doinst.sh b/system/audit/doinst.sh index 779bb9aa32..b6622d7fb3 100644 --- a/system/audit/doinst.sh +++ b/system/audit/doinst.sh @@ -23,14 +23,4 @@ preserve_perms() { } preserve_perms etc/rc.d/rc.auditd.new -preserve_perms etc/rc.d/rc.auditd.conf.new -config etc/audit/rules.d/audit.rules.new -config etc/audit/auditd.conf.new -config etc/audisp/audispd.conf.new -config etc/audisp/zos-remote.conf.new -config etc/audisp/plugins.d/af_unix.conf.new -config etc/audisp/plugins.d/au-remote.conf.new -config etc/audisp/plugins.d/audispd-zos-remote.conf.new -config etc/audisp/plugins.d/syslog.conf.new -config etc/audisp/audisp-remote.conf.new -config etc/libaudit.conf.new +config etc/rc.d/rc.auditd.conf.new 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/busybox/5-busybox-dot-config.1.32.x b/system/busybox/5-busybox-dot-config.1.32.x new file mode 100644 index 0000000000..a9403d63d5 --- /dev/null +++ b/system/busybox/5-busybox-dot-config.1.32.x @@ -0,0 +1,1198 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.32.1 +# Sun Jan 3 01:47:48 2021 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Settings +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +# CONFIG_FEDORA_COMPAT is not set +CONFIG_INCLUDE_SUSv2=y +CONFIG_LONG_OPTS=y +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +CONFIG_LFS=y +# CONFIG_PAM is not set +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set +CONFIG_FEATURE_PIDFILE=y +CONFIG_PID_FILE_PATH="/run" +CONFIG_BUSYBOX=y +# CONFIG_FEATURE_SHOW_SCRIPT is not set +CONFIG_FEATURE_INSTALLER=y +# CONFIG_INSTALL_NO_USR is not set +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +CONFIG_FEATURE_PREFER_APPLETS=y +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SYSLOG_INFO=y +CONFIG_FEATURE_SYSLOG=y +CONFIG_PLATFORM_LINUX=y + +# +# Build Options +# +CONFIG_STATIC=y +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_SYSROOT="" +CONFIG_EXTRA_CFLAGS="" +CONFIG_EXTRA_LDFLAGS="" +CONFIG_EXTRA_LDLIBS="" +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_STACK_OPTIMIZATION_386=y + +# +# Installation Options ("make install" behavior) +# +# CONFIG_INSTALL_APPLET_SYMLINKS is not set +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +CONFIG_INSTALL_APPLET_DONT=y +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_DEBUG_SANITIZE is not set +# CONFIG_UNIT_TEST is not set +# CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# +# Library Tuning +# +# CONFIG_FEATURE_USE_BSS_TAIL is not set +CONFIG_FLOAT_DURATION=y +CONFIG_FEATURE_RTMINMAX=y +CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SMALL=1 +CONFIG_SHA3_SMALL=0 +CONFIG_FEATURE_FAST_TOP=y +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_EDITING_VI=y +CONFIG_FEATURE_EDITING_HISTORY=255 +CONFIG_FEATURE_EDITING_SAVEHISTORY=y +CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y +CONFIG_FEATURE_REVERSE_SEARCH=y +CONFIG_FEATURE_TAB_COMPLETION=y +CONFIG_FEATURE_USERNAME_COMPLETION=y +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_WINCH=y +# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_UNICODE_SUPPORT=y +CONFIG_UNICODE_USING_LOCALE=y +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_FEATURE_NON_POSIX_CP is not set +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_USE_SENDFILE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_FEATURE_SKIP_ROOTFS=y +# CONFIG_MONOTONIC_SYSCALL is not set +CONFIG_IOCTL_HEX2STR_ERROR=y +CONFIG_FEATURE_HWIB=y + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_XZ=y +CONFIG_FEATURE_SEAMLESS_LZMA=y +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +CONFIG_FEATURE_AR_CREATE=y +CONFIG_UNCOMPRESS=y +CONFIG_GUNZIP=y +CONFIG_ZCAT=y +CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y +CONFIG_BUNZIP2=y +CONFIG_BZCAT=y +CONFIG_UNLZMA=y +CONFIG_LZCAT=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZCAT=y +CONFIG_XZ=y +CONFIG_BZIP2=y +CONFIG_BZIP2_SMALL=8 +CONFIG_FEATURE_BZIP2_DECOMPRESS=y +CONFIG_CPIO=y +CONFIG_FEATURE_CPIO_O=y +# CONFIG_FEATURE_CPIO_P is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +CONFIG_GZIP=y +# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set +CONFIG_GZIP_FAST=0 +CONFIG_FEATURE_GZIP_LEVELS=y +CONFIG_FEATURE_GZIP_DECOMPRESS=y +# CONFIG_LZOP is not set +CONFIG_UNLZOP=y +CONFIG_LZOPCAT=y +# CONFIG_LZOP_COMPR_HIGH is not set +# CONFIG_RPM is not set +CONFIG_RPM2CPIO=y +CONFIG_TAR=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_TO_COMMAND=y +CONFIG_FEATURE_TAR_UNAME_GNAME=y +# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set +# CONFIG_FEATURE_TAR_SELINUX is not set +CONFIG_UNZIP=y +CONFIG_FEATURE_UNZIP_CDF=y +CONFIG_FEATURE_UNZIP_BZIP2=y +CONFIG_FEATURE_UNZIP_LZMA=y +CONFIG_FEATURE_UNZIP_XZ=y +CONFIG_FEATURE_LZMA_FAST=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_FEATURE_CATN=y +CONFIG_FEATURE_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_FEATURE_CP_REFLINK=y +CONFIG_CUT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +CONFIG_FEATURE_DATE_COMPAT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_FEATURE_DD_STATUS=y +CONFIG_DF=y +CONFIG_FEATURE_DF_FANCY=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_EXPAND=y +CONFIG_UNEXPAND=y +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FACTOR=y +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_GROUPS=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LINK=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_WIDTH=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y +CONFIG_MKDIR=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MKTEMP=y +CONFIG_MV=y +CONFIG_NICE=y +CONFIG_NL=y +CONFIG_NOHUP=y +CONFIG_NPROC=y +CONFIG_OD=y +CONFIG_PASTE=y +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +CONFIG_SHRED=y +CONFIG_SHUF=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_FEATURE_STAT_FILESYSTEM=y +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_FEATURE_SYNC_FANCY=y +CONFIG_FSYNC=y +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TEST=y +CONFIG_TEST1=y +CONFIG_TEST2=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TIMEOUT=y +CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_NODEREF=y +CONFIG_FEATURE_TOUCH_SUSV3=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_TRUE=y +CONFIG_TRUNCATE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNAME_OSNAME="GNU/Linux" +CONFIG_BB_ARCH=y +CONFIG_UNIQ=y +CONFIG_UNLINK=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_BASE64=y +CONFIG_UUENCODE=y +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +# CONFIG_WHO is not set +# CONFIG_W is not set +# CONFIG_USERS is not set +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options +# +CONFIG_FEATURE_VERBOSE=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_FGCONSOLE=y +CONFIG_KBD_MODE=y +CONFIG_LOADFONT=y +CONFIG_SETFONT=y +# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set +CONFIG_DEFAULT_SETFONT_DIR="" + +# +# Common options for loadfont and setfont +# +CONFIG_FEATURE_LOADFONT_PSF2=y +CONFIG_FEATURE_LOADFONT_RAW=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y +CONFIG_SETCONSOLE=y +CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +CONFIG_SHOWKEY=y + +# +# Debian Utilities +# +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +CONFIG_FEATURE_RUN_PARTS_FANCY=y +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_WHICH=y + +# +# klibc-utils +# +# CONFIG_MINIPS is not set +# CONFIG_NUKE is not set +CONFIG_RESUME=y +CONFIG_RUN_INIT=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=4096 +# CONFIG_FEATURE_VI_8BIT is not set +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_UNDO=y +CONFIG_FEATURE_VI_UNDO_QUEUE=y +CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_EXECUTABLE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_EXEC_PLUS=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +CONFIG_FEATURE_FIND_QUIT=y +CONFIG_FEATURE_FIND_DELETE=y +CONFIG_FEATURE_FIND_EMPTY=y +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_FEATURE_FIND_LINKS=y +CONFIG_GREP=y +CONFIG_EGREP=y +CONFIG_FGREP=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y +CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y +CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y +CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y + +# +# Init Utilities +# +CONFIG_BOOTCHARTD=y +CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y +CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y +CONFIG_HALT=y +CONFIG_POWEROFF=y +CONFIG_REBOOT=y +# CONFIG_FEATURE_WAIT_FOR_INIT is not set +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +CONFIG_INIT=y +CONFIG_LINUXRC=y +CONFIG_FEATURE_USE_INITTAB=y +# CONFIG_FEATURE_KILL_REMOVED is not set +CONFIG_FEATURE_KILL_DELAY=0 +CONFIG_FEATURE_INIT_SCTTY=y +# CONFIG_FEATURE_INIT_SYSLOG is not set +CONFIG_FEATURE_INIT_QUIET=y +CONFIG_FEATURE_INIT_COREDUMPS=y +CONFIG_INIT_TERMINAL_TYPE="linux" +CONFIG_FEATURE_INIT_MODIFY_CMDLINE=y + +# +# Login/Password Management Utilities +# +CONFIG_FEATURE_SHADOWPASSWDS=y +CONFIG_USE_BB_PWD_GRP=y +CONFIG_USE_BB_SHADOW=y +CONFIG_USE_BB_CRYPT=y +CONFIG_USE_BB_CRYPT_SHA=y +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_ADDUSER=y +CONFIG_FEATURE_CHECK_NAMES=y +CONFIG_LAST_ID=60000 +CONFIG_FIRST_SYSTEM_ID=100 +CONFIG_LAST_SYSTEM_ID=999 +CONFIG_CHPASSWD=y +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des" +CONFIG_CRYPTPW=y +CONFIG_MKPASSWD=y +CONFIG_DELUSER=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_GETTY=y +CONFIG_LOGIN=y +# CONFIG_LOGIN_SESSION_AS_CHILD is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +# CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set +CONFIG_SULOGIN=y +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +CONFIG_LSATTR=y +CONFIG_TUNE2FS=y + +# +# Linux Module Utilities +# +CONFIG_MODPROBE_SMALL=y +CONFIG_DEPMOD=y +CONFIG_INSMOD=y +CONFIG_LSMOD=y +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_MODINFO=y +CONFIG_MODPROBE=y +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +CONFIG_RMMOD=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y +CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y +# CONFIG_FEATURE_2_4_MODULES is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" + +# +# Linux System Utilities +# +CONFIG_ACPID=y +CONFIG_FEATURE_ACPID_COMPAT=y +CONFIG_BLKDISCARD=y +CONFIG_BLKID=y +CONFIG_FEATURE_BLKID_TYPE=y +CONFIG_BLOCKDEV=y +CONFIG_CAL=y +CONFIG_CHRT=y +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_EJECT=y +CONFIG_FEATURE_EJECT_SCSI=y +CONFIG_FALLOCATE=y +CONFIG_FATATTR=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +CONFIG_FEATURE_GPT_LABEL=y +CONFIG_FEATURE_FDISK_ADVANCED=y +CONFIG_FINDFS=y +CONFIG_FLOCK=y +CONFIG_FDFLUSH=y +CONFIG_FREERAMDISK=y +CONFIG_FSCK_MINIX=y +CONFIG_FSFREEZE=y +CONFIG_FSTRIM=y +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y +CONFIG_XXD=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +CONFIG_IONICE=y +CONFIG_IPCRM=y +CONFIG_IPCS=y +# CONFIG_LAST is not set +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_LOSETUP=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_FEATURE_MDEV_DAEMON=y +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y +CONFIG_MKE2FS=y +CONFIG_MKFS_EXT2=y +CONFIG_MKFS_MINIX=y +CONFIG_FEATURE_MINIX2=y +# CONFIG_MKFS_REISER is not set +CONFIG_MKDOSFS=y +CONFIG_MKFS_VFAT=y +CONFIG_MKSWAP=y +CONFIG_FEATURE_MKSWAP_UUID=y +CONFIG_MORE=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +CONFIG_FEATURE_MOUNT_VERBOSE=y +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +# CONFIG_FEATURE_MOUNT_NFS is not set +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_FEATURE_MOUNT_OTHERTAB=y +CONFIG_MOUNTPOINT=y +# CONFIG_NOLOGIN is not set +# CONFIG_NOLOGIN_DEPENDENCIES is not set +CONFIG_NSENTER=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +CONFIG_RDEV=y +CONFIG_READPROFILE=y +CONFIG_RENICE=y +CONFIG_REV=y +CONFIG_RTCWAKE=y +CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y +CONFIG_SETARCH=y +CONFIG_LINUX32=y +CONFIG_LINUX64=y +CONFIG_SETPRIV=y +CONFIG_FEATURE_SETPRIV_DUMP=y +CONFIG_FEATURE_SETPRIV_CAPABILITIES=y +CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES=y +CONFIG_SETSID=y +CONFIG_SWAPON=y +CONFIG_FEATURE_SWAPON_DISCARD=y +CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWAPOFF=y +CONFIG_FEATURE_SWAPONOFF_LABEL=y +CONFIG_SWITCH_ROOT=y +CONFIG_TASKSET=y +CONFIG_FEATURE_TASKSET_FANCY=y +CONFIG_FEATURE_TASKSET_CPULIST=y +CONFIG_UEVENT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y +CONFIG_UNSHARE=y +# CONFIG_WALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_BCACHE=y +CONFIG_FEATURE_VOLUMEID_BTRFS=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_EXFAT=y +CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_F2FS=y +CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y +CONFIG_FEATURE_VOLUMEID_JFS=y +# CONFIG_FEATURE_VOLUMEID_LFS is not set +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_MINIX=y +CONFIG_FEATURE_VOLUMEID_NILFS=y +CONFIG_FEATURE_VOLUMEID_NTFS=y +CONFIG_FEATURE_VOLUMEID_OCFS2=y +CONFIG_FEATURE_VOLUMEID_REISERFS=y +CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SQUASHFS=y +CONFIG_FEATURE_VOLUMEID_SYSV=y +CONFIG_FEATURE_VOLUMEID_UBIFS=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_XFS=y + +# +# Miscellaneous Utilities +# +CONFIG_ADJTIMEX=y +CONFIG_BBCONFIG=y +CONFIG_FEATURE_COMPRESS_BBCONFIG=y +CONFIG_BC=y +CONFIG_DC=y +CONFIG_FEATURE_DC_BIG=y +# CONFIG_FEATURE_DC_LIBM is not set +CONFIG_FEATURE_BC_INTERACTIVE=y +CONFIG_FEATURE_BC_LONG_OPTIONS=y +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 +CONFIG_CHAT=y +CONFIG_FEATURE_CHAT_NOFAIL=y +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +CONFIG_FEATURE_CHAT_IMPLICIT_CR=y +# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set +# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set +# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set +# CONFIG_FEATURE_CHAT_CLR_ABORT is not set +# CONFIG_CONSPY is not set +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +CONFIG_FEATURE_CROND_CALL_SENDMAIL=y +CONFIG_FEATURE_CROND_SPECIAL_TIMES=y +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_CRONTAB=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_DEVMEM is not set +CONFIG_FBSPLASH=y +# CONFIG_FLASH_ERASEALL is not set +# CONFIG_FLASH_LOCK is not set +# CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASHCP is not set +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_HEXEDIT=y +CONFIG_I2CGET=y +CONFIG_I2CSET=y +CONFIG_I2CDUMP=y +CONFIG_I2CDETECT=y +CONFIG_I2CTRANSFER=y +CONFIG_INOTIFYD=y +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_TRUNCATE=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_FEATURE_LESS_WINCH=y +CONFIG_FEATURE_LESS_ASK_TERMINAL=y +CONFIG_FEATURE_LESS_DASHCMD=y +CONFIG_FEATURE_LESS_LINENUMS=y +CONFIG_FEATURE_LESS_RAW=y +CONFIG_FEATURE_LESS_ENV=y +CONFIG_LSSCSI=y +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +CONFIG_MAN=y +CONFIG_MICROCOM=y +# CONFIG_MIM is not set +CONFIG_MT=y +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +CONFIG_PARTPROBE=y +CONFIG_RAIDAUTORUN=y +CONFIG_READAHEAD=y +CONFIG_RFKILL=y +# CONFIG_RUNLEVEL is not set +CONFIG_RX=y +CONFIG_SETFATTR=y +CONFIG_SETSERIAL=y +CONFIG_STRINGS=y +CONFIG_TIME=y +CONFIG_TS=y +CONFIG_TTYSIZE=y +CONFIG_UBIATTACH=y +CONFIG_UBIDETACH=y +CONFIG_UBIMKVOL=y +CONFIG_UBIRMVOL=y +CONFIG_UBIRSVOL=y +CONFIG_UBIUPDATEVOL=y +CONFIG_UBIRENAME=y +CONFIG_VOLNAME=y +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +CONFIG_FEATURE_UNIX_LOCAL=y +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_FEATURE_TLS_SHA1 is not set +CONFIG_ARP=y +CONFIG_ARPING=y +CONFIG_BRCTL=y +CONFIG_FEATURE_BRCTL_FANCY=y +CONFIG_FEATURE_BRCTL_SHOW=y +CONFIG_DNSD=y +CONFIG_ETHER_WAKE=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTPD_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FEATURE_FTPD_AUTHENTICATION=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y +CONFIG_HOSTNAME=y +CONFIG_DNSDOMAINNAME=y +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_RANGES=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y +CONFIG_FEATURE_HTTPD_PROXY=y +CONFIG_FEATURE_HTTPD_GZIP=y +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +CONFIG_FEATURE_IFCONFIG_SLIP=y +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_IFENSLAVE=y +CONFIG_IFPLUGD=y +CONFIG_IFUP=y +CONFIG_IFDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set +CONFIG_INETD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPNEIGH=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_ROUTE_DIR="y" +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_NEIGH=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y +CONFIG_FEATURE_IPCALC_FANCY=y +CONFIG_FAKEIDENTD=y +CONFIG_NAMEIF=y +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NBDCLIENT=y +CONFIG_NC=y +# CONFIG_NETCAT is not set +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +CONFIG_NC_110_COMPAT=y +CONFIG_NETSTAT=y +CONFIG_FEATURE_NETSTAT_WIDE=y +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +CONFIG_FEATURE_NSLOOKUP_BIG=y +CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y +CONFIG_NTPD=y +CONFIG_FEATURE_NTPD_SERVER=y +CONFIG_FEATURE_NTPD_CONF=y +CONFIG_FEATURE_NTP_AUTH=y +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PSCAN=y +CONFIG_ROUTE=y +CONFIG_SLATTACH=y +CONFIG_SSL_CLIENT=y +CONFIG_TC=y +CONFIG_FEATURE_TC_INGRESS=y +CONFIG_TCPSVD=y +CONFIG_UDPSVD=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_FEATURE_TELNET_WIDTH=y +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TFTP=y +# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +CONFIG_FEATURE_TFTP_HPA_COMPAT=y +CONFIG_TFTPD=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +# CONFIG_TFTP_DEBUG is not set +CONFIG_TLS=y +CONFIG_TRACEROUTE=y +CONFIG_TRACEROUTE6=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_TIMEOUT=y +# CONFIG_FEATURE_WGET_HTTPS is not set +# CONFIG_FEATURE_WGET_OPENSSL is not set +CONFIG_WHOIS=y +CONFIG_ZCIP=y +CONFIG_UDHCPD=y +CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y +CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y +CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" +CONFIG_DUMPLEASES=y +CONFIG_DHCPRELAY=y +CONFIG_UDHCPC=y +CONFIG_FEATURE_UDHCPC_ARPING=y +CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y +CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC6=y +CONFIG_FEATURE_UDHCPC6_RFC3646=y +CONFIG_FEATURE_UDHCPC6_RFC4704=y +CONFIG_FEATURE_UDHCPC6_RFC4833=y +CONFIG_FEATURE_UDHCPC6_RFC5970=y + +# +# Common options for DHCP applets +# +CONFIG_FEATURE_UDHCP_PORT=y +CONFIG_UDHCP_DEBUG=9 +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 +CONFIG_FEATURE_UDHCP_RFC3397=y +CONFIG_FEATURE_UDHCP_8021Q=y +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" + +# +# Print Utilities +# +CONFIG_LPD=y +CONFIG_LPR=y +CONFIG_LPQ=y + +# +# Mail Utilities +# +CONFIG_MAKEMIME=y +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +CONFIG_REFORMIME=y +CONFIG_FEATURE_REFORMIME_COMPAT=y +CONFIG_SENDMAIL=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_IOSTAT=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +CONFIG_LSOF=y +CONFIG_MPSTAT=y +CONFIG_NMETER=y +CONFIG_PGREP=y +CONFIG_PKILL=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +CONFIG_FEATURE_POWERTOP_INTERACTIVE=y +CONFIG_PS=y +# CONFIG_FEATURE_PS_WIDE is not set +# CONFIG_FEATURE_PS_LONG is not set +CONFIG_FEATURE_PS_TIME=y +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +CONFIG_PSTREE=y +CONFIG_PWDX=y +CONFIG_SMEMCAP=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_INTERACTIVE=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set +CONFIG_WATCH=y +CONFIG_FEATURE_SHOW_THREADS=y + +# +# Runit Utilities +# +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y +CONFIG_RUNSV=y +CONFIG_RUNSVDIR=y +# CONFIG_FEATURE_RUNSVDIR_LOG is not set +CONFIG_SV=y +CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" +CONFIG_SVC=y +CONFIG_SVOK=y +CONFIG_SVLOGD=y +# CONFIG_CHCON is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RUNCON is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SESTATUS is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_RESTORECON is not set +# CONFIG_SETSEBOOL is not set + +# +# Shells +# +CONFIG_SH_IS_ASH=y +# CONFIG_SH_IS_HUSH is not set +# CONFIG_SH_IS_NONE is not set +# CONFIG_BASH_IS_ASH is not set +# CONFIG_BASH_IS_HUSH is not set +CONFIG_BASH_IS_NONE=y +CONFIG_SHELL_ASH=y +CONFIG_ASH=y +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_INTERNAL_GLOB=y +CONFIG_ASH_BASH_COMPAT=y +CONFIG_ASH_BASH_SOURCE_CURDIR=y +CONFIG_ASH_BASH_NOT_FOUND_HOOK=y +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y +CONFIG_ASH_IDLE_TIMEOUT=y +CONFIG_ASH_MAIL=y +CONFIG_ASH_ECHO=y +CONFIG_ASH_PRINTF=y +CONFIG_ASH_TEST=y +CONFIG_ASH_HELP=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_CMDCMD=y +CONFIG_CTTYHACK=y +# CONFIG_HUSH is not set +# CONFIG_SHELL_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_LINENO_VAR is not set +# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_HUSH_ECHO is not set +# CONFIG_HUSH_PRINTF is not set +# CONFIG_HUSH_TEST is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_EXPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_READONLY is not set +# CONFIG_HUSH_KILL is not set +# CONFIG_HUSH_WAIT is not set +# CONFIG_HUSH_COMMAND is not set +# CONFIG_HUSH_TRAP is not set +# CONFIG_HUSH_TYPE is not set +# CONFIG_HUSH_TIMES is not set +# CONFIG_HUSH_READ is not set +# CONFIG_HUSH_SET is not set +# CONFIG_HUSH_UNSET is not set +# CONFIG_HUSH_ULIMIT is not set +# CONFIG_HUSH_UMASK is not set +# CONFIG_HUSH_GETOPTS is not set +# CONFIG_HUSH_MEMLEAK is not set + +# +# Options common to all shells +# +CONFIG_FEATURE_SH_MATH=y +CONFIG_FEATURE_SH_MATH_64=y +CONFIG_FEATURE_SH_MATH_BASE=y +CONFIG_FEATURE_SH_EXTRA_QUIET=y +CONFIG_FEATURE_SH_STANDALONE=y +# CONFIG_FEATURE_SH_NOFORK is not set +CONFIG_FEATURE_SH_READ_FRAC=y +CONFIG_FEATURE_SH_HISTFILESIZE=y +# CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set + +# +# System Logging Utilities +# +CONFIG_KLOGD=y + +# +# klogd should not be used together with syslog to kernel printk buffer +# +CONFIG_FEATURE_KLOGD_KLOGCTL=y +CONFIG_LOGGER=y +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_SYSLOGD_DUP=y +CONFIG_FEATURE_SYSLOGD_CFG=y +CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS=y +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_FEATURE_KMSG_SYSLOG=y diff --git a/system/busybox/busybox.SlackBuild b/system/busybox/busybox.SlackBuild index f3653f94be..be0893eada 100644 --- a/system/busybox/busybox.SlackBuild +++ b/system/busybox/busybox.SlackBuild @@ -23,10 +23,10 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=busybox -VERSION=${VERSION:-1.28.1} +VERSION=${VERSION:-1.32.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -K_CONFIG=${K_CONFIG:-4} # set to 2 for kernel 2.*.* +K_CONFIG=${K_CONFIG:-5} # set to 2 for kernel 2.*.* if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/system/busybox/busybox.info b/system/busybox/busybox.info index f1ea50d6c3..11427bcb77 100644 --- a/system/busybox/busybox.info +++ b/system/busybox/busybox.info @@ -1,8 +1,8 @@ PRGNAM="busybox" -VERSION="1.28.1" +VERSION="1.32.1" HOMEPAGE="https://www.busybox.net/" -DOWNLOAD="https://www.busybox.net/downloads/busybox-1.28.1.tar.bz2" -MD5SUM="928919a21e34d5c5507d872a4fb7b9f4" +DOWNLOAD="https://www.busybox.net/downloads/busybox-1.32.1.tar.bz2" +MD5SUM="6273c550ab6a32e8ff545e00e831efc5" 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/cdrkit/cdrkit-1.1.11-gcc10.patch b/system/cdrkit/cdrkit-1.1.11-gcc10.patch new file mode 100644 index 0000000000..99f0c106d5 --- /dev/null +++ b/system/cdrkit/cdrkit-1.1.11-gcc10.patch @@ -0,0 +1,12 @@ +diff -up cdrkit-1.1.11/genisoimage/genisoimage.h.me cdrkit-1.1.11/genisoimage/genisoimage.h +--- cdrkit-1.1.11/genisoimage/genisoimage.h.me 2020-02-24 15:10:35.542998992 +0100 ++++ cdrkit-1.1.11/genisoimage/genisoimage.h 2020-02-24 15:10:50.011130450 +0100 +@@ -377,7 +377,7 @@ extern int use_fileversion; + extern int split_SL_component; + extern int split_SL_field; + extern char *trans_tbl; +-char *outfile; ++extern char *outfile; + + #define JMAX 64 /* maximum Joliet file name length (spec) */ + #define JLONGMAX 103 /* out of spec Joliet file name length */ diff --git a/system/cdrkit/cdrkit.SlackBuild b/system/cdrkit/cdrkit.SlackBuild index f778f25ff2..a5c211b649 100644 --- a/system/cdrkit/cdrkit.SlackBuild +++ b/system/cdrkit/cdrkit.SlackBuild @@ -67,6 +67,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/cdrkit-1.1.11-gcc10.patch + # Make Makefile prefix cmake -DCMAKE_INSTALL_PREFIX=/usr diff --git a/system/cldr-emoji-annotation/README b/system/cldr-emoji-annotation/README deleted file mode 100644 index 48228e21c3..0000000000 --- a/system/cldr-emoji-annotation/README +++ /dev/null @@ -1,4 +0,0 @@ -This package consists of CLDR annotation files -from http://www.unicode.org/ - -Based on https://github.com/fujiwarat/cldr-emoji-annotation diff --git a/system/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild b/system/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild deleted file mode 100644 index 0f548cdfba..0000000000 --- a/system/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -# Slackware build script for cldr-emoji-annotation - -# Copyright 2017 Ozan Türkyılmaz, 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=cldr-emoji-annotation -VERSION=${VERSION:-31.0.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 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 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/system/cldr-emoji-annotation/cldr-emoji-annotation.info b/system/cldr-emoji-annotation/cldr-emoji-annotation.info deleted file mode 100644 index 3cfd3754da..0000000000 --- a/system/cldr-emoji-annotation/cldr-emoji-annotation.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="cldr-emoji-annotation" -VERSION="31.0.1_1" -HOMEPAGE="https://github.com/fujiwarat/cldr-emoji-annotation/" -DOWNLOAD="https://github.com/fujiwarat/cldr-emoji-annotation/releases/download/31.0.1_1/cldr-emoji-annotation-31.0.1_1.tar.gz" -MD5SUM="1aac931f38e25518ec2602745037953f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Ozan Türkyılmaz" -EMAIL="Ozan.Turkyilmaz@gmail.com" diff --git a/system/cldr-emoji-annotation/slack-desc b/system/cldr-emoji-annotation/slack-desc deleted file mode 100644 index a00211bff9..0000000000 --- a/system/cldr-emoji-annotation/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------------------------------------------------------| -cldr-emoji-annotation: cldr-emoji-annotation (CLDR annotation files) -cldr-emoji-annotation: -cldr-emoji-annotation: This package consists of CLDR annotation files from -cldr-emoji-annotation: http://www.unicode.org/ -cldr-emoji-annotation: -cldr-emoji-annotation: Based on -cldr-emoji-annotation: https://github.com/fujiwarat/cldr-emoji-annotation -cldr-emoji-annotation: -cldr-emoji-annotation: -cldr-emoji-annotation: -cldr-emoji-annotation: 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 + #include + #include ++#include + #include + + #include 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/cpulimit/cpulimit.SlackBuild b/system/cpulimit/cpulimit.SlackBuild index 11e58b12ed..949c11b71b 100644 --- a/system/cpulimit/cpulimit.SlackBuild +++ b/system/cpulimit/cpulimit.SlackBuild @@ -52,6 +52,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/opsengine/cpulimit/issues/96#issuecomment-748001523 +patch -p1 < $CWD/glibc-2.32.patch + make mkdir -p $PKG/usr/bin diff --git a/system/cpulimit/glibc-2.32.patch b/system/cpulimit/glibc-2.32.patch new file mode 100644 index 0000000000..26eeadd4e2 --- /dev/null +++ b/system/cpulimit/glibc-2.32.patch @@ -0,0 +1,19 @@ +diff -Naur cpulimit-0.2.orig/src/cpulimit.c cpulimit-0.2/src/cpulimit.c +--- cpulimit-0.2.orig/src/cpulimit.c 2015-06-17 08:46:59.000000000 +0200 ++++ cpulimit-0.2/src/cpulimit.c 2021-01-23 11:01:12.298033000 +0100 +@@ -38,12 +38,14 @@ + #include + #include + #include ++#ifdef __APPLE__ + #include ++#endif + #include + #include + #include + +-#ifdef __APPLE__ || __FREEBSD__ ++#if defined(__APPLE__) || defined(__FREEBSD__) + #include + #endif + 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/dislocker/dislocker.SlackBuild b/system/dislocker/dislocker.SlackBuild index 1b3a653ec8..e8c24214d2 100644 --- a/system/dislocker/dislocker.SlackBuild +++ b/system/dislocker/dislocker.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for dislocker -# Copyright 2018 Leonardo Citrolo, Italy +# Copyright 2018-2020 Leonardo Citrolo, Italy # 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=dislocker -VERSION=${VERSION:-0.7.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.7.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/system/dislocker/dislocker.info b/system/dislocker/dislocker.info index 585be4f1ab..ed5b9bfa5a 100644 --- a/system/dislocker/dislocker.info +++ b/system/dislocker/dislocker.info @@ -1,8 +1,8 @@ PRGNAM="dislocker" -VERSION="0.7.1" +VERSION="0.7.3" HOMEPAGE="https://github.com/Aorimn/dislocker" -DOWNLOAD="https://github.com/Aorimn/dislocker/archive/v0.7.1/dislocker-0.7.1.tar.gz" -MD5SUM="df1454a1631d6c171d2d01610f83b344" +DOWNLOAD="https://github.com/Aorimn/dislocker/archive/v0.7.3/dislocker-0.7.3.tar.gz" +MD5SUM="ff1a5a0120cedf04c6146da91dfbd27c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="mbedtls" diff --git a/system/dosbox-x/doinst.sh b/system/dosbox-x/doinst.sh new file mode 100644 index 0000000000..65c7e2eeb9 --- /dev/null +++ b/system/dosbox-x/doinst.sh @@ -0,0 +1,9 @@ +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/system/dosbox-x/dosbox-x.SlackBuild b/system/dosbox-x/dosbox-x.SlackBuild index 5a04069ac3..91e9d5bb8d 100644 --- a/system/dosbox-x/dosbox-x.SlackBuild +++ b/system/dosbox-x/dosbox-x.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=dosbox-x -VERSION=${VERSION:-0.83.2} +VERSION=${VERSION:-0.83.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -90,13 +90,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS CHANGELOG CODE_OF_CONDUCT.md CONTRIBUTING.md COPYING \ - "DOS GAMES THAT NEED A HIGHER MCB BASE SEGMENT.TXT" INSTALL NEWS \ + CREDITS.md INSTALL.md NEWS PULL_REQUEST_TEMPLATE.md \ 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/system/dosbox-x/dosbox-x.info b/system/dosbox-x/dosbox-x.info index 0b95690601..712808f4b9 100644 --- a/system/dosbox-x/dosbox-x.info +++ b/system/dosbox-x/dosbox-x.info @@ -1,10 +1,10 @@ PRGNAM="dosbox-x" -VERSION="0.83.2" +VERSION="0.83.8" HOMEPAGE="http://dosbox-x.com/" -DOWNLOAD="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v0.83.2/dosbox-x-dosbox-x-v0.83.2.tar.gz" -MD5SUM="3da8a408deaf9518da1423dff8021f53" +DOWNLOAD="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v0.83.8/dosbox-x-dosbox-x-v0.83.8.tar.gz" +MD5SUM="f7f7f28e520dbdd94f13031a058260af" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="SDL2" +REQUIRES="" MAINTAINER="Leo C." EMAIL="leoc@gmx.com" 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 + #include ++#include + #include + #include + #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 + #include ++#include + #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 + #include ++#include + #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 cfc322e817..0000000000 --- a/system/f2fs_tools/f2fs_tools.SlackBuild +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh -# Slackware build script for -# -# Michales (clavisound) Michaloudes korgie@gmail.com <2014> - -PRGNAM=f2fs_tools -SRCNAM=f2fs-tools -VERSION=${VERSION:-1.14.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 $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 d3c8afa5b2..0000000000 --- a/system/f2fs_tools/f2fs_tools.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="f2fs_tools" -VERSION="1.14.0" -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.14.0.tar.gz" -MD5SUM="b8be45bb2903d9c89d33f3dda630f7b9" -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/fsv/fsv.SlackBuild b/system/fsv/fsv.SlackBuild index ec5a93c0a2..eb8d37f282 100644 --- a/system/fsv/fsv.SlackBuild +++ b/system/fsv/fsv.SlackBuild @@ -71,7 +71,9 @@ sed -i \ -e 's/netscape -no-.* > /firefox %s > /' \ src/dialog.c -autoreconf -if +# thanks AUR! +sed -i 's/@DATADIRNAME@/share/' po/Makefile.in.in +./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/system/fuse3/README b/system/fuse3/README deleted file mode 100644 index fedc4c62b9..0000000000 --- a/system/fuse3/README +++ /dev/null @@ -1,15 +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. - -The package can optionally install extensive developer documentation. If this -is needed, run the SlackBuild like this: - -FUSE3_DEVDOCS=yes ./fuse3.SlackBuild diff --git a/system/fuse3/fuse3.SlackBuild b/system/fuse3/fuse3.SlackBuild deleted file mode 100644 index da4fbda772..0000000000 --- a/system/fuse3/fuse3.SlackBuild +++ /dev/null @@ -1,106 +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.10.1} -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 - -FUSE3_DEVDOCS=${FUSE3_DEVDOCS:-no} - -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 -if [ "$FUSE3_DEVDOCS" = "yes" ]; then - cp -a doc/ example/ $PKG/usr/doc/$PRGNAM-$VERSION -fi - -cp -a \ - README.md LICENSE LGPL2.txt GPL2.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/system/fuse3/fuse3.info b/system/fuse3/fuse3.info deleted file mode 100644 index 25599ccf6a..0000000000 --- a/system/fuse3/fuse3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fuse3" -VERSION="3.10.1" -HOMEPAGE="https://github.com/libfuse/libfuse" -DOWNLOAD="https://github.com/libfuse/libfuse/releases/download/fuse-3.10.1/fuse-3.10.1.tar.xz" -MD5SUM="e973012119e98b048307558271b5b296" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="meson" -MAINTAINER="Vincent Batts" -EMAIL="vbatts@hashbangbash.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-disk-utility/gnome-disk-utility.SlackBuild b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild index 749e3b038c..4e8d87e249 100644 --- a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild +++ b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gnome-disk-utility -# Copyright 2015 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2015,2021 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=gnome-disk-utility -VERSION=${VERSION:-3.6.1} +VERSION=${VERSION:-3.38.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 @@ -72,21 +72,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 \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --disable-schemas-compile \ - --disable-libsystemd-login - -make -make install DESTDIR=$PKG + --buildtype=release \ + -Dlogind=libelogind \ + -Dgsd_plugin=false \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +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 @@ -95,7 +103,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 NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING HACKING NEWS README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/gnome-disk-utility/gnome-disk-utility.info b/system/gnome-disk-utility/gnome-disk-utility.info index cbed34abc3..daa528a455 100644 --- a/system/gnome-disk-utility/gnome-disk-utility.info +++ b/system/gnome-disk-utility/gnome-disk-utility.info @@ -1,8 +1,8 @@ PRGNAM="gnome-disk-utility" -VERSION="3.6.1" +VERSION="3.38.1" HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility/" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gnome-disk-utility/3.6/gnome-disk-utility-3.6.1.tar.xz" -MD5SUM="ff6e0a50a3a6aa9a8d9aa8b19d304485" +DOWNLOAD="https://download.gnome.org/sources/gnome-disk-utility/3.38/gnome-disk-utility-3.38.1.tar.xz" +MD5SUM="6e18fc9c6a50d120fd2c87c634382f03" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libpwquality" 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 , Pisa, Italy +# Copyright 2012-2020 Matteo Bernardini , 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 -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 +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 -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 +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 +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 +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 ++ + typedef void (* PreferencesGuiChangeCallback) (gboolean, gboolean); + + void preferences_gui_set_csr_visible_callback (PreferencesGuiChangeCallback callback); +@@ -43,10 +45,8 @@ + void preferences_deinit (void); + + +-#include +-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 +-#include + + + #include "preferences-gui.h" +@@ -26,7 +25,7 @@ + #include + + +-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 +-#include ++#include + + #include + + #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 @@ +- +- +- +- /schemas/apps/gnomint/size +- /apps/gnomint/size +- gnomint +- string +- (500,400) +- +- Window size The (width,length) size +- gnoMint should take when started. This cannot be smaller than +- (320,200). +- +- +- +- +- +- /schemas/apps/gnomint/revoked_visible +- /apps/gnomint/revoked_visible +- gnomint +- bool +- 0 +- +- Revoked certificates visibility +- Whether the revoked certificates should be visible. +- +- +- +- +- +- /schemas/apps/gnomint/crq_visible +- /apps/gnomint/crq_visible +- gnomint +- bool +- 1 +- +- Certificate requests visibility +- Whether the certificate requests should be visible. +- +- +- +- +- +- /schemas/apps/gnomint/gnome_keyring_export +- /apps/gnomint/gnome_keyring_export +- gnomint +- bool +- 1 +- +- Automatic exporting of certificates for gnome-keyring +- Whether the created or imported certificates are +- automatically exported to gnome-keyring certificate-store. +- +- +- +- +- +- +--- /dev/null ++++ gnomint-1.3.0/gconf/net.sf.gnomint.gschema.xml +@@ -0,0 +1,30 @@ ++ ++ ++ ++ '(500,400)' ++ Window size ++ The (width,length) size gnoMint should take when ++ started. This cannot be smaller than (320,200). ++ ++ ++ false ++ Revoked certificates visibility ++ Whether the revoked certificates should be ++ visible. ++ ++ ++ true ++ Certificate requests visibility ++ Whether the certificate requests should be ++ visible. ++ ++ ++ true ++ Automatic exporting of certificates for ++ gnome-keyring ++ Whether the created or imported certificates are ++ automatically exported to gnome-keyring ++ certificate-store. ++ ++ ++ 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 +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 +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 +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 +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 @@ +- ++ ++ + +- +- ++ + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + gtk-properties + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Shows the certificate properties window + Shows the certificate properties window + True + True +- ++ + + + + + True ++ False + + + + + E_xport + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Exports the certificate so it can be imported by any other application + Exports the certificate so it can be imported by any other application + True + False +- ++ + + + + + Extrac_t private key + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Extracts the private key of the selected +@@ -52,25 +57,27 @@ + each time the certificate will be used + True + False +- ++ + + + + + True ++ False + + + + + Revo_ke + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Revokes the selected certificate + Revokes the selected certificate + True + False +- ++ + + + +--- gnomint-1.3.0.orig/gui/certificate_properties_dialog.ui ++++ gnomint-1.3.0/gui/certificate_properties_dialog.ui +@@ -1,547 +1,549 @@ +- ++ ++ + +- +- +- +- 24 +- 1 +- 8760 +- 24 +- 168 +- ++ + +- 60 + 1 + 600 ++ 60 + 1 + 12 + ++ ++ 1 ++ 8760 ++ 24 ++ 24 ++ 168 ++ + ++ False + Certificate properties - gnoMint + True + center + gnomint.png + dialog + +- ++ ++ ++ ++ + True ++ False ++ vertical + + + True + True + 5 + +- ++ + True ++ False + 5 ++ vertical + +- ++ + True ++ False + 5 ++ vertical + 5 + + +- 0 +- 0 ++ False + <b>This certificate has been verified for the following uses:</b> + True ++ 0 ++ 0 + + ++ False ++ True + 0 + + + + + False ++ True + 0 + + + +- ++ ++ False ++ + + False ++ True + 1 + + + +- ++ + True ++ False + 5 +- 17 +- 2 + 10 + + + True ++ False ++ MD5FINGERPRINT + 0 + 0 +- MD5FINGERPRINT + + + 1 +- 2 + 14 +- 15 + + + + + True ++ False ++ SHA1FINGERPRINT + 0 + 0 +- SHA1FINGERPRINT + + + 1 +- 2 + 13 +- 14 + + + + + True ++ False ++ + 0 + 0 +- + + + 1 +- 2 + 12 +- 13 + + + + + True ++ False ++ CertExpirationDate + 0 + 0 +- CertExpirationDate + + + 1 +- 2 + 11 +- 12 + + + + + True ++ False ++ CertActivationDate + 0 + 0 +- CertActivationDate + + + 1 +- 2 + 10 +- 11 + + + + + True ++ False ++ + 0 + 0 +- + + + 1 +- 2 + 9 +- 10 + + + + + True ++ False ++ CAOU + 0 + 0 +- CAOU + + + 1 +- 2 + 8 +- 9 + + + + + True ++ False ++ CAO + 0 + 0 +- CAO + + + 1 +- 2 + 7 +- 8 + + + + + True ++ False ++ CACN + 0 + 0 +- CACN + + + 1 +- 2 + 6 +- 7 + + + + + True ++ False ++ + 0 + 0 +- + + + 1 +- 2 + 5 +- 6 + + + + + True ++ False ++ CertSN + 0 + 0 +- CertSN + + + 1 +- 2 + 4 +- 5 + + + + + True ++ False ++ SubjectOU + 0 + 0 +- SubjectOU + + + 1 +- 2 + 3 +- 4 + + + + + True ++ False ++ SubjectO + 0 + 0 +- SubjectO + + + 1 +- 2 + 2 +- 3 + + + + + True ++ False ++ SubjectCN + 0 + 0 +- SubjectCN + + + 1 +- 2 + 1 +- 2 + + + + + True ++ False ++ + 0 + 0 +- + + + 1 +- 2 ++ 0 + + + + + True ++ False ++ MD5 fingerprint + 0 + 0 +- MD5 fingerprint + + ++ 0 + 14 +- 15 +- GTK_FILL + + + + + True ++ False ++ SHA1 fingerprint + 0 + 0 +- SHA1 fingerprint + + ++ 0 + 13 +- 14 +- GTK_FILL + + + + + True +- 0 +- 1 ++ False + <b>Fingerprints</b> + True ++ 0 ++ 1 + + ++ 0 + 12 +- 13 +- GTK_FILL +- 7 + + + + + True ++ False ++ Expires on + 0 + 0 +- Expires on + + ++ 0 + 11 +- 12 +- GTK_FILL + + + + + True ++ False ++ Activated on + 0 + 0 +- Activated on + + ++ 0 + 10 +- 11 +- GTK_FILL + + + + + True +- 0 +- 1 ++ False + <b>Validity</b> + True ++ 0 ++ 1 + + ++ 0 + 9 +- 10 +- GTK_FILL +- 7 + + + + + True ++ False ++ Organizational Unit (OU) + 0 + 0 +- Organizational Unit (OU) + + ++ 0 + 8 +- 9 +- GTK_FILL + + + + + True ++ False ++ Organization (O) + 0 + 0 +- Organization (O) + + ++ 0 + 7 +- 8 +- GTK_FILL + + + + + True ++ False ++ Common Name (CN) + 0 + 0 +- Common Name (CN) + + ++ 0 + 6 +- 7 +- GTK_FILL + + + + + True +- 0 +- 1 ++ False + <b>Emmited by</b> + True ++ 0 ++ 1 + + ++ 0 + 5 +- 6 +- GTK_FILL +- 7 + + + + + True ++ False ++ Serial number + 0 + 0 +- Serial number + + ++ 0 + 4 +- 5 +- GTK_FILL + + + + + True ++ False ++ Organizational Unit (OU) + 0 + 0 +- Organizational Unit (OU) + + ++ 0 + 3 +- 4 +- GTK_FILL + + + + + True ++ False ++ Organization (O) + 0 + 0 +- Organization (O) + + ++ 0 + 2 +- 3 +- GTK_FILL + + + + + True ++ False ++ Common Name (CN) + 0 + 0 +- Common Name (CN) + + ++ 0 + 1 +- 2 +- GTK_FILL + + + + + True +- 0 +- 1 ++ False + <b>Certificate subject</b> + True ++ 0 ++ 1 + + +- GTK_FILL +- 7 ++ 0 ++ 0 + + + + + True +- 0 +- 0 ++ False + SHA256FINGERPRINT + True + char + 60 ++ 60 ++ 0 ++ 0 + + + 1 +- 2 + 15 +- 16 + + + + + True ++ False ++ SHA256 fingerprint + 0 + 0 +- SHA256 fingerprint + + ++ 0 + 15 +- 16 +- GTK_FILL + + + + + True +- 0 +- 0 ++ False + SHA512FINGERPRINT + True + char + 60 ++ 60 ++ 0 ++ 0 + + + 1 +- 2 + 16 +- 17 + + + + + True ++ False ++ SHA512 fingerprint + 0 + 0 +- SHA512 fingerprint + + ++ 0 + 16 +- 17 +- GTK_FILL + + +- + + ++ False ++ True + 2 + + +@@ -550,59 +552,68 @@ + + + True ++ False ++ General + 0 + 0 +- General + + + False + + + +- ++ + True ++ False + 10 ++ vertical + 5 + + +- 0 +- 0 ++ False + <b>Certificate hierarchy</b> + True ++ 0 ++ 0 + + + False ++ True + 0 + + + + + True +- automatic +- automatic + in + + + True + False ++ ++ ++ + + + + +- False ++ True ++ True + 1 + + + + + True +- 0 +- 0 ++ False + <b>Certificate fields</b> + True ++ 0 ++ 0 + + + False ++ True + 2 + + +@@ -610,18 +621,21 @@ + + True + True +- automatic +- automatic + in + + + True + True + False ++ ++ ++ + + + + ++ True ++ True + 3 + + +@@ -633,9 +647,10 @@ + + + True ++ False ++ Details + 0 + 0 +- Details + + + 1 +@@ -643,22 +658,30 @@ + + + +- ++ + True ++ False ++ vertical + + + True +- 0 +- 0 +- 5 ++ False ++ 5 ++ 5 + <small><i> +-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.</i> ++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.</i> + </small> +-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: + + True + True ++ 0 ++ 0 + + + False +@@ -667,18 +690,23 @@ + + + +- ++ + True ++ False + 8 + + + True ++ False ++ Maximum number of months before ++expiration of the new generated certificates: ++ True + 0 + 0 +- Maximum number of months before expiration of the new generated certificates: +- True + + ++ True ++ True + 0 + + +@@ -686,13 +714,15 @@ + + True + True +- ++ + AdjustmentCertMonthsBeforeExpiration + 1 + True +- ++ + + ++ True ++ True + 1 + + +@@ -709,20 +739,26 @@ + True + 4 + +- ++ + True ++ False ++ vertical + +- ++ + True ++ False + 8 + + + True +- 0 ++ False + Hours between CRL updates: + True ++ 0 + + ++ False ++ True + 0 + + +@@ -730,32 +766,41 @@ + + True + True +- ++ + AdjustmentHoursBetweenCRLUpdates + 1 + True +- ++ + + ++ False ++ True + 1 + + + + ++ False ++ True + 0 + + + +- ++ + True ++ False + 9 ++ vertical + + + True +- 0 ++ False + CRL distribution URL: ++ 0 + + ++ True ++ True + 0 + + +@@ -763,8 +808,8 @@ + + True + True +- +- ++ ++ + + + False +@@ -774,6 +819,8 @@ + + + ++ False ++ True + 1 + + +@@ -782,6 +829,7 @@ + + + True ++ False + <b>CRL Properties</b> + True + +@@ -799,11 +847,10 @@ + True + 4 + +- ++ + True ++ False + 10 +- 5 +- 2 + + + Country +@@ -812,8 +859,12 @@ + False + True + True +- ++ + ++ ++ 0 ++ 0 ++ + + + +@@ -823,16 +874,17 @@ + False + True + True +- ++ + + ++ 0 + 1 +- 2 + + + +- ++ + True ++ False + + + must be the same +@@ -842,9 +894,11 @@ + False + True + country_differ_radiobutton +- ++ + + ++ False ++ True + 0 + + +@@ -859,18 +913,21 @@ + True + + ++ False ++ True + 1 + + + + + 1 +- 2 ++ 0 + + + +- ++ + True ++ False + + + must be the same +@@ -880,9 +937,11 @@ + False + True + state_differ_radiobutton +- ++ + + ++ False ++ True + 0 + + +@@ -897,15 +956,15 @@ + True + + ++ False ++ True + 1 + + + + + 1 +- 2 + 1 +- 2 + + + +@@ -916,11 +975,11 @@ + False + True + True +- ++ + + ++ 0 + 2 +- 3 + + + +@@ -931,11 +990,11 @@ + False + True + True +- ++ + + ++ 0 + 3 +- 4 + + + +@@ -946,16 +1005,17 @@ + False + True + True +- ++ + + ++ 0 + 4 +- 5 + + + +- ++ + True ++ False + + + must be the same +@@ -965,9 +1025,11 @@ + False + True + city_differ_radiobutton +- ++ + + ++ False ++ True + 0 + + +@@ -982,20 +1044,21 @@ + True + + ++ False ++ True + 1 + + + + + 1 +- 2 + 2 +- 3 + + + +- ++ + True ++ False + + + must be the same +@@ -1005,9 +1068,11 @@ + False + True + organization_differ_radiobutton +- ++ + + ++ False ++ True + 0 + + +@@ -1022,20 +1087,21 @@ + True + + ++ False ++ True + 1 + + + + + 1 +- 2 + 3 +- 4 + + + +- ++ + True ++ False + + + must be the same +@@ -1045,9 +1111,11 @@ + False + True + ou_differ_radiobutton +- ++ + + ++ False ++ True + 0 + + +@@ -1062,15 +1130,15 @@ + True + + ++ False ++ True + 1 + + + + + 1 +- 2 + 4 +- 5 + + + +@@ -1078,10 +1146,11 @@ + + + True +- 0 +- 0 ++ False + <b>Inherited fields from CA subject</b> + True ++ 0 ++ 0 + + + +@@ -1097,11 +1166,10 @@ + True + 4 + +- ++ + True ++ False + 10 +- 4 +- 2 + + + Certification Authority +@@ -1110,8 +1178,12 @@ + False + True + True +- ++ + ++ ++ 0 ++ 0 ++ + + + +@@ -1121,11 +1193,11 @@ + False + True + True +- ++ + + + 1 +- 2 ++ 0 + + + +@@ -1137,13 +1209,11 @@ + True + True + True +- ++ + + + 1 +- 2 + 1 +- 2 + + + +@@ -1155,13 +1225,11 @@ + True + True + True +- ++ + + + 1 +- 2 + 2 +- 3 + + + +@@ -1173,11 +1241,11 @@ + True + True + True +- ++ + + ++ 0 + 3 +- 4 + + + +@@ -1189,11 +1257,11 @@ + True + True + True +- ++ + + ++ 0 + 2 +- 3 + + + +@@ -1204,22 +1272,21 @@ + False + True + True +- ++ + + ++ 0 + 1 +- 2 + + + + + True ++ False + + + 1 +- 2 + 3 +- 4 + + + +@@ -1227,10 +1294,11 @@ + + + True +- 0 +- 0 ++ False + <b>Uses of new generated certificates</b> + True ++ 0 ++ 0 + + + +@@ -1246,11 +1314,10 @@ + True + 4 + +- ++ + True ++ False + 10 +- 4 +- 2 + + + Email protection +@@ -1260,13 +1327,11 @@ + True + True + True +- ++ + + + 1 +- 2 + 1 +- 2 + + + +@@ -1277,11 +1342,11 @@ + False + True + True +- ++ + + + 1 +- 2 ++ 0 + + + +@@ -1293,11 +1358,11 @@ + True + True + True +- ++ + + ++ 0 + 1 +- 2 + + + +@@ -1309,8 +1374,12 @@ + True + True + True +- ++ + ++ ++ 0 ++ 0 ++ + + + +@@ -1320,11 +1389,11 @@ + False + True + True +- ++ + + ++ 0 + 2 +- 3 + + + +@@ -1335,11 +1404,11 @@ + False + True + True +- ++ + + ++ 0 + 3 +- 4 + + + +@@ -1350,26 +1419,23 @@ + False + True + True +- ++ + + + 1 +- 2 + 2 +- 3 + + + + + True ++ False + 0 + 0 + + + 1 +- 2 + 3 +- 4 + + + +@@ -1377,14 +1443,17 @@ + + + True +- 0 +- 0 ++ False + <b>Purposes of new generated certificates</b> + True ++ 0 ++ 0 + + + + ++ False ++ True + 5 + + +@@ -1396,9 +1465,10 @@ + + + True ++ False ++ CA Policy + 0 + 0 +- CA Policy + + + 2 +@@ -1407,12 +1477,15 @@ + + + ++ False ++ True + 0 + + + +- ++ + True ++ False + 10 + end + +@@ -1422,7 +1495,7 @@ + True + True + True +- ++ + + + False +@@ -1433,6 +1506,7 @@ + + + False ++ True + end + 1 + +--- gnomint-1.3.0.orig/gui/change_password_dialog.ui ++++ gnomint-1.3.0/gui/change_password_dialog.ui +@@ -1,32 +1,81 @@ +- ++ ++ + +- +- ++ + ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + Database password protection - gnoMint + center-on-parent + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 2 ++ ++ ++ True ++ False ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + 20 +- 4 +- 2 +- 10 + 10 ++ 10 ++ True + +- ++ + True ++ False + True + + +@@ -37,7 +86,7 @@ + True + True + True +- ++ + + + False +@@ -64,39 +113,22 @@ + + + 1 +- 2 +- GTK_FILL +- +- +- +- +- +- True +- 0 +- 0 +- Protect CA database private +-keys with password: +- True +- +- +- GTK_FILL +- ++ 0 + + + + + True +- 0 ++ False + Enter new password again + for confirmation: + True + word-char ++ 0 + + ++ 0 + 3 +- 4 +- GTK_FILL +- + + + +@@ -105,14 +137,12 @@ + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False +- +- ++ ++ + + + 1 +- 2 + 3 +- 4 + + + +@@ -121,46 +151,41 @@ + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False +- +- ++ ++ + + + 1 +- 2 + 2 +- 3 + + + + + True +- 0 ++ False + Please, enter new + password: + True ++ 0 + + ++ 0 + 2 +- 3 +- GTK_FILL +- + + + + + True +- 0 +- 0 ++ False + Please, enter current + password: + True ++ 0 ++ 0 + + ++ 0 + 1 +- 2 +- GTK_FILL +- +- 15 + + + +@@ -169,61 +194,34 @@ + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False +- +- ++ ++ + + + 1 +- 2 + 1 +- 2 + + +- +- +- 1 +- +- +- +- +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- end + +- +- gtk-cancel +- True +- True +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok ++ + True +- True +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- True ++ False ++ Protect CA database private ++keys with password: ++ True ++ 0 ++ 0 + + +- False +- False +- 1 ++ 0 ++ 0 + + + + + False +- end +- 0 ++ True ++ 1 + + + +--- gnomint-1.3.0.orig/gui/creation_process_window.ui ++++ gnomint-1.3.0/gui/creation_process_window.ui +@@ -1,40 +1,50 @@ +- ++ ++ + +- +- ++ + + True ++ False + Creating new CA - gnoMint + True + center + gnomint.png + dialog + +- ++ ++ ++ ++ + True ++ False + + + True ++ False ++ + 0 + 0 +- + + ++ False ++ True + 0 + + + +- ++ + True ++ False + 9 + vertical + True + + + True ++ False ++ Creating CA Root Certificate + 0 + 0 +- Creating CA Root Certificate + + + False +@@ -45,6 +55,7 @@ + + + True ++ False + 0 + 0 + +@@ -57,7 +68,7 @@ + + + True +- True ++ False + 0 + + +@@ -73,7 +84,7 @@ + True + True + True +- ++ + + + False +@@ -84,17 +95,21 @@ + + + False ++ True + 1 + + + + + True ++ False ++ + 0 + 0 +- + + ++ False ++ True + 2 + + +--- gnomint-1.3.0.orig/gui/csr_popup_menu.ui ++++ gnomint-1.3.0/gui/csr_popup_menu.ui +@@ -1,45 +1,50 @@ +- ++ ++ + +- +- ++ + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + gtk-properties + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Shows the CSR properties window + Shows the CSR properties window + True + True +- ++ + + + + + True ++ False + + + + + E_xport + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Exports the CSR so it can be imported by any other application + Exports the CSR so it can be imported by any other application + True + False +- ++ + + + + + Extrac_t private key + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Extracts the private key of the selected +@@ -52,32 +57,35 @@ + each time the CSR will be used + True + False +- ++ + + + + + True ++ False + + + + + _Sign + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False +- ++ + + + + + gtk-delete + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True +- ++ + + + +--- gnomint-1.3.0.orig/gui/csr_properties_dialog.ui ++++ gnomint-1.3.0/gui/csr_properties_dialog.ui +@@ -1,8 +1,9 @@ +- ++ ++ + +- +- ++ + ++ False + CSR properties - gnoMint + True + center +@@ -10,170 +11,183 @@ + dialog + True + +- ++ ++ ++ ++ + True ++ False + vertical + + + True ++ False + 5 + False + False + +- ++ + True ++ False + 5 + vertical + +- ++ + True ++ False + 5 + vertical + 5 + + + True +- 0 +- 0 +- <b>This Certificate Signing Request has its corresponding private key saved in the internal database.</b> ++ False ++ <b>This Certificate Signing Request has its ++corresponding private key saved in the internal database.</b> + True + True ++ 0 ++ 0 + + ++ False ++ True + 0 + + + + + False ++ True + 0 + + + +- ++ + True ++ False + + + False ++ True + 1 + + + +- ++ + True ++ False + 5 +- 4 +- 2 + 10 + + + True ++ False ++ SubjectOU + 0 + 0 +- SubjectOU + + + 1 +- 2 + 3 +- 4 + + + + + True ++ False ++ SubjectO + 0 + 0 +- SubjectO + + + 1 +- 2 + 2 +- 3 + + + + + True ++ False ++ SubjectCN + 0 + 0 +- SubjectCN + + + 1 +- 2 + 1 +- 2 + + + + + True ++ False ++ + 0 + 0 +- + + + 1 +- 2 ++ 0 + + + + + True ++ False ++ Organizational Unit (OU) + 0 + 0 +- Organizational Unit (OU) + + ++ 0 + 3 +- 4 +- GTK_FILL + + + + + True ++ False ++ Organization (O) + 0 + 0 +- Organization (O) + + ++ 0 + 2 +- 3 +- GTK_FILL + + + + + True ++ False ++ Common Name (CN) + 0 + 0 +- Common Name (CN) + + ++ 0 + 1 +- 2 +- GTK_FILL + + + + + True +- 0 +- 1 ++ False + <b>CSR subject</b> + True ++ 0 ++ 1 + + +- GTK_FILL +- 7 ++ 0 ++ 0 + + + + + False ++ True + 2 + + +@@ -185,9 +199,10 @@ + + + True ++ False ++ General + 0 + 0 +- General + + + False +@@ -199,9 +214,10 @@ + + + True ++ False ++ Details + 0 + 0 +- Details + + + 1 +@@ -210,12 +226,15 @@ + + + ++ False ++ True + 0 + + + +- ++ + True ++ False + 10 + end + +@@ -225,7 +244,7 @@ + True + True + True +- ++ + + + False +@@ -235,6 +254,8 @@ + + + ++ False ++ True + end + 1 + +--- gnomint-1.3.0.orig/gui/dh_parameters_dialog.ui ++++ gnomint-1.3.0/gui/dh_parameters_dialog.ui +@@ -1,68 +1,124 @@ +- ++ ++ + +- +- ++ + + 1024 + 10240 +- 1024 +- 1024 +- 0 + 1024 ++ 1024 ++ 1024 + + ++ False + 5 + New Diffie-Hellman parameters - gnoMint + center-on-parent + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical + 2 ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + vertical + 12 + + + True +- 0 +- You are about to create and export a set of Diffie·Hellman parameters into a PKCS#3 structure file. ++ False ++ You are about to create and export a set of ++Diffie·Hellman parameters into a PKCS#3 structure file. + True + True ++ 0 + + ++ False ++ True + 0 + + + + + True +- 0 +- 8 +- <small><i>PKCS#3 files containing Diffie·Hellman parameters are used by some cryptographic ++ False ++ 8 ++ 8 ++ <small><i>PKCS#3 files containing Diffie·Hellman parameters are used by some cryptographic + applications for a secure interchange of their keys over insecure channels.</i></small> + True + True + 80 ++ 0 + + ++ False ++ True + 1 + + + + + True +- 0 ++ False + Please, enter the prime size, in bits: + True + True ++ 0 + + ++ False ++ True + 2 + + +@@ -70,58 +126,23 @@ + + True + True +- ++ + AdjustmentDHPrimeSizeSpinButton + + ++ False ++ True + 3 + + + + ++ False ++ True + 10 + 1 + + +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- True +- True +- True +- +- +- False +- False +- 1 +- +- +- +- +- False +- end +- 0 +- +- + + + +--- 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 @@ +- ++ ++ + +- +- ++ + ++ False + Enter password - gnoMint + True + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 20 + vertical + + + True +- 0 +- 0 ++ False + This action requires using one or more private keys saved in the CA database. + + Please insert the database password. +@@ -30,6 +75,8 @@ + fill + True + 40 ++ 0 ++ 0 + + + False +@@ -38,28 +85,35 @@ + + + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + dialog-password +- 6 ++ 6 + + ++ False ++ True + 0 + + + + + True +- 1 ++ False + Password: + True ++ 1 + + ++ False ++ True + 1 + + +@@ -69,15 +123,19 @@ + True + True + False +- ++ + True + + ++ False ++ True + 2 + + + + ++ False ++ True + 1 + + +@@ -86,10 +144,9 @@ + Remember this password during this gnoMint session + True + True ++ False + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- False +- 0 + True + + +@@ -100,46 +157,9 @@ + + + +- 1 +- +- +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- True +- True +- True +- +- +- False +- False +- 1 +- +- +- +- + False +- end +- 0 ++ True ++ 1 + + + +--- gnomint-1.3.0.orig/gui/get_password_dialog.ui ++++ gnomint-1.3.0/gui/get_password_dialog.ui +@@ -1,53 +1,100 @@ +- ++ ++ + +- +- ++ + ++ False + Enter password - gnoMint + True + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ False ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + 11 + vertical + + + True +- 0 +- 0 ++ False + Please, enter password + True + True ++ 0 ++ 0 + + ++ False ++ True + 0 + + + +- ++ + True ++ False + 30 +- 2 +- 2 + + + True + True + False +- ++ + + + 1 +- 2 + 1 +- 2 + + + +@@ -55,85 +102,55 @@ + True + True + False +- ++ + True +- ++ + + + 1 +- 2 ++ 0 + + + + + True +- 0 +- 0 ++ False + Password (confirm): + True ++ 0 ++ 0 + + ++ 0 + 1 +- 2 + + + + + True +- 0 +- 0 ++ False + Password: + True ++ 0 ++ 0 + ++ ++ 0 ++ 0 ++ + + + +- 1 +- +- +- +- +- 1 +- +- +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- + False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- False +- True +- True +- True +- +- +- False +- False ++ True + 1 + + + + + False +- end +- 0 ++ True ++ 1 + + + +--- gnomint-1.3.0.orig/gui/get_pkey_dialog.ui ++++ gnomint-1.3.0/gui/get_pkey_dialog.ui +@@ -1,8 +1,9 @@ +- ++ ++ + +- +- ++ + ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + Choose private key file. gnoMint +@@ -10,32 +11,84 @@ + center-on-parent + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 2 ++ ++ ++ True ++ False ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ 4 ++ end ++ 0 ++ ++ + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 20 + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- 0 +- 0 + <big>Choose private key file</big> + +-For doing the selected operation, you must provide the file where resides the private key corresponding to the certificate: ++For doing the selected operation, you must provide the ++file where resides the private key corresponding to the ++certificate: + True + True + word-char + 40 ++ 0 ++ 0 + + + False +@@ -46,24 +99,28 @@ + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Certificate DN + + ++ False ++ True + 1 + + + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- 0 +- 0 + Please, choose the file: + True + True + word-char + 40 ++ 0 ++ 0 + + + False +@@ -74,8 +131,9 @@ + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- ++ + + + False +@@ -101,53 +159,12 @@ + + + ++ False ++ True + 10 + 1 + + +- +- +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- end +- +- +- gtk-cancel +- True +- True +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- True +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- True +- +- +- False +- False +- 1 +- +- +- +- +- False +- 4 +- end +- 0 +- +- + + + +--- 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 @@ +- ++ ++ + +- +- ++ + ++ False + 5 + Import selection - gnoMint + center-on-parent + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical + 2 ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + 8 + vertical + 8 + + + True ++ False ++ Please, choose the more suitable option for ++what you want to import: ++ True + 0 + 0 +- Please, choose the more suitable option for what you want to import: +- True + + ++ False ++ True + 0 + + + +- ++ + True ++ False + vertical + + +@@ -47,21 +98,31 @@ + True + + ++ False ++ True + 0 + + + + + True +- 0 +- 0 +- 24 +- 9 +- <i>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.</i> ++ False ++ 24 ++ 24 ++ 9 ++ 9 ++ <i>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.</i> + True + True ++ 0 ++ 0 + + ++ False ++ True + 1 + + +@@ -76,73 +137,45 @@ + importfile_radiobutton + + ++ False ++ True + 2 + + + + + True +- 0 +- 0 +- 24 +- 9 ++ False ++ 24 ++ 24 ++ 9 ++ 9 + <i>Import a directory containing the structure of + a whole CA made with OpenSSL .</i> + True + fill + True ++ 0 ++ 0 + + ++ False ++ True + 3 + + + + +- 1 +- +- +- +- +- 1 +- +- +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- True +- True +- True +- +- + False +- False ++ True + 1 + + + + + False +- end +- 0 ++ True ++ 1 + + + +--- gnomint-1.3.0.orig/gui/import_password_dialog.ui ++++ gnomint-1.3.0/gui/import_password_dialog.ui +@@ -1,35 +1,84 @@ +- ++ ++ + +- +- ++ + ++ False + Enter password - gnoMint + True + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 20 + vertical + + + True +- 0 +- 0 +- The whole selected file, or some of its elements, seems to be cyphered using a password or passphrase. ++ False ++ 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. ++For importing the file into gnoMint database, you must ++provide an appropiate password. + True + fill + True + 40 ++ 0 ++ 0 + + + False +@@ -40,54 +89,69 @@ + + + True +- 0 +- 8 ++ False ++ 8 ++ 8 + <small><i>The part that is being imported has the description:</i></small> + True + True + right ++ 0 + + ++ False ++ True + 1 + + + + + True +- 0 +- 15 ++ False ++ 15 ++ 15 + <small><i>#Description#</i></small> + True + True + right ++ 0 + + ++ False ++ True + 2 + + + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + dialog-password +- 6 ++ 6 + + ++ False ++ True + 0 + + + + + True +- 1 ++ False + Password: + True ++ 1 + + ++ False ++ True + 1 + + +@@ -97,60 +161,27 @@ + True + True + False +- ++ + True + + ++ False ++ True + 2 + + + + +- 3 +- +- +- +- +- 1 +- +- +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- True +- True +- True +- +- + False +- False +- 1 ++ True ++ 3 + + + + + False +- end +- 0 ++ True ++ 1 + + + +--- gnomint-1.3.0.orig/gui/main_window.ui ++++ gnomint-1.3.0/gui/main_window.ui +@@ -1,51 +1,82 @@ +- ++ ++ + +- +- ++ ++ ++ True ++ False ++ addca.png ++ ++ ++ True ++ False ++ addcsr.png ++ ++ ++ True ++ False ++ extractpkey.png ++ ++ ++ True ++ False ++ sign.png ++ + + True ++ False + gnoMint + gnoMint_main + center + 400 + 300 + gnomint.png +- ++ ++ ++ ++ + +- ++ + True ++ False + vertical + + + True ++ False + + + True ++ False + _Certificates + True + + ++ False + + + _New certificate database + True ++ False + True + False +- ++ + + + + + _Open certificate database + True ++ False + True + False +- ++ + + + + + True ++ False + Open _recents + True + +@@ -54,41 +85,47 @@ + + _Save certificate database as... + True ++ False + True + False +- ++ + + + + + True ++ False + + + + + gtk-add + True ++ False + True + True + + + True ++ False + + + _Add self-signed CA + True ++ False + True + False +- ++ + + + + + Add _Certificate Request + True ++ False + True + False +- ++ + + + +@@ -100,12 +137,13 @@ + Extrac_t private key + True + False ++ False + True + Extract the saved private key to an external file or device + Extract the saved private key to an external file or device + True + False +- ++ + + + +@@ -113,9 +151,10 @@ + Revo_ke + True + False ++ False + True + False +- ++ + + + +@@ -123,9 +162,10 @@ + _Sign + True + False ++ False + True + False +- ++ + + + +@@ -133,91 +173,103 @@ + gtk-delete + True + False ++ False + True + True +- ++ + + + + + True ++ False + + + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Generate the current Certificate Revocation List + Generate the current Certificate Revocation List + Generate _CRL + True +- ++ + + + + + True ++ False + + + + + True ++ False + Generate D_H parameters... + True +- ++ + + + + + True ++ False + + + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Change database pass_word + True +- ++ + + + + + True ++ False + + + + + _Import + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False +- ++ + + + + + True + False ++ False + E_xport + True +- ++ + + + + + True ++ False + + + + + gtk-quit + True ++ False + True + True +- ++ + + + +@@ -227,31 +279,36 @@ + + + True ++ False + _Edit + True + + ++ False + + + gtk-properties + True ++ False + True + True +- ++ + + + + + True ++ False + + + + + gtk-preferences + True ++ False + True + True +- ++ + + + +@@ -261,31 +318,35 @@ + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _View + True + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Certificate _Signing Requests + True + True +- ++ + + + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Revoked Certificates + True + True +- ++ + + + +@@ -295,17 +356,20 @@ + + + True ++ False + _Help + True + + ++ False + + + gtk-about + True ++ False + True + True +- ++ + + + +@@ -322,14 +386,16 @@ + + + True ++ False + + + True ++ False + True + Create a new database + Create a new database + gtk-new +- ++ + + + False +@@ -339,11 +405,12 @@ + + + True ++ False + True + Open an existing database + Open an existing database + gtk-open +- ++ + + + False +@@ -353,6 +420,7 @@ + + + True ++ False + + + False +@@ -362,12 +430,13 @@ + + + True ++ False + True + Add an autosigned CA + Add an autosigned CA + Add autosigned CA certificate + addcaimg +- ++ + + + False +@@ -377,12 +446,13 @@ + + + True ++ False + True + Add a new Certificate Signing Request + Add a new Certificate Signing Request + Add CSR + addcsrimg +- ++ + + + False +@@ -392,6 +462,7 @@ + + + True ++ False + + + False +@@ -402,12 +473,13 @@ + + True + False ++ False + True + Extract the private key of the selected item into a external file + Extract the private key of the selected item into a external file + Extract Private Key + extractpkeyimg +- ++ + + + False +@@ -418,12 +490,13 @@ + + True + False ++ False + True + Revoke the selected certificate + Revoke the selected certificate + Revoke + gtk-cancel +- ++ + + + False +@@ -434,12 +507,13 @@ + + True + False ++ False + True + Sign the selected Certificate Signing Request + Sign the selected Certificate Signing Request + Sign + signimg +- ++ + + + False +@@ -450,11 +524,12 @@ + + True + False ++ False + True + Delete the selected Certificate Signing Request + Delete the selected Certificate Signing Request + gtk-delete +- ++ + + + False +@@ -472,41 +547,28 @@ + + True + True +- automatic +- automatic + in + + + True + True + True +- +- +- ++ ++ ++ ++ ++ ++ + + + + ++ True ++ True + 2 + + + + + +- +- True +- addca.png +- +- +- True +- addcsr.png +- +- +- True +- sign.png +- +- +- True +- extractpkey.png +- + +--- gnomint-1.3.0.orig/gui/new_ca_window.ui ++++ gnomint-1.3.0/gui/new_ca_window.ui +@@ -1,49 +1,58 @@ +- ++ ++ + +- +- ++ + +- 2048 + 1024 + 5120 ++ 2048 + 1024 + 1024 + + +- 240 + 1 + 600 ++ 240 + 1 + 12 + + + True ++ False + New CA - gnoMint + True + center + gnomint.png + dialog + ++ ++ ++ + + True ++ False + 8 + False + False + +- ++ + True ++ False ++ vertical + 6 + +- ++ + True ++ False + + + True +- 0 +- 0 ++ False + <big>CA Subject Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -54,9 +63,10 @@ + + + True ++ False ++ + 0 + 0 +- + + + False +@@ -72,186 +82,168 @@ + + + +- ++ + True ++ False + 6 +- 6 +- 2 + 6 + + + True ++ False ++ Organization: + 0 + 0 +- Organization: + + ++ 0 + 3 +- 4 +- GTK_FILL +- + + + + + True ++ False ++ Organization Unit: + 0 + 0 +- Organization Unit: + + ++ 0 + 4 +- 5 +- GTK_FILL +- + + + + + True +- 0 +- 0 ++ False + Country: + 0 ++ 0 ++ 0 + + +- GTK_FILL +- ++ 0 ++ 0 + + + + + True ++ False ++ State or Province name: + 0 + 0 +- State or Province name: + + ++ 0 + 1 +- 2 +- GTK_FILL +- + + + + + True ++ False ++ City: + 0 + 0 +- City: + + ++ 0 + 2 +- 3 +- GTK_FILL +- + + + + + True + True +- ++ + + + 1 +- 2 + 1 +- 2 +- + + + + + True + True +- ++ + + + 1 +- 2 + 2 +- 3 +- + + + + + True + True +- ++ + + + 1 +- 2 + 3 +- 4 +- + + + + + True + True +- ++ + + + 1 +- 2 + 4 +- 5 +- + + + + + True +- 0 +- 0 ++ False + CA Root Certificate + Common Name (CN): ++ 0 ++ 0 + + ++ 0 + 5 +- 6 +- GTK_FILL +- + + + + + True + True +- +- ++ ++ + + + 1 +- 2 + 5 +- 6 +- + + + + + True ++ False + + + 1 +- 2 +- GTK_FILL +- ++ 0 + + + + ++ False ++ True + 1 + + + +- ++ + True ++ False + 12 + end + +@@ -277,7 +269,7 @@ + True + True + True +- ++ + + + False +@@ -294,7 +286,7 @@ + True + True + True +- ++ + + + False +@@ -317,28 +309,33 @@ + + + True ++ False ++ CA properties + 0 + 0 +- CA properties + + + False + + + +- ++ + True ++ False ++ vertical + +- ++ + True ++ False + + + True +- 0 +- 0 ++ False + <big>CA Root certificate properties</big> + + True ++ 0 ++ 0 + + + False +@@ -349,9 +346,10 @@ + + + True ++ False ++ + 0 + 0 +- + + + False +@@ -362,16 +360,16 @@ + + + False ++ True + 0 + + + +- ++ + True ++ False + 6 +- 3 +- 2 +- True ++ True + + + True +@@ -384,24 +382,20 @@ + + + 1 +- 2 + 2 +- 3 +- + + + + + True ++ False ++ Months before root certificate expiration: + 0 + 0 +- Months before root certificate expiration: + + ++ 0 + 2 +- 3 +- GTK_FILL +- + + + +@@ -416,15 +410,13 @@ + + + 1 +- 2 + 1 +- 2 +- + + + +- ++ + True ++ False + True + + +@@ -435,7 +427,7 @@ + True + True + True +- ++ + + + False +@@ -462,45 +454,46 @@ + + + 1 +- 2 +- GTK_FILL +- ++ 0 + + + + + True ++ False ++ Private key bit length: + 0 + 0 +- Private key bit length: + + ++ 0 + 1 +- 2 +- GTK_FILL +- + + + + + True ++ False ++ Private key type: + 0 + 0 +- Private key type: + + +- GTK_FILL +- ++ 0 ++ 0 + + + + ++ True ++ True + 1 + + + +- ++ + True ++ False + 12 + end + +@@ -526,7 +519,7 @@ + True + True + True +- ++ + + + False +@@ -542,7 +535,7 @@ + True + True + True +- ++ + + + False +@@ -558,7 +551,7 @@ + True + True + True +- ++ + + + False +@@ -569,20 +562,23 @@ + + + False ++ True + 2 + + + + + 1 ++ False + + + + + True ++ False ++ Root certificate prop + 0 + 0 +- Root certificate prop + + + 1 +@@ -590,19 +586,23 @@ + + + +- ++ + True ++ False ++ vertical + +- ++ + True ++ False + + + True +- 0 +- 0 ++ False + <big>CA properties</big> + + True ++ 0 ++ 0 + + + False +@@ -613,9 +613,10 @@ + + + True ++ False ++ + 0 + 0 +- + + + False +@@ -626,17 +627,21 @@ + + + False ++ True + 0 + + + +- ++ + True ++ False ++ vertical + + + True +- 0 ++ False + CRL Distribution Point: ++ 0 + + + False +@@ -647,8 +652,7 @@ + + + True +- 0 +- 0 ++ False + <small>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 @@ + True + True + 60 ++ 0 ++ 0 + + + False +@@ -668,7 +674,7 @@ + + True + True +- ++ + + + False +@@ -678,12 +684,15 @@ + + + ++ True ++ True + 1 + + + +- ++ + True ++ False + 12 + end + +@@ -709,7 +718,7 @@ + True + True + True +- ++ + + + False +@@ -725,7 +734,7 @@ + True + True + True +- ++ + + + False +@@ -741,7 +750,7 @@ + True + True + True +- ++ + + + False +@@ -752,17 +761,20 @@ + + + False ++ True + 2 + + + + + 2 ++ False + + + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Password protect + +--- gnomint-1.3.0.orig/gui/new_cert_window.ui ++++ gnomint-1.3.0/gui/new_cert_window.ui +@@ -1,41 +1,47 @@ +- ++ ++ + +- +- ++ + + 1 + 600 +- 1 +- 12 +- 0 + 1 ++ 1 ++ 12 + + + True ++ False + New Certificate - gnoMint + True + center + gnomint.png + dialog + ++ ++ ++ + + True ++ False + 8 + False + False + +- ++ + True ++ False + vertical + 6 + + + True +- 0 +- 0 ++ False + <big>New Certificate Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -46,197 +52,196 @@ + + + True +- 0 +- 0 +- You are about to sign a Certificate Signing Request, and this way, creating a new certificate. Please check the certificate properties. ++ False ++ You are about to sign a Certificate Signing Request, ++and this way, creating a new certificate. Please ++check the certificate properties. + fill + True ++ 0 ++ 0 + + ++ False ++ True + 1 + + + +- ++ + True ++ False + 16 +- 6 +- 2 +- 10 + 6 ++ 10 + + + True ++ False ++ label + 0 + 0 +- label + + + 1 +- 2 + 5 +- 6 + + + + + True ++ False ++ label + 0 + 0 +- label + + + 1 +- 2 + 4 +- 5 + + + + + True ++ False ++ label + 0 + 0 +- label + + + 1 +- 2 + 3 +- 4 + + + + + True ++ False ++ label + 0 + 0 +- label + + + 1 +- 2 + 2 +- 3 + + + + + True ++ False ++ label + 0 + 0 +- label + + + 1 +- 2 + 1 +- 2 + + + + + True ++ False ++ label + 0 + 0 +- label + + + 1 +- 2 ++ 0 + + + + + True ++ False ++ Organization: + 0 + 0 +- Organization: + + ++ 0 + 3 +- 4 +- GTK_FILL +- + + + + + True ++ False ++ Organization Unit: + 0 + 0 +- Organization Unit: + + ++ 0 + 4 +- 5 +- GTK_FILL +- + + + + + True ++ False ++ Country: + 0 + 0 +- Country: + + +- GTK_FILL +- ++ 0 ++ 0 + + + + + True ++ False ++ State or Province name: + 0 + 0 +- State or Province name: + + ++ 0 + 1 +- 2 +- GTK_FILL +- + + + + + True ++ False ++ City: + 0 + 0 +- City: + + ++ 0 + 2 +- 3 +- GTK_FILL +- + + + + + True +- 0 +- 0 ++ False + New certificate + Common Name (CN): ++ 0 ++ 0 + + ++ 0 + 5 +- 6 +- GTK_FILL +- + + + + ++ False ++ True + 2 + + + +- ++ + True ++ False + 12 + end + +@@ -262,7 +267,7 @@ + True + True + True +- ++ + + + False +@@ -278,7 +283,7 @@ + True + True + True +- ++ + + + False +@@ -301,27 +306,30 @@ + + + True ++ False ++ CA properties + 0 + 0 +- CA properties + + + False + + + +- ++ + True ++ False + vertical + 6 + + + True +- 0 +- 0 ++ False + <big>New Certificate Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -332,13 +340,18 @@ + + + True +- 0 +- 0 +- You are about to sign a Certificate Signing Request. Please, choose the Certification Authority you are going to use for signing it. ++ False ++ You are about to sign a Certificate Signing Request. ++Please, choose the Certification Authority you are ++going to use for signing it. + fill + True ++ 0 ++ 0 + + ++ False ++ True + 1 + + +@@ -346,25 +359,29 @@ + + True + True +- automatic +- automatic + in + + + True + True + False +- ++ ++ ++ ++ + + + + ++ True ++ True + 2 + + + +- ++ + True ++ False + 12 + end + +@@ -390,7 +407,7 @@ + True + True + True +- ++ + + + False +@@ -406,7 +423,7 @@ + True + True + True +- ++ + + + False +@@ -423,7 +440,7 @@ + True + True + True +- ++ + + + False +@@ -446,9 +463,10 @@ + + + True ++ False ++ Choose CA for signing the CSR + 0 + 0 +- Choose CA for signing the CSR + + + 2 +@@ -456,17 +474,19 @@ + + + +- ++ + True ++ False + vertical + + + True +- 0 +- 0 ++ False + <big>New Certificate Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -475,17 +495,21 @@ + + + +- ++ + True ++ False + 8 + + + True ++ False ++ Months before certificate expiration: + 0 + 0 +- Months before certificate expiration: + + ++ False ++ True + 0 + + +@@ -493,19 +517,21 @@ + + True + True +- ++ + AdjustmentMonthsBeforeExpirationSpinButton1 + 1 + True + + ++ False ++ True + 1 + + + + + False +- False ++ True + 1 + + +@@ -515,11 +541,10 @@ + True + 4 + +- ++ + True ++ False + 10 +- 4 +- 2 + + + Data encipherment +@@ -529,13 +554,11 @@ + True + True + True +- ++ + + + 1 +- 2 + 2 +- 3 + + + +@@ -547,13 +570,11 @@ + True + True + True +- ++ + + + 1 +- 2 + 1 +- 2 + + + +@@ -565,11 +586,11 @@ + True + True + True +- ++ + + + 1 +- 2 ++ 0 + + + +@@ -580,8 +601,12 @@ + False + True + True +- ++ + ++ ++ 0 ++ 0 ++ + + + +@@ -592,11 +617,11 @@ + True + True + True +- ++ + + ++ 0 + 3 +- 4 + + + +@@ -607,11 +632,11 @@ + False + True + True +- ++ + + ++ 0 + 2 +- 3 + + + +@@ -622,22 +647,21 @@ + False + True + True +- ++ + + ++ 0 + 1 +- 2 + + + + + True ++ False + + + 1 +- 2 + 3 +- 4 + + + +@@ -645,16 +669,17 @@ + + + True +- 0 +- 0 ++ False + <b>Certificate uses</b> + True ++ 0 ++ 0 + + + + +- False +- False ++ True ++ True + 2 + + +@@ -664,22 +689,20 @@ + True + 4 + +- ++ + True ++ False + 10 +- 4 +- 2 + + + True ++ False + 0 + 0 + + + 1 +- 2 + 3 +- 4 + + + +@@ -690,13 +713,11 @@ + False + True + True +- ++ + + + 1 +- 2 + 2 +- 3 + + + +@@ -707,11 +728,11 @@ + False + True + True +- ++ + + ++ 0 + 3 +- 4 + + + +@@ -722,11 +743,11 @@ + False + True + True +- ++ + + ++ 0 + 2 +- 3 + + + +@@ -738,8 +759,12 @@ + True + True + True +- ++ + ++ ++ 0 ++ 0 ++ + + + +@@ -750,11 +775,11 @@ + True + True + True +- ++ + + ++ 0 + 1 +- 2 + + + +@@ -765,11 +790,11 @@ + False + True + True +- ++ + + + 1 +- 2 ++ 0 + + + +@@ -781,13 +806,11 @@ + True + True + True +- ++ + + + 1 +- 2 + 1 +- 2 + + + +@@ -795,30 +818,36 @@ + + + True +- 0 +- 0 ++ False + <b>Certificate purposes</b> + True ++ 0 ++ 0 + + + + ++ True ++ True + 3 + + + +- ++ + True ++ False + + + False ++ True + 10 + 4 + + + +- ++ + True ++ False + 12 + end + +@@ -844,7 +873,7 @@ + True + True + True +- ++ + + + False +@@ -860,7 +889,7 @@ + True + True + True +- ++ + + + False +@@ -876,7 +905,7 @@ + True + True + True +- ++ + + + False +@@ -887,6 +916,7 @@ + + + False ++ False + 5 + + +@@ -898,6 +928,7 @@ + + + True ++ False + Certificate properties + + +--- gnomint-1.3.0.orig/gui/new_crl_dialog.ui ++++ gnomint-1.3.0/gui/new_crl_dialog.ui +@@ -1,26 +1,75 @@ +- ++ ++ + +- +- ++ + ++ False + 5 + New CRL - gnoMint + center-on-parent + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical + 11 ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ False ++ True ++ True ++ True ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + + + True +- 0 +- 0 ++ False + <big><b>New Certificate Revocation List</b></big> + True ++ 0 ++ 0 + + + False +@@ -31,9 +80,10 @@ + + + True +- 0 ++ False + Please, select the CA for which a Certificate + Revocation List is going to be created: ++ 0 + + + False +@@ -45,64 +95,25 @@ + + True + True +- automatic +- automatic + in + + + True + True + False +- ++ ++ ++ ++ + + + + ++ True ++ True + 3 + + +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- False +- True +- True +- True +- +- +- +- False +- False +- 1 +- +- +- +- +- False +- end +- 0 +- +- + + + +--- gnomint-1.3.0.orig/gui/new_req_window.ui ++++ gnomint-1.3.0/gui/new_req_window.ui +@@ -1,41 +1,50 @@ +- ++ ++ + +- +- ++ + +- 2048 + 1024 + 5120 ++ 2048 + 1024 + + + True ++ False + New certificate request - gnoMint + True + center + gnomint.png + dialog + ++ ++ ++ + + True ++ False + 8 + False + False + +- ++ + True ++ False ++ vertical + 7 + +- ++ + True ++ False + + + True +- 0 +- 0 ++ False + <big>Certificate Request Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -46,9 +55,10 @@ + + + True ++ False ++ + 0 + 0 +- + + + False +@@ -59,18 +69,26 @@ + + + False ++ True + 0 + + + + + True +- 0 +- <small>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.</small> ++ False ++ <small>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.</small> + True + True ++ 0 + + ++ False ++ True + 1 + + +@@ -84,6 +102,8 @@ + True + + ++ False ++ True + 2 + + +@@ -95,9 +115,11 @@ + False + True + dont_inherit_radiobutton +- ++ + + ++ False ++ True + 3 + + +@@ -105,8 +127,6 @@ + + True + True +- automatic +- automatic + in + + +@@ -114,16 +134,22 @@ + True + False + True ++ ++ ++ + + + + ++ True ++ True + 4 + + + +- ++ + True ++ False + 12 + end + +@@ -149,7 +175,7 @@ + True + True + True +- ++ + + + False +@@ -165,7 +191,7 @@ + True + True + True +- ++ + + + False +@@ -176,6 +202,7 @@ + + + False ++ True + 5 + + +@@ -184,29 +211,34 @@ + + + True ++ False ++ CA properties + 0 + 0 +- CA properties + + + False + + + +- ++ + True ++ False ++ vertical + 6 + +- ++ + True ++ False + + + True +- 0 +- 0 ++ False + <big>Certificate Request Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -217,9 +249,10 @@ + + + True ++ False ++ + 0 + 0 +- + + + False +@@ -235,185 +268,167 @@ + + + +- ++ + True ++ False + 6 +- 6 +- 2 + 6 + + + True ++ False + + + 1 +- 2 +- GTK_FILL +- ++ 0 + + + + + True + True +- +- ++ ++ + + + 1 +- 2 + 5 +- 6 +- + + + + + True +- 0 +- 0 ++ False + Certificate + Common Name (CN): ++ 0 ++ 0 + + ++ 0 + 5 +- 6 +- GTK_FILL +- + + + + + True + True +- ++ + + + 1 +- 2 + 4 +- 5 +- + + + + + True + True +- ++ + + + 1 +- 2 + 3 +- 4 +- + + + + + True + True +- ++ + + + 1 +- 2 + 2 +- 3 +- + + + + + True + True +- ++ + + + 1 +- 2 + 1 +- 2 +- + + + + + True ++ False ++ City: + 0 + 0 +- City: + + ++ 0 + 2 +- 3 +- GTK_FILL +- + + + + + True ++ False ++ State or Province name: + 0 + 0 +- State or Province name: + + ++ 0 + 1 +- 2 +- GTK_FILL +- + + + + + True ++ False ++ Country: + 0 + 0 +- Country: + + +- GTK_FILL +- ++ 0 ++ 0 + + + + + True ++ False ++ Organization Unit: + 0 + 0 +- Organization Unit: + + ++ 0 + 4 +- 5 +- GTK_FILL +- + + + + + True ++ False ++ Organization: + 0 + 0 +- Organization: + + ++ 0 + 3 +- 4 +- GTK_FILL +- + + + + ++ False ++ True + 1 + + + +- ++ + True ++ False + 12 + end + +@@ -439,7 +454,7 @@ + True + True + True +- ++ + + + False +@@ -455,7 +470,7 @@ + True + True + True +- ++ + + + False +@@ -472,7 +487,7 @@ + True + True + True +- ++ + + + False +@@ -495,9 +510,10 @@ + + + True ++ False ++ Root certificate prop + 0 + 0 +- Root certificate prop + + + 1 +@@ -505,19 +521,23 @@ + + + +- ++ + True ++ False ++ vertical + +- ++ + True ++ False + + + True +- 0 +- 0 ++ False + <big>Certificate Request Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -528,9 +548,10 @@ + + + True ++ False ++ + 0 + 0 +- + + + False +@@ -541,23 +562,23 @@ + + + False ++ True + 0 + + + +- ++ + True ++ False + 6 +- 2 +- 2 +- True ++ True + + + True + True + False + 5 +- ++ + AdjustmentKeyLengthSpinButton1 + 1024 + True +@@ -566,15 +587,13 @@ + + + 1 +- 2 + 1 +- 2 +- + + + +- ++ + True ++ False + True + + +@@ -586,7 +605,7 @@ + True + True + dsa_radiobutton1 +- ++ + + + False +@@ -613,45 +632,46 @@ + + + 1 +- 2 +- GTK_FILL +- ++ 0 + + + + + True ++ False ++ Private key bit length: + 0 + 0 +- Private key bit length: + + ++ 0 + 1 +- 2 +- GTK_FILL +- + + + + + True ++ False ++ Private key type: + 0 + 0 +- Private key type: + + +- GTK_FILL +- ++ 0 ++ 0 + + + + ++ True ++ True + 1 + + + +- ++ + True ++ False + 12 + end + +@@ -677,7 +697,7 @@ + True + True + True +- ++ + + + False +@@ -693,7 +713,7 @@ + True + True + True +- ++ + + + False +@@ -709,7 +729,7 @@ + True + True + True +- ++ + + + False +@@ -720,6 +740,7 @@ + + + False ++ True + 2 + + +@@ -731,6 +752,7 @@ + + + True ++ False + page 3 + + +--- gnomint-1.3.0.orig/gui/preferences_dialog.ui ++++ gnomint-1.3.0/gui/preferences_dialog.ui +@@ -1,8 +1,9 @@ +- ++ ++ + +- +- ++ + ++ False + 5 + General Preferences - gnoMint + False +@@ -10,19 +11,51 @@ + center-on-parent + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical + 2 ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ True ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + + + True + True + +- ++ + True ++ False + vertical + + +@@ -33,9 +66,11 @@ + False + True + True +- ++ + + ++ False ++ True + 0 + + +@@ -44,6 +79,7 @@ + + + True ++ False + Export options + + +@@ -52,36 +88,12 @@ + + + ++ False ++ True + 6 + 1 + + +- +- +- True +- end +- +- +- gtk-ok +- True +- True +- True +- True +- +- +- +- False +- False +- 0 +- +- +- +- +- False +- end +- 0 +- +- + + + +--- 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 @@ +- ++ ++ + +- +- ++ + ++ False + Export certificate - gnoMint + True + center +@@ -10,32 +11,82 @@ + gnomint.png + dialog + True +- False ++ ++ ++ + +- ++ + True ++ False + vertical ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + 8 + vertical + 8 + + + True ++ False ++ Please, choose which part of the ++saved certificate you want to export: ++ True + 0 + 0 +- Please, choose which part of the saved certificate you want to export: +- True + + ++ True ++ True + 0 + + + +- ++ + True ++ False + vertical + + +@@ -48,22 +99,29 @@ + True + + ++ True ++ True + 0 + + + + + True +- 0 +- 0 +- 24 +- 9 ++ False ++ 24 ++ 24 ++ 9 ++ 9 + <i>Export only the certificate to a public file, in PEM format.</i> + True + fill + True ++ 0 ++ 0 + + ++ True ++ True + 1 + + +@@ -79,22 +137,31 @@ + publicpart_radiobutton1 + + ++ True ++ True + 2 + + + + + True +- 0 +- 0 +- 24 +- 9 +- <i>Export the saved private key to a PKCS#8 password-protected file. This file should only be accessed by the subject of the certificate.</i> ++ False ++ 24 ++ 24 ++ 9 ++ 9 ++ <i>Export the saved private key to a PKCS#8 password- ++protected file. This file should only be accessed by the ++subject of the certificate.</i> + True + fill + True ++ 0 ++ 0 + + ++ True ++ True + 3 + + +@@ -109,22 +176,31 @@ + publicpart_radiobutton1 + + ++ True ++ True + 4 + + + + + True +- 0 +- 0 +- 24 +- 9 +- <i>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.</i> ++ False ++ 24 ++ 24 ++ 9 ++ 9 ++ <i>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.</i> + True + fill + True ++ 0 ++ 0 + + ++ True ++ True + 5 + + +@@ -139,72 +215,46 @@ + publicpart_radiobutton1 + + ++ True ++ True + 6 + + + + + True +- 0 +- 0 +- 24 +- 9 +- <i>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.</i> ++ False ++ 24 ++ 24 ++ 9 ++ 9 ++ <i>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.</i> + True + fill + True ++ 0 ++ 0 + + ++ True ++ True + 7 + + + + +- 1 +- +- +- +- +- 1 +- +- +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- True +- True +- True +- +- +- False +- False ++ True ++ True + 1 + + + + + False +- end +- 0 ++ True ++ 1 + + + 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 +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, 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 -# 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 -# Copyright 2014-2019 Aaditya Bagga -# 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 , 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 , 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 + #elif defined(__i386__) && defined (__GNUC__) ++#include + + 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 ++// #include + #include + + 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(i), ++ static_cast(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/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/krusader/README b/system/krusader/README deleted file mode 100644 index ebf9e2a48f..0000000000 --- a/system/krusader/README +++ /dev/null @@ -1,13 +0,0 @@ -Krusader is an advanced twin panel (commander style) file manager for KDE -and other desktops in the *nix world, similar to Midnight or Total Commander. -It provides all the file management features you could possibly want. - -Optional run-time dependencies are (available from SlackBuilds.org): -- krename, -- p7zip, -- dpkg, -- rar, -- unace, -- arj, -- unrar, -- md5deep. diff --git a/system/krusader/doinst.sh b/system/krusader/doinst.sh deleted file mode 100644 index 65c7e2eeb9..0000000000 --- a/system/krusader/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/system/krusader/krusader.SlackBuild b/system/krusader/krusader.SlackBuild deleted file mode 100644 index 2306895f6a..0000000000 --- a/system/krusader/krusader.SlackBuild +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh - -# Slackware build script for krusader - -# Copyright 2006,2007,2008,2009,2010 Robby Workman, Northport, Alabama, USA -# Copyright 2010 Grigorios Bouzakis -# Copyright 2012 Bill Kirkpatrick -# Copyright 2017 Andrzej Telszewski, Banie -# 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=krusader -VERSION=${VERSION:-git_20150309_13fa966} -SRCVER=${SRCVER:-13fa9666bec443d2f8a49e35c86ce62859fb4ee5} -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-$SRCVER -tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz -cd $PRGNAM-$SRCVER -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} \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -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 - -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 CREDITS ChangeLog FAQ 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 -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/krusader/krusader.info b/system/krusader/krusader.info deleted file mode 100644 index 9049c62932..0000000000 --- a/system/krusader/krusader.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="krusader" -VERSION="git_20150309_13fa966" -HOMEPAGE="https://krusader.org/" -DOWNLOAD="https://github.com/KDE/krusader/archive/13fa966/krusader-13fa9666bec443d2f8a49e35c86ce62859fb4ee5.tar.gz" -MD5SUM="0a444772e0bddbb0602313985b295120" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Andrzej Telszewski" -EMAIL="atelszewski@gmail.com" diff --git a/system/krusader/slack-desc b/system/krusader/slack-desc deleted file mode 100644 index 4b39778c09..0000000000 --- a/system/krusader/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------------------------------------------------------| -krusader: krusader (Krusader File Manager) -krusader: -krusader: krusader is an advanced twin panel (commander style) file manager -krusader: for KDE and other desktops in the *nix world, similar to Midnight -krusader: or Total Commander. It provides all the file management features -krusader: you could possibly want. -krusader: -krusader: Homepage: https://krusader.org/ -krusader: -krusader: -krusader: 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 . - -# 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/lhasa/README b/system/lhasa/README deleted file mode 100644 index c6441fdb2b..0000000000 --- a/system/lhasa/README +++ /dev/null @@ -1,17 +0,0 @@ -lhasa (Free Software replacement for UNIX LHA tool) - -Lhasa is a Free Software replacement for the Unix LHA tool, for -decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for -the tool is a library, so that it can be reused for other purposes. Lhasa -aims to be compatible with as many types of lzh/lzs archives as -possible. It also aims to generate the same output as the (non-free) -Unix LHA tool, so that it will act as a drop-in free replacement. - -Note that lhasa is only for *decompressing*, not compressing/creating -archives. - -The binary is installed as /usr/bin/lhasa. If installing on a system that -doesn't already have Slackware's lha package, symlinks will be created -so lhasa can be called as /usr/bin/lha (and "man lha" will work). This -allows lhasa to replace Slackware's lha package, but doesn't conflict -if both are installed. diff --git a/system/lhasa/doinst.sh b/system/lhasa/doinst.sh deleted file mode 100644 index e48f847b41..0000000000 --- a/system/lhasa/doinst.sh +++ /dev/null @@ -1,5 +0,0 @@ -# If there's no lha, take over: -if [ ! -r usr/bin/lha ]; then - ( cd usr/bin ; ln -sf lhasa lha ) - ( cd usr/man/man1 ; ln -sf lhasa.1.gz lha.1.gz ) -fi diff --git a/system/lhasa/lhasa.SlackBuild b/system/lhasa/lhasa.SlackBuild deleted file mode 100644 index aa9247fc7c..0000000000 --- a/system/lhasa/lhasa.SlackBuild +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh - -# Slackware build script for lhasa - -# Written by B. Watson (yalhcru@gmail.com) - -# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. - -PRGNAM=lhasa -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 - -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 \ - --program-suffix=sa \ - --disable-static \ - --enable-shared \ - --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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/api -cp -a AUTHORS COPYING INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION -cp -a doc/html/* $PKG/usr/doc/$PRGNAM-$VERSION/api -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/lhasa/lhasa.info b/system/lhasa/lhasa.info deleted file mode 100644 index 0324dff668..0000000000 --- a/system/lhasa/lhasa.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="lhasa" -VERSION="0.3.1" -HOMEPAGE="http://fragglet.github.io/lhasa/" -DOWNLOAD="https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz" -MD5SUM="b843cb4e97f9788f7845f23cd30cc7c6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" diff --git a/system/lhasa/slack-desc b/system/lhasa/slack-desc deleted file mode 100644 index 98930cceef..0000000000 --- a/system/lhasa/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------------------------------------------------------| -lhasa: lhasa (Free Software replacement for UNIX LHA tool) -lhasa: -lhasa: Lhasa is a Free Software replacement for the Unix LHA tool, for -lhasa: decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The -lhasa: backend for the tool is a library, so that it can be reused for -lhasa: other purposes. Lhasa aims to be compatible with as many types of -lhasa: lzh/lzs archives as possible. It also aims to generate the same -lhasa: output as the (non-free) Unix LHA tool, so that it will act as a -lhasa: drop-in free replacement. -lhasa: -lhasa: 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/luckybackup/luckybackup.SlackBuild b/system/luckybackup/luckybackup.SlackBuild index f20c8ef1df..6eade53376 100644 --- a/system/luckybackup/luckybackup.SlackBuild +++ b/system/luckybackup/luckybackup.SlackBuild @@ -74,7 +74,7 @@ patch -p0 < $CWD/luckybackup.pro.patch sed -i "s/PROGVERSION/$VERSION/" ./luckybackup.pro sed -i "s,/usr/share/doc/luckybackup/,/usr/doc/luckybackup-$VERSION/,g" src/global.cpp -qmake luckybackup.pro \ +qmake-qt5 luckybackup.pro \ QMAKE_CFLAGS="$SLKCFLAGS" \ QMAKE_CXXFLAGS="$SLKCFLAGS" 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 + #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 17feed23bd..0000000000 --- a/system/lz4/lz4.SlackBuild +++ /dev/null @@ -1,96 +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. - -# 20201208 bkw: update for 1.9.3 -# 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.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 --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 b6bb9ea084..0000000000 --- a/system/lz4/lz4.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="lz4" -VERSION="1.9.3" -HOMEPAGE="https://lz4.github.io/lz4/" -DOWNLOAD="https://github.com/lz4/lz4/archive/v1.9.3/lz4-1.9.3.tar.gz" -MD5SUM="3a1ab1684e14fc1afc66228ce61b2db3" -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 8ac7c0c470..0000000000 --- a/system/man-db/README +++ /dev/null @@ -1,14 +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 7c9b5a31f6..0000000000 --- a/system/man-db/man-db.SlackBuild +++ /dev/null @@ -1,225 +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. - -# 20210306 bkw: update for v2.9.4 (resync with -current again) -# 20201024 bkw: update for v2.9.3 (matches -current) -# 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.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 - -# 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.3 - -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 62e0c9f10e..0000000000 --- a/system/man-db/man-db.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="man-db" -VERSION="2.9.4" -HOMEPAGE="http://www.nongnu.org/man-db/" -DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.9.4.tar.xz \ - http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.5.3.tar.gz" -MD5SUM="6e233a555f7b9ae91ce7cd0faa322bce \ - dad443d0911cf9f0f1bd90a334bc9004" -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 Binary files a/system/man-db/man_db.conf.new.gz and /dev/null 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/mpich/mpich.SlackBuild b/system/mpich/mpich.SlackBuild index 3245ac845a..cb62c4be9f 100644 --- a/system/mpich/mpich.SlackBuild +++ b/system/mpich/mpich.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 {} \; +# Workaround for gfortran-10.x: https://github.com/pmodels/mpich/issues/4300 +FC="gfortran" \ +FFLAGS="-fallow-argument-mismatch" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ 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 @@ - - - - - monospace - - Noto Mono - - - - Noto Mono - - monospace - - - 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 @@ - - - - - sans-serif - - Noto Sans - - - - Noto Sans - - sans-serif - - - 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 @@ - - - - - serif - - Noto Serif - - - - Noto Serif - - serif - - - 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 -# 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-driver/nvidia-legacy304-driver.SlackBuild b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild index 18fefdaaa8..fe4f0517c1 100644 --- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild +++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild @@ -99,7 +99,6 @@ install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/ install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION-nvidia install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.$VERSION-nvidia -install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia install -m 755 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-compiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ @@ -123,7 +122,6 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then install -m 755 32/libcuda.so.$VERSION $PKG/usr/lib/ install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/libGL.so.$VERSION-nvidia - install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/ install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/ install -m 755 32/libnvidia-ml.so.$VERSION $PKG/usr/lib/ @@ -205,7 +203,7 @@ cd $TMP/nvidia-settings-$VERSION make cd ../../ - CFLAGS="$SLKCFLAGS" \ + CFLAGS="$SLKCFLAGS -fcommon" \ make install -m 755 src/_out/Linux_$TARGET/nvidia-settings $PKG/usr/bin/ @@ -243,8 +241,6 @@ else fi # These update placeholders and correct wrong paths -sed -i "s|__LIBGL_PATH__|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia -sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia sed -i "s|__UTILS_PATH__|/usr/bin|" \ $PKG/usr/share/applications/nvidia-settings.desktop sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" \ diff --git a/system/nvidia-legacy304-driver/nvidia-switch b/system/nvidia-legacy304-driver/nvidia-switch index 4ac2648e9c..7f718f42e5 100644 --- a/system/nvidia-legacy304-driver/nvidia-switch +++ b/system/nvidia-legacy304-driver/nvidia-switch @@ -48,22 +48,18 @@ save_GL(){ if [ "$1" = "nvidia" ]; then if [ ! -e libGL.so.$GL_VERSION-xorg ]; then mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg - mv libGL.la libGL.la-xorg fi mv libGL.so.$NV_VERSION-nvidia libGL.so.$NV_VERSION ln -sf libGL.so.$NV_VERSION libGL.so.1 ln -sf libGL.so.$NV_VERSION libGL.so - mv libGL.la-nvidia libGL.la fi if [ "$1" = "xorg" ]; then mv libGL.so.$NV_VERSION libGL.so.$NV_VERSION-nvidia - mv libGL.la libGL.la-nvidia if [ -e libGL.so.$GL_VERSION-xorg ]; then mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION ln -sf libGL.so.$GL_VERSION libGL.so.1 ln -sf libGL.so.$GL_VERSION libGL.so - mv libGL.la-xorg libGL.la else echo WARNING: libGL.so.$GL_VERSION is missing. fi 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-legacy340-driver/nvidia-legacy340-driver.SlackBuild b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild index 543b3e6516..e4dd4bf1da 100644 --- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild +++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild @@ -76,7 +76,6 @@ install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/ install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION-nvidia install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.$VERSION-nvidia -install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia install -m 755 libEGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so.$VERSION-nvidia install -m 755 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ @@ -104,7 +103,6 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then install -m 755 32/libcuda.so.$VERSION $PKG/usr/lib/ install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/libGL.so.$VERSION-nvidia - install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia install -m 755 32/libEGL.so.$VERSION $PKG/usr/lib/libEGL.so.$VERSION-nvidia install -m 755 32/libnvcuvid.so.$VERSION $PKG/usr/lib/ install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/ @@ -182,7 +180,7 @@ cd $TMP/nvidia-settings-$VERSION make cd ../../ - CFLAGS="$SLKCFLAGS" \ + CFLAGS="$SLKCFLAGS -fcommon" \ make install -m 755 src/_out/Linux_$TARGET/nvidia-settings $PKG/usr/bin/ @@ -234,7 +232,7 @@ cd - \( -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 + CFLAGS="$SLKCFLAGS -I/usr/include/tirpc -Wl,-ltirpc" make #FIXME: need rc.nvidia-persistenced script install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/ install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/ @@ -253,8 +251,6 @@ else fi # These update placeholders and correct wrong paths -sed -i "s|__LIBGL_PATH__|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia -sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia sed -i "s|__UTILS_PATH__|/usr/bin|" \ $PKG/usr/share/applications/nvidia-settings.desktop sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" \ diff --git a/system/nvidia-legacy340-driver/nvidia-switch b/system/nvidia-legacy340-driver/nvidia-switch index fd90c87949..fe6c962fb0 100644 --- a/system/nvidia-legacy340-driver/nvidia-switch +++ b/system/nvidia-legacy340-driver/nvidia-switch @@ -40,8 +40,8 @@ LIB32="${ROOT}usr/lib" XMOD="${LIB}/xorg/modules" XLIB="$XMOD/extensions" NV_VERSION='PKGVERSION' # This will be replaced in the build script -GL_VERSION="1.2.0" -EGL_VERSION="1.0.0" +GL_VERSION="1.7.0" +EGL_VERSION="1.1.0" NV_CONF="/usr/share/X11/xorg.conf.d/10-nvidia.conf" save_GL(){ diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild index b984a32580..5e7b6ea665 100644 --- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild +++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild @@ -373,7 +373,7 @@ if [ "${PERSISTENCED:-no}" = "yes" ]; then \( -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 + CFLAGS="$SLKCFLAGS -I/usr/include/tirpc -Wl,-ltirpc" make install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/ install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/ diff --git a/system/nvidia-legacy390-driver/nvidia-switch b/system/nvidia-legacy390-driver/nvidia-switch index 2f57366cfd..5ea8a5c1c8 100644 --- a/system/nvidia-legacy390-driver/nvidia-switch +++ b/system/nvidia-legacy390-driver/nvidia-switch @@ -67,11 +67,9 @@ 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 - mv libGL.la-nvidia libGL.la ln -sf libGL.so.1.7.0-nvidia libGL.so.1 ln -sf libGL.so.1 libGL.so ln -sf libEGL.so.1.1.0-nvidia libEGL.so.1.1.0 diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild index dadc3c08c9..7c5c310110 100644 --- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild +++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild @@ -78,6 +78,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 e8980f65af..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.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 -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 b5ecb010b2..0000000000 --- a/system/nvme-cli/nvme-cli.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nvme-cli" -VERSION="1.13" -HOMEPAGE="https://github.com/linux-nvme/nvme-cli" -DOWNLOAD="https://github.com/linux-nvme/nvme-cli/archive/v1.13/nvme-cli-1.13.tar.gz" -MD5SUM="a9a326d481fa7bd68cb03bfc5c5e7f44" -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/gcc10.patch b/system/p7zip/gcc10.patch new file mode 100644 index 0000000000..d9571cc230 --- /dev/null +++ b/system/p7zip/gcc10.patch @@ -0,0 +1,22 @@ +https://sourceforge.net/p/p7zip/bugs/226/ + +--- a/CPP/Windows/ErrorMsg.cpp 2020-05-28 00:35:02.729896917 +0200 ++++ b/CPP/Windows/ErrorMsg.cpp 2020-05-28 00:40:01.676442629 +0200 +@@ -13,7 +13,7 @@ + const char * txt = 0; + AString msg; + +- switch(errorCode) { ++ switch(HRESULT(errorCode)) { + case ERROR_NO_MORE_FILES : txt = "No more files"; break ; + case E_NOTIMPL : txt = "E_NOTIMPL"; break ; + case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; +@@ -43,7 +43,7 @@ + const char * txt = 0; + AString msg; + +- switch(messageID) { ++ switch(HRESULT(messageID)) { + case ERROR_NO_MORE_FILES : txt = "No more files"; break ; + case E_NOTIMPL : txt = "E_NOTIMPL"; break ; + case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; diff --git a/system/p7zip/p7zip.SlackBuild b/system/p7zip/p7zip.SlackBuild index ec9cbda5ed..10a5ff1a7a 100644 --- a/system/p7zip/p7zip.SlackBuild +++ b/system/p7zip/p7zip.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" @@ -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/gcc10.patch + make all3 \ OPTFLAGS="$SLKCFLAGS" \ DEST_HOME=/usr \ 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 11043b331e..0000000000 --- a/system/parallel/parallel.SlackBuild +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -# Slackware build script for "parallel". - -# Copyright 2020-2021 CRTS -# Copyright 2015-2017 Marcel Saegebarth -# 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:-20210122} -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 CITATION COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION -cp $CWD/GNU_Parallel_2018.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/system/parallel/parallel.info b/system/parallel/parallel.info deleted file mode 100644 index b9f5ef28f2..0000000000 --- a/system/parallel/parallel.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="parallel" -VERSION="20210122" -HOMEPAGE="http://www.gnu.org/software/parallel/" -DOWNLOAD="https://ftp.gnu.org/gnu/parallel/parallel-20210122.tar.bz2 - https://zenodo.org/record/1146014/files/GNU_Parallel_2018.pdf" -MD5SUM="d7adb3a5cc00bc024eedd5718351cef4 - e32a78d93e53029d7338eac9f4194924" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="CRTS" -EMAIL="crts@gmx.net" 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/linker-no-pie.patch b/system/qemu/linker-no-pie.patch new file mode 100644 index 0000000000..615d9a4ffa --- /dev/null +++ b/system/qemu/linker-no-pie.patch @@ -0,0 +1,40 @@ +diff --git a/configure b/configure +index 3f823ed163..61c17c2dde 100755 +--- a/configure ++++ b/configure +@@ -2133,7 +2133,6 @@ EOF + # Check we support --no-pie first; we will need this for building ROMs. + if compile_prog "-Werror -fno-pie" "-no-pie"; then + CFLAGS_NOPIE="-fno-pie" +- LDFLAGS_NOPIE="-no-pie" + fi + + if test "$static" = "yes"; then +@@ -2149,7 +2148,6 @@ if test "$static" = "yes"; then + fi + elif test "$pie" = "no"; then + CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS" +- CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS" + elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then + CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS" + CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS" +@@ -6768,7 +6766,6 @@ echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak + echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak + echo "GLIB_LIBS=$glib_libs" >> $config_host_mak + echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak +-echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak + echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak + echo "EXESUF=$EXESUF" >> $config_host_mak + echo "HOST_DSOSUF=$HOST_DSOSUF" >> $config_host_mak +diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile +index 084fc10f05..30771f8d17 100644 +--- a/pc-bios/optionrom/Makefile ++++ b/pc-bios/optionrom/Makefile +@@ -41,7 +41,6 @@ override CFLAGS += $(call cc-option, $(Wa)-32) + + LD_I386_EMULATION ?= elf_i386 + override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds +-override LDFLAGS += $(LDFLAGS_NOPIE) + + all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin + diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild index 57a43b834a..e2e1bae37f 100644 --- a/system/qemu/qemu.SlackBuild +++ b/system/qemu/qemu.SlackBuild @@ -59,7 +59,7 @@ # 6.2 16-Nov-2020 version update, 14.2 final release. PRGNAM=qemu -VERSION=${VERSION:-4.1.1} +VERSION=${VERSION:-5.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -135,6 +135,11 @@ else with_vnc="--disable-vnc" fi +# temp fix until upstream catches up. +# ld: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?) +# https://lists.gnu.org/archive/html/qemu-devel/2020-12/msg03684.html +patch -p1 < $CWD/linker-no-pie.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -155,14 +160,11 @@ CXXFLAGS="$SLKCFLAGS" \ $with_vnc \ $targets -# Make these first; otherwise make won't run in parallel. -make config-all-devices.mak config-all-disas.mak - 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 @@ -191,7 +193,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 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 ff582deea0..8735ce5e19 100644 --- a/system/qemu/qemu.info +++ b/system/qemu/qemu.info @@ -1,8 +1,8 @@ PRGNAM="qemu" -VERSION="4.1.1" +VERSION="5.2.0" HOMEPAGE="https://www.qemu.org" -DOWNLOAD="https://download.qemu.org/qemu-4.1.1.tar.xz" -MD5SUM="53879f792ef2675c6c5e6cbf5cc1ac6c" +DOWNLOAD="https://download.qemu.org/qemu-5.2.0.tar.xz" +MD5SUM="179f86928835da857c237b42f4b2df73" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="SDL2" diff --git a/system/qstardict/doinst.sh b/system/qstardict/doinst.sh index 5fb28930db..65c7e2eeb9 100644 --- a/system/qstardict/doinst.sh +++ b/system/qstardict/doinst.sh @@ -1,3 +1,9 @@ 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/system/qstardict/gcc4.4.patch b/system/qstardict/gcc4.4.patch deleted file mode 100644 index db4b3157a7..0000000000 --- a/system/qstardict/gcc4.4.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- trunk/plugins/stardict/dictziplib.cpp 2009/07/10 15:01:40 446 -+++ trunk/plugins/stardict/dictziplib.cpp 2009/08/06 07:32:12 447 -@@ -305,7 +305,7 @@ - - #ifdef Q_OS_UNIX - if (stat(fname.c_str(), &sb) || !S_ISREG(sb.st_mode)) --#elif def Q_OS_WIN32 -+#elif defined(Q_OS_WIN32) - if (_stat(fname.c_str(), &sb) || !(sb.stMode & _S_IFREG)) - #endif - { - diff --git a/system/qstardict/qstardict-1.0.1-glib_includes.patch b/system/qstardict/qstardict-1.0.1-glib_includes.patch deleted file mode 100644 index fd6e993b92..0000000000 --- a/system/qstardict/qstardict-1.0.1-glib_includes.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: plugins/stardict/stardict.cpp -=================================================================== ---- plugins/stardict/stardict.cpp.orig -+++ plugins/stardict/stardict.cpp -@@ -28,8 +28,7 @@ - #include - #include - #include --#include --#include -+#include - #include "lib.h" - #include "file.hpp" - #include "settingsdialog.h" diff --git a/system/qstardict/qstardict.SlackBuild b/system/qstardict/qstardict.SlackBuild index 063d72760f..d29cf70a83 100644 --- a/system/qstardict/qstardict.SlackBuild +++ b/system/qstardict/qstardict.SlackBuild @@ -6,13 +6,13 @@ # Modified by Branko Grubic PRGNAM=qstardict -VERSION=${VERSION:-1.0.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.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 @@ -23,10 +23,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -BUILD_PLASMOID=${BUILD_PLASMOID:-"yes"} - -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" @@ -41,50 +39,24 @@ 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 +rm -rf $PRGNAM-$PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Patch for glib > 2.30.x -# http://sourceforge.net/tracker/?func=detail&aid=3471473&group_id=200786&atid=974933 -patch -p0 < $CWD/qstardict-1.0.1-glib_includes.patch - -# qstardict only have "stardict" and "web" plugins enabled by default. -# Actually there are swac and multitran plugins in addition. -# Uncomment the following line to get full plugins. -# enabled_plugins="stardict web swac multitran" - -qmake QMAKE_CXXFLAGS="$SLKCFLAGS" \ - PLUGINS_DIR=/usr/lib${LIBDIRSUFFIX}/qstardict/plugins \ - DOCS_DIR=/usr/doc/$PRGNAM-$VERSION \ - ENABLED_PLUGINS=$enabled_plugins + \( -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 {} \; +qmake-qt5 ENABLED_PLUGINS="stardict swac web" \ + LIB_DIR=/usr/lib$LIBDIRSUFFIX DOCS_DIR=/usr/doc/$PRGNAM-$VERSION make make install INSTALL_ROOT=$PKG -if [ "$BUILD_PLASMOID" = "yes" ]; then - mkdir kdeplasma/build - cd kdeplasma/build - # Fix the plugin path or LIB_INSTALL_DIR will have no effect... - ( cd ../dataengine ; sed -i -e '4d' -e 's.//..' config.h.cmake ) - cmake -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ - -DCMAKE_INSTALL_PREFIX=/usr .. - make - make install DESTDIR=$PKG - cd - -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 -cp -a README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/qstardict/qstardict.info b/system/qstardict/qstardict.info index 35317dadb0..44559f1367 100644 --- a/system/qstardict/qstardict.info +++ b/system/qstardict/qstardict.info @@ -1,8 +1,8 @@ PRGNAM="qstardict" -VERSION="1.0.1" +VERSION="1.3" HOMEPAGE="http://qstardict.ylsoftware.com/index.php" -DOWNLOAD="http://qstardict.ylsoftware.com/files/qstardict-1.0.1.tar.bz2" -MD5SUM="4e058439edad45103a9f5c74d2a381e5" +DOWNLOAD="https://github.com/a-rodin/qstardict/archive/qstardict-1.3/qstardict-1.3.tar.gz" +MD5SUM="761600b1c0dbb33b1025a073c72851da" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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 , Pisa, Italy +# Copyright 2011-2020 Matteo Bernardini , 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/rEFInd/rEFInd.SlackBuild b/system/rEFInd/rEFInd.SlackBuild index 9046b5f8fa..4388d55d07 100644 --- a/system/rEFInd/rEFInd.SlackBuild +++ b/system/rEFInd/rEFInd.SlackBuild @@ -62,6 +62,9 @@ else REFIND_SUFFIX=ia32 fi sed -i '/^EFICRT0/ s/$/\/gnuefi/' Make.common + +sed -i 's|no-strict-aliasing|no-strict-aliasing -fno-tree-loop-distribute-patterns|' Make.common + make all_gnuefi REFIND_SHARE_DIR=$PKG/usr/share/$PRGNAM-$VERSION mkdir -p $PKG/usr/sbin diff --git a/system/rabbitmq-server/rabbitmq-server.SlackBuild b/system/rabbitmq-server/rabbitmq-server.SlackBuild index be0659042e..3cd446d475 100644 --- a/system/rabbitmq-server/rabbitmq-server.SlackBuild +++ b/system/rabbitmq-server/rabbitmq-server.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rabbitmq-server -VERSION=${VERSION:-3.6.10} +VERSION=${VERSION:-3.8.14} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -110,7 +110,7 @@ chown -R $RABBITMQ_USER:$RABBITMQ_GROUP $PKG/var/{lib,log}/rabbitmq install -dm 750 ${PKG}/etc/rabbitmq install -m 644 $CWD/rabbitmq-env.conf $PKG/etc/rabbitmq/rabbitmq-env.conf.new -install -m 644 deps/rabbit/docs/rabbitmq.config.example ${PKG}/etc/rabbitmq/ +install -m 644 deps/rabbit/docs/rabbitmq.conf.example ${PKG}/etc/rabbitmq/ chown -R $RABBITMQ_USER:$RABBITMQ_GROUP $PKG/etc/rabbitmq mkdir -p ${PKG}/etc/rc.d diff --git a/system/rabbitmq-server/rabbitmq-server.info b/system/rabbitmq-server/rabbitmq-server.info index ec61fb5464..d7a393db86 100644 --- a/system/rabbitmq-server/rabbitmq-server.info +++ b/system/rabbitmq-server/rabbitmq-server.info @@ -1,10 +1,10 @@ PRGNAM="rabbitmq-server" -VERSION="3.6.10" +VERSION="3.8.14" HOMEPAGE="https://www.rabbitmq.com/" -DOWNLOAD="https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.10/rabbitmq-server-3.6.10.tar.xz" -MD5SUM="3b2e7514a016a81859443723f6be514b" +DOWNLOAD="https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.14/rabbitmq-server-3.8.14.tar.xz" +MD5SUM="b79184aec51c4b90a4d3a282c59b3fa9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="erlang-otp" +REQUIRES="elixir" MAINTAINER="Andre Barboza" EMAIL="bmg.andre@gmail.com" 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 -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 -+ -+ * configure: Add check for bfh.h -+ -+2012-06-19 5e07c4e Ivan Hu -+ -+ * tests: Add a test to check invalid PKCS7 signature attaching -+ -+2012-06-19 bfb778e Ivan Hu -+ -+ * sbattach: Check that attached signatures are valid PKCS7 data -+ -+2012-06-14 bf6df84 Jeremy Kerr -+ -+ * sbverify: Use a variable for image filename -+ -+2012-06-13 9b7f7fb Jeremy Kerr -+ -+ * image: Unconditionally parse PE/COFF data -+ -+2012-06-13 128f1c1 Jeremy Kerr -+ -+ * sbverify: Check for failed image load -+ -+2012-06-13 b48e256 Jeremy Kerr -+ -+ * tests: Add tests for missing image, cert & key files -+ -+2012-06-13 0af5e01 Jeremy Kerr -+ -+ * tests: Execute tests in a clean (temporary) directory -+ -+2012-06-13 8716e88 Jeremy Kerr -+ -+ * tests: Use COMPILE.S for assembing test object -+ -+2012-06-13 807f0e6 Jeremy Kerr -+ -+ * Version 0.2 -+ -+2012-06-13 7c2d8bb Jeremy Kerr -+ -+ * docs: Add simple manpage for sbattach -+ -+2012-06-13 deb9211 Jeremy Kerr -+ -+ * automake: Clean generated man files -+ -+2012-06-13 3cde1e4 Jeremy Kerr -+ -+ * tests: Add a few simple tests -+ -+2012-06-13 cc881c2 Jeremy Kerr -+ -+ * Remove unused test.c file -+ -+2012-06-12 4c79e3a Jeremy Kerr -+ -+ * sbattach: Add too to manage detached signatures -+ -+2012-06-12 564f5bc Jeremy Kerr -+ -+ * image: Add facility to write unsigned images -+ -+2012-06-11 a07b8d2 Jeremy Kerr -+ -+ * sbsign,sbverify: Update getopt_long optstrings -+ -+2012-06-11 5836038 Jeremy Kerr -+ -+ * sbverify: Add support for detached signatures -+ -+2012-06-11 b8a7d51 Jeremy Kerr -+ -+ * sbverify: Split image signature table reading to separate function -+ -+2012-06-11 e9f438c Jeremy Kerr -+ -+ * Fix warnings from added -W flags -+ -+2012-06-11 f19e8bb Jeremy Kerr -+ -+ * automake: Add -Wall -Wextra CFLAGS -+ -+2012-06-11 af4f088 Jeremy Kerr -+ -+ * sbsign: Add --detached option to create detached PKCS7 signatures -+ -+2012-06-11 0c9fbd2 Jeremy Kerr -+ -+ * sbsign: fix flag for verbose operation -+ -+2012-06-11 3673db1 Jeremy Kerr -+ -+ * docs: Fix manpage creation -+ -+2012-05-29 9b2f3a7 Adam Conrad -+ -+ * autogen.sh: Fix ccan_module assignment -+ -+2012-05-28 3fb0f00 Jeremy Kerr -+ -+ * image: use read_write_all from ccan -+ -+2012-05-28 f1112b4 Jeremy Kerr -+ -+ * image: Fix format specifier for 32-bit builds -+ -+2012-05-24 d5e634c Jeremy Kerr -+ -+ * autoconfiscate -+ -+2012-05-23 82f8c30 Jeremy Kerr -+ -+ * docs: Add initial manpages -+ -+2012-05-23 c14efcb Jeremy Kerr -+ -+ * sbsign,sbverify: help2man-ize usage output -+ -+2012-05-23 98a4f10 Jeremy Kerr -+ -+ * Makefile: Add dist targets -+ -+2012-05-22 1b2b5c6 Jeremy Kerr -+ -+ * ccan: Add ccan import logic -+ -+2012-05-15 6ff68e5 Jeremy Kerr -+ -+ * Move ccan submodule -+ -+2012-05-15 9a08e25 Jeremy Kerr -+ -+ * Remove unused header -+ -+2012-05-14 bc618c5 Jeremy Kerr -+ -+ * Remove pkcs7-simple test file -+ -+2012-05-14 9ac930e Jeremy Kerr -+ -+ * Makefile: add install target -+ -+2012-05-14 a1b270f Jeremy Kerr -+ -+ * Makefile: Comment components -+ -+2012-05-14 c67b82a Jeremy Kerr -+ -+ * sbverify: clean up openssl init -+ -+2012-05-14 c499763 Jeremy Kerr -+ -+ * sbverify: add check for invalid PKCS7 data -+ -+2012-05-14 74eb766 Jeremy Kerr -+ -+ * sbverify: Add certificate chain verification -+ -+2012-05-12 e111127 Jeremy Kerr -+ -+ * verify: move idc-related parsing to idc.c -+ -+2012-05-12 46cf6a6 Jeremy Kerr -+ -+ * sbsign: fix incorrect check for certificate load -+ -+2012-05-12 57d9f0c Jeremy Kerr -+ -+ * image: reformat gap warnings -+ -+2012-05-12 ab05bec Jeremy Kerr -+ -+ * image: add cert table to image size -+ -+2012-05-12 e1fec08 Jeremy Kerr -+ -+ * sbverify: Add check for image hash -+ -+2012-05-12 fefe97c Jeremy Kerr -+ -+ * sbverify: check for presence of signature table -+ -+2012-05-12 b73f723 Jeremy Kerr -+ -+ * Makefile: add $(tools) var -+ -+2012-05-12 55b1940 Jeremy Kerr -+ -+ * sbsigntool -> sbsign -+ -+2012-05-12 a183de9 Jeremy Kerr -+ -+ * image: open output file with O_TRUNC -+ -+2012-04-24 04b70fc Jeremy Kerr -+ -+ * sbsigntooL: expand usage info -+ -+2012-04-24 9826a43 Jeremy Kerr -+ -+ * Add GPLv3 text in COPYING -+ -+2012-04-24 906654e Jeremy Kerr -+ -+ * coff: remove unneeded coff includes -+ -+2012-04-23 9d3c8b5 Jeremy Kerr -+ -+ * Add copyright comments -+ -+2012-04-23 e019eec Jeremy Kerr -+ -+ * image: warn about potential checksum differences -+ -+2012-04-23 01e33cd Jeremy Kerr -+ -+ * idc: allocate using the image context -+ -+2012-04-23 acd8c0a Jeremy Kerr -+ -+ * 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 -Date: Tue, 6 Jan 2015 08:00:28 -0800 -Subject: [PATCH] OBS add correcting definition of EFI_ARCH - -Signed-off-by: James Bottomley ---- - 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/sddm/README b/system/sddm/README deleted file mode 100644 index 48efe82f75..0000000000 --- a/system/sddm/README +++ /dev/null @@ -1,24 +0,0 @@ -SDDM is a modern display manager for X11 and Wayland aiming to be -fast, simple and beautiful. It uses modern technologies like QtQuick, -which in turn gives the designer the ability to create smooth, -animated user interfaces. - -You will need to edit /etc/rc.d/rc.4 to get this work. -Put the section that refers to sddm before the sections for xdm, kdm -etc: - -# Look for SDDM as well: -if [ -x /usr/bin/sddm ]; then - exec /usr/bin/sddm -fi - -Note: The home for SDDM is set by default in /etc/passwd as -/var/empty. This ought to be changed to /var/lib/sddm. To do this, -run: - -usermod -d /var/lib/sddm sddm - -when SDDM is *not* running. Do this before installing or upgrading the -package. - -Note that this is fixed in -current. diff --git a/system/sddm/consolekit.patch b/system/sddm/consolekit.patch deleted file mode 100644 index 2d0cc20938..0000000000 --- a/system/sddm/consolekit.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/daemon/LogindDBusTypes.cpp -+++ b/src/daemon/LogindDBusTypes.cpp -@@ -60,7 +60,7 @@ - - if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) { - qDebug() << "Console kit interface found"; -- available = true; -+ available = false; - serviceName = QStringLiteral("org.freedesktop.ConsoleKit"); - managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager"); - managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind - diff --git a/system/sddm/doinst.sh b/system/sddm/doinst.sh deleted file mode 100644 index 873f5495c0..0000000000 --- a/system/sddm/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... -} - -config etc/sddm.conf.new - -if [ -n "$(grep sddm etc/passwd | grep var/empty)" ]; then - echo "*NOTICE*" - echo - echo 'SDDM $HOME is set to /var/empty in /etc/passwd' - echo "This needs to be changed to /var/lib/sddm" - echo "(see README)." - echo - echo "Please run:" - echo "usermod -d /var/lib/sddm sddm" - echo -fi diff --git a/system/sddm/sddm.SlackBuild b/system/sddm/sddm.SlackBuild deleted file mode 100644 index a977bd5c30..0000000000 --- a/system/sddm/sddm.SlackBuild +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/sh - -# Slackware build script for sddm -# Copyright 2017 David Woodfall -# 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=sddm -VERSION=${VERSION:-0.18.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 - -SDDM_HOME="/var/lib/sddm" -PW_HOME="$( getent passwd sddm | cut -d: -f6 )" -if [ "$PW_HOME" != "$SDDM_HOME" ]; then - cat < /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - ChangeLog INSTALL.md LICENSE.CC-BY-3.0 LICENSE README.md docs *.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/$SDDM_HOME -chown sddm:sddm $PKG/$SDDM_HOME - -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/sddm/sddm.conf.new b/system/sddm/sddm.conf.new deleted file mode 100644 index b5b4e205e5..0000000000 --- a/system/sddm/sddm.conf.new +++ /dev/null @@ -1,129 +0,0 @@ -[Autologin] -# Whether sddm should automatically log back into sessions when they exit -Relogin=false - -# Name of session file for autologin session (if empty try last logged in) -Session= - -# Username for autologin session -User= - - -[General] -# Halt command -HaltCommand=/sbin/shutdown -h -P now - -# Input method module -InputMethod= - -# Initial NumLock state. Can be on, off or none. -# If property is set to none, numlock won't be changed -# NOTE: Currently ignored if autologin is enabled. -Numlock=on - -# Reboot command -RebootCommand=/sbin/shutdown -r now - - -[Theme] -# Current theme name -Current=maya - -# Cursor theme used in the greeter -CursorTheme=Oxygen_White - -# Number of users to use as threshold -# above which avatars are disabled -# unless explicitly enabled with EnableAvatars -DisableAvatarsThreshold=7 - -# Enable display of custom user avatars -EnableAvatars= - -# Global directory for user avatars -# The files should be named .face.icon -FacesDir=/usr/share/sddm/faces - -# Theme directory path -ThemeDir=/usr/share/sddm/themes - - -[Users] -# Default $PATH for logged in users -DefaultPath=/bin:/usr/bin:/usr/local/bin - -# Comma-separated list of shells. -# Users with these shells as their default won't be listed -HideShells= - -# Comma-separated list of users that should not be listed -HideUsers= - -# Maximum user id for displayed users -MaximumUid=60000 - -# Minimum user id for displayed users -MinimumUid=1000 - -# Remember the session of the last successfully logged in user -RememberLastSession=true - -# Remember the last successfully logged in user -RememberLastUser=true - -# When logging in as the same user twice, restore the original session, rather than create a new one -ReuseSession=false - - -[Wayland] -# Enable Qt's automatic high-DPI scaling -EnableHiDPI=false - -# Path to a script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/wayland-session - -# Directory containing available Wayland sessions -SessionDir=/usr/share/wayland-sessions - -# Path to the user session log file -SessionLogFile=.local/share/sddm/wayland-session.log - - -[X11] -# Path to a script to execute when starting the display server -DisplayCommand=/usr/share/sddm/scripts/Xsetup - -# Path to a script to execute when stopping the display server -DisplayStopCommand=/usr/share/sddm/scripts/Xstop - -# Enable Qt's automatic high-DPI scaling -EnableHiDPI=false - -# The lowest virtual terminal number that will be used. -MinimumVT=7 - -# Arguments passed to the X server invocation -ServerArguments=-nolisten tcp - -# Path to X server binary -ServerPath=/usr/bin/X - -# Path to a script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/Xsession - -# Directory containing available X sessions -SessionDir=/usr/share/xsessions - -# Path to the user session log file -SessionLogFile=.local/share/sddm/xorg-session.log - -# Path to the Xauthority file -UserAuthFile=.Xauthority - -# Path to xauth binary -XauthPath=/usr/bin/xauth - -# Path to Xephyr binary -XephyrPath=/usr/bin/Xephyr - - diff --git a/system/sddm/sddm.info b/system/sddm/sddm.info deleted file mode 100644 index 6b38805b07..0000000000 --- a/system/sddm/sddm.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sddm" -VERSION="0.18.1" -HOMEPAGE="https://github.com/sddm/sddm" -DOWNLOAD="https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz" -MD5SUM="c1ca638a3faf76c526df3049cbc9668a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="extra-cmake-modules qt5" -MAINTAINER="Dave Woodfall" -EMAIL="dave@slackbuilds.org" diff --git a/system/sddm/slack-desc b/system/sddm/slack-desc deleted file mode 100644 index 63b8060419..0000000000 --- a/system/sddm/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------------------------------------------------------| -sddm: sddm (QML based X11 and Wayland display manager) -sddm: -sddm: SDDM is a modern display manager for X11 and Wayland aiming to be -sddm: fast, simple and beautiful. It uses modern technologies like QtQuick, -sddm: which in turn gives the designer the ability to create smooth, -sddm: animated user interfaces. -sddm: -sddm: https://github.com/sddm/sddm -sddm: -sddm: -sddm: diff --git a/system/sddm/xsession.patch b/system/sddm/xsession.patch deleted file mode 100644 index 457ba85ed0..0000000000 --- a/system/sddm/xsession.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur a/data/scripts/Xsession b/data/scripts/Xsession ---- a/data/scripts/Xsession 2018-07-18 11:31:40.000000000 +0100 -+++ b/data/scripts/Xsession 2018-08-07 20:06:16.937412206 +0100 -@@ -68,6 +68,7 @@ - # by the scripts to work - xsessionddir="/etc/X11/Xsession.d" - OPTIONFILE=/etc/X11/Xsession.options -+# This seems to break with some WMs - USERXSESSION=$HOME/.xsession - USERXSESSIONRC=$HOME/.xsessionrc - ALTUSERXSESSION=$HOME/.Xsession -@@ -91,9 +92,10 @@ - fi - [ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources - --if [ -f "$USERXSESSION" ]; then -- . "$USERXSESSION" --fi -+# This seems to break with some WMs -+#if [ -f "$USERXSESSION" ]; then -+# . "$USERXSESSION" -+#fi - - if [ -z "$*" ]; then - exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." diff --git a/system/slackyd/slackyd.SlackBuild b/system/slackyd/slackyd.SlackBuild index e02d19902c..7eeac5a742 100644 --- a/system/slackyd/slackyd.SlackBuild +++ b/system/slackyd/slackyd.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 {} \; -make "CFLAGS=$SLKCFLAGS -lcrypto" +make "CFLAGS=$SLKCFLAGS -lcrypto -w -Wl,--allow-multiple-definition" make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/system/spacefm/gcc10.patch b/system/spacefm/gcc10.patch new file mode 100644 index 0000000000..1e8c1e52d7 --- /dev/null +++ b/system/spacefm/gcc10.patch @@ -0,0 +1,92 @@ +https://github.com/IgnorantGuru/spacefm/issues/770 + +diff --git a/src/settings.c b/src/settings.c +index 280196f..9d8e880 100644 +--- a/src/settings.c ++++ b/src/settings.c +@@ -52,6 +52,24 @@ + /* Dirty hack: check whether we are under LXDE or not */ + #define is_under_LXDE() (g_getenv( "_LXSESSION_PID" ) != NULL) + ++/* GCC 10.1+ */ ++char* settings_terminal_su = NULL; ++char* settings_graphical_su = NULL; ++GList* xset_cmd_history = NULL; ++XSet* evt_win_focus = NULL; ++XSet* evt_win_move = NULL; ++XSet* evt_win_click = NULL; ++XSet* evt_win_key = NULL; ++XSet* evt_win_close = NULL; ++XSet* evt_pnl_show = NULL; ++XSet* evt_pnl_focus = NULL; ++XSet* evt_pnl_sel = NULL; ++XSet* evt_tab_new = NULL; ++XSet* evt_tab_chdir = NULL; ++XSet* evt_tab_focus = NULL; ++XSet* evt_tab_close = NULL; ++XSet* evt_device = NULL; ++ + AppSettings app_settings = {0}; + /* const gboolean singleInstance_default = TRUE; */ + const gboolean show_hidden_files_default = FALSE; +diff --git a/src/settings.h b/src/settings.h +index 07419b8..4591d48 100644 +--- a/src/settings.h ++++ b/src/settings.h +@@ -130,7 +130,7 @@ const char* xset_get_user_tmp_dir(); + /////////////////////////////////////////////////////////////////////////////// + //MOD extra settings below + +-GList* xsets; ++extern GList* xsets; + + enum { + XSET_B_UNSET, +@@ -333,22 +333,22 @@ typedef struct + } XMenuItem; + + // cache these for speed in event handlers +-XSet* evt_win_focus; +-XSet* evt_win_move; +-XSet* evt_win_click; +-XSet* evt_win_key; +-XSet* evt_win_close; +-XSet* evt_pnl_show; +-XSet* evt_pnl_focus; +-XSet* evt_pnl_sel; +-XSet* evt_tab_new; +-XSet* evt_tab_chdir; +-XSet* evt_tab_focus; +-XSet* evt_tab_close; +-XSet* evt_device; ++extern XSet* evt_win_focus; ++extern XSet* evt_win_move; ++extern XSet* evt_win_click; ++extern XSet* evt_win_key; ++extern XSet* evt_win_close; ++extern XSet* evt_pnl_show; ++extern XSet* evt_pnl_focus; ++extern XSet* evt_pnl_sel; ++extern XSet* evt_tab_new; ++extern XSet* evt_tab_chdir; ++extern XSet* evt_tab_focus; ++extern XSet* evt_tab_close; ++extern XSet* evt_device; + + // instance-wide command history +-GList* xset_cmd_history; ++extern GList* xset_cmd_history; + + static const char* terminal_programs[] = //for pref-dialog.c + { +@@ -396,8 +396,8 @@ static const char* gsu_commands[] = // order and contents must match prefdlg.ui + }; + + // These will contain the su and gsu settings from /etc/spacefm/spacefm.conf +-char* settings_terminal_su; +-char* settings_graphical_su; ++extern char* settings_terminal_su; ++extern char* settings_graphical_su; + + typedef struct + { 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 + #include + #include ++#include + + #include + diff --git a/system/spacefm/spacefm.SlackBuild b/system/spacefm/spacefm.SlackBuild index c8a93b7eaa..3254423cf5 100644 --- a/system/spacefm/spacefm.SlackBuild +++ b/system/spacefm/spacefm.SlackBuild @@ -81,6 +81,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 {} \; +# https://github.com/IgnorantGuru/spacefm/issues/727 +patch -p1 < $CWD/glibc-2.28.patch +# https://github.com/IgnorantGuru/spacefm/issues/770 +patch -p1 < $CWD/gcc10.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 5b0176ceb1..0000000000 --- a/system/t1utils/t1utils.SlackBuild +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -# Slackware build script for t1utils - -# Copyright 2013-2021 Kyle Guinn , 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.42} -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 -# (Was fixed in 1.42, but keep this workaround to prefer the system memmem.) -./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 d1d725aa09..0000000000 --- a/system/t1utils/t1utils.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="t1utils" -VERSION="1.42" -HOMEPAGE="https://www.lcdf.org/type/#t1utils" -DOWNLOAD="https://www.lcdf.org/type/t1utils-1.42.tar.gz" -MD5SUM="acc4bc832bafbdc059fb3b0cad8c3ab0" -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/the_silver_searcher/the_silver_searcher.SlackBuild b/system/the_silver_searcher/the_silver_searcher.SlackBuild index 6eb153be2e..b392d0520d 100644 --- a/system/the_silver_searcher/the_silver_searcher.SlackBuild +++ b/system/the_silver_searcher/the_silver_searcher.SlackBuild @@ -75,7 +75,7 @@ autoconf autoheader automake --add-missing -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon" \ ./configure \ --prefix=/usr \ --mandir=/usr/man \ 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 ++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__)) + #include ++#endif + #endif /* SVR4 */ + + #include +@@ -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 -+/* #include */ -+#include /* for openpty and forkpty */ -+#include /* 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/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/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index 0b1d3f9e64..ac4f0b6b5b 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -134,7 +134,7 @@ autoreconf -vif DOCDIR=/usr/doc/$PRGNAM-$VERSION PKGDOC=$PKG/$DOCDIR -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \ CXXFLAGS="$SLKCFLAGS" \ XA=/bin/true \ ./configure \ diff --git a/system/vifm/vifm.SlackBuild b/system/vifm/vifm.SlackBuild index 5974e05a88..5c85d826df 100644 --- a/system/vifm/vifm.SlackBuild +++ b/system/vifm/vifm.SlackBuild @@ -18,7 +18,7 @@ # bothered to support older versions (you're on your own). PRGNAM=vifm -VERSION=${VERSION:-0.10.1} +VERSION=${VERSION:-0.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/vifm/vifm.info b/system/vifm/vifm.info index b006ebeac7..eb97107c56 100644 --- a/system/vifm/vifm.info +++ b/system/vifm/vifm.info @@ -1,8 +1,8 @@ PRGNAM="vifm" -VERSION="0.10.1" +VERSION="0.11" HOMEPAGE="https://vifm.info" -DOWNLOAD="https://downloads.sourceforge.net/vifm/vifm-0.10.1.tar.bz2" -MD5SUM="0afde44205424355ec5f90957971bb07" +DOWNLOAD="https://downloads.sourceforge.net/vifm/vifm-0.11.tar.bz2" +MD5SUM="c79b606b4763b5c9b82d3b3e6f89ded0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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..1b5ee26806 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:-3.2.0} 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..fd4ae674a2 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="3.2.0" 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-3.2.0.tar.gz" +MD5SUM="a87507223c32d15eb12e1754404061dc" 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..0640872fde 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.18} 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..063832d19c 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.18" 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.18/Oracle_VM_VirtualBox_Extension_Pack-6.1.18.vbox-extpack" +MD5SUM="2d76cc451155d87dedb558e0554f4272" 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..f0da0bc6d8 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.18} +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..27c5be7377 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.18" 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.18.tar.xz" +MD5SUM="3dec422341ce223345a211d52930c0ac" 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-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..888e763836 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 # All rights reserved. # @@ -25,7 +25,7 @@ PRGNAM=virtualbox SRCNAM=VirtualBox -VERSION=${VERSION:-5.0.40} +VERSION=${VERSION:-6.1.18} 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 @@ -132,17 +134,15 @@ MODE="755" # 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 +158,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 +214,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 +232,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 +246,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 +254,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..70a53295fe 100644 --- a/system/virtualbox/virtualbox.info +++ b/system/virtualbox/virtualbox.info @@ -1,14 +1,14 @@ PRGNAM="virtualbox" -VERSION="5.0.40" +VERSION="6.1.18" 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.18/VirtualBox-6.1.18.tar.bz2 \ + http://download.virtualbox.org/virtualbox/6.1.18/VBoxGuestAdditions_6.1.18.iso \ + http://download.virtualbox.org/virtualbox/6.1.18/UserManual.pdf \ + http://download.virtualbox.org/virtualbox/6.1.18/SDKRef.pdf" +MD5SUM="c61001386eb3822ab8f06d688a82e84b \ + dc3c3f818d27a78f1accfcda05e13f85 \ + dd8d7c6c90bc3d6bf6d6df2409959c1c \ + b39598031bb68c44721f4fced8e5133c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="acpica virtualbox-kernel" diff --git a/system/wacomtablet/README b/system/wacomtablet/README deleted file mode 100644 index 7e0960d536..0000000000 --- a/system/wacomtablet/README +++ /dev/null @@ -1,2 +0,0 @@ -This module implements a GUI for the Wacom Linux Drivers and extends it -with profile support to handle different button / pen layouts per profile. diff --git a/system/wacomtablet/slack-desc b/system/wacomtablet/slack-desc deleted file mode 100644 index e025263648..0000000000 --- a/system/wacomtablet/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------------------------------------------------------| -wacomtablet: wacomtablet (KDE Wacom Tablet) -wacomtablet: -wacomtablet: This module implements a GUI for the Wacom Linux Drivers and extends -wacomtablet: it with profile support to handle different button / pen layouts -wacomtablet: per profile. -wacomtablet: -wacomtablet: https://github.com/KDE/wacomtablet -wacomtablet: -wacomtablet: -wacomtablet: -wacomtablet: diff --git a/system/wacomtablet/wacomtablet.SlackBuild b/system/wacomtablet/wacomtablet.SlackBuild deleted file mode 100644 index 35cb3a5246..0000000000 --- a/system/wacomtablet/wacomtablet.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -# Slackware build script for KDE wacomtablet - -# Copyright 2013 Giorgio Peron Campodarsego, PD, Italy giorgio.peron@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=wacomtablet -VERSION=${VERSION:-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.gz || tar xvf $CWD/v$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 {} \; - -# Fixes based on Arch Linux patch (thanks!) -sed -i \ - -e 's/cmake_minimum_required(VERSION 2.6)/cmake_minimum_required(VERSION 3.0.0)/' \ - CMakeLists.txt -sed -i \ - -e 's/XsetWacomAdaptor/XinputWacomAdaptor/' \ - autotests/kded/xinputadaptor/CMakeLists.txt - -mkdir 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 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/wacomtablet/wacomtablet.info b/system/wacomtablet/wacomtablet.info deleted file mode 100644 index f424ef99b0..0000000000 --- a/system/wacomtablet/wacomtablet.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wacomtablet" -VERSION="2.1" -HOMEPAGE="https://github.com/KDE/wacomtablet" -DOWNLOAD="https://github.com/KDE/wacomtablet/archive/v2.1.tar.gz" -MD5SUM="54f080ba51567585d8ba8791b28e357b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Giorgio Peron" -EMAIL="giorgio.peron@gmail.com" 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 , 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/xfburn/xfburn.SlackBuild b/system/xfburn/xfburn.SlackBuild index d90ff00729..564e01cbca 100644 --- a/system/xfburn/xfburn.SlackBuild +++ b/system/xfburn/xfburn.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfburn -VERSION=${VERSION:-0.5.5} +VERSION=${VERSION:-0.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/xfburn/xfburn.info b/system/xfburn/xfburn.info index dc50a7af53..38df9792f7 100644 --- a/system/xfburn/xfburn.info +++ b/system/xfburn/xfburn.info @@ -1,8 +1,8 @@ PRGNAM="xfburn" -VERSION="0.5.5" +VERSION="0.6.2" HOMEPAGE="https://goodies.xfce.org/projects/applications/xfburn" -DOWNLOAD="https://archive.xfce.org/src/apps/xfburn/0.5/xfburn-0.5.5.tar.bz2" -MD5SUM="818181480321b382b9943e886bcdfda5" +DOWNLOAD="https://archive.xfce.org/src/apps/xfburn/0.6/xfburn-0.6.2.tar.bz2" +MD5SUM="f4666de100f62fac070b5840e8b98014" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libburn libisofs" 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/yakuake/README b/system/yakuake/README deleted file mode 100644 index be602331b3..0000000000 --- a/system/yakuake/README +++ /dev/null @@ -1,9 +0,0 @@ -Yakuake (Yet Another Kuake) is a KDE terminal emulator. Its design was -inspired from consoles in computer games such as Quake which slide down from -the top of the screen when a key is pressed, and slide back up when the key -is pressed again. - -Running Yakuake is faster than launching a new terminal with a keyboard -shortcut because the program is already loaded into memory, and so can be -useful to people who frequently find themselves opening and closing -terminals for odd tasks. diff --git a/system/yakuake/doinst.sh b/system/yakuake/doinst.sh deleted file mode 100644 index 7c2b4d5242..0000000000 --- a/system/yakuake/doinst.sh +++ /dev/null @@ -1,11 +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/system/yakuake/slack-desc b/system/yakuake/slack-desc deleted file mode 100644 index 59f88d8cf7..0000000000 --- a/system/yakuake/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------------------------------------------------------| -yakuake: yakuake (Yet Another Kuake, KDE terminal emulator) -yakuake: -yakuake: Yakuake is a KDE terminal emulator. Its design was inspired from -yakuake: consoles in computer games such as Quake which slide down from the top -yakuake: of the screen when a key is pressed, and slide back up when the key is -yakuake: pressed again. Its features include: -yakuake: - Smoothly rolls down from the top of your screen -yakuake: - Tabbed interface, Skinnable -yakuake: - Configurable dimensions and animation speed -yakuake: - Sophisticated DCOP interface -yakuake: diff --git a/system/yakuake/yakuake.SlackBuild b/system/yakuake/yakuake.SlackBuild deleted file mode 100644 index 39a8686e79..0000000000 --- a/system/yakuake/yakuake.SlackBuild +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh - -# SlackBuild script for yakuake - -# Copyright 2012-2017 Matthew "mfillpot" Fillpot -# Copyright 2018 Greg Tourte -# 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. - -# Slackware build script for yakuake -# Originally Written by Steffen Schwebel (steffen.schwebel at web.de) - -# Modified by SlackBuilds.org - -PRGNAM=yakuake -VERSION=${VERSION:-2.9.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.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 build -( cd build -cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX="$LIBDIRSUFFIX" \ - -DCMAKE_BUILD_TYPE="Release" \ - -Wno-dev \ - .. - -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 COPYING* KDE4FAQ 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 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/system/yakuake/yakuake.info b/system/yakuake/yakuake.info deleted file mode 100644 index b39cbafe06..0000000000 --- a/system/yakuake/yakuake.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="yakuake" -VERSION="2.9.9" -HOMEPAGE="https://yakuake.kde.org" -DOWNLOAD="https://download.kde.org/stable/yakuake/2.9.9/src/yakuake-2.9.9.tar.xz" -MD5SUM="ef97612710b28d62e43a58bed49cbead" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="ArTourter" -EMAIL="artourter@gmail.com" 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 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 Binary files a/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz and /dev/null 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" -- cgit v1.2.3