From 16f7c508bb21dabaf5d8068454a31ca6f3d6c979 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Mon, 7 Aug 2017 16:31:24 +0200 Subject: 20170807.1 global branch merge. Signed-off-by: Matteo Bernardini --- README | 16 + academic/antiprism/antiprism.SlackBuild | 2 +- academic/cld2/cld2.SlackBuild | 4 +- academic/gelemental/gcc.patch | 12 + academic/gelemental/gelemental.SlackBuild | 3 + academic/genometools/genometools.SlackBuild | 2 +- academic/prank-msa/prank-msa.SlackBuild | 2 +- academic/prank-msa/prank-msa.info | 6 +- academic/primer3/primer3.SlackBuild | 4 +- academic/root/root.SlackBuild | 9 +- academic/root/root.info | 8 +- academic/t_coffee/t_coffee.SlackBuild | 3 +- 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 + accessibility/easystroke/easystroke.SlackBuild | 1 + accessibility/easystroke/gcc7-build-fix.patch | 40 + accessibility/jpilot/jpilot.SlackBuild | 23 +- accessibility/jpilot/jpilot.info | 6 +- audio/aacgain/aacgain.SlackBuild | 2 +- audio/alsamodularsynth/alsamodularsynth.SlackBuild | 9 +- audio/ardour/README | 2 + audio/ardour/ardour.SlackBuild | 12 +- audio/ardour/ardour.info | 6 +- audio/audacious-aac/audacious-aac.SlackBuild | 8 +- audio/audacious-aac/audacious-aac.info | 6 +- .../patches/enable_only_aac_plugin.diff | 2 +- 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/butt/butt.SlackBuild | 2 +- audio/calf-ladspa/calf-ladspa.SlackBuild | 2 +- audio/clementine/clementine.SlackBuild | 3 + audio/clementine/clementine.info | 2 +- audio/clementine/functional-header.patch | 48 + audio/darkice/darkice.SlackBuild | 2 +- audio/jack2/gcc_6_and_7.patch | 41 + audio/jack2/jack2.SlackBuild | 2 + audio/lmms/gcc6.patch | 112 + audio/lmms/lmms.SlackBuild | 3 + audio/mac/gcc6.patch | 181 ++ audio/mac/mac.SlackBuild | 11 +- audio/mac/mac.info | 4 +- audio/milkytracker/README | 3 +- audio/milkytracker/milkytracker.SlackBuild | 52 +- audio/milkytracker/milkytracker.info | 8 +- audio/milkytracker/patches/gnuinstalldirs.patch | 71 + audio/milkytracker/patches/sdlmain.patch | 12 + audio/mixxx/chromaprint-1.4.patch | 44 - audio/mixxx/mixxx.SlackBuild | 15 +- audio/mixxx/mixxx.info | 6 +- audio/muse/README | 2 +- audio/muse/muse.SlackBuild | 18 +- audio/muse/muse.info | 8 +- audio/ocp/ocp.SlackBuild | 2 +- audio/pianobar/pianobar.info | 2 +- audio/rumor/gcc7.diff | 12 + audio/rumor/rumor.SlackBuild | 3 + audio/seq24/perfedit.patch | 29 - audio/seq24/seq24.SlackBuild | 27 +- audio/seq24/seq24.info | 6 +- audio/shell-fm/README | 12 - audio/shell-fm/shell-fm.SlackBuild | 92 - audio/shell-fm/shell-fm.info | 10 - audio/shell-fm/slack-desc | 19 - audio/sidplayfp/sidplayfp.SlackBuild | 10 +- audio/sidplayfp/sidplayfp.info | 6 +- audio/yoshimi/0001-Fix-for-fltk-1.3.patch | 54 - audio/yoshimi/yoshimi.SlackBuild | 32 +- audio/yoshimi/yoshimi.info | 6 +- business/ledger/ledger.SlackBuild | 15 +- business/ledger/ledger.info | 6 +- business/ledger/ledger_git.diff | 105 - desktop/arc-theme-Red/arc-theme-Red.SlackBuild | 8 +- desktop/arc-theme-Red/arc-theme-Red.info | 6 +- desktop/cairo-dock-plugins/README | 2 +- .../cairo-dock-plugins.SlackBuild | 32 +- desktop/cairo-dock-plugins/cairo-dock-plugins.info | 6 +- desktop/cairo-dock-plugins/patches/mono.patch | 106 + .../patches/time_h-confict.patch | 137 + desktop/cairo-dock/cairo-dock.SlackBuild | 17 +- desktop/cairo-dock/cairo-dock.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/dunst/dunst.SlackBuild | 14 +- desktop/dunst/dunst.info | 6 +- desktop/lumina/lumina.SlackBuild | 1 + desktop/lxhotkey/README | 12 + desktop/lxhotkey/lxhotkey.SlackBuild | 104 + desktop/lxhotkey/lxhotkey.info | 10 + desktop/lxhotkey/slack-desc | 19 + desktop/polybar/polybar.SlackBuild | 2 + desktop/searchmonkey/patch.txt | 11 + desktop/searchmonkey/searchmonkey.SlackBuild | 1 + desktop/vokoscreen/README | 3 + desktop/vokoscreen/doinst.sh | 9 + desktop/vokoscreen/slack-desc | 19 + desktop/vokoscreen/vokoscreen.SlackBuild | 94 + desktop/vokoscreen/vokoscreen.info | 10 + desktop/wbar/wbar.SlackBuild | 2 +- development/ChezScheme/ChezScheme.SlackBuild | 1 + development/FreeBASIC/FreeBASIC.SlackBuild | 7 +- 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/anjuta/anjuta.SlackBuild | 2 +- .../apache-log4cxx/apache-log4cxx.SlackBuild | 1 + .../apache-log4cxx/narrowing-fixes.patch.gz | Bin 0 -> 1631 bytes development/avr-binutils/avr-binutils.SlackBuild | 2 +- development/avr-binutils/avr-binutils.info | 6 +- development/avr-gcc/Revert-eeb6872bf.patch | 82 + development/avr-gcc/avr-gcc.SlackBuild | 14 +- development/avr-gcc/avr-gcc.info | 6 +- development/curlpp/curlpp.SlackBuild | 2 +- development/gnats/gnats.SlackBuild | 2 +- development/gpsim/gpsim.SlackBuild | 2 +- development/hte/hte.SlackBuild | 24 +- development/hte/hte.info | 6 +- development/hte/hteditor-2.1.0-gcc-7.patch | 32 + .../fix-scanner-config-for-flex-2.6.x.patch | 23 + development/latrace/latrace.SlackBuild | 3 + development/mysql-pinba/mysql-pinba.SlackBuild | 2 +- .../mysql-workbench/mysql-workbench.SlackBuild | 5 + development/nodejs/chromium-v8-gcc7.patch | 69 + development/nodejs/nodejs.SlackBuild | 6 +- development/numpy/numpy.SlackBuild | 4 +- development/numpy/numpy.info | 6 +- development/odb/odb.SlackBuild | 3 + development/odb/odb_gcc6.patch | 355 +++ 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/srcML/srcML.info | 4 +- development/swfmill/swfmill.SlackBuild | 2 +- development/tora/README | 2 + development/tora/tora.SlackBuild | 14 +- development/tora/tora.info | 8 +- development/wxHexEditor/wxHexEditor.SlackBuild | 8 +- development/wxHexEditor/wxHexEditor.info | 8 +- .../alienarena-7.66-no-qglBlitFramebufferEXT.patch | 22 + games/alienarena/alienarena.SlackBuild | 30 +- games/alienarena/alienarena.info | 4 +- games/alienarena/checkout_code.sh | 6 + 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/desmume/desmume.SlackBuild | 13 +- games/desmume/desmume.info | 6 +- games/desmume/osmesa-header-fix.patch | 11 - games/dolphin-emu/dolphin-emu.SlackBuild | 3 + 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 | 31 + games/etlegacy-from-source/files/openurl.sh | 15 + games/etlegacy-from-source/slack-desc | 19 + games/exult/exult.SlackBuild | 2 +- games/exult/exult.info | 6 +- games/f1spirit/03_gcc6.patch | 12 + games/f1spirit/f1spirit.SlackBuild | 3 + games/frogatto/frogatto.SlackBuild | 6 +- 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/higan/higan.SlackBuild | 4 +- games/higan/higan.info | 8 +- games/higan/slack-desc | 2 +- games/nestopia/nestopia.SlackBuild | 2 +- games/nlarn/nlarn.SlackBuild | 3 + games/noteye/noteye.SlackBuild | 3 + games/nuvie/nuvie.SlackBuild | 2 +- games/openlierox/http_curl.patch | 20 - games/openlierox/openlierox.SlackBuild | 8 +- games/openlierox/openlierox.info | 8 +- games/pcsxr/pcsxr.SlackBuild | 3 + games/pcsxr/zlib129fix.patch | 34 + games/pingus/missing-header.patch | 22 + games/pingus/pingus.SlackBuild | 3 + games/pokerth/pokerth-c++11.patch | 95 + games/pokerth/pokerth-gcc6.patch | 41 + games/pokerth/pokerth.SlackBuild | 7 + games/pokerth/std-ifstream-and-std-ofstream.patch | 151 + games/rlvm/gcc.patch | 24 + games/rlvm/rlvm.SlackBuild | 3 + games/roadfighter/gcc.patch | 11 + games/roadfighter/roadfighter.SlackBuild | 3 + games/scid_vs_pc/scid_vs_pc.SlackBuild | 2 +- games/scid_vs_pc/scid_vs_pc.info | 6 +- .../speed-dreams-params-conversion.patch | 22 + games/speed-dreams/speed-dreams.SlackBuild | 3 + games/torcs/torcs.SlackBuild | 2 +- games/warmux/patches/return-null.patch | 11 + games/warmux/warmux.SlackBuild | 3 + games/widelands/widelands-gcc47.patch | 12 - games/widelands/widelands.SlackBuild | 12 +- games/widelands/widelands.info | 6 +- games/xmoto/xmoto.SlackBuild | 2 +- games/xu4/gcc7.patch | 90 + games/xu4/xu4.SlackBuild | 3 + games/xye/xye.SlackBuild | 2 +- gis/grass/gcc7.patch | 90 + gis/grass/grass.SlackBuild | 2 + gis/xplanet/xplanet.SlackBuild | 6 + graphics/OpenCASCADE/OpenCASCADE.SlackBuild | 2 +- graphics/graphviz/graphviz.SlackBuild | 1 + graphics/k3d/README | 1 - graphics/k3d/gcc7.patch | 23 + graphics/k3d/k3d.SlackBuild | 3 + graphics/k3d/k3d.info | 2 +- graphics/kuickshow/kuickshow.SlackBuild | 8 + graphics/librecad/librecad.SlackBuild | 2 +- graphics/librecad/librecad.info | 6 +- graphics/mypaint/mypaint.SlackBuild | 8 +- graphics/mypaint/mypaint.info | 8 +- graphics/openimageio/openimageio.SlackBuild | 4 +- graphics/photoprint/photoprint.SlackBuild | 20 +- graphics/povray/povray.SlackBuild | 10 +- graphics/povray/povray.info | 6 +- graphics/rawstudio/rawstudio.SlackBuild | 2 +- graphics/ufraw/gcc7.patch | 17 + graphics/ufraw/ufraw.SlackBuild | 3 + graphics/vulkansdk/README | 15 - graphics/vulkansdk/slack-desc | 19 - graphics/vulkansdk/vulkansdk.SlackBuild | 84 - graphics/vulkansdk/vulkansdk.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 +- libraries/Atlas-C++/Atlas-C++.SlackBuild | 2 +- libraries/CEGUI0.7/CEGUI0.7.SlackBuild | 2 +- libraries/DevIL/04_png_set_expand_gray.diff | 26 - libraries/DevIL/DevIL.SlackBuild | 53 +- libraries/DevIL/DevIL.info | 6 +- libraries/DevIL/patch-include_IL_il.h | 13 - libraries/FreeImage/FreeImage.SlackBuild | 2 +- libraries/PyQt5/PyQt5.SlackBuild | 2 +- libraries/PyQt5/PyQt5.info | 6 +- libraries/SDL2/README | 7 - libraries/SDL2/SDL2.SlackBuild | 97 - libraries/SDL2/SDL2.info | 10 - libraries/SDL2/slack-desc | 19 - libraries/SDL2_image/README | 4 - libraries/SDL2_image/SDL2_image.SlackBuild | 99 - libraries/SDL2_image/SDL2_image.info | 10 - libraries/SDL2_image/slack-desc | 19 - libraries/SDL2_mixer/README | 11 - libraries/SDL2_mixer/SDL2_mixer.SlackBuild | 99 - libraries/SDL2_mixer/SDL2_mixer.info | 10 - libraries/SDL2_mixer/slack-desc | 19 - libraries/SDL2_net/README | 3 - libraries/SDL2_net/SDL2_net.SlackBuild | 100 - libraries/SDL2_net/SDL2_net.info | 10 - libraries/SDL2_net/slack-desc | 19 - libraries/SDL2_ttf/README | 4 - libraries/SDL2_ttf/SDL2_ttf.SlackBuild | 99 - libraries/SDL2_ttf/SDL2_ttf.info | 10 - libraries/SDL2_ttf/slack-desc | 19 - libraries/SFGUI/SFGUI.SlackBuild | 6 +- libraries/SFGUI/SFGUI.info | 6 +- libraries/bamf/bamf.SlackBuild | 2 +- libraries/ccrtp/ccrtp.SlackBuild | 2 +- libraries/ccrtp/ccrtp.info | 6 +- libraries/cuneiform/cuneiform-gcc.patch | 98 + libraries/cuneiform/cuneiform.SlackBuild | 12 +- libraries/fuzzylite/fuzzylite.SlackBuild | 6 +- libraries/fuzzylite/fuzzylite.info | 6 +- libraries/gstreamermm/fix_warnings.patch | 15 + libraries/gstreamermm/gstreamermm.SlackBuild | 3 + libraries/hpx/gcc7.patch | 23 + libraries/hpx/hpx.SlackBuild | 4 + libraries/http-parser/http-parser.SlackBuild | 2 +- libraries/json-c/README | 2 + libraries/json-c/json-c.SlackBuild | 110 + libraries/json-c/json-c.info | 10 + libraries/json-c/slack-desc | 19 + libraries/lame/README | 3 - libraries/lame/lame.SlackBuild | 109 - libraries/lame/lame.info | 10 - libraries/lame/slack-desc | 19 - libraries/libbluray/README | 15 - libraries/libbluray/libbluray.SlackBuild | 111 - libraries/libbluray/libbluray.info | 10 - libraries/libbluray/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/libcmis/libcmis.SlackBuild | 2 +- 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 + ...ror-by-default-since-gperf-code-will-not-.patch | 29 + libraries/libe-book/libe-book.SlackBuild | 5 + libraries/libedit/README | 11 - libraries/libedit/libedit.SlackBuild | 105 - libraries/libedit/libedit.info | 10 - libraries/libedit/slack-desc | 19 - libraries/libfaketime/libfaketime.SlackBuild | 4 +- libraries/libfaketime/libfaketime.info | 6 +- libraries/libffado/libffado-derefptr.patch | 20 + libraries/libffado/libffado-gcc6.patch | 19 + libraries/libffado/libffado-mixer.patch | 45 - libraries/libffado/libffado.SlackBuild | 8 +- libraries/libffado/libffado.info | 6 +- libraries/libgexiv2/libgexiv2.SlackBuild | 2 +- libraries/libgexiv2/libgexiv2.info | 6 +- libraries/libinput/README | 13 - libraries/libinput/libinput.SlackBuild | 112 - libraries/libinput/libinput.info | 10 - libraries/libinput/slack-desc | 19 - libraries/libkqueue/libkqueue.SlackBuild | 4 +- libraries/libkqueue/libkqueue.info | 6 +- libraries/libmemcached/libmemcached.SlackBuild | 2 +- libraries/libmp4v2/libmp4v2.SlackBuild | 2 +- libraries/libmusicbrainz/libmusicbrainz.SlackBuild | 2 +- libraries/libmwaw/libmwaw.SlackBuild | 2 +- libraries/libopenshot/libopenshot.SlackBuild | 1 + libraries/libpqxx/libpqxx.SlackBuild | 16 +- libraries/libpqxx/libpqxx.info | 8 +- libraries/libqinfinity/libqinfinity.SlackBuild | 2 +- libraries/libqxt/libqxt-gcc6.patch | 11 + libraries/libqxt/libqxt.SlackBuild | 3 + libraries/libr3/libr3.info | 2 +- libraries/libsidplayfp/libsidplayfp.SlackBuild | 8 +- libraries/libsidplayfp/libsidplayfp.info | 6 +- libraries/libu2f-host/libu2f-host.info | 2 +- libraries/libvirt-python/libvirt-python.SlackBuild | 2 +- libraries/libvirt-python/libvirt-python.info | 6 +- libraries/libvirt/libvirt.SlackBuild | 4 +- libraries/libvirt/libvirt.info | 6 +- libraries/libwacom/README | 5 - libraries/libwacom/libwacom.SlackBuild | 98 - libraries/libwacom/libwacom.info | 10 - libraries/libwacom/slack-desc | 19 - libraries/libwebp/README | 18 - libraries/libwebp/libwebp.SlackBuild | 99 - libraries/libwebp/libwebp.info | 10 - libraries/libwebp/slack-desc | 19 - libraries/libwebsockets/libwebsockets.SlackBuild | 2 +- libraries/libwebsockets/libwebsockets.info | 6 +- libraries/libwps/libwps.SlackBuild | 2 +- libraries/libzrtpcpp/libzrtpcpp.SlackBuild | 4 +- libraries/libzrtpcpp/libzrtpcpp.info | 6 +- libraries/live555/live555.SlackBuild | 4 + libraries/npth/README | 11 - libraries/npth/npth.SlackBuild | 95 - libraries/npth/npth.info | 10 - libraries/npth/slack-desc | 19 - libraries/openbabel/openbabel.SlackBuild | 14 +- libraries/openbabel/openbabel.info | 6 +- libraries/physfs/physfs.SlackBuild | 2 +- libraries/poppler-qt5/poppler-qt5.SlackBuild | 4 +- libraries/poppler-qt5/poppler-qt5.info | 6 +- .../ptlib/ptlib-2.10.10-mga-bison-parameter.patch | 39 - libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch | 2951 ++++++++++++++++++++ libraries/ptlib/ptlib.SlackBuild | 3 +- libraries/qt5/patches/qt-5.7.1_gcc-7.patch | 122 + libraries/qt5/qt5.SlackBuild | 4 + libraries/rapidjson/rapidjson.SlackBuild | 2 +- libraries/rudiments/rudiments.SlackBuild | 8 +- libraries/rudiments/rudiments.info | 6 +- libraries/sdformat/cmake.patch | 20 + libraries/sdformat/sdformat.SlackBuild | 3 + libraries/ucl/ucl.SlackBuild | 1 + libraries/ucommon/ucommon.SlackBuild | 2 +- libraries/ucommon/ucommon.info | 6 +- 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 - ...-explicit-cast-and-prevent-compiler-error.patch | 50 + libraries/wvstreams/wvstreams.SlackBuild | 4 + 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/xml-security-c/xml-security-c.SlackBuild | 3 + libraries/xml-security-c/xmlsec-1.6.1-cxx11.patch | 11 + 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 - 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/hashkill/hashkill.info | 2 +- misc/ibus-unikey/ibus-unikey.SlackBuild | 2 +- misc/krename/krename.SlackBuild | 3 + misc/krename/null.patch | 12 + misc/stardict-tools/stardict-tools.SlackBuild | 3 + misc/xca/xca.SlackBuild | 4 + misc/yapet/gcc6.patch | 11 + misc/yapet/yapet.SlackBuild | 3 + misc/zinnia/zinnia-fixes-gcc6-compile.patch | 22 + misc/zinnia/zinnia.SlackBuild | 3 + multimedia/avidemux/avidemux.SlackBuild | 12 +- multimedia/avidemux/avidemux.info | 6 +- multimedia/avidemux/cmake_3.9.patch | 12 + multimedia/bombono-dvd/bombono-dvd.SlackBuild | 2 + .../patches/fix_operator_ambiguity.patch | 352 +++ .../patches/fix_throw_specifications.patch | 24 + multimedia/dvgrab/dvgrab.SlackBuild | 2 +- multimedia/ffmpeg/README | 70 - multimedia/ffmpeg/ffmpeg.SlackBuild | 255 -- multimedia/ffmpeg/ffmpeg.info | 10 - multimedia/ffmpeg/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/gst-libav/README | 2 - multimedia/gst-libav/gst-libav.SlackBuild | 96 - multimedia/gst-libav/gst-libav.info | 10 - multimedia/gst-libav/slack-desc | 19 - .../gst-plugins-bad/gst-plugins-bad.SlackBuild | 5 +- multimedia/gst-plugins-bad/gst-plugins-bad.info | 6 +- .../gst-plugins-ugly/gst-plugins-ugly.SlackBuild | 2 +- multimedia/gst-plugins-ugly/gst-plugins-ugly.info | 6 +- multimedia/kdenlive/kdenlive.SlackBuild | 3 + multimedia/kodi/kodi.SlackBuild | 3 + multimedia/kodi/patches/std_string.patch | 82 + multimedia/lightspark/lightspark.SlackBuild | 2 +- multimedia/lightspark/lightspark.info | 6 +- multimedia/mlt/mlt.SlackBuild | 7 +- multimedia/mythtv/libvpxenc.patch | 42 - multimedia/mythtv/mythtv.SlackBuild | 7 +- multimedia/mythtv/mythtv.info | 8 +- multimedia/oggvideotools/oggvideotools.SlackBuild | 2 +- multimedia/smpeg/smpeg.SlackBuild | 2 +- multimedia/subtitleeditor/fix-23714-cxx11-v2.patch | 273 -- .../subtitleeditor/subtitleeditor.SlackBuild | 7 +- multimedia/subtitleeditor/subtitleeditor.info | 6 +- multimedia/tvheadend/tvheadend.SlackBuild | 5 +- multimedia/tvheadend/tvheadend.info | 6 +- multimedia/tvtime/tvtime.SlackBuild | 23 +- multimedia/tvtime/tvtime.info | 6 +- multimedia/vlc/vlc.SlackBuild | 2 +- multimedia/vlc/vlc.info | 6 +- network/RSSOwl/RSSOwl.SlackBuild | 2 +- network/aMule/0001-desktop-files-GenericName.patch | 65 + network/aMule/aMule.SlackBuild | 10 +- network/aMule/aMule.info | 8 +- network/bip/bip.SlackBuild | 2 +- network/bwm-ng/bwm-ng.SlackBuild | 3 + network/bwm-ng/fix_gcc7_inline.patch | 40 + network/dobbscoin/dobbscoin.SlackBuild | 9 +- network/dobbscoin/dobbscoin.info | 2 +- network/dwb/dwb.info | 2 +- network/emacs-w3m/emacs-w3m.SlackBuild | 8 +- network/emacs-w3m/emacs-w3m.info | 6 +- network/fcgiwrap/fcgiwrap.SlackBuild | 2 +- network/fqterm/fqterm.SlackBuild | 32 +- network/fqterm/fqterm.info | 6 +- network/guacamole-server/README | 6 +- .../guacamole-server/guacamole-server.SlackBuild | 12 +- network/guacamole-server/guacamole-server.info | 6 +- network/guacamole-server/uuid.patch | 22 +- network/hylafax+/hylafax+.SlackBuild | 4 +- network/hylafax+/hylafax+.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/ip2location-c/ip2location-c.SlackBuild | 12 +- network/ip2location-c/ip2location-c.info | 6 +- 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/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/kvirc/kvirc.SlackBuild | 21 +- network/kvirc/kvirc.info | 8 +- 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/linuxdcpp/linuxdcpp.SlackBuild | 2 +- network/mldonkey/mldonkey.SlackBuild | 20 +- network/mldonkey/mldonkey.info | 6 +- 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/ncrack/ncrack.SlackBuild | 2 +- network/newsbeuter/newsbeuter.SlackBuild | 2 + network/pdns-recursor/README | 2 + network/pdns-recursor/pdns-recursor.SlackBuild | 40 +- network/pdns-recursor/pdns-recursor.info | 8 +- network/pdns-recursor/rc.pdns-recursor | 103 + network/phodav/phodav.SlackBuild | 2 +- network/phodav/phodav.info | 6 +- .../pidgin-musictracker.SlackBuild | 2 +- network/qbittorrent/qbittorrent.SlackBuild | 6 +- network/qbittorrent/qbittorrent.info | 6 +- network/qupzilla/qupzilla.SlackBuild | 10 +- network/qupzilla/qupzilla.info | 6 +- network/razor-agents/razor-agents.SlackBuild | 2 +- network/sqlrelay/sqlrelay.SlackBuild | 8 +- network/sqlrelay/sqlrelay.info | 6 +- network/sshfs-fuse/README | 10 - network/sshfs-fuse/slack-desc | 19 - network/sshfs-fuse/sshfs-fuse.SlackBuild | 99 - network/sshfs-fuse/sshfs-fuse.info | 10 - network/transmission-remote-gtk/README | 4 +- .../transmission-remote-gtk.SlackBuild | 18 +- .../transmission-remote-gtk.info | 6 +- network/vacuum-im/clientinfo.patch | 37 - network/vacuum-im/vacuum-im.SlackBuild | 6 +- network/vacuum-im/vacuum-im.info | 6 +- network/verlihub/verlihub-gcc7.patch | 18 + network/verlihub/verlihub.SlackBuild | 3 + network/zmap/zmap.info | 2 +- office/apvlv/apvlv.SlackBuild | 25 +- office/apvlv/apvlv.info | 6 +- office/coolreader/coolreader.SlackBuild | 45 +- office/coolreader/coolreader.info | 8 +- office/fbreader/fbreader.SlackBuild | 3 + 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/htmldoc/build_fix.patch | 13 + office/htmldoc/htmldoc.SlackBuild | 20 +- office/htmldoc/htmldoc.info | 8 +- office/htmldoc/slack-desc | 2 +- office/juffed/README | 6 - office/juffed/doinst.sh | 3 - office/juffed/juffed.SlackBuild | 99 - office/juffed/juffed.info | 10 - office/juffed/slack-desc | 19 - office/kbgoffice/gcc6.patch | 17 + office/kbgoffice/kbgoffice.SlackBuild | 3 + office/referencer/referencer-lib_path.patch | 11 + office/referencer/referencer.SlackBuild | 3 + perl/perl-Gnome2-Vte/perl-Gnome2-Vte.info | 2 +- python/six/README | 10 - python/six/six.SlackBuild | 87 - python/six/six.info | 10 - python/six/slack-desc | 19 - system/brasero/brasero.SlackBuild | 2 +- system/bulk_extractor/bulk_extractor.SlackBuild | 6 +- system/bulk_extractor/bulk_extractor.info | 6 +- system/caprice32/caprice32.SlackBuild | 2 + system/clamav/clamav-0.99.2-gcc-6.patch | 84 + system/clamav/clamav.SlackBuild | 3 + system/collectd/collectd.SlackBuild | 8 +- system/collectd/collectd.info | 6 +- system/colord/colord.SlackBuild | 5 + system/conky/conky-1.10.6-gcc7.patch | 11 + system/conky/conky.SlackBuild | 3 + system/dymo-cups-drivers/cups-ppd-header.patch | 40 + .../dymo-cups-drivers/dymo-cups-drivers.SlackBuild | 3 + system/dynamips/dynamips.SlackBuild | 1 + system/evilvte/evilvte.info | 2 +- system/facter/facter.SlackBuild | 2 +- system/fakeroot/fakeroot.SlackBuild | 5 + system/fakeroot/glibc-xattr-types.patch | 108 + system/fakeroot/hide-dlsym-error.patch | 32 + system/gnome-terminal/gnome-terminal.info | 2 +- system/guake/guake.info | 2 +- system/guefi/README | 3 + system/guefi/guefi.SlackBuild | 91 + system/guefi/guefi.info | 10 + system/guefi/slack-desc | 19 + system/kyotocabinet/kyotocabinet-1.2.76-gcc6.patch | 45 + system/kyotocabinet/kyotocabinet.SlackBuild | 5 +- system/lilyterm/lilyterm.SlackBuild | 2 +- system/lilyterm/lilyterm.info | 8 +- system/lxterminal/lxterminal.info | 2 +- system/lzop/lzop-1.03-gcc6.patch | 26 + system/lzop/lzop.SlackBuild | 3 + system/nvidia-legacy340-kernel/4.9.patch | 15 + .../nvidia-legacy340-kernel.SlackBuild | 3 + system/opensc/opensc.SlackBuild | 12 +- system/opensc/opensc.info | 6 +- system/qemu/qemu.SlackBuild | 9 +- system/qemu/qemu.info | 6 +- system/qtfm/gcc6.patch | 12 + system/qtfm/qtfm.SlackBuild | 11 +- system/qtfm/qtfm.info | 8 +- system/rhash/rhash.SlackBuild | 6 +- system/rhash/rhash.info | 6 +- system/roxterm/roxterm.info | 2 +- system/tp_smapi/tp_smapi.SlackBuild | 6 +- system/tp_smapi/tp_smapi.info | 6 +- system/ttyrec/ttyrec.SlackBuild | 2 +- system/uhd/uhd.SlackBuild | 14 +- system/uhd/uhd.info | 8 +- system/upx/upx.SlackBuild | 2 + system/vice/vice.SlackBuild | 6 +- system/vice/vice.info | 6 +- system/xnp2/gcc6.patch | 17 + system/xnp2/xnp2.SlackBuild | 3 + 667 files changed, 9926 insertions(+), 6930 deletions(-) create mode 100644 academic/gelemental/gcc.patch 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 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 create mode 100644 audio/clementine/functional-header.patch create mode 100644 audio/jack2/gcc_6_and_7.patch create mode 100644 audio/lmms/gcc6.patch create mode 100644 audio/mac/gcc6.patch create mode 100644 audio/milkytracker/patches/gnuinstalldirs.patch create mode 100644 audio/milkytracker/patches/sdlmain.patch delete mode 100644 audio/mixxx/chromaprint-1.4.patch create mode 100644 audio/rumor/gcc7.diff delete mode 100644 audio/seq24/perfedit.patch 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/yoshimi/0001-Fix-for-fltk-1.3.patch delete mode 100644 business/ledger/ledger_git.diff create mode 100644 desktop/cairo-dock-plugins/patches/mono.patch create mode 100644 desktop/cairo-dock-plugins/patches/time_h-confict.patch 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 create mode 100644 desktop/lxhotkey/README create mode 100644 desktop/lxhotkey/lxhotkey.SlackBuild create mode 100644 desktop/lxhotkey/lxhotkey.info create mode 100644 desktop/lxhotkey/slack-desc create mode 100644 desktop/searchmonkey/patch.txt create mode 100644 desktop/vokoscreen/README create mode 100644 desktop/vokoscreen/doinst.sh create mode 100644 desktop/vokoscreen/slack-desc create mode 100644 desktop/vokoscreen/vokoscreen.SlackBuild create mode 100644 desktop/vokoscreen/vokoscreen.info 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/apache-log4cxx/narrowing-fixes.patch.gz create mode 100644 development/avr-gcc/Revert-eeb6872bf.patch create mode 100644 development/hte/hteditor-2.1.0-gcc-7.patch create mode 100644 development/latrace/fix-scanner-config-for-flex-2.6.x.patch create mode 100644 development/nodejs/chromium-v8-gcc7.patch create mode 100644 development/odb/odb_gcc6.patch 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 games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch create mode 100644 games/alienarena/checkout_code.sh create mode 100644 games/brainparty/patches/gcc-6.patch create mode 100644 games/chroma/gcc.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 create mode 100644 games/glob2/c++14.patch create mode 100644 games/goonies/gcc6.patch delete mode 100644 games/openlierox/http_curl.patch create mode 100644 games/pcsxr/zlib129fix.patch create mode 100644 games/pingus/missing-header.patch create mode 100644 games/pokerth/pokerth-c++11.patch create mode 100644 games/pokerth/pokerth-gcc6.patch create mode 100644 games/pokerth/std-ifstream-and-std-ofstream.patch 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/warmux/patches/return-null.patch delete mode 100644 games/widelands/widelands-gcc47.patch create mode 100644 games/xu4/gcc7.patch create mode 100644 gis/grass/gcc7.patch create mode 100644 graphics/k3d/gcc7.patch create mode 100644 graphics/ufraw/gcc7.patch delete mode 100644 graphics/vulkansdk/README delete mode 100644 graphics/vulkansdk/slack-desc delete mode 100644 graphics/vulkansdk/vulkansdk.SlackBuild delete mode 100644 graphics/vulkansdk/vulkansdk.info create mode 100644 ham/svxlink/gcc6.patch delete mode 100644 libraries/DevIL/04_png_set_expand_gray.diff delete mode 100644 libraries/DevIL/patch-include_IL_il.h 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 create mode 100644 libraries/cuneiform/cuneiform-gcc.patch create mode 100644 libraries/gstreamermm/fix_warnings.patch create mode 100644 libraries/hpx/gcc7.patch create mode 100644 libraries/json-c/README create mode 100644 libraries/json-c/json-c.SlackBuild create mode 100644 libraries/json-c/json-c.info create mode 100644 libraries/json-c/slack-desc 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/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/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/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 create mode 100644 libraries/libe-book/0001-Disable-werror-by-default-since-gperf-code-will-not-.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 create mode 100644 libraries/libffado/libffado-derefptr.patch create mode 100644 libraries/libffado/libffado-gcc6.patch delete mode 100644 libraries/libffado/libffado-mixer.patch 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/libqxt/libqxt-gcc6.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/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/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/qt5/patches/qt-5.7.1_gcc-7.patch create mode 100644 libraries/sdformat/cmake.patch 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 create mode 100644 libraries/wvstreams/patches/0001-Use-explicit-cast-and-prevent-compiler-error.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 create mode 100644 libraries/xml-security-c/xmlsec-1.6.1-cxx11.patch 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 misc/gourmet/tostring-to-tobytes.patch create mode 100644 misc/krename/null.patch create mode 100644 misc/yapet/gcc6.patch create mode 100644 misc/zinnia/zinnia-fixes-gcc6-compile.patch create mode 100644 multimedia/avidemux/cmake_3.9.patch create mode 100644 multimedia/bombono-dvd/patches/fix_operator_ambiguity.patch create mode 100644 multimedia/bombono-dvd/patches/fix_throw_specifications.patch delete mode 100644 multimedia/ffmpeg/README 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/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 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/kodi/patches/std_string.patch delete mode 100644 multimedia/mythtv/libvpxenc.patch delete mode 100644 multimedia/subtitleeditor/fix-23714-cxx11-v2.patch create mode 100644 network/aMule/0001-desktop-files-GenericName.patch create mode 100644 network/bwm-ng/fix_gcc7_inline.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/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 create mode 100644 network/pdns-recursor/rc.pdns-recursor 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/vacuum-im/clientinfo.patch create mode 100644 network/verlihub/verlihub-gcc7.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/htmldoc/build_fix.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 create mode 100644 office/referencer/referencer-lib_path.patch 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 create mode 100644 system/clamav/clamav-0.99.2-gcc-6.patch create mode 100644 system/conky/conky-1.10.6-gcc7.patch create mode 100644 system/dymo-cups-drivers/cups-ppd-header.patch create mode 100644 system/fakeroot/glibc-xattr-types.patch create mode 100644 system/fakeroot/hide-dlsym-error.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 create mode 100644 system/kyotocabinet/kyotocabinet-1.2.76-gcc6.patch create mode 100644 system/lzop/lzop-1.03-gcc6.patch create mode 100644 system/nvidia-legacy340-kernel/4.9.patch create mode 100644 system/qtfm/gcc6.patch create mode 100644 system/xnp2/gcc6.patch diff --git a/README b/README index 2a7d813872..b31c68f074 100644 --- a/README +++ b/README @@ -1,3 +1,19 @@ +SBo-git - slackbuilds repository for slackware-current +- - - + +this is a 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/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/cld2/cld2.SlackBuild b/academic/cld2/cld2.SlackBuild index 0011d0d861..bd6f5526fe 100644 --- a/academic/cld2/cld2.SlackBuild +++ b/academic/cld2/cld2.SlackBuild @@ -68,7 +68,7 @@ cd $PRGNAM-$SRCREV chown -R root:root . ( cd internal - g++ -shared $SLKCFLAGS \ + g++ -shared $SLKCFLAGS -Wno-error=narrowing \ cldutil.cc cldutil_shared.cc compact_lang_det.cc compact_lang_det_hint_code.cc \ compact_lang_det_impl.cc debug.cc fixunicodevalue.cc \ generated_entities.cc generated_language.cc generated_ulscript.cc \ @@ -80,7 +80,7 @@ chown -R root:root . cld2_generated_distinctoctachrome.cc cld_generated_score_quad_octa_2.cc \ -o libcld2.so - g++ -shared $SLKCFLAGS \ + g++ -shared $SLKCFLAGS -Wno-error=narrowing \ cldutil.cc cldutil_shared.cc compact_lang_det.cc compact_lang_det_hint_code.cc \ compact_lang_det_impl.cc debug.cc fixunicodevalue.cc \ generated_entities.cc generated_language.cc generated_ulscript.cc \ 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 22beaf7d9c..f8a08e984d 100644 --- a/academic/gelemental/gelemental.SlackBuild +++ b/academic/gelemental/gelemental.SlackBuild @@ -84,6 +84,9 @@ sed -i "s:set_size_request (50, 50):set_size_request (64, 64):" src/buttons.cc # include glib.h instead of individual headers. patch -p1 -i $CWD/glib-single-include.patch +# Fix for the newer gcc +patch -p1 -i $CWD/gcc.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ diff --git a/academic/genometools/genometools.SlackBuild b/academic/genometools/genometools.SlackBuild index e6ca3e09d0..a617ee7485 100644 --- a/academic/genometools/genometools.SlackBuild +++ b/academic/genometools/genometools.SlackBuild @@ -76,7 +76,7 @@ find -L . \ sed -i "s:lib/libgenometools:lib${LIBDIRSUFFIX}/libgenometools:g" Makefile sed -i "s:\$(prefix)/lib:\$(prefix)/lib${LIBDIRSUFFIX}:g" Makefile -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=format-truncation=" \ CXXFLAGS="$SLKCFLAGS" \ make $BUILDARCH \ prefix=/usr diff --git a/academic/prank-msa/prank-msa.SlackBuild b/academic/prank-msa/prank-msa.SlackBuild index e1180665b5..f9de0b7ec9 100644 --- a/academic/prank-msa/prank-msa.SlackBuild +++ b/academic/prank-msa/prank-msa.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=prank-msa SRCNAM=prank.source -VERSION=${VERSION:-150803} +VERSION=${VERSION:-170427} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/academic/prank-msa/prank-msa.info b/academic/prank-msa/prank-msa.info index 2d999b1d23..ab3041d52b 100644 --- a/academic/prank-msa/prank-msa.info +++ b/academic/prank-msa/prank-msa.info @@ -1,10 +1,10 @@ PRGNAM="prank-msa" -VERSION="150803" +VERSION="170427" HOMEPAGE="http://wasabiapp.org/software/prank/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="http://wasabiapp.org/download/prank/prank.source.150803.tgz" -MD5SUM_x86_64="71ac2659e91c385c96473712c0a23e8a" +DOWNLOAD_x86_64="http://wasabiapp.org/download/prank/prank.source.170427.tgz" +MD5SUM_x86_64="a5cda14dc4e5efe1f14b84eb7a7caabd" REQUIRES="bppsuite mafft exonerate" MAINTAINER="Petar Petrov" EMAIL="slackalaxy@gmail.com" diff --git a/academic/primer3/primer3.SlackBuild b/academic/primer3/primer3.SlackBuild index 8e60d3fe02..78d8dbf3d5 100644 --- a/academic/primer3/primer3.SlackBuild +++ b/academic/primer3/primer3.SlackBuild @@ -72,13 +72,11 @@ find -L . \ 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. 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/t_coffee/t_coffee.SlackBuild b/academic/t_coffee/t_coffee.SlackBuild index 7329c61e2f..b2b07568f2 100644 --- a/academic/t_coffee/t_coffee.SlackBuild +++ b/academic/t_coffee/t_coffee.SlackBuild @@ -73,7 +73,8 @@ find -L . \ cd t_coffee_source -CFLAGS="$SLKCFLAGS" \ +sed -i "s|-O3|$SLKCFLAGS -fpermissive|" makefile + CC="gcc" \ FCC="gfortran" \ make -i all 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 e579ff1e9a..bdddfa4182 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 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ 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 87ba9524d7..617d64049e 100644 --- a/academic/ugene/ugene.SlackBuild +++ b/academic/ugene/ugene.SlackBuild @@ -73,6 +73,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks fedora +patch -p1 < $CWD/ugene-1.22.0-dont_hardcode_includes.patch + # Fix libraries and man pages paths sed -i "s:/lib:/lib${LIBDIRSUFFIX}:g" src/ugene_globals.pri sed -i "s:/share/man:/man:g" src/ugene_globals.pri diff --git a/accessibility/easystroke/easystroke.SlackBuild b/accessibility/easystroke/easystroke.SlackBuild index 29b04e812b..3e2f2fedcc 100644 --- a/accessibility/easystroke/easystroke.SlackBuild +++ b/accessibility/easystroke/easystroke.SlackBuild @@ -59,6 +59,7 @@ sed -i 's|-lboost_serialization-mt|-lboost_serialization|' Makefile # Thanks to ARCH Linux patch -p1 < $CWD/lambda.patch +patch -p1 < $CWD/gcc7-build-fix.patch make CXX="g++ $SLKCFLAGS" CC="gcc -std=c99 $SLKCFLAGS" PREFIX=/usr diff --git a/accessibility/easystroke/gcc7-build-fix.patch b/accessibility/easystroke/gcc7-build-fix.patch new file mode 100644 index 0000000000..b66bcb4edf --- /dev/null +++ b/accessibility/easystroke/gcc7-build-fix.patch @@ -0,0 +1,40 @@ +From 9e2c32390c5c253aade3bb703e51841748d2c37e Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely +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/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 45d6ae6ebb..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://jpilot.org/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/audio/aacgain/aacgain.SlackBuild b/audio/aacgain/aacgain.SlackBuild index 2a138e95c9..cabdf16c33 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" \ ./configure \ --build=$ARCH-slackware-linux diff --git a/audio/alsamodularsynth/alsamodularsynth.SlackBuild b/audio/alsamodularsynth/alsamodularsynth.SlackBuild index 60c79fccb5..088d4c44dd 100644 --- a/audio/alsamodularsynth/alsamodularsynth.SlackBuild +++ b/audio/alsamodularsynth/alsamodularsynth.SlackBuild @@ -31,7 +31,7 @@ TARNAM=ams if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -72,6 +72,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +export CC=clang +export CXX=clang++ + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LIBS="-ldl" \ diff --git a/audio/ardour/README b/audio/ardour/README index 7894f96b66..3fe7f11121 100644 --- a/audio/ardour/README +++ b/audio/ardour/README @@ -1,3 +1,5 @@ Ardour is an application to fit the needs of musicians under Linux. It is designed to be a fully functional professional audio application, that uses the professional sound server jack for sound i/o. + +cppunit and suil are optional dependencies. diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild index 8eefcb3953..80e5ccc6ee 100644 --- a/audio/ardour/ardour.SlackBuild +++ b/audio/ardour/ardour.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ardour -VERSION=${VERSION:-4.7.0} +VERSION=${VERSION:-5.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 @@ -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 @@ -106,10 +106,10 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh # Let's not clobber config files -cd $PKG/etc/ardour4 +cd $PKG/etc/ardour5 for i in $(find . -type f) ; do mv $i $i.new - echo "config etc/ardour4/$i.new" >> $PKG/install/doinst.sh + echo "config etc/ardour5/$i.new" >> $PKG/install/doinst.sh done cd - diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info index afb7049ee1..5387fa5b06 100644 --- a/audio/ardour/ardour.info +++ b/audio/ardour/ardour.info @@ -1,8 +1,8 @@ PRGNAM="ardour" -VERSION="4.7.0" +VERSION="5.10.0" HOMEPAGE="http://ardour.org" -DOWNLOAD="http://www.liwjatan.at/files/src/ardour/Ardour-4.7.0.tar.bz2" -MD5SUM="60b7b889beb3727b55264513fd93af3b" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/Ardour-5.10.0.tar.bz2" +MD5SUM="fee09577683747a9b9ef1445c8b3f4a0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="aubio jack-audio-connection-kit liblo liblrdf vamp-plugin-sdk rubberband lv2 cwiid lilv" 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 574bc34f88..2a903ffb9a 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="http://audacious-media-player.org/" -DOWNLOAD="http://distfiles.audacious-media-player.org/audacious-plugins-3.7.2.tar.bz2" -MD5SUM="6ae2f17885897e717b8bbafc32858e2f" +DOWNLOAD="http://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-aac/patches/enable_only_aac_plugin.diff b/audio/audacious-aac/patches/enable_only_aac_plugin.diff index eb0d46801c..94692f2f26 100644 --- a/audio/audacious-aac/patches/enable_only_aac_plugin.diff +++ b/audio/audacious-aac/patches/enable_only_aac_plugin.diff @@ -2,7 +2,7 @@ +++ audacious-plugins-3.6.1/Makefile 2015-04-23 19:59:48.072721987 +0200 @@ -1,4 +1,4 @@ -SUBDIRS = src po -+SUBDIRS = src/aac-raw ++SUBDIRS = src/aac DISTCLEAN = buildsys.mk config.h config.log config.status extra.mk 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 4f20ab124e..d334093006 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="http://audacious-media-player.org/" -DOWNLOAD="http://distfiles.audacious-media-player.org/audacious-plugins-3.7.2.tar.bz2" -MD5SUM="6ae2f17885897e717b8bbafc32858e2f" +DOWNLOAD="http://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 f45b5c764f..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, Herrenberg, BW; 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 5370644793..0000000000 --- a/audio/audacious-ffmpeg/audacious-ffmpeg.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="audacious-ffmpeg" -VERSION="3.7.2" -HOMEPAGE="http://audacious-media-player.org/" -DOWNLOAD="http://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[at]schoepfer[dot]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 1c73a4afc1..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: http://audacious-media-player.org/ -audacious-ffmpeg: -audacious-ffmpeg: -audacious-ffmpeg: -audacious-ffmpeg: -audacious-ffmpeg: diff --git a/audio/butt/butt.SlackBuild b/audio/butt/butt.SlackBuild index 8cfe05ed28..5a9e116b18 100644 --- a/audio/butt/butt.SlackBuild +++ b/audio/butt/butt.SlackBuild @@ -55,7 +55,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 d5e99369ae..d6675b8c85 100644 --- a/audio/clementine/clementine.SlackBuild +++ b/audio/clementine/clementine.SlackBuild @@ -78,6 +78,8 @@ patch -p1 < $CWD/sqlite.patch # https://github.com/clementine-player/Clementine/commit/ded312685735fc266d4154d355286eeb86db3bcd patch -p1 < $CWD/chromaprint-1.4.patch +patch -p1 < $CWD/functional-header.patch + mkdir build cd build cmake \ @@ -86,6 +88,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ + -DUSE_SYSTEM_PROJECTM=1 \ -DCMAKE_BUILD_TYPE=Release \ .. make all CFLAGS="-fPIC" PMFLAGS="-DNEWBUFFER" diff --git a/audio/clementine/clementine.info b/audio/clementine/clementine.info index 1f92d726a1..184e07d412 100644 --- a/audio/clementine/clementine.info +++ b/audio/clementine/clementine.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz" MD5SUM="04ce1c102841282e620d4caae2a897a2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="chromaprint cryptopp libechonest protobuf" +REQUIRES="chromaprint cryptopp libechonest projectM protobuf" MAINTAINER="David Woodfall" EMAIL="dave@dawoodfall.net" diff --git a/audio/clementine/functional-header.patch b/audio/clementine/functional-header.patch new file mode 100644 index 0000000000..f41147d0ff --- /dev/null +++ b/audio/clementine/functional-header.patch @@ -0,0 +1,48 @@ +From a2f7d018c7bdee96d4cefd5a1ec0c4f710fea226 Mon Sep 17 00:00:00 2001 +From: Morris +Date: Sun, 12 Feb 2017 23:41:43 +0100 +Subject: [PATCH] Add missing includes + +--- + src/core/mergedproxymodel.cpp | 1 + + src/devices/giolister.cpp | 1 + + src/library/groupbydialog.cpp | 2 ++ + 3 files changed, 4 insertions(+) + +diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp +index 56217f6..8c210d3 100644 +--- a/src/core/mergedproxymodel.cpp ++++ b/src/core/mergedproxymodel.cpp +@@ -23,6 +23,7 @@ + + #include + ++#include + #include + + // boost::multi_index still relies on these being in the global namespace. +diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp +index aa3bddb..5f63ef2 100644 +--- a/src/devices/giolister.cpp ++++ b/src/devices/giolister.cpp +@@ -17,6 +17,7 @@ + + #include "config.h" + ++#include + #include + + #include +diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp +index 5efdc9f..e5f711b 100644 +--- a/src/library/groupbydialog.cpp ++++ b/src/library/groupbydialog.cpp +@@ -20,6 +20,8 @@ + + #include + ++#include ++ + // boost::multi_index still relies on these being in the global namespace. + using std::placeholders::_1; + using std::placeholders::_2; 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/jack2/gcc_6_and_7.patch b/audio/jack2/gcc_6_and_7.patch new file mode 100644 index 0000000000..1fbf7b6a4b --- /dev/null +++ b/audio/jack2/gcc_6_and_7.patch @@ -0,0 +1,41 @@ +diff -Naur jack-1.9.10.orig/tests/iodelay.cpp jack-1.9.10/tests/iodelay.cpp +--- jack-1.9.10.orig/tests/iodelay.cpp 2014-07-18 14:28:13.000000000 +0200 ++++ jack-1.9.10/tests/iodelay.cpp 2017-07-26 11:30:15.780890455 +0200 +@@ -20,6 +20,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -167,8 +168,8 @@ + static jack_port_t *jack_capt; + static jack_port_t *jack_play; + +-jack_latency_range_t capture_latency = {-1, -1}; +-jack_latency_range_t playback_latency = {-1, -1}; ++jack_latency_range_t capture_latency = {UINT32_MAX, UINT32_MAX}; ++jack_latency_range_t playback_latency = {UINT32_MAX, UINT32_MAX}; + + void + latency_cb (jack_latency_callback_mode_t mode, void *arg) +@@ -266,4 +267,4 @@ + return 0; + } + +-// -------------------------------------------------------------------------------- +\ No newline at end of file ++// -------------------------------------------------------------------------------- +diff -Naur jack-1.9.10.orig/tests/test.cpp jack-1.9.10/tests/test.cpp +--- jack-1.9.10.orig/tests/test.cpp 2014-07-18 14:28:13.000000000 +0200 ++++ jack-1.9.10/tests/test.cpp 2017-07-26 11:30:35.980457716 +0200 +@@ -480,7 +480,7 @@ + jack_nframes_t delta_time = cur_time - last_time; + + Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time); +- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) { ++ if (delta_time > 0 && (jack_nframes_t)abs((int64_t)delta_time - cur_buffer_size) > tolerance) { + printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance); + } + diff --git a/audio/jack2/jack2.SlackBuild b/audio/jack2/jack2.SlackBuild index 204c9293e3..f35d6925ba 100644 --- a/audio/jack2/jack2.SlackBuild +++ b/audio/jack2/jack2.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/gcc_6_and_7.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./waf configure \ diff --git a/audio/lmms/gcc6.patch b/audio/lmms/gcc6.patch new file mode 100644 index 0000000000..ef7fbe75c9 --- /dev/null +++ b/audio/lmms/gcc6.patch @@ -0,0 +1,112 @@ +From a06cb0126ccb025993efb2d81c7cbfd8edd60609 Mon Sep 17 00:00:00 2001 +From: Javier Serrano Polo +Date: Sat, 30 Apr 2016 00:00:09 +0200 +Subject: [PATCH] Fixed build problems with GCC 6 + +--- + plugins/LadspaEffect/calf/src/modules_limit.cpp | 3 ++- + plugins/opl2/fmopl.c | 29 +++++++++++----------- + .../zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl | 6 +++-- + .../zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl | 6 +++-- + 5 files changed, 29 insertions(+), 22 deletions(-) + +diff --git a/plugins/LadspaEffect/calf/src/modules_limit.cpp b/plugins/LadspaEffect/calf/src/modules_limit.cpp +index 3930078..cd3d6fa 100644 +--- a/plugins/LadspaEffect/calf/src/modules_limit.cpp ++++ b/plugins/LadspaEffect/calf/src/modules_limit.cpp +@@ -540,7 +540,8 @@ uint32_t multibandlimiter_audio_module::process(uint32_t offset, uint32_t numsam + } // process single strip with filter + + // write multiband coefficient to buffer +- buffer[pos] = std::min(*params[param_limit] / std::max(fabs(sum_left), fabs(sum_right)), 1.0); ++ float pre_buffer = *params[param_limit] / std::max(fabs(sum_left), fabs(sum_right)); ++ buffer[pos] = std::min(pre_buffer, 1.0f); + + for (int i = 0; i < strips; i++) { + // process gain reduction +diff --git a/plugins/opl2/fmopl.c b/plugins/opl2/fmopl.c +index 9b411a2..3dd4a51 100644 +--- a/plugins/opl2/fmopl.c ++++ b/plugins/opl2/fmopl.c +@@ -653,21 +653,21 @@ static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE ) { + double rate; + + /* make attack rate & decay rate tables */ +- for ( i = 0; i < 4; i++ ) OPL->AR_TABLE[i] = OPL->DR_TABLE[i] = 0; { +- for (i = 4; i <= 60; i++) { +- rate = OPL->freqbase; /* frequency rate */ +- if( i < 60 ) { +- rate *= 1.0+(i&3)*0.25; /* b0-1 : x1 , x1.25 , x1.5 , x1.75 */ +- } +- rate *= 1<<((i>>2)-1); /* b2-5 : shift bit */ +- rate *= (double)(EG_ENT<AR_TABLE[i] = rate / ARRATE; +- OPL->DR_TABLE[i] = rate / DRRATE; +- } +- for ( i = 60; i < 75; i++ ) { +- OPL->AR_TABLE[i] = EG_AED-1; +- OPL->DR_TABLE[i] = OPL->DR_TABLE[60]; ++ for ( i = 0; i < 4; i++ ) OPL->AR_TABLE[i] = OPL->DR_TABLE[i] = 0; ++ for (i = 4; i <= 60; i++) { ++ rate = OPL->freqbase; /* frequency rate */ ++ if( i < 60 ) { ++ rate *= 1.0+(i&3)*0.25; /* b0-1 : x1 , x1.25 , x1.5 , x1.75 */ + } ++ rate *= 1<<((i>>2)-1); /* b2-5 : shift bit */ ++ rate *= (double)(EG_ENT<AR_TABLE[i] = rate / ARRATE; ++ OPL->DR_TABLE[i] = rate / DRRATE; ++ } ++ for ( i = 60; i < 75; i++ ) { ++ OPL->AR_TABLE[i] = EG_AED-1; ++ OPL->DR_TABLE[i] = OPL->DR_TABLE[60]; ++ } + #if 0 + for ( i = 0; i < 64 ; i++ ) { /* make for overflow area */ + LOG(LOG_WAR,("rate %2d , ar %f ms , dr %f ms \n",i, +@@ -675,7 +675,6 @@ static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE ) { + ((double)(EG_ENT<DR_TABLE[i]) * (1000.0 / OPL->rate) )); + } + #endif +- } + } + + /* ---------- generic table initialize ---------- */ +diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl +index 359f64c..db70677 100644 +--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl ++++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl +@@ -204,12 +204,14 @@ if (event==FL_RELEASE){ + + if ((event==FL_DRAG)&&(currentpoint>=0)){ + int ny=127-(int) (y_*127.0/h()); +- if (ny<0) ny=0;if (ny>127) ny=127; ++ if (ny<0) ny=0; ++ if (ny>127) ny=127; + env->Penvval[currentpoint]=ny; + + int dx=(int)((x_-cpx)*0.1); + int newdt=cpdt+dx; +- if (newdt<0) newdt=0;if (newdt>127) newdt=127; ++ if (newdt<0) newdt=0; ++ if (newdt>127) newdt=127; + if (currentpoint!=0) env->Penvdt[currentpoint]=newdt; + else env->Penvdt[currentpoint]=0; + +diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl +index f1b887c..5ab7290 100644 +--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl ++++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl +@@ -133,8 +133,10 @@ if ( (x_>=0)&&(x_=0)&&(y_=w()) x_=w();if (y_>=h()-1) y_=h()-1; ++ if (x_<0) x_=0; ++ if (y_<0) y_=0; ++ if (x_>=w()) x_=w(); ++ if (y_>=h()-1) y_=h()-1; + + if ((oldx<0)||(oldx==x_)){ + int sn=(int)(x_*1.0/w()*N_RES_POINTS); diff --git a/audio/lmms/lmms.SlackBuild b/audio/lmms/lmms.SlackBuild index 2de7305a99..35414c0364 100644 --- a/audio/lmms/lmms.SlackBuild +++ b/audio/lmms/lmms.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 {} \; +# Thanks archlinux +patch -p1 < $CWD/gcc6.patch + mkdir build cd build cmake \ 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 644f31dcc5..1590f769d4 100644 --- a/audio/mac/mac.SlackBuild +++ b/audio/mac/mac.SlackBuild @@ -41,9 +41,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION-u4-b5 -tar xvf $CWD/$PRGNAM-$VERSION-u4-b5.tar.gz -cd $PRGNAM-$VERSION-u4-b5 +rm -rf $PRGNAM-$VERSION-u4-b5-s7 +tar xvf $CWD/$PRGNAM-$VERSION-u4-b5-s7.tar.gz +cd $PRGNAM-$VERSION-u4-b5-s7 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -51,6 +51,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/gcc6.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -61,9 +63,6 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-assembly=yes \ --build=$ARCH-slackware-linux -# Patch to fix gcc4 output errors: -patch -p0 < $CWD/gcc4_errors.patch - make make install DESTDIR=$PKG diff --git a/audio/mac/mac.info b/audio/mac/mac.info index 7e21a2e6b4..2eb81bf1b7 100644 --- a/audio/mac/mac.info +++ b/audio/mac/mac.info @@ -1,8 +1,8 @@ PRGNAM="mac" VERSION="3.99" HOMEPAGE="https://web.archive.org/web/20120529111247/http://supermmx.org/linux/mac" -DOWNLOAD="http://etree.org/shnutils/shntool/support/formats/ape/unix/3.99-u4-b5/mac-3.99-u4-b5.tar.gz" -MD5SUM="75716b342e07deae58f56a2522362006" +DOWNLOAD="http://etree.org/shnutils/shntool/support/formats/ape/unix/3.99-u4-b5-s7/mac-3.99-u4-b5-s7.tar.gz" +MD5SUM="74df3c96476636387ddd12255b03bebe" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/audio/milkytracker/README b/audio/milkytracker/README index f16c7e8551..b940d275bb 100644 --- a/audio/milkytracker/README +++ b/audio/milkytracker/README @@ -1,5 +1,4 @@ This is MilkyTracker 0.90.80. MilkyTracker is an audio tracker, and can create standard .MOD and .XM module files. -JACK support is optional and can be added by doing: - JACK=yes ./milkytracker.SlackBuild +lhasa is an optional dependency. diff --git a/audio/milkytracker/milkytracker.SlackBuild b/audio/milkytracker/milkytracker.SlackBuild index 7f6841c8f1..f5b9189d03 100644 --- a/audio/milkytracker/milkytracker.SlackBuild +++ b/audio/milkytracker/milkytracker.SlackBuild @@ -24,13 +24,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=milkytracker -VERSION=${VERSION:-0.90.86} +SRCNAM=MilkyTracker +VERSION=${VERSION:-1.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 @@ -41,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,34 +61,39 @@ 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 $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 -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 -lasound" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --with-jack=${JACK:-no} +# From upstream +patch -p1 < $CWD/patches/gnuinstalldirs.patch +# Thanks fedora +patch -p1 < $CWD/patches/sdlmain.patch -make -make install DESTDIR=$PKG +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ + -DCMAKE_BUILD_TYPE=Release \ + .. + make + make install DESTDIR=$PKG +cd .. mkdir -p $PKG/usr/share/{applications,pixmaps} cp $CWD/milkytracker.desktop $PKG/usr/share/applications cp resources/pictures/carton.png $PKG/usr/share/pixmaps/milkytracker-icon-128.png -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/audio/milkytracker/milkytracker.info b/audio/milkytracker/milkytracker.info index cdab01e8f0..1ae6e90182 100644 --- a/audio/milkytracker/milkytracker.info +++ b/audio/milkytracker/milkytracker.info @@ -1,10 +1,10 @@ PRGNAM="milkytracker" -VERSION="0.90.86" +VERSION="1.0.0" HOMEPAGE="http://www.milkytracker.org/" -DOWNLOAD="http://www.milkytracker.org/files/milkytracker-0.90.86.tar.bz2" -MD5SUM="1ef462969cf54ba61748d4d878b5747e" +DOWNLOAD="https://github.com/milkytracker/MilkyTracker/archive/v1.0.0/milkytracker-1.0.0.tar.gz" +MD5SUM="ba6840d3725f805c409f78061f48c319" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="zziplib" +REQUIRES="jack-audio-connection-kit zziplib" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" diff --git a/audio/milkytracker/patches/gnuinstalldirs.patch b/audio/milkytracker/patches/gnuinstalldirs.patch new file mode 100644 index 0000000000..aeae02af2b --- /dev/null +++ b/audio/milkytracker/patches/gnuinstalldirs.patch @@ -0,0 +1,71 @@ +From 56bf091a0e8c5242e160d37f2974f3e1e2525821 Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Sun, 7 May 2017 10:49:21 +0200 +Subject: [PATCH] Use GNUInstallDirs in order to change installation paths + +* This allows distro-specific modification of directories + to adjust to different FHS layouts. +--- + CMakeLists.txt | 5 ++++- + docs/CMakeLists.txt | 2 +- + resources/music/CMakeLists.txt | 2 +- + src/tracker/CMakeLists.txt | 2 +- + 4 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 996e2f0..bac54f3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,9 +19,12 @@ + # along with MilkyTracker. If not, see . + # + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 2.8.5) + project(MilkyTracker) + ++# Adhere to GNU filesystem layout conventions ++include(GNUInstallDirs) ++ + # Force SDL if requested + option(FORCESDL "Force SDL instead of native" OFF) + if(FORCESDL) +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt +index 0aacc60..aca4a61 100644 +--- a/docs/CMakeLists.txt ++++ b/docs/CMakeLists.txt +@@ -35,7 +35,7 @@ elseif(WIN32) + set(INSTALL_DEST .) + else() + list(APPEND DOCUMENTS readme_unix) +- set(INSTALL_DEST share/doc/${PROJECT_NAME_LOWER}) ++ set(INSTALL_DEST ${CMAKE_INSTALL_DOCDIR}) + endif() + + install(FILES ${DOCUMENTS} DESTINATION ${INSTALL_DEST}) +diff --git a/resources/music/CMakeLists.txt b/resources/music/CMakeLists.txt +index f918b6e..f29fcd6 100644 +--- a/resources/music/CMakeLists.txt ++++ b/resources/music/CMakeLists.txt +@@ -24,7 +24,7 @@ file(GLOB SONGS "*.xm") + if(APPLE OR WIN32) + set(INSTALL_DEST "Example Songs") + else() +- set(INSTALL_DEST share/${PROJECT_NAME_LOWER}/songs) ++ set(INSTALL_DEST ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME_LOWER}/songs) + endif() + + install(FILES ${SONGS} DESTINATION ${INSTALL_DEST}) +diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt +index 1e4062e..b7a96a7 100644 +--- a/src/tracker/CMakeLists.txt ++++ b/src/tracker/CMakeLists.txt +@@ -399,7 +399,7 @@ target_link_libraries( + if(APPLE OR WIN32) + set(INSTALL_DEST .) + else() +- set(INSTALL_DEST bin) ++ set(INSTALL_DEST ${CMAKE_INSTALL_BINDIR}) + endif() + + install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_DEST}) diff --git a/audio/milkytracker/patches/sdlmain.patch b/audio/milkytracker/patches/sdlmain.patch new file mode 100644 index 0000000000..3917a062d6 --- /dev/null +++ b/audio/milkytracker/patches/sdlmain.patch @@ -0,0 +1,12 @@ +diff -ru MilkyTracker-1.0.0/cmake/FindSDL2.cmake MilkyTracker-sdlmain/cmake/FindSDL2.cmake +--- MilkyTracker-1.0.0/cmake/FindSDL2.cmake 2017-03-12 21:30:25.000000000 +0200 ++++ MilkyTracker-sdlmain/cmake/FindSDL2.cmake 2017-03-19 20:23:15.773398294 +0200 +@@ -93,7 +93,7 @@ + endif() + + set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) +-set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY}) ++set(SDL2_LIBRARIES ${SDL2_LIBRARY}) + + include(FindPackageHandleStandardArgs) + diff --git a/audio/mixxx/chromaprint-1.4.patch b/audio/mixxx/chromaprint-1.4.patch deleted file mode 100644 index 35e63d2c5f..0000000000 --- a/audio/mixxx/chromaprint-1.4.patch +++ /dev/null @@ -1,44 +0,0 @@ -Description: chromaprint 1.4 compatibility -Origin: upstream, - https://github.com/mixxxdj/mixxx/commit/71f3e5d0adb5116a23f9163b045f3419b9056a08, - https://github.com/mixxxdj/mixxx/commit/830e864384ee1c96272997ee3f1dae4f71b28f3e, - https://github.com/mixxxdj/mixxx/commit/c5b4368fd228feee28af4fb32ab6fbfd3f29f212 -Last-Update: 2017-01-11 - ---- mixxx-2.0.0~dfsg.orig/src/musicbrainz/chromaprinter.cpp -+++ mixxx-2.0.0~dfsg/src/musicbrainz/chromaprinter.cpp -@@ -5,6 +5,19 @@ - #include "musicbrainz/chromaprinter.h" - #include "soundsourceproxy.h" - -+namespace -+{ -+ // Type declarations of *fprint and *encoded pointers need to account for Chromaprint API version -+ // (void* -> uint32_t*) and (void* -> char*) changed in versions v1.4.0 or later -- alyptik 12/2016 -+ #if (CHROMAPRINT_VERSION_MINOR > 3) || (CHROMAPRINT_VERSION_MAJOR > 1) -+ typedef uint32_t* uint32_p; -+ typedef char* char_p; -+ #else -+ typedef void* uint32_p; -+ typedef void* char_p; -+ #endif -+} -+ - ChromaPrinter::ChromaPrinter(QObject* parent) - : QObject(parent) { - } -@@ -57,12 +70,12 @@ QString ChromaPrinter::calcFingerPrint(c - } - chromaprint_finish(ctx); - -- void* fprint = NULL; -+ uint32_p fprint = NULL; - int size = 0; - int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size); - QByteArray fingerprint; - if (ret == 1) { -- void* encoded = NULL; -+ char_p encoded = NULL; - int encoded_size = 0; - chromaprint_encode_fingerprint(fprint, size, - CHROMAPRINT_ALGORITHM_DEFAULT, diff --git a/audio/mixxx/mixxx.SlackBuild b/audio/mixxx/mixxx.SlackBuild index 4ee8066b9c..2302eb09ae 100644 --- a/audio/mixxx/mixxx.SlackBuild +++ b/audio/mixxx/mixxx.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mixxx -VERSION=${VERSION:-2.0.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20170530_27a110f} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -54,16 +54,14 @@ else LIBDIRSUFFIX="" fi -SRCVER=$(echo $VERSION | tr _ - ) - 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.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 \) \ @@ -71,9 +69,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Upstream patch for the newer chromaprint -patch -p1 < $CWD/chromaprint-1.4.patch - # 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/mixxx/mixxx.info b/audio/mixxx/mixxx.info index b332a332b3..3c20e166c1 100644 --- a/audio/mixxx/mixxx.info +++ b/audio/mixxx/mixxx.info @@ -1,8 +1,8 @@ PRGNAM="mixxx" -VERSION="2.0.0" +VERSION="20170530_27a110f" HOMEPAGE="https://www.mixxx.org" -DOWNLOAD="http://downloads.mixxx.org/mixxx-2.0.0/mixxx-2.0.0-src.tar.gz" -MD5SUM="5520a2f110f1078197d2ff914ccca37a" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/mixxx-20170530_27a110f.tar.xz" +MD5SUM="607e4e2e85d1b62e2fe2ef8735c12fe2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="chromaprint faad2 libmp4v2 libshout opencore-amr portaudio portmidi protobuf rubberband" diff --git a/audio/muse/README b/audio/muse/README index 232eb66968..3e36c8b2a9 100644 --- a/audio/muse/README +++ b/audio/muse/README @@ -4,6 +4,6 @@ the MusE development team. MusE aims to be a complete multitrack virtual studio for Linux, it is published under the GNU General Public License. -Optional dependencies are fluidsynth, dssi and lash. +Optional dependencies are fluidsynth, lash and lilv. To start MusE, the user has to be in the "audio" group. diff --git a/audio/muse/muse.SlackBuild b/audio/muse/muse.SlackBuild index 833fd3ba30..233321bf1b 100644 --- a/audio/muse/muse.SlackBuild +++ b/audio/muse/muse.SlackBuild @@ -5,13 +5,13 @@ # Written by Felix Pfeifer pfeifer[dot]felix[at]googlemail[dot]com PRGNAM=muse -VERSION=${VERSION:-2.1.2} +VERSION=${VERSION:-3.0pre2} 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,16 +46,16 @@ 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 -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DENABLE_PYTHON:STRING="ON" \ diff --git a/audio/muse/muse.info b/audio/muse/muse.info index f72af27286..c4baf66135 100644 --- a/audio/muse/muse.info +++ b/audio/muse/muse.info @@ -1,10 +1,10 @@ PRGNAM="muse" -VERSION="2.1.2" +VERSION="3.0pre2" HOMEPAGE="http://muse-sequencer.org/" -DOWNLOAD="http://downloads.sf.net/lmuse/muse-2.1.2.tar.gz" -MD5SUM="ad917335ac05a3d62e3cd073af901001" +DOWNLOAD="http://downloads.sf.net/lmuse/muse-3.0pre2.tar.gz" +MD5SUM="9737152b13ff90959507890ed1491bfa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jack-audio-connection-kit ladspa_sdk liblo" +REQUIRES="dssi jack-audio-connection-kit ladspa_sdk liblo qt5" MAINTAINER="Felix Pfeifer" EMAIL="pfeifer[dot]felix[at]googlemail[dot]com" diff --git a/audio/ocp/ocp.SlackBuild b/audio/ocp/ocp.SlackBuild index 523d4638c8..4351552662 100644 --- a/audio/ocp/ocp.SlackBuild +++ b/audio/ocp/ocp.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; sed -i "s/0.1.20/0.1.21/g" configure -sed -i "4592c2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*)" configure +sed -i "4592c2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*|6.*|7.*)" configure CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/audio/pianobar/pianobar.info b/audio/pianobar/pianobar.info index ebf0a2a2a8..1d386052a8 100644 --- a/audio/pianobar/pianobar.info +++ b/audio/pianobar/pianobar.info @@ -5,6 +5,6 @@ DOWNLOAD="https://6xq.net/pianobar/pianobar-2016.06.02.tar.bz2" MD5SUM="0fc71e7cd3840db43943dde60a781227" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ffmpeg" +REQUIRES="ffmpeg json-c" MAINTAINER="Brenton Earl" EMAIL="brent@exitstatusone.com" 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; iadd( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( snap_xpm )))); -- m_button_snap->signal_clicked().connect( bind( mem_fun( *this, &perfedit::popup_menu), m_menu_snap )); -+ m_button_snap->signal_clicked().connect( bind( mem_fun( *this, &perfedit::popup_menu), m_menu_snap )); - add_tooltip( m_button_snap, "Grid snap. (Fraction of Measure Length)" ); - m_entry_snap = manage( new Entry()); - m_entry_snap->set_size_request( 40, -1 ); -@@ -152,7 +152,7 @@ - /* beats per measure */ - m_button_bpm = manage( new Button()); - m_button_bpm->add( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( down_xpm )))); -- m_button_bpm->signal_clicked().connect( bind( mem_fun( *this, &perfedit::popup_menu), m_menu_bpm )); -+ m_button_bpm->signal_clicked().connect( bind( mem_fun( *this, &perfedit::popup_menu), m_menu_bpm )); - add_tooltip( m_button_bpm, "Time Signature. Beats per Measure" ); - m_entry_bpm = manage( new Entry()); - m_entry_bpm->set_width_chars(2); -@@ -162,7 +162,7 @@ - /* beat width */ - m_button_bw = manage( new Button()); - m_button_bw->add( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( down_xpm )))); -- m_button_bw->signal_clicked().connect( bind( mem_fun( *this, &perfedit::popup_menu), m_menu_bw )); -+ m_button_bw->signal_clicked().connect( bind( mem_fun( *this, &perfedit::popup_menu), m_menu_bw )); - add_tooltip( m_button_bw, "Time Signature. Length of Beat" ); - m_entry_bw = manage( new Entry()); - m_entry_bw->set_width_chars(2); diff --git a/audio/seq24/seq24.SlackBuild b/audio/seq24/seq24.SlackBuild index 39df07766b..4b8cf91b27 100644 --- a/audio/seq24/seq24.SlackBuild +++ b/audio/seq24/seq24.SlackBuild @@ -23,13 +23,13 @@ # YOUR DATA IS DESTROYED. PRGNAM=seq24 -VERSION=${VERSION:-rev136} +VERSION=${VERSION:-0.9.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" @@ -59,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM/trunk -tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM/trunk +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 \ @@ -69,12 +69,17 @@ find -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 -i - -patch -p2 < $CWD/perfedit.patch +# Thanks to fedora for this: +# class "mutex" in src/* clashes with "std::mutex" due +# to "using namespace std;". Rename mutex to seq24_mutex. +sed -i \ + -e 's,mutex::,seq24_mutex::,' \ + -e 's,\([ cs]\) mutex,\1 seq24_mutex,' \ + -e 's,::mutex,::seq24_mutex,' \ + src/*.h src/*.cpp CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -O2 -std=c++11" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/audio/seq24/seq24.info b/audio/seq24/seq24.info index 7681d18b95..3ebc841eb3 100644 --- a/audio/seq24/seq24.info +++ b/audio/seq24/seq24.info @@ -1,8 +1,8 @@ PRGNAM="seq24" -VERSION="rev136" +VERSION="0.9.3" HOMEPAGE="http://filter24.org/seq24/" -DOWNLOAD="http://master.dl.sourceforge.net/project/slackbuildsdirectlinks/seq24/seq24-rev136.tar.gz" -MD5SUM="e3616365eefa04349773198fec794241" +DOWNLOAD="https://launchpad.net/seq24/trunk/0.9.3/+download/seq24-0.9.3.tar.bz2" +MD5SUM="e7c653abb71f17e5cc070ef1d8406a1a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/audio/shell-fm/README b/audio/shell-fm/README deleted file mode 100644 index fdf6eca651..0000000000 --- a/audio/shell-fm/README +++ /dev/null @@ -1,12 +0,0 @@ -shell-fm is a lightweight, console-based player for Last.FM radio streams. -It's pretty small (the binary is currently a little smaller than 60K, or -50K when stripped) and it has most features the "official" player has, if -not even a few more. Additional features are, for example: - -network interface (control shell-fm remotely) -autoban (automatically ban all tracks of an artist you don't like) -bookmark stations (quickly jump to bookmarked stations with a single key) -... probably more - -*NOTE: Last-FM have changed their API so that only PAID subscribers -can listen to streams in shell-fm. diff --git a/audio/shell-fm/shell-fm.SlackBuild b/audio/shell-fm/shell-fm.SlackBuild deleted file mode 100644 index 6b0a480d55..0000000000 --- a/audio/shell-fm/shell-fm.SlackBuild +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh - -# Slackware build script for shell-fm - -# Copyright 2009-2013 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=shell-fm -VERSION=${VERSION:-git20130207} -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 {} \; - -LDFLAGS="-lstdc++" \ -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 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 798592cb54..0000000000 --- a/audio/shell-fm/shell-fm.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="shell-fm" -VERSION="git20130207" -HOMEPAGE="https://github.com/jkramer/shell-fm" -DOWNLOAD="http://unrealize.co.uk/source/shell-fm-git20130207.tar.xz" -MD5SUM="56692e9253265ca91dde3081cfd58782" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" 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/yoshimi/0001-Fix-for-fltk-1.3.patch b/audio/yoshimi/0001-Fix-for-fltk-1.3.patch deleted file mode 100644 index 22568fcbcf..0000000000 --- a/audio/yoshimi/0001-Fix-for-fltk-1.3.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 86532198f0467c6d29090ce7ad95bcb36cd697f6 Mon Sep 17 00:00:00 2001 -From: Andrew Deryabin -Date: Tue, 3 Feb 2015 06:08:57 +0000 -Subject: [PATCH 1/2] Fix for fltk < 1.3 - ---- - src/main.cpp | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) - -diff --git a/src/main.cpp b/src/main.cpp -index ab995ad..18a36d2 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -30,6 +30,8 @@ using namespace std; - #include - #include - #include -+#include -+#include - - #include - #include -@@ -97,10 +99,27 @@ static void *mainGuiThread(void *arg) - - map::iterator it; - fl_register_images(); -+#if (FL_MAJOR_VERSION == 1 && FL_MINOR_VERSION < 3) -+ char *fname = tmpnam(NULL); -+ if(fname) -+ { -+ FILE *f = fopen(fname, "wb"); -+ if(f) -+ { -+ fwrite(yoshimi_logo_png, sizeof(yoshimi_logo_png), 1, f); -+ fclose(f); -+ } -+ } -+ Fl_PNG_Image pix(fname); -+ if(fname) -+ unlink(fname); -+#else -+ Fl_PNG_Image pix("yoshimi_logo_png", yoshimi_logo_png, sizeof(yoshimi_logo_png)); -+#endif - Fl_Window winSplash(400, 300, "yoshimi splash screen"); - Fl_Box box(0, 0, 400,300); - //Fl_Pixmap pix(yoshimi_logo); -- Fl_PNG_Image pix("yoshimi_logo_png", yoshimi_logo_png, sizeof(yoshimi_logo_png)); -+ - box.image(pix); - Fl_Box boxLb(10, 300-30, 400-20, 30); - boxLb.box(FL_NO_BOX); --- -2.2.2 - diff --git a/audio/yoshimi/yoshimi.SlackBuild b/audio/yoshimi/yoshimi.SlackBuild index 9108177be7..a5fa58b73b 100644 --- a/audio/yoshimi/yoshimi.SlackBuild +++ b/audio/yoshimi/yoshimi.SlackBuild @@ -5,13 +5,13 @@ # Written by Zbigniew Baniewski, PRGNAM=yoshimi -VERSION=${VERSION:-1.3.2} +VERSION=${VERSION:-1.5.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 @@ -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,32 +51,32 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -cat $CWD/0001-Fix-for-fltk-1.3.patch | patch -p1 - -cd src +mkdir src/build +cd src/build # Both "DDefaultAudio/Midi..." lines can be removed for default JACK audio/MIDI cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DDefaultAudio:STRING=alsa \ - -DDefaultMidi:STRING=alsa \ - . + -DCMAKE_BUILD_TYPE=Release \ + .. make VERBOSE=1 make install DESTDIR=$PKG -cd .. +cd ../.. -# Move man pages to correct location -#mv $PKG/usr/share/man $PKG/usr/ +# Move man pages and docs to the correct locations +mv $PKG/usr/share/man $PKG/usr/ +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION +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 -#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/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 COPYING INSTALL README.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/audio/yoshimi/yoshimi.info b/audio/yoshimi/yoshimi.info index 6635219915..006befc376 100644 --- a/audio/yoshimi/yoshimi.info +++ b/audio/yoshimi/yoshimi.info @@ -1,8 +1,8 @@ PRGNAM="yoshimi" -VERSION="1.3.2" +VERSION="1.5.2.1" HOMEPAGE="http://yoshimi.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/yoshimi/1.1/yoshimi-1.3.2.tar.bz2" -MD5SUM="48aefa60c1f451b6ea39a4a36583f8ab" +DOWNLOAD="http://downloads.sf.net/yoshimi/yoshimi-1.5.2.1.tar.bz2" +MD5SUM="432e8453334a49dd7b43d5bfae6a02bc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="mxml fltk lv2 jack-audio-connection-kit" diff --git a/business/ledger/ledger.SlackBuild b/business/ledger/ledger.SlackBuild index fb5532d4b9..7f617570d6 100644 --- a/business/ledger/ledger.SlackBuild +++ b/business/ledger/ledger.SlackBuild @@ -3,13 +3,13 @@ # Written by Lionel Young (redtricycle at gmail dot com) PRGNAM=ledger -VERSION=${VERSION:-3.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20170216_b414544} +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,7 +26,7 @@ rm -rf $PKG mkdir -p $TMP $PKG/usr $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.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -37,12 +37,13 @@ find -L . \ tar xvf $CWD/utfcpp.tar.gz -C lib/ -# Fix build with boost-1.58 (thanks to Arch Linux) -patch -p1 < $CWD/ledger_git.diff - ./acprep --prefix=/usr update + +make make install DESTDIR=$PKG +install -D -m0644 contrib/$PRGNAM-completion.bash $PKG/etc/bash_completion.d/$PRGNAM + find $PKG -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/business/ledger/ledger.info b/business/ledger/ledger.info index 7cf053d3ce..23ed0a1906 100644 --- a/business/ledger/ledger.info +++ b/business/ledger/ledger.info @@ -1,9 +1,9 @@ PRGNAM="ledger" -VERSION="3.1" +VERSION="20170216_b414544" HOMEPAGE="http://ledger-cli.org" -DOWNLOAD="https://github.com/ledger/ledger/archive/v3.1.tar.gz \ +DOWNLOAD="http://ponce.cc/slackware/sources/repo/ledger-20170216_b414544.tar.xz \ http://sourceforge.net/projects/slackbuildsdirectlinks/files/utfcpp/utfcpp.tar.gz" -MD5SUM="f4389aae3ba96eb5590784db7fa614ca \ +MD5SUM="8187b6101ddd73c88754b9616add9ac1 \ 32519c82d4c1d269c623fe179aa69f59" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/business/ledger/ledger_git.diff b/business/ledger/ledger_git.diff deleted file mode 100644 index 5398144762..0000000000 --- a/business/ledger/ledger_git.diff +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/src/account.h b/src/account.h -index 76e839e..0b55ce9 100644 ---- a/src/account.h -+++ b/src/account.h -@@ -261,11 +261,7 @@ public: - mutable optional xdata_; - - bool has_xdata() const { --#if BOOST_VERSION >= 105600 -- return xdata_ != NULL; --#else -- return xdata_; --#endif -+ return !!(xdata_); - } - void clear_xdata(); - xdata_t& xdata() { -diff --git a/src/filters.cc b/src/filters.cc -index 2f97a0e..b6530c0 100644 ---- a/src/filters.cc -+++ b/src/filters.cc -@@ -707,7 +707,7 @@ namespace { - insert_prices_in_map(price_map_t& _all_prices) - : all_prices(_all_prices) {} - -- void operator()(datetime_t& date, const amount_t& price) { -+ void operator()(const datetime_t& date, const amount_t& price) { - all_prices.insert(price_map_t::value_type(date, price)); - } - }; -diff --git a/src/item.h b/src/item.h -index 458cb37..aa55e41 100644 ---- a/src/item.h -+++ b/src/item.h -@@ -191,11 +191,7 @@ public: - static bool use_aux_date; - - virtual bool has_date() const { --#if BOOST_VERSION >= 105600 -- return _date != NULL; --#else -- return _date; --#endif -+ return !!(_date); - } - - virtual date_t date() const { -diff --git a/src/iterators.cc b/src/iterators.cc -index 21bec5d..0225e21 100644 ---- a/src/iterators.cc -+++ b/src/iterators.cc -@@ -96,7 +96,7 @@ namespace { - TRACE_DTOR(create_price_xact); - } - -- void operator()(datetime_t& date, const amount_t& price) { -+ void operator()(const datetime_t& date, const amount_t& price) { - xact_t * xact; - string symbol = price.commodity().symbol(); - -diff --git a/src/parser.h b/src/parser.h -index e46fc71..25c4a7e 100644 ---- a/src/parser.h -+++ b/src/parser.h -@@ -118,7 +118,7 @@ public: - - ptr_op_t parse(std::istream& in, - const parse_flags_t& flags = PARSE_DEFAULT, -- const optional& original_string = NULL); -+ const optional& original_string = boost::none); - }; - - } // namespace ledger -diff --git a/src/post.h b/src/post.h -index 1e5fc56..7796293 100644 ---- a/src/post.h -+++ b/src/post.h -@@ -205,11 +205,7 @@ public: - mutable optional xdata_; - - bool has_xdata() const { --#if BOOST_VERSION >= 105600 -- return xdata_ != NULL; --#else -- return xdata_; --#endif -+ return !!(xdata_); - } - void clear_xdata() { - xdata_ = none; -diff --git a/src/times.h b/src/times.h -index c1bfb1c..0cb05ff 100644 ---- a/src/times.h -+++ b/src/times.h -@@ -568,11 +568,7 @@ public: - void stabilize(const optional& date = none); - - bool is_valid() const { --#if BOOST_VERSION >= 105600 -- return start != NULL; --#else -- return start; --#endif -+ return !!(start); - } diff --git a/desktop/arc-theme-Red/arc-theme-Red.SlackBuild b/desktop/arc-theme-Red/arc-theme-Red.SlackBuild index cc07fe3983..e03ebc416f 100644 --- a/desktop/arc-theme-Red/arc-theme-Red.SlackBuild +++ b/desktop/arc-theme-Red/arc-theme-Red.SlackBuild @@ -26,7 +26,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=arc-theme-Red -VERSION=${VERSION:-1.0} +VERSION=${VERSION:-20170519_6750f9d} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,18 +57,14 @@ else LIBDIRSUFFIX="" fi -SRCVER="1" - set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz -mv $PRGNAM-$SRCVER $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 \ diff --git a/desktop/arc-theme-Red/arc-theme-Red.info b/desktop/arc-theme-Red/arc-theme-Red.info index 4ef7f411a3..45992fc89d 100644 --- a/desktop/arc-theme-Red/arc-theme-Red.info +++ b/desktop/arc-theme-Red/arc-theme-Red.info @@ -1,8 +1,8 @@ PRGNAM="arc-theme-Red" -VERSION="1.0" +VERSION="20170519_6750f9d" HOMEPAGE="https://github.com/mclmza/arc-theme-Red" -DOWNLOAD="https://github.com/mclmza/arc-theme-Red/archive/1/arc-theme-Red-1.tar.gz" -MD5SUM="3539b67264d727a46d2f0c5c97bc24c8" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/arc-theme-Red-20170519_6750f9d.tar.xz" +MD5SUM="876fb1ee265a5e2f18b12efa865a8cfa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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..ff20324bc6 100644 --- a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild +++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cairo-dock-plugins -VERSION=${VERSION:-3.3.2} +VERSION=${VERSION:-3.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -59,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf cairo-dock-plug-ins-$VERSION tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +cd cairo-dock-plug-ins-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,25 +69,33 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks to fedora and archlinux +patch -p1 < $CWD/patches/mono.patch +patch -p1 < $CWD/patches/time_h-confict.patch +sed -i.wall -e 's|-Wno-all||' Dbus/interfaces/vala/src/CMakeLists.txt + +mkdir build +cd build cmake \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release . + -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install DESTDIR=$PKG +cd .. # Sheesh. Donchaloveruby? -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1 +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/2.4.0 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/usr/lib${LIBDIRSUFFIX}/ruby/2.4.0/CDApplet.rb \ + $PKG/usr/lib${LIBDIRSUFFIX}/ruby/2.4.0 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 + mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/2.4.0 + mv $PKG/usr/CDApplet.rb $PKG/usr/lib${LIBDIRSUFFIX}/ruby/2.4.0 fi find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/desktop/cairo-dock-plugins/cairo-dock-plugins.info b/desktop/cairo-dock-plugins/cairo-dock-plugins.info index b28117ab5d..3fb0f52e51 100644 --- a/desktop/cairo-dock-plugins/cairo-dock-plugins.info +++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.info @@ -1,8 +1,8 @@ PRGNAM="cairo-dock-plugins" -VERSION="3.3.2" +VERSION="3.4.1" HOMEPAGE="http://www.glx-dock.org" -DOWNLOAD="https://launchpad.net/cairo-dock-plug-ins/3.3/3.3.2/+download/cairo-dock-plugins-3.3.2.tar.gz" -MD5SUM="3c40afe91cba65da68a70e5e78b76c24" +DOWNLOAD="https://github.com/Cairo-Dock/cairo-dock-plug-ins/archive/3.4.1/cairo-dock-plugins-3.4.1.tar.gz" +MD5SUM="434941926f9205fd8562a15b6ac5f243" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cairo-dock" diff --git a/desktop/cairo-dock-plugins/patches/mono.patch b/desktop/cairo-dock-plugins/patches/mono.patch new file mode 100644 index 0000000000..637c1ca494 --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/mono.patch @@ -0,0 +1,106 @@ +diff -rupN cairo-dock-plug-ins-3.4.1.orig/CMakeLists.txt cairo-dock-plug-ins-3.4.1/CMakeLists.txt +--- cairo-dock-plug-ins-3.4.1.orig/CMakeLists.txt 2015-03-12 09:43:57.171067365 +0100 ++++ cairo-dock-plug-ins-3.4.1/CMakeLists.txt 2015-03-12 09:46:20.717120675 +0100 +@@ -573,11 +573,11 @@ if (enable-mono-interface) + if (NOT GMCS_EXECUTABLE OR NOT EXISTS ${GMCS_EXECUTABLE}) + message (STATUS "Could not find Mono compiler gmcs, won't build Mono interface.") + else() +- pkg_check_modules (MONO_PACKAGE glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0) ++ pkg_check_modules (MONO_PACKAGE dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-3.0) + if (NOT MONO_PACKAGE_FOUND) +- message (STATUS "Could not find glib-sharp-2.0, ndesk-dbus-1.0 or ndesk-dbus-glib-1.0; won't be built Mono interface.") +- message (WARNING "These modules are required to compile DBus applet with Mono interface: glib-sharp-2.0, ndesk-dbus-1.0 and ndesk-dbus-glib-1.0") +- set (MODULES_MISSING "${MODULES_MISSING} glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0") ++ message (STATUS "Could not find dbus-sharp-2.0, dbus-sharp-glib-2.0 or glib-sharp-3.0; won't be built Mono interface.") ++ message (WARNING "These modules are required to compile DBus applet with Mono interface: dbus-sharp-2.0, dbus-sharp-glib-2.0 and glib-sharp-3.0") ++ set (MODULES_MISSING "${MODULES_MISSING} dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-3.0") + else() + set (MONO_FOUND TRUE) + set (with_mono yes) +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CDApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CDApplet.cs +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CDApplet.cs 2015-03-12 09:52:56.491934965 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CDApplet.cs 2015-03-12 09:56:50.191652099 +0100 +@@ -21,7 +21,7 @@ + // Make your own class derive from a CDApplet, and override the functions you need (the ones which don't start with an underscore). + + // Compile it with the following command, then rename 'demo_mono.exe' to 'demo_mono'. +-// gmcs /target:library CDApplet.cs ISubApplet.cs IApplet.cs -pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0 ++// gmcs /target:library CDApplet.cs ISubApplet.cs IApplet.cs -pkg:dbus-sharp-2.0 -pkg:dbus-sharp-glib-2.0 -pkg:glib-sharp-3.0 + ////////////////////////// + ////// dependancies ////// + ////////////////////////// +@@ -29,7 +29,7 @@ using System; // Environment + using System.IO; // Path, Directory + using System.Reflection; + using GLib; +-using NDesk.DBus; ++using DBus; + using CairoDock.Applet; + + //namespace CairoDock.Applet +@@ -258,8 +258,8 @@ public class CDApplet + + private void _connect_to_dock () + { +- NDesk.DBus.BusG.Init(); +- NDesk.DBus.Bus bus = NDesk.DBus.Bus.Session; ++ DBus.BusG.Init(); ++ DBus.Bus bus = DBus.Bus.Session; + this.icon = bus.GetObject ("org.cairodock.CairoDock", new ObjectPath (this.cBusPath)); + this.icon.on_click += new OnClickEvent (on_click); + this.icon.on_middle_click += new OnMiddleClickEvent (on_middle_click); +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CMakeLists.txt cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CMakeLists.txt +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CMakeLists.txt 2015-03-12 09:52:56.491934965 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CMakeLists.txt 2015-03-12 09:54:07.418777441 +0100 +@@ -3,7 +3,7 @@ + + execute_process(COMMAND ${GMCS_EXECUTABLE} + -target:library +- -pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0 ++ -pkg:dbus-sharp-2.0 -pkg:dbus-sharp-glib-2.0 -pkg:glib-sharp-3.0 + -out:${CMAKE_CURRENT_BINARY_DIR}/CDApplet.dll + ${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/ISubApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/IApplet.cs) + ### find how to register to GAC ... +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/demos/demo_mono/demo_mono.cs cairo-dock-plug-ins-3.4.1/Dbus/demos/demo_mono/demo_mono.cs +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/demos/demo_mono/demo_mono.cs 2015-03-12 09:59:41.064312097 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/demos/demo_mono/demo_mono.cs 2015-03-12 10:02:39.473424651 +0100 +@@ -138,7 +138,7 @@ public class Applet : CDApplet + public override void on_build_menu () + { + Console.WriteLine("*** build menu"); +- /// Warning : teh AddMenuItems fails with NDesk-DBus 0.6.0; until this is fixed, use the PopulateMenu method. ++ /// Warning : the AddMenuItems fails with DBus Sharp 0.6.0; until this is fixed, use the PopulateMenu method. + /**Dictionary[] pItems = new Dictionary[] { + new Dictionary() + { +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/IApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/IApplet.cs +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/IApplet.cs 2015-03-12 09:59:41.067645289 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/IApplet.cs 2015-03-12 10:00:35.395334804 +0100 +@@ -1,6 +1,6 @@ + using System; + using System.Collections.Generic; // Dictionnary +-using NDesk.DBus; ++using DBus; + + namespace CairoDock.Applet + { +@@ -27,7 +27,7 @@ namespace CairoDock.Applet + Left + } + +- [NDesk.DBus.Interface("org.cairodock.CairoDock.applet")] ++ [DBus.Interface("org.cairodock.CairoDock.applet")] + public interface IApplet + { + object Get(string cProperty); +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/ISubApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/ISubApplet.cs +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/ISubApplet.cs 2015-03-12 09:59:41.067645289 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/ISubApplet.cs 2015-03-12 10:00:16.522802989 +0100 +@@ -1,6 +1,6 @@ + using System; + using System.Collections.Generic; // Dictionnary +-using NDesk.DBus; ++using DBus; + + namespace CairoDock.Applet + { diff --git a/desktop/cairo-dock-plugins/patches/time_h-confict.patch b/desktop/cairo-dock-plugins/patches/time_h-confict.patch new file mode 100644 index 0000000000..0a2ea720d1 --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/time_h-confict.patch @@ -0,0 +1,137 @@ +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c.glibc 2016-12-11 16:10:41.656840262 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c 2016-12-11 16:23:31.875117800 +0900 +@@ -17,6 +17,7 @@ + * along with this program. If not, see . + */ + ++#include "applet-time_h-struct.h" + #include + + #include "applet-struct.h" +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c.glibc 2016-12-11 16:10:41.657840257 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c 2016-12-11 16:22:24.465443591 +0900 +@@ -17,6 +17,7 @@ + * along with this program. If not, see . + */ + ++#include "applet-time_h-struct.h" + #include "stdlib.h" + + #include "applet-struct.h" +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c.glibc 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c 2016-12-11 16:24:08.991938415 +0900 +@@ -17,6 +17,7 @@ + * along with this program. If not, see . + */ + ++#include "applet-time_h-struct.h" + #include + #include + +@@ -66,4 +67,4 @@ + + + return GLDI_NOTIFICATION_LET_PASS; +-} +\ ファイル末尾に改行がありません ++} +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c.glibc 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c 2016-12-11 16:23:55.137005376 +0900 +@@ -19,6 +19,7 @@ + * along with this program. If not, see . + */ + ++#include "applet-time_h-struct.h" + #include + #ifndef __FreeBSD__ + #include +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h.glibc 2016-12-11 16:10:41.657840257 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h 2016-12-11 16:22:59.589273837 +0900 +@@ -21,6 +21,7 @@ + #ifndef __CD_APPLET_STRUCT__ + #define __CD_APPLET_STRUCT__ + ++#include "applet-time_h-struct.h" + #include + #include + #define _STRUCT_TIMEVAL +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h.glibc 2016-12-11 16:11:55.464483550 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h 2016-12-11 16:19:52.003180440 +0900 +@@ -0,0 +1,27 @@ ++/** ++* This file is a part of the Cairo-Dock project ++* ++* Copyright : (C) see the 'copyright' file. ++* E-mail : see the 'copyright' file. ++* ++* This program is free software; you can redistribute it and/or ++* modify it under the terms of the GNU General Public License ++* as published by the Free Software Foundation; either version 3 ++* of the License, or (at your option) any later version. ++* ++* This program is distributed in the hope that it will be useful, ++* but WITHOUT ANY WARRANTY; without even the implied warranty of ++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++* GNU General Public License for more details. ++* You should have received a copy of the GNU General Public License ++* along with this program. If not, see . ++*/ ++ ++#ifndef __CD_APPLET_TIME_H_STRUCT__ ++#define __CD_APPLET_TIME_H_STRUCT__ ++ ++#define _POSIX_C_SOURCE 200809L ++#include ++ ++#endif ++ +--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c.glibc 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c 2016-12-11 16:20:44.168928323 +0900 +@@ -20,6 +20,7 @@ + * along with this program. If not, see . + */ + ++#include "applet-time_h-struct.h" + #include + + #include "applet-struct.h" +--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h.glibc 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h 2016-12-11 16:19:47.713201174 +0900 +@@ -20,6 +20,7 @@ + #ifndef __CD_APPLET_STRUCT__ + #define __CD_APPLET_STRUCT__ + ++#include "applet-time_h-struct.h" + #include + #include + #define _STRUCT_TIMEVAL +--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h.glibc 2016-12-11 16:11:55.464483550 +0900 ++++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h 2016-12-11 16:19:52.003180440 +0900 +@@ -0,0 +1,27 @@ ++/** ++* This file is a part of the Cairo-Dock project ++* ++* Copyright : (C) see the 'copyright' file. ++* E-mail : see the 'copyright' file. ++* ++* This program is free software; you can redistribute it and/or ++* modify it under the terms of the GNU General Public License ++* as published by the Free Software Foundation; either version 3 ++* of the License, or (at your option) any later version. ++* ++* This program is distributed in the hope that it will be useful, ++* but WITHOUT ANY WARRANTY; without even the implied warranty of ++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++* GNU General Public License for more details. ++* You should have received a copy of the GNU General Public License ++* along with this program. If not, see . ++*/ ++ ++#ifndef __CD_APPLET_TIME_H_STRUCT__ ++#define __CD_APPLET_TIME_H_STRUCT__ ++ ++#define _POSIX_C_SOURCE 200809L ++#include ++ ++#endif ++ diff --git a/desktop/cairo-dock/cairo-dock.SlackBuild b/desktop/cairo-dock/cairo-dock.SlackBuild index f12d52fb2d..9935833256 100644 --- a/desktop/cairo-dock/cairo-dock.SlackBuild +++ b/desktop/cairo-dock/cairo-dock.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cairo-dock -VERSION=${VERSION:-3.3.2} +VERSION=${VERSION:-3.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -59,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf $PRGNAM-core-$VERSION tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +cd $PRGNAM-core-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,16 +69,19 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +mkdir build +cd build cmake \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ - -DCMAKE_BUILD_TYPE=Release . + -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install DESTDIR=$PKG +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/desktop/cairo-dock/cairo-dock.info b/desktop/cairo-dock/cairo-dock.info index d439b98f7a..1c6f1ba104 100644 --- a/desktop/cairo-dock/cairo-dock.info +++ b/desktop/cairo-dock/cairo-dock.info @@ -1,8 +1,8 @@ PRGNAM="cairo-dock" -VERSION="3.3.2" +VERSION="3.4.1" HOMEPAGE="http://www.glx-dock.org" -DOWNLOAD="https://launchpad.net/cairo-dock-core/3.3/3.3.2/+download/cairo-dock-3.3.2.tar.gz" -MD5SUM="aae077803322049e2488ca7c2980cd0d" +DOWNLOAD="https://github.com/Cairo-Dock/cairo-dock-core/archive/3.4.1/cairo-dock-3.4.1.tar.gz" +MD5SUM="63285f2744a76354cea9cc4c012b3c11" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtkglext" diff --git a/desktop/ceti-2-theme/README b/desktop/ceti-2-theme/README deleted file mode 100644 index 81caf7d90f..0000000000 --- a/desktop/ceti-2-theme/README +++ /dev/null @@ -1,10 +0,0 @@ -ceti-2-theme (GTK2|GTK3 themes) - -ceti-2 is a theme for GTK 3, GTK 2 and Gnome-Shell. It supports GTK 3 -and GTK 2 based desktop environments like Gnome, Unity, Budgie, -Pantheon, etc. - -It is the Official continuation of ceti for Gnome 3.14, 3.16 and 3.18. -It has been completely revamped and is now based on Vertex. - -Optional dependencies: gtk-engines, gtk-engines-unico. diff --git a/desktop/ceti-2-theme/ceti-2-theme.SlackBuild b/desktop/ceti-2-theme/ceti-2-theme.SlackBuild deleted file mode 100644 index f5ed3c662c..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 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 -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 -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 28f1dffa11..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="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" 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/dunst/dunst.SlackBuild b/desktop/dunst/dunst.SlackBuild index 41987c2244..2bb3ccfee2 100644 --- a/desktop/dunst/dunst.SlackBuild +++ b/desktop/dunst/dunst.SlackBuild @@ -28,13 +28,13 @@ # 3.4.2016 - don't clobber the config PRGNAM=dunst -VERSION=${VERSION:-1.1.0} -BUILD=${BUILD:-3} +VERSION=${VERSION:-1.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 @@ -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 $PRGNAM $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 . \ @@ -94,7 +94,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 -pv $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS CHANGELOG INSTALL LICENSE docs/dunst_explainations.png \ +cp -a AUTHORS CHANGELOG.md LICENSE README.md RELEASE_NOTES docs/dunst_layout.png \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/desktop/dunst/dunst.info b/desktop/dunst/dunst.info index d205ca63b0..01a9719d44 100644 --- a/desktop/dunst/dunst.info +++ b/desktop/dunst/dunst.info @@ -1,8 +1,8 @@ PRGNAM="dunst" -VERSION="1.1.0" +VERSION="1.2.0" HOMEPAGE="http://knopwob.org/dunst/" -DOWNLOAD="https://github.com/knopwob/dunst/archive/v1.1.0.tar.gz" -MD5SUM="b44c0cb8ed62e3d1d1bc899615170f3d" +DOWNLOAD="https://github.com/knopwob/dunst/archive/v1.2.0/dunst-1.2.0.tar.gz" +MD5SUM="425d5bb10a8b571c7494c5e60aaae7e1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libxdg-basedir" diff --git a/desktop/lumina/lumina.SlackBuild b/desktop/lumina/lumina.SlackBuild index 6814c758bb..fddcea452b 100644 --- a/desktop/lumina/lumina.SlackBuild +++ b/desktop/lumina/lumina.SlackBuild @@ -80,6 +80,7 @@ qmake-qt5 \ LIBPREFIX=/usr/lib${LIBDIRSUFFIX} \ QMAKE_CFLAGS="$SLKCFLAGS" \ QMAKE_CXXFLAGS="$SLKCFLAGS" \ + QMAKE_CFLAGS_ISYSTEM= \ QT5LIBDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ L_ETCDIR=/etc \ diff --git a/desktop/lxhotkey/README b/desktop/lxhotkey/README new file mode 100644 index 0000000000..c57c836abc --- /dev/null +++ b/desktop/lxhotkey/README @@ -0,0 +1,12 @@ +lxhotkey is a plugin-based shortcuts editor for window managers. + +openbox is an optional dependency (and ATM the only window +manager supported). + +at the moment the application can be used from the command line +and from gtk+2 and gtk+3 GUIs: the developer, Andrej N. Gritsenko, +invites interested users to write theirselves other GUI plugins +(Qt, etc.) they may need. + +by default the gtk+2 plugin is built: to build the gtk+3 one +pass the script the parameter GTK=3 diff --git a/desktop/lxhotkey/lxhotkey.SlackBuild b/desktop/lxhotkey/lxhotkey.SlackBuild new file mode 100644 index 0000000000..f6a8dfc337 --- /dev/null +++ b/desktop/lxhotkey/lxhotkey.SlackBuild @@ -0,0 +1,104 @@ +#!/bin/sh + +# Slackware build script for lxhotkey + +# Copyright 2016-2017 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=lxhotkey +VERSION=${VERSION:-20170720_eb36db7} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +GTK=${GTK:-2} + +DOCS="CONCEPT COPYING ChangeLog" + +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 {} \; + +sh autogen.sh || true + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --with-gtk=$GTK \ + --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/desktop/lxhotkey/lxhotkey.info b/desktop/lxhotkey/lxhotkey.info new file mode 100644 index 0000000000..e7ab7c5af0 --- /dev/null +++ b/desktop/lxhotkey/lxhotkey.info @@ -0,0 +1,10 @@ +PRGNAM="lxhotkey" +VERSION="20170720_eb36db7" +HOMEPAGE="http://lxde.org" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxhotkey-20170720_eb36db7.tar.xz" +MD5SUM="985a5f5b666c09e87722ddf73ccda5ff" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/desktop/lxhotkey/slack-desc b/desktop/lxhotkey/slack-desc new file mode 100644 index 0000000000..d4845d4620 --- /dev/null +++ b/desktop/lxhotkey/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------------------------------------------------------| +lxhotkey: lxhotkey (global shortcuts editor) +lxhotkey: +lxhotkey: lxhotkey is a plugin-based shortcuts editor for window managers. +lxhotkey: +lxhotkey: homepage: http://lxde.org +lxhotkey: +lxhotkey: +lxhotkey: +lxhotkey: +lxhotkey: +lxhotkey: diff --git a/desktop/polybar/polybar.SlackBuild b/desktop/polybar/polybar.SlackBuild index 57bd438cea..5bf6afd6ef 100644 --- a/desktop/polybar/polybar.SlackBuild +++ b/desktop/polybar/polybar.SlackBuild @@ -88,6 +88,8 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_C_COMPILER="clang" \ + -DCMAKE_CXX_COMPILER="clang++" \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/desktop/searchmonkey/patch.txt b/desktop/searchmonkey/patch.txt new file mode 100644 index 0000000000..4e4681d95b --- /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 b1c2ef0824..f807c46128 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/vokoscreen/README b/desktop/vokoscreen/README new file mode 100644 index 0000000000..77ad627f95 --- /dev/null +++ b/desktop/vokoscreen/README @@ -0,0 +1,3 @@ +vokoscreen is an easy to use screencast creator to record educational +videos, live recordings of browser, installation, videoconferences, +etc. diff --git a/desktop/vokoscreen/doinst.sh b/desktop/vokoscreen/doinst.sh new file mode 100644 index 0000000000..3e5691a052 --- /dev/null +++ b/desktop/vokoscreen/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 usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/desktop/vokoscreen/slack-desc b/desktop/vokoscreen/slack-desc new file mode 100644 index 0000000000..f7792432b7 --- /dev/null +++ b/desktop/vokoscreen/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------------------------------------------------------| +vokoscreen: vokoscreen (screencast application) +vokoscreen: +vokoscreen: vokoscreen is an easy to use screencast creator to record educational +vokoscreen: videos, live recordings of browser, installation, videoconferences, +vokoscreen: etc. +vokoscreen: +vokoscreen: homepage: http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html +vokoscreen: +vokoscreen: +vokoscreen: +vokoscreen: diff --git a/desktop/vokoscreen/vokoscreen.SlackBuild b/desktop/vokoscreen/vokoscreen.SlackBuild new file mode 100644 index 0000000000..1cd9f83a6f --- /dev/null +++ b/desktop/vokoscreen/vokoscreen.SlackBuild @@ -0,0 +1,94 @@ +#!/bin/sh + +# Slackware build script for vokoscreen + +# Copyright 2017 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=vokoscreen +VERSION=${VERSION:-2.5.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 CHANGE COPYING CREDITS" + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION-beta +tar xvf $CWD/$PRGNAM-$VERSION-beta.tar.gz +cd $PRGNAM-$VERSION-beta +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -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 -config release "DEFINES += NO_NEW_VERSION_CHECK" +make +make 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 + +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 +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/vokoscreen/vokoscreen.info b/desktop/vokoscreen/vokoscreen.info new file mode 100644 index 0000000000..8c18ff8237 --- /dev/null +++ b/desktop/vokoscreen/vokoscreen.info @@ -0,0 +1,10 @@ +PRGNAM="vokoscreen" +VERSION="2.5.4" +HOMEPAGE="http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html" +DOWNLOAD="https://github.com/vkohaupt/vokoscreen/archive/2.5.4-beta/vokoscreen-2.5.4-beta.tar.gz" +MD5SUM="46318cee36c7c5e5e53772871cbb182c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="ffmpeg qt5" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" 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/development/ChezScheme/ChezScheme.SlackBuild b/development/ChezScheme/ChezScheme.SlackBuild index 3bc820df42..0cfb734ca4 100644 --- a/development/ChezScheme/ChezScheme.SlackBuild +++ b/development/ChezScheme/ChezScheme.SlackBuild @@ -92,6 +92,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/FreeBASIC/FreeBASIC.SlackBuild b/development/FreeBASIC/FreeBASIC.SlackBuild index bba9d245a7..70775745d0 100644 --- a/development/FreeBASIC/FreeBASIC.SlackBuild +++ b/development/FreeBASIC/FreeBASIC.SlackBuild @@ -89,13 +89,10 @@ if [ "$ARCH" = "x86_64" ]; then $PKG/usr/lib/${PRGNAM,,} fi -# fix linking with libtinfo over libncurses +# fix linking libtinfo over the newer version - WARNING, UGLY SHIT! -ponce ln -sf \ - /usr/lib${LIBDIRSUFFIX}/libncurses.so.5 \ + /usr/lib${LIBDIRSUFFIX}/libtinfo.so.6 \ $PKG/usr/lib${LIBDIRSUFFIX}/libtinfo.so.5 -ln -sf \ - /usr/lib${LIBDIRSUFFIX}/libtinfo.so.5 \ - $PKG/usr/lib${LIBDIRSUFFIX}/libtinfo.so # gzip man page gzip -c doc/fbc.1 > $PKG/usr/man/man1/fbc.1.gz diff --git a/development/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 49346896e2..0000000000 --- a/development/SDL2_gfx/SDL2_gfx.SlackBuild +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh - -# Slackware build script for SDL2_gfx - -# Copyright 2014-2017 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.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 {} \; - -./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 fbf60c3585..0000000000 --- a/development/SDL2_gfx/SDL2_gfx.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="SDL2_gfx" -VERSION="1.0.3" -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.3.tar.gz" -MD5SUM="6cd25c38a803295348e8c00e9c69d364" -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/anjuta/anjuta.SlackBuild b/development/anjuta/anjuta.SlackBuild index e5ce45bcc8..7a3fb12f58 100644 --- a/development/anjuta/anjuta.SlackBuild +++ b/development/anjuta/anjuta.SlackBuild @@ -69,7 +69,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=format-nonliteral -Wno-error=format-y2k" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/development/apache-log4cxx/apache-log4cxx.SlackBuild b/development/apache-log4cxx/apache-log4cxx.SlackBuild index 8e1adafefb..a0971e9701 100644 --- a/development/apache-log4cxx/apache-log4cxx.SlackBuild +++ b/development/apache-log4cxx/apache-log4cxx.SlackBuild @@ -70,6 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; zcat $CWD/fixincludes.patch.gz | patch -p1 || exit +zcat $CWD/narrowing-fixes.patch.gz | patch -p1 || exit CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/development/apache-log4cxx/narrowing-fixes.patch.gz b/development/apache-log4cxx/narrowing-fixes.patch.gz new file mode 100644 index 0000000000..cd79cc6971 Binary files /dev/null and b/development/apache-log4cxx/narrowing-fixes.patch.gz differ diff --git a/development/avr-binutils/avr-binutils.SlackBuild b/development/avr-binutils/avr-binutils.SlackBuild index 3b31a96b3f..8684c76c33 100644 --- a/development/avr-binutils/avr-binutils.SlackBuild +++ b/development/avr-binutils/avr-binutils.SlackBuild @@ -9,7 +9,7 @@ # This file is placed in the public domain. PRGNAM=avr-binutils -VERSION=${VERSION:-2.25} +VERSION=${VERSION:-2.29} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/avr-binutils/avr-binutils.info b/development/avr-binutils/avr-binutils.info index 6b640d3296..370f240a4b 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.29" 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.29.tar.bz2" +MD5SUM="23733a26c8276edbb1168c9bee60e40e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/avr-gcc/Revert-eeb6872bf.patch b/development/avr-gcc/Revert-eeb6872bf.patch new file mode 100644 index 0000000000..1688c149a8 --- /dev/null +++ b/development/avr-gcc/Revert-eeb6872bf.patch @@ -0,0 +1,82 @@ +commit 43d83a70267a9e5c456d28de8e7348820446b712 +Author: Bartłomiej Piotrowski +Date: Tue May 16 07:50:42 2017 +0200 + + Revert "Prevent LTO wrappers to process a recursive execution" + + This reverts commit eeb6872bfdfd1e71b27de6f62a5f5c08a2efb015. + +diff --git a/gcc/file-find.c b/gcc/file-find.c +index b072a4993d76..b5a1fe8494e8 100644 +--- a/gcc/file-find.c ++++ b/gcc/file-find.c +@@ -208,38 +208,3 @@ prefix_from_string (const char *p, struct path_prefix *pprefix) + } + free (nstore); + } +- +-void +-remove_prefix (const char *prefix, struct path_prefix *pprefix) +-{ +- struct prefix_list *remove, **prev, **remove_prev = NULL; +- int max_len = 0; +- +- if (pprefix->plist) +- { +- prev = &pprefix->plist; +- for (struct prefix_list *pl = pprefix->plist; pl->next; pl = pl->next) +- { +- if (strcmp (prefix, pl->prefix) == 0) +- { +- remove = pl; +- remove_prev = prev; +- continue; +- } +- +- int l = strlen (pl->prefix); +- if (l > max_len) +- max_len = l; +- +- prev = &pl; +- } +- +- if (remove_prev) +- { +- *remove_prev = remove->next; +- free (remove); +- } +- +- pprefix->max_len = max_len; +- } +-} +diff --git a/gcc/file-find.h b/gcc/file-find.h +index 8f49a3af273e..407feba26e74 100644 +--- a/gcc/file-find.h ++++ b/gcc/file-find.h +@@ -41,7 +41,6 @@ extern void find_file_set_debug (bool); + extern char *find_a_file (struct path_prefix *, const char *, int); + extern void add_prefix (struct path_prefix *, const char *); + extern void add_prefix_begin (struct path_prefix *, const char *); +-extern void remove_prefix (const char *prefix, struct path_prefix *); + extern void prefix_from_env (const char *, struct path_prefix *); + extern void prefix_from_string (const char *, struct path_prefix *); + +diff --git a/gcc/gcc-ar.c b/gcc/gcc-ar.c +index 78d2fc1ad306..d5d80e042e5a 100644 +--- a/gcc/gcc-ar.c ++++ b/gcc/gcc-ar.c +@@ -194,14 +194,6 @@ main (int ac, char **av) + #ifdef CROSS_DIRECTORY_STRUCTURE + real_exe_name = concat (target_machine, "-", PERSONALITY, NULL); + #endif +- /* Do not search original location in the same folder. */ +- char *exe_folder = lrealpath (av[0]); +- exe_folder[strlen (exe_folder) - strlen (lbasename (exe_folder))] = '\0'; +- char *location = concat (exe_folder, PERSONALITY, NULL); +- +- if (access (location, X_OK) == 0) +- remove_prefix (exe_folder, &path); +- + exe_name = find_a_file (&path, real_exe_name, X_OK); + if (!exe_name) + { diff --git a/development/avr-gcc/avr-gcc.SlackBuild b/development/avr-gcc/avr-gcc.SlackBuild index a91986fe8c..ab3f811380 100644 --- a/development/avr-gcc/avr-gcc.SlackBuild +++ b/development/avr-gcc/avr-gcc.SlackBuild @@ -8,7 +8,7 @@ # This file is placed in the public domain. PRGNAM=avr-gcc -VERSION=${VERSION:-4.9.2} +VERSION=${VERSION:-7.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -45,9 +45,8 @@ 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 +tar xvf $CWD/gcc-$VERSION.tar.bz2 +cd gcc-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -55,6 +54,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80717 +patch -p1 < $CWD/Revert-eeb6872bf.patch + +mkdir ../avr-gcc-build-$VERSION +cd ../avr-gcc-build-$VERSION + CFLAGS_FOR_BUILD="$SLKCFLAGS" \ CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \ ../gcc-$VERSION/configure \ @@ -99,6 +104,7 @@ make 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 diff --git a/development/avr-gcc/avr-gcc.info b/development/avr-gcc/avr-gcc.info index 6bd3a9b64d..4eda349091 100644 --- a/development/avr-gcc/avr-gcc.info +++ b/development/avr-gcc/avr-gcc.info @@ -1,8 +1,8 @@ PRGNAM="avr-gcc" -VERSION="4.9.2" +VERSION="7.1.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-7.1.0/gcc-7.1.0.tar.bz2" +MD5SUM="6bf56a2bca9dac9dbbf8e8d1036964a8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="avr-binutils" diff --git a/development/curlpp/curlpp.SlackBuild b/development/curlpp/curlpp.SlackBuild index 0a685f034c..ed53c95565 100644 --- a/development/curlpp/curlpp.SlackBuild +++ b/development/curlpp/curlpp.SlackBuild @@ -69,7 +69,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS -Wno-error=unused-function" \ -CXXFLAGS="$SLKCFLAGS -Wno-error=unused-function" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=unused-function -Wno-error=deprecated-declarations" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/development/gnats/gnats.SlackBuild b/development/gnats/gnats.SlackBuild index bd2d9b5390..004f4de7d6 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/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/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/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/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 9f2fe32c2a..4dbe2f2fe6 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/nodejs/chromium-v8-gcc7.patch b/development/nodejs/chromium-v8-gcc7.patch new file mode 100644 index 0000000000..03d6c2b494 --- /dev/null +++ b/development/nodejs/chromium-v8-gcc7.patch @@ -0,0 +1,69 @@ +diff -up chromium-56.0.2924.87/v8/src/objects-body-descriptors.h.gcc7 chromium-56.0.2924.87/v8/src/objects-body-descriptors.h +--- chromium-56.0.2924.87/v8/src/objects-body-descriptors.h.gcc7 2017-02-28 16:00:27.313172210 -0500 ++++ chromium-56.0.2924.87/v8/src/objects-body-descriptors.h 2017-02-28 16:00:46.016804708 -0500 +@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public + + template + static inline void IterateBody(HeapObject* obj, int object_size) { +- IterateBody(obj); ++ IterateBody(obj); + } + }; + +--- deps/v8/src/objects.h.orig 2017-05-11 17:42:34.296905432 +0700 ++++ deps/v8/src/objects.h 2017-05-11 17:44:23.790189039 +0700 +@@ -3261,22 +3261,11 @@ + template + class HashTable : public HashTableBase { + public: +- // Wrapper methods +- inline uint32_t Hash(Key key) { +- if (Shape::UsesSeed) { +- return Shape::SeededHash(key, GetHeap()->HashSeed()); +- } else { +- return Shape::Hash(key); +- } +- } + +- inline uint32_t HashForObject(Key key, Object* object) { +- if (Shape::UsesSeed) { +- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); +- } else { +- return Shape::HashForObject(key, object); +- } +- } ++ // Wrapper methods. Defined in src/objects-inl.h ++ // to break a cycle with src/heap/heap.h. ++ inline uint32_t Hash(Key key); ++ inline uint32_t HashForObject(Key key, Object* object); + + // Returns a new HashTable object. + MUST_USE_RESULT static Handle New( +--- deps/v8/src/objects-inl.h.orig 2017-05-11 17:44:47.550817371 +0700 ++++ deps/v8/src/objects-inl.h 2017-05-11 17:45:13.290415065 +0700 +@@ -36,6 +36,25 @@ + namespace v8 { + namespace internal { + ++template ++uint32_t HashTable::Hash(Key key) { ++ if (Shape::UsesSeed) { ++ return Shape::SeededHash(key, GetHeap()->HashSeed()); ++ } else { ++ return Shape::Hash(key); ++ } ++} ++ ++template ++uint32_t HashTable::HashForObject(Key key, ++ Object* object) { ++ if (Shape::UsesSeed) { ++ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); ++ } else { ++ return Shape::HashForObject(key, object); ++ } ++} ++ + PropertyDetails::PropertyDetails(Smi* smi) { + value_ = smi->value(); + } diff --git a/development/nodejs/nodejs.SlackBuild b/development/nodejs/nodejs.SlackBuild index 631d127ec8..6db70ab3ac 100644 --- a/development/nodejs/nodejs.SlackBuild +++ b/development/nodejs/nodejs.SlackBuild @@ -81,10 +81,14 @@ sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" tools/install.py sed -i "s/'lib'/'lib${LIBDIRSUFFIX}'/" lib/module.js sed -i "s|\"lib\"|\"lib${LIBDIRSUFFIX}\"|" deps/npm/lib/npm.js +cd deps +patch -p1 < $CWD/chromium-v8-gcc7.patch +cd .. ./configure \ --prefix=/usr \ --shared-zlib \ - --shared-openssl + --shared-openssl \ + --with-intl=system-icu make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make install DESTDIR=$PKG diff --git a/development/numpy/numpy.SlackBuild b/development/numpy/numpy.SlackBuild index 1cbea85539..9e9e59776e 100644 --- a/development/numpy/numpy.SlackBuild +++ b/development/numpy/numpy.SlackBuild @@ -40,7 +40,7 @@ # ATLAS library (S. Udrea) PRGNAM=numpy -VERSION=${VERSION:-1.11.1} +VERSION=${VERSION:-1.13.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -139,7 +139,7 @@ else fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt THANKS.txt INSTALL.rst.txt PKG-INFO \ +cp -a LICENSE.txt THANKS.txt INSTALL.rst.txt \ $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/development/numpy/numpy.info b/development/numpy/numpy.info index f94e077438..3ee4efddd4 100644 --- a/development/numpy/numpy.info +++ b/development/numpy/numpy.info @@ -1,8 +1,8 @@ PRGNAM="numpy" -VERSION="1.11.1" +VERSION="1.13.1" HOMEPAGE="http://numpy.scipy.org/" -DOWNLOAD="http://download.sourceforge.net/project/numpy/NumPy/1.11.1/numpy-1.11.1.tar.gz" -MD5SUM="2f44a895a8104ffac140c3a70edbd450" +DOWNLOAD="https://github.com/numpy/numpy/archive/v1.13.1/numpy-1.13.1.tar.gz" +MD5SUM="bf7784ef9885be7e16b6a8198060965c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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/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 bffb35a45e..7ba088e19c 100644 --- a/development/perf/perf.SlackBuild +++ b/development/perf/perf.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=perf -VERSION=${VERSION:-4.4.75} +VERSION=${VERSION:-4.9.36} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/perf/perf.info b/development/perf/perf.info index 5b94c463d4..f7fc1d058c 100644 --- a/development/perf/perf.info +++ b/development/perf/perf.info @@ -1,5 +1,5 @@ PRGNAM="perf" -VERSION="4.4.75" +VERSION="4.9.36" HOMEPAGE="https://perf.wiki.kernel.org/index.php/Main_Page" DOWNLOAD="http://www.pastemobile.org/static/perf.dummy" MD5SUM="9cba6c70fb57a22a155073d54748b614" diff --git a/development/srcML/srcML.info b/development/srcML/srcML.info index d9321d2396..9fd227c29e 100644 --- a/development/srcML/srcML.info +++ b/development/srcML/srcML.info @@ -2,9 +2,9 @@ PRGNAM="srcML" VERSION="0.9.5" HOMEPAGE="http://www.srcml.org/" DOWNLOAD="http://131.123.42.38/lmcrs/beta/srcML-src.tar.gz \ - http://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.tar.bz2" + http://downloads.sourceforge.net/boost/boost_1_63_0.tar.bz2" MD5SUM="e5c4223f7556b57984b20d70606f50ab \ - 6aa9a5c6a4ca1016edd0ed1178e3cb87" + 1c837ecd990bb022d07e7aab32b09847" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="antlr2" diff --git a/development/swfmill/swfmill.SlackBuild b/development/swfmill/swfmill.SlackBuild index 5881f08825..910f31fa33 100644 --- a/development/swfmill/swfmill.SlackBuild +++ b/development/swfmill/swfmill.SlackBuild @@ -54,7 +54,7 @@ find -L . \ export CFLAGS="" -export CXXFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing" ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/development/tora/README b/development/tora/README index e1c08a248a..b109aec98a 100644 --- a/development/tora/README +++ b/development/tora/README @@ -5,3 +5,5 @@ through Qt's ODBC support. For Oracle DBMS support, run the script like this, ORACLE_HOME=/path/to/oracle/home ./tora.Slackbuild + +postgresql is an autodetected dependency. diff --git a/development/tora/tora.SlackBuild b/development/tora/tora.SlackBuild index 9245687cbb..e0150dab62 100644 --- a/development/tora/tora.SlackBuild +++ b/development/tora/tora.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tora -VERSION=${VERSION:-2.1.3} +VERSION=${VERSION:-20170725_d9fddb8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,11 +60,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION - -patch -Np1 -i "${CWD}/include_unistd.patch" - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -79,12 +76,13 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DWANT_INTERNAL_QSCINTILLA=0 \ + -DWANT_INTERNAL_QSCINTILLA=1 \ + -DWANT_INTERNAL_LOKI=1 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG - +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -94,7 +92,7 @@ mkdir -p $PKG/usr/share/icons/hicolor/{32x32,16x16}/apps mkdir -p $PKG/usr/share/applications ( cd $TMP/$PRGNAM-$VERSION - cp -a AUTHORS BUGS ChangeLog COPYING* README* TODO NEWS $PKG/usr/doc/$PRGNAM-$VERSION + cp -a AUTHORS ChangeLog COPYING* README* TODO NEWS $PKG/usr/doc/$PRGNAM-$VERSION cp -a src/help/*.html $PKG/usr/doc/$PRGNAM-$VERSION/help cp -a src/help/images/*.png $PKG/usr/doc/$PRGNAM-$VERSION/help/images cp -a src/icons/tora.xpm $PKG/usr/share/icons/hicolor/32x32/apps diff --git a/development/tora/tora.info b/development/tora/tora.info index a03ef294b4..c90540fffe 100644 --- a/development/tora/tora.info +++ b/development/tora/tora.info @@ -1,10 +1,10 @@ PRGNAM="tora" -VERSION="2.1.3" +VERSION="3.2" HOMEPAGE="http://torasql.com" -DOWNLOAD="http://sourceforge.net/projects/tora/files/tora/2.1.3/tora-2.1.3.tar.bz2" -MD5SUM="b3a4b5c827c300e75eea53874634e8a2" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/tora-20170725_d9fddb8.tar.xz" +MD5SUM="0ebe7f9420b719d3062cf6598c9b8fc6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="qt5" MAINTAINER="Giuseppe Di Terlizzi" EMAIL="giuseppe.diterlizzi@gmail.com" diff --git a/development/wxHexEditor/wxHexEditor.SlackBuild b/development/wxHexEditor/wxHexEditor.SlackBuild index 5f8c72c651..0865380b0e 100644 --- a/development/wxHexEditor/wxHexEditor.SlackBuild +++ b/development/wxHexEditor/wxHexEditor.SlackBuild @@ -27,7 +27,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wxHexEditor -VERSION=${VERSION:-0.23} +VERSION=${VERSION:-20170415_bb951eb} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -63,9 +63,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM -tar xvf $CWD/$PRGNAM-v$VERSION-src.tar.bz2 -cd $PRGNAM +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 \ diff --git a/development/wxHexEditor/wxHexEditor.info b/development/wxHexEditor/wxHexEditor.info index d306385318..ea1fbc2857 100644 --- a/development/wxHexEditor/wxHexEditor.info +++ b/development/wxHexEditor/wxHexEditor.info @@ -1,10 +1,10 @@ PRGNAM="wxHexEditor" -VERSION="0.23" +VERSION="20170415_bb951eb" HOMEPAGE="http://wxhexeditor.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/wxhexeditor/wxHexEditor-v0.23-src.tar.bz2" -MD5SUM="d0e785c95cf40737246e5b2cc4cb7204" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/wxHexEditor-20170415_bb951eb.tar.xz" +MD5SUM="8b3f8d2c459a6bc7bd18d091d85f9671" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="wxPython" +REQUIRES="webkit2gtk wxGTK3" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" 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..55ae155331 --- /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/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/desmume/desmume.SlackBuild b/games/desmume/desmume.SlackBuild index 4e5fec368b..a13e3a7cd7 100644 --- a/games/desmume/desmume.SlackBuild +++ b/games/desmume/desmume.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=desmume -VERSION=${VERSION:-0.9.11} +VERSION=${VERSION:-20170609_73c8f8a} 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 . \ @@ -77,8 +77,8 @@ for i in AUTHORS; do mv ${i}.new $i done -# Fix missing header. -patch -p1 < $CWD/osmesa-header-fix.patch +cd src/frontend/posix +./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -88,7 +88,6 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --enable-osmesa \ --enable-hud \ - --enable-gdb-stub \ --enable-wifi \ --enable-openal \ --enable-glade \ @@ -99,6 +98,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 +107,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..66f876b98e 100644 --- a/games/desmume/desmume.info +++ b/games/desmume/desmume.info @@ -1,8 +1,8 @@ PRGNAM="desmume" -VERSION="0.9.11" +VERSION="20170609_73c8f8a" 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-20170609_73c8f8a.tar.xz" +MD5SUM="e28cf3d3578c48670aab926b28818057" 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..676a965265 100644 --- a/games/dolphin-emu/dolphin-emu.SlackBuild +++ b/games/dolphin-emu/dolphin-emu.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 +sed -i 's/CHAR_/CHARACTER_/g' Source/Core/VideoBackends/OGL/RasterFont.cpp + mkdir build cd build cmake -G "Unix Makefiles" \ 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..ef7b9625c1 --- /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-2016 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:-20170622_ae5f9ef} +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 + ln -s $CWD/omnibot-linux-latest.tar.gz legacy/ + ln -s $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..34a4acd1e3 --- /dev/null +++ b/games/etlegacy-from-source/etlegacy-from-source.info @@ -0,0 +1,16 @@ +PRGNAM="etlegacy" +VERSION="20170622_ae5f9ef" +HOMEPAGE="http://www.etlegacy.com" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/etlegacy-20170622_ae5f9ef.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="3932c07ac68fac86d2d15679029028a3 \ + 714a5c98406e455377e6cea1fdfdd16b \ + a322a5b8bf478643785362f35143847c \ + 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..42aaa1626d --- /dev/null +++ b/games/etlegacy-from-source/files/get_tarball_from_git.sh @@ -0,0 +1,31 @@ +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 .. +cd scripts +git archive master > ../../scripts.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 scripts +tar xf ../../scripts.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/exult/exult.SlackBuild b/games/exult/exult.SlackBuild index 0d316d97de..f8278ef643 100644 --- a/games/exult/exult.SlackBuild +++ b/games/exult/exult.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=exult -VERSION=${VERSION:-1.5.0_svn} +VERSION=${VERSION:-20170608_dee7d24} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/games/exult/exult.info b/games/exult/exult.info index 658a6e1a73..d460b8bf4b 100644 --- a/games/exult/exult.info +++ b/games/exult/exult.info @@ -1,9 +1,9 @@ PRGNAM="exult" -VERSION="1.5.0_svn" +VERSION="20170608_dee7d24" HOMEPAGE="http://exult.sourceforge.net/" -DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/exult-1.5.0_svn.tar.xz \ +DOWNLOAD="http://ponce.cc/slackware/sources/repo/exult-20170608_dee7d24.tar.xz \ http://downloads.sourceforge.net/project/exult/exult-data/exult_audio.zip" -MD5SUM="fcc6b6c7aa4ed2af7c9e1f9097b8fe28 \ +MD5SUM="d2e505fb0a97d560a219d56b3bffbb47 \ 1905328f00bbbfee33812c1942bc7880" DOWNLOAD_x86_64="" MD5SUM_x86_64="" 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/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/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 760f39ef37..236b445e1c 100644 --- a/games/goonies/goonies.SlackBuild +++ b/games/goonies/goonies.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 compilers +patch -p1 < $CWD/gcc6.patch + # fix linker and installation paths patch -p1 < $CWD/makefile.patch diff --git a/games/higan/higan.SlackBuild b/games/higan/higan.SlackBuild index a9511ca33c..2b0a75c1bc 100644 --- a/games/higan/higan.SlackBuild +++ b/games/higan/higan.SlackBuild @@ -27,7 +27,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=higan -VERSION=${VERSION:-101} +VERSION=${VERSION:-103} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -94,7 +94,7 @@ install -m 755 icarus/out/icarus $PKG/usr/bin/ install -m 755 higan/out/higan $PKG/usr/bin/ install -m 644 higan/data/higan.desktop $PKG/usr/share/applications/ install -m 644 higan/data/higan.png $PKG/usr/share/pixmaps/ -cp -dr higan/systems/* higan/data/cheats.bml $PKG/usr/share/higan/ +cp -dr higan/systems/* $PKG/usr/share/higan/ find $PKG -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/games/higan/higan.info b/games/higan/higan.info index 717fe9d120..e8a96fd65d 100644 --- a/games/higan/higan.info +++ b/games/higan/higan.info @@ -1,8 +1,8 @@ PRGNAM="higan" -VERSION="101" -HOMEPAGE="http://byuu.net/higan/" -DOWNLOAD="http://helmet.kafuka.org/higan_v101-source.7z" -MD5SUM="7c0f00b05c5589ea01b5c2b18c452e0f" +VERSION="103" +HOMEPAGE="https://byuu.org/emulation/higan/" +DOWNLOAD="https://download.byuu.org/higan_v103-source.7z" +MD5SUM="b45deec0c92a05d1677c919d0d387a19" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenAL p7zip" diff --git a/games/higan/slack-desc b/games/higan/slack-desc index fa5df6a824..70b0e5e75a 100644 --- a/games/higan/slack-desc +++ b/games/higan/slack-desc @@ -15,5 +15,5 @@ higan: Famicom (NES), Super Famicom (SNES), Game Boy, Game Boy Color, and higan: Game Boy Advance. It also supports the subsystems Super Game Boy, higan: BS-X Satellaview and Sufami Turbo. higan: -higan: Homepage: http://byuu.net/higan/ +higan: Homepage: https://byuu.org/emulation/higan/ higan: diff --git a/games/nestopia/nestopia.SlackBuild b/games/nestopia/nestopia.SlackBuild index f45e53f233..8d531896e5 100644 --- a/games/nestopia/nestopia.SlackBuild +++ b/games/nestopia/nestopia.SlackBuild @@ -54,7 +54,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; patch < $CWD/Makefile.patch -sed -i "s/-O3 -g3/-g3 ${SLKCFLAGS}/g" Makefile +sed -i "s/-O3 -g3/-g3 ${SLKCFLAGS} -fpermissive/g" Makefile make -j1 PREFIX=/usr make install PREFIX=$PKG/usr 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/nuvie/nuvie.SlackBuild b/games/nuvie/nuvie.SlackBuild index 79af657479..aa51eac8b6 100644 --- a/games/nuvie/nuvie.SlackBuild +++ b/games/nuvie/nuvie.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing -fpermissive" \ ./configure \ --prefix=/usr \ --build=$ARCH-slackware-linux 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 8604adbf6a..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="e28549d49714fb0af9a3f35031aad834" +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/pcsxr/pcsxr.SlackBuild b/games/pcsxr/pcsxr.SlackBuild index 49eba27447..af5d3b9f33 100644 --- a/games/pcsxr/pcsxr.SlackBuild +++ b/games/pcsxr/pcsxr.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 fedora +patch -p1 < $CWD/zlib129fix.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="$SLKLDFLAGS" \ diff --git a/games/pcsxr/zlib129fix.patch b/games/pcsxr/zlib129fix.patch new file mode 100644 index 0000000000..632e1ceffe --- /dev/null +++ b/games/pcsxr/zlib129fix.patch @@ -0,0 +1,34 @@ +diff --git a/pcsxr/configure.ac b/pcsxr/configure.ac +index 300bb18..128b4f9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -113,6 +113,9 @@ if test "x$have_xtest" = xno; then + AC_MSG_ERROR([unable to find xtest headers]) + fi + ++AC_CHECK_LIB(z, uncompress2, ++[ AC_DEFINE([HAVE_UNCOMPRESS2], [1], [Define if libz supports uncompress2]) ]) ++ + AM_CONDITIONAL(USE_LIBCDIO, false) + + AC_ARG_ENABLE(libcdio, [ --enable-libcdio use GNU libcdio for CD-ROM support (default=no)], +diff --git a/pcsxr/libpcsxcore/cdriso.c b/pcsxr/libpcsxcore/cdriso.c +index 04e866d..fb7f28a 100644 +--- a/libpcsxcore/cdriso.c ++++ b/libpcsxcore/cdriso.c +@@ -1219,6 +1219,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector) + return ret; + } + ++#ifndef HAVE_UNCOMPRESS2 + static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) + { + static z_stream z; +@@ -1249,6 +1250,7 @@ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned lo + *out_size -= z.avail_out; + return ret == 1 ? 0 : ret; + } ++#endif + + static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector) + { 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/pokerth-c++11.patch b/games/pokerth/pokerth-c++11.patch new file mode 100644 index 0000000000..3978ee263c --- /dev/null +++ b/games/pokerth/pokerth-c++11.patch @@ -0,0 +1,95 @@ +From 924fcd64044bd17c683345627def83df044ce867 Mon Sep 17 00:00:00 2001 +From: Felix Hammer +Date: Wed, 19 Aug 2015 15:02:10 +0200 +Subject: [PATCH] Linux Desktop build fix + +--- + pokerth_lib.pro | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pokerth_lib.pro b/pokerth_lib.pro +index 6ab18b9..e9f1e3a 100644 +--- a/pokerth_lib.pro ++++ b/pokerth_lib.pro +@@ -256,6 +256,8 @@ win32{ + ##### My release static build options + #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections + INCLUDEPATH += /opt/gsasl/include ++ DEFINES += _WEBSOCKETPP_CPP11_STL_ ++ QMAKE_CXXFLAGS += -std=gnu++11 + } + + mac{ +#diff --git a/pokerth_qml-client.pro b/pokerth_qml-client.pro +#index 6e5223f..eec1feb 100644 +#--- a/pokerth_qml-client.pro +#+++ b/pokerth_qml-client.pro +#@@ -6,7 +6,6 @@ isEmpty( PREFIX ){ +# DEFINES += PREFIX=\"$${PREFIX}\" +# +# TEMPLATE = app +#-TARGET = pokerth +# CODECFORSRC = UTF-8 +# QT += core qml quick widgets svg sql +# CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on +diff --git a/src/net/common/sessiondata.cpp b/src/net/common/sessiondata.cpp +index 06f7146..69bcdb7 100644 +--- a/src/net/common/sessiondata.cpp ++++ b/src/net/common/sessiondata.cpp +@@ -318,8 +318,9 @@ void + SessionData::CloseWebSocketHandle() + { + if (m_webData) { +- boost::system::error_code ec; +- m_webData->webSocketServer->close(m_webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", ec); ++// boost::system::error_code ec; ++ std::error_code std_ec; ++ m_webData->webSocketServer->close(m_webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", std_ec); + } + } + +diff --git a/src/net/common/websendbuffer.cpp b/src/net/common/websendbuffer.cpp +index 2ba665a..3130373 100644 +--- a/src/net/common/websendbuffer.cpp ++++ b/src/net/common/websendbuffer.cpp +@@ -57,9 +57,10 @@ void + WebSendBuffer::AsyncSendNextPacket(boost::shared_ptr session) + { + if (closeAfterSend) { +- boost::system::error_code ec; ++// boost::system::error_code ec; ++ std::error_code std_ec; + boost::shared_ptr webData = session->GetWebData(); +- webData->webSocketServer->close(webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", ec); ++ webData->webSocketServer->close(webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", std_ec); + } + } + +@@ -70,10 +71,11 @@ WebSendBuffer::InternalStorePacket(boost::shared_ptr session, boost + google::protobuf::uint8 *buf = new google::protobuf::uint8[packetSize]; + packet->GetMsg()->SerializeWithCachedSizesToArray(buf); + +- boost::system::error_code ec; ++// boost::system::error_code ec; ++ std::error_code std_ec; + boost::shared_ptr webData = session->GetWebData(); +- webData->webSocketServer->send(webData->webHandle, string((const char *)buf, packetSize), websocketpp::frame::opcode::BINARY, ec); +- if (ec) { ++ webData->webSocketServer->send(webData->webHandle, string((const char *)buf, packetSize), websocketpp::frame::opcode::BINARY, std_ec); ++ if (std_ec) { + SetCloseAfterSend(); + } + +diff --git a/src/net/serveracceptwebhelper.h b/src/net/serveracceptwebhelper.h +index a1d371e..f7e8123 100644 +--- a/src/net/serveracceptwebhelper.h ++++ b/src/net/serveracceptwebhelper.h +@@ -52,7 +53,7 @@ class ServerAcceptWebHelper : public ServerAcceptInterface + + protected: + +- typedef std::map > SessionMap; ++ typedef std::map, std::owner_less > SessionMap; + + bool validate(websocketpp::connection_hdl hdl); + void on_open(websocketpp::connection_hdl hdl); diff --git a/games/pokerth/pokerth-gcc6.patch b/games/pokerth/pokerth-gcc6.patch new file mode 100644 index 0000000000..d663ab2133 --- /dev/null +++ b/games/pokerth/pokerth-gcc6.patch @@ -0,0 +1,41 @@ +--- PokerTH-1.1.1-src/pokerth_db.pro.orig 2016-05-12 20:20:57.336018308 +0000 ++++ PokerTH-1.1.1-src/pokerth_db.pro 2016-05-12 20:21:14.335959204 +0000 +@@ -49,7 +49,6 @@ + !win32{ + ##### My release static build options + #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections +- INCLUDEPATH += $${PREFIX}/include + } + + mac{ +--- PokerTH-1.1.1-src/pokerth_lib.pro.orig 2016-05-12 20:24:53.581864921 +0000 ++++ PokerTH-1.1.1-src/pokerth_lib.pro 2016-05-12 20:25:20.441771862 +0000 +@@ -243,7 +243,7 @@ + !win32{ + ##### My release static build options + #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections +- INCLUDEPATH += $${PREFIX}/include /opt/gsasl/include ++ INCLUDEPATH += /opt/gsasl/include + } + + mac{ +--- PokerTH-1.1.1-src/pokerth_game.pro.orig 2016-05-12 21:02:08.527791266 +0000 ++++ PokerTH-1.1.1-src/pokerth_game.pro 2016-05-12 21:02:19.027758386 +0000 +@@ -402,7 +402,6 @@ + # #### My release static build options + # QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections + # QMAKE_LFLAGS += -Wl,--gc-sections +- INCLUDEPATH += $${PREFIX}/include + QMAKE_LIBDIR += lib + !android{ + LIBPATH += $${PREFIX}/lib /opt/gsasl/lib +--- PokerTH-1.1.1-src/pokerth_server.pro.orig 2016-05-12 21:10:02.469679181 +0000 ++++ PokerTH-1.1.1-src/pokerth_server.pro 2016-05-12 21:10:34.106251260 +0000 +@@ -174,7 +174,6 @@ + #QMAKE_LFLAGS += -Wl,--gc-sections + + LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib +- INCLUDEPATH += $${PREFIX}/include + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) + BOOST_FS = boost_filesystem boost_filesystem-mt + BOOST_THREAD = boost_thread boost_thread-mt diff --git a/games/pokerth/pokerth.SlackBuild b/games/pokerth/pokerth.SlackBuild index 5412cb9fbe..dff4115966 100644 --- a/games/pokerth/pokerth.SlackBuild +++ b/games/pokerth/pokerth.SlackBuild @@ -77,6 +77,13 @@ find -L . \ # Thanks ponce. sed -i "s|libircclient/||" src/net/common/ircthread.cpp +# Fix for the newest boost +patch -p1 < $CWD/std-ifstream-and-std-ofstream.patch + +# Fix building with gcc-6.x - thanks Archlinux folks! +patch -p1 < $CWD/pokerth-gcc6.patch +patch -p1 < $CWD/pokerth-c++11.patch + qmake pokerth.pro make #CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" diff --git a/games/pokerth/std-ifstream-and-std-ofstream.patch b/games/pokerth/std-ifstream-and-std-ofstream.patch new file mode 100644 index 0000000000..37030c331d --- /dev/null +++ b/games/pokerth/std-ifstream-and-std-ofstream.patch @@ -0,0 +1,151 @@ +From: Jonathan Wakely +Date: Thu, 26 Nov 2015 16:27:52 +0000 +Subject: Qualify std::ifstream and std::ofstream + +Starting with Boost 1.60.0 includes +, which declares ifstream and ofstream +types that make the unqualified names ifstream and ofstream ambiguous. +The names must be qualified to refer to the std versions. + +Upstream pull request at: https://github.com/pokerth/pokerth/pull/299 +--- + src/core/common/avatarmanager.cpp | 4 ++-- + src/core/common/loghelper_server.cpp | 6 +++--- + src/net/common/clientstate.cpp | 4 ++-- + src/net/common/clientthread.cpp | 4 ++-- + src/net/common/downloaderthread.cpp | 2 +- + src/pokerth_server.cpp | 2 +- + src/zlib_compress.cpp | 4 ++-- + 7 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp +index d9b9fd4..d137a5c 100644 +--- a/src/core/common/avatarmanager.cpp ++++ b/src/core/common/avatarmanager.cpp +@@ -61,7 +61,7 @@ using namespace std; + using namespace boost::filesystem; + + struct AvatarFileState { +- ifstream inputStream; ++ std::ifstream inputStream; + }; + + AvatarManager::AvatarManager(bool useExternalServer, const std::string &externalServerAddress, +@@ -363,7 +363,7 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFil + path tmpPath(cacheDir); + tmpPath /= (md5buf.ToString() + ext); + string fileName(tmpPath.file_string()); +- ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc); ++ std::ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc); + if (!o.fail()) { + o.write((const char *)data, size); + o.close(); +diff --git a/src/core/common/loghelper_server.cpp b/src/core/common/loghelper_server.cpp +index f79e4ca..a0d0350 100644 +--- a/src/core/common/loghelper_server.cpp ++++ b/src/core/common/loghelper_server.cpp +@@ -67,7 +67,7 @@ void + internal_log_err(const string &msg) + { + if (!g_logFile.empty()) { +- ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); ++ std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); + if (!o.fail()) { + o << second_clock::local_time() << " ERR: " << msg; + o.flush(); +@@ -80,7 +80,7 @@ internal_log_msg(const std::string &msg) + { + if (g_logLevel) { + if (!g_logFile.empty()) { +- ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); ++ std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); + if (!o.fail()) + o << second_clock::local_time() << " MSG: " << msg; + } +@@ -92,7 +92,7 @@ internal_log_level(const std::string &msg, int logLevel) + { + if (g_logLevel >= logLevel) { + if (!g_logFile.empty()) { +- ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); ++ std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); + if (!o.fail()) + o << second_clock::local_time() << " OUT: " << msg; + } +diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp +index 84921ce..58fd5fb 100644 +--- a/src/net/common/clientstate.cpp ++++ b/src/net/common/clientstate.cpp +@@ -302,8 +302,8 @@ ClientStateReadingServerList::Enter(boost::shared_ptr client) + + // Unzip the file using zlib. + try { +- ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary); +- ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc); ++ std::ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary); ++ std::ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc); + boost::iostreams::filtering_streambuf in; + in.push(boost::iostreams::zlib_decompressor()); + in.push(inFile); +diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp +index c36e94a..45b79cb 100644 +--- a/src/net/common/clientthread.cpp ++++ b/src/net/common/clientthread.cpp +@@ -1604,7 +1604,7 @@ void + ClientThread::ReadSessionGuidFromFile() + { + string guidFileName(GetContext().GetCacheDir() + TEMP_GUID_FILENAME); +- ifstream guidStream(guidFileName.c_str(), ios::in | ios::binary); ++ std::ifstream guidStream(guidFileName.c_str(), ios::in | ios::binary); + if (guidStream.good()) { + std::vector tmpGuid(CLIENT_GUID_SIZE); + guidStream.read(&tmpGuid[0], CLIENT_GUID_SIZE); +@@ -1616,7 +1616,7 @@ void + ClientThread::WriteSessionGuidToFile() const + { + string guidFileName(GetContext().GetCacheDir() + TEMP_GUID_FILENAME); +- ofstream guidStream(guidFileName.c_str(), ios::out | ios::trunc | ios::binary); ++ std::ofstream guidStream(guidFileName.c_str(), ios::out | ios::trunc | ios::binary); + if (guidStream.good()) { + guidStream.write(GetContext().GetSessionGuid().c_str(), GetContext().GetSessionGuid().size()); + } +diff --git a/src/net/common/downloaderthread.cpp b/src/net/common/downloaderthread.cpp +index e58e3f8..56a9526 100644 +--- a/src/net/common/downloaderthread.cpp ++++ b/src/net/common/downloaderthread.cpp +@@ -96,7 +96,7 @@ DownloaderThread::Main() + // Previous download was finished. + if (m_curDownloadData) { + path filepath(m_curDownloadData->filename); +- ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary); ++ std::ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary); + // Find out file size. + // Not fully portable, but works on win/linux/mac. + instream.seekg(0, ios_base::beg); +diff --git a/src/pokerth_server.cpp b/src/pokerth_server.cpp +index 3b93d46..450a47e 100644 +--- a/src/pokerth_server.cpp ++++ b/src/pokerth_server.cpp +@@ -161,7 +161,7 @@ main(int argc, char *argv[]) + pidFile = tmpPidPath.directory_string(); + } + { +- ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc); ++ std::ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc); + if (!pidStream.fail()) + pidStream << getpid(); + else +diff --git a/src/zlib_compress.cpp b/src/zlib_compress.cpp +index e3fd72d..4b04817 100644 +--- a/src/zlib_compress.cpp ++++ b/src/zlib_compress.cpp +@@ -59,8 +59,8 @@ main(int argc, char *argv[]) + return 2; + } + try { +- ifstream inFile(inputFilePath.directory_string().c_str(), ios_base::in); +- ofstream outFile(outputFilePath.directory_string().c_str(), ios_base::out | ios_base::binary); ++ std::ifstream inFile(inputFilePath.directory_string().c_str(), ios_base::in); ++ std::ofstream outFile(outputFilePath.directory_string().c_str(), ios_base::out | ios_base::binary); + boost::iostreams::filtering_streambuf out; + out.push(boost::iostreams::zlib_compressor()); + out.push(outFile); 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 eee917a62b..95ea975803 100644 --- a/games/roadfighter/roadfighter.SlackBuild +++ b/games/roadfighter/roadfighter.SlackBuild @@ -73,6 +73,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/scid_vs_pc/scid_vs_pc.SlackBuild b/games/scid_vs_pc/scid_vs_pc.SlackBuild index 5db2ad0e97..6fac446448 100644 --- a/games/scid_vs_pc/scid_vs_pc.SlackBuild +++ b/games/scid_vs_pc/scid_vs_pc.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=scid_vs_pc -VERSION=${VERSION:-4.14} +VERSION=${VERSION:-4.17} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/games/scid_vs_pc/scid_vs_pc.info b/games/scid_vs_pc/scid_vs_pc.info index 3db1d0ba91..c6778941fc 100644 --- a/games/scid_vs_pc/scid_vs_pc.info +++ b/games/scid_vs_pc/scid_vs_pc.info @@ -1,8 +1,8 @@ PRGNAM="scid_vs_pc" -VERSION="4.14" +VERSION="4.17" HOMEPAGE="http://scidvspc.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/project/scidvspc/source/scid_vs_pc-4.14.tgz" -MD5SUM="2bf8507ede7e16595c8249997f1afc9f" +DOWNLOAD="http://downloads.sourceforge.net/scidvspc/scid_vs_pc-4.17.tgz" +MD5SUM="6c2e1c7efced0cd153f929fb57cbb04b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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 09da73dba9..529fc7aba0 100644 --- a/games/speed-dreams/speed-dreams.SlackBuild +++ b/games/speed-dreams/speed-dreams.SlackBuild @@ -58,6 +58,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/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/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..2b0c0f8894 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 \ 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..8482c99d6d 100644 --- a/games/widelands/widelands.SlackBuild +++ b/games/widelands/widelands.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=widelands -VERSION=${VERSION:-build19} +VERSION=${VERSION:-20170618} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION-src -tar xvf $CWD/$PRGNAM-$VERSION-src.tar.bz2 -cd $PRGNAM-$VERSION-src +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,9 +69,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix compiling with gcc 4.7 -patch -p0 -i $CWD/widelands-gcc47.patch - mkdir -p build1 cd build1 cmake \ @@ -98,7 +95,6 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION mv $PKG/usr/{VERSION,ChangeLog,CREDITS,COPYING} $PKG/usr/doc/$PRGNAM-$VERSION -cp -a WL_RELEASE $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/games/widelands/widelands.info b/games/widelands/widelands.info index a98f31a43a..2d69dba9b4 100644 --- a/games/widelands/widelands.info +++ b/games/widelands/widelands.info @@ -1,8 +1,8 @@ PRGNAM="widelands" -VERSION="build19" +VERSION="20170618" HOMEPAGE="http://www.widelands.org" -DOWNLOAD="https://launchpad.net/widelands/build19/build19/+download/widelands-build19-src.tar.bz2" -MD5SUM="0ef7ccf021b8001056739f755500366d" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/widelands-20170618.tar.bz2" +MD5SUM="a293822f26386c16a66d4801716e0740" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="SDL2_image SDL2_mixer SDL2_net SDL2_ttf lua" diff --git a/games/xmoto/xmoto.SlackBuild b/games/xmoto/xmoto.SlackBuild index 539df636d7..7dc9f71b37 100644 --- a/games/xmoto/xmoto.SlackBuild +++ b/games/xmoto/xmoto.SlackBuild @@ -52,7 +52,7 @@ find -L . \ patch -p1 < $CWD/gcc-4.7.patch CFLAGS="$SLKCFLAGS -DdDOUBLE" \ -CXXFLAGS="$SLKCFLAGS -DdDOUBLE" \ +CXXFLAGS="$SLKCFLAGS -DdDOUBLE -fpermissive" \ LDFLAGS="-ldl" \ ./configure \ --prefix=/usr \ diff --git a/games/xu4/gcc7.patch b/games/xu4/gcc7.patch new file mode 100644 index 0000000000..29f2cceee4 --- /dev/null +++ b/games/xu4/gcc7.patch @@ -0,0 +1,90 @@ +--- xu4-20130612_svn/src/image_sdl.cpp.orig 2017-07-07 05:16:49.443617174 +0700 ++++ xu4-20130612_svn/src/image_sdl.cpp 2017-07-07 05:25:40.763657058 +0700 +@@ -349,7 +349,7 @@ + unsigned int y_finish = std::min(int(bottom), oy + span + 1); + for (y = y_start; y < y_finish; ++y) { + +- int divisor = 1 + span * 2 - abs(ox - x) - abs(oy - y); ++ int divisor = 1 + span * 2 - std::abs((long int) (ox - x)) - std::abs((long int) (oy - y)); + + unsigned int r, g, b, a; + getPixel(x, y, r, g, b, a); +--- xu4-20130612_svn/src/map.cpp.orig 2017-07-07 05:26:04.108658810 +0700 ++++ xu4-20130612_svn/src/map.cpp 2017-07-07 05:28:17.857668850 +0700 +@@ -123,14 +123,14 @@ + if (map && map->border_behavior == Map::BORDER_WRAP) { + MapCoords me = *this; + +- if (abs(me.x - c.x) > abs(me.x + map->width - c.x)) ++ if (std::abs((long int) (me.x - c.x)) > std::abs((long int) (me.x + map->width - c.x))) + me.x += map->width; +- else if (abs(me.x - c.x) > abs(me.x - map->width - c.x)) ++ else if (std::abs((long int) (me.x - c.x)) > std::abs((long int) (me.x - map->width - c.x))) + me.x -= map->width; + +- if (abs(me.y - c.y) > abs(me.y + map->width - c.y)) ++ if (std::abs((long int) (me.y - c.y)) > std::abs((long int) (me.y + map->width - c.y))) + me.y += map->height; +- else if (abs(me.y - c.y) > abs(me.y - map->width - c.y)) ++ else if (std::abs((long int) (me.y - c.y)) > std::abs((long int) (me.y - map->width - c.y))) + me.y -= map->height; + + dx = me.x - c.x; +--- xu4-20130612_svn/src/person.cpp.orig 2017-07-07 05:28:34.604670107 +0700 ++++ xu4-20130612_svn/src/person.cpp 2017-07-07 05:29:29.432674223 +0700 +@@ -221,7 +221,7 @@ + eventHandler->pushController(&getPlayerCtrl); + int player = getPlayerCtrl.waitFor(); + if (player != -1) { +- string player_str = to_string(player+1); ++ string player_str = to_string((long int) player+1); + script->setVar(script->getInputName(), player_str); + } + else script->unsetVar(script->getInputName()); +--- xu4-20130612_svn/src/script.cpp.orig 2017-07-07 05:29:46.242675485 +0700 ++++ xu4-20130612_svn/src/script.cpp 2017-07-07 05:31:00.015681023 +0700 +@@ -44,7 +44,7 @@ + + Script::Variable::Variable(const int &v) : set(true) { + i_val = v; +- s_val = to_string(v); ++ s_val = to_string((long int) v); + } + + int& Script::Variable::getInt() { return i_val; } +@@ -503,7 +503,7 @@ + } + // Get the current iterator for our loop + else if (item == "iterator") +- prop = to_string(this->iterator); ++ prop = to_string((long int) this->iterator); + else if ((pos = item.find("show_inventory:")) < item.length()) { + pos = item.find(":"); + string itemScript = item.substr(pos+1); +@@ -611,7 +611,7 @@ + if (content.empty()) + errorWarning("Error: empty math() function"); + +- prop = to_string(mathValue(content)); ++ prop = to_string((long int) mathValue(content)); + } + + /** +@@ -643,7 +643,7 @@ + + /* generate a random number */ + else if (funcName == "random") +- prop = to_string(xu4_random((int)strtol(content.c_str(), NULL, 10))); ++ prop = to_string((long int) xu4_random((int)strtol(content.c_str(), NULL, 10))); + + /* replaced with "true" if content is empty, or "false" if not */ + else if (funcName == "isempty") { +@@ -1391,7 +1391,7 @@ + string children_results; + + mathParseChildren(current, &children_results); +- *result = to_string(mathValue(children_results)); ++ *result = to_string((long int) mathValue(children_results)); + } + } + } diff --git a/games/xu4/xu4.SlackBuild b/games/xu4/xu4.SlackBuild index d4439ca2cc..08a91827bf 100644 --- a/games/xu4/xu4.SlackBuild +++ b/games/xu4/xu4.SlackBuild @@ -73,6 +73,9 @@ sed -i -e '/border\.png/s,^,//,' src/imagemgr.cpp # validate the game's XML files. So: sed -i '/#define *DEFAULT_VALIDATE_XML/s,1,0,' src/settings.h +# Patch for GCC 7 +patch -p1 < $CWD/gcc7.patch + # The -DNPERF stops u4 from creating a debug/ in the current dir. make -C src DEBUGCXXFLAGS="-DNPERF $SLKCFLAGS" prefix=/usr libdir=$PKGLIBDIR make -C src install prefix=$PKG/usr libdir=$PKGLIBDIR diff --git a/games/xye/xye.SlackBuild b/games/xye/xye.SlackBuild index 8487aecd40..fbe4eba763 100644 --- a/games/xye/xye.SlackBuild +++ b/games/xye/xye.SlackBuild @@ -72,7 +72,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing" \ ./configure \ --prefix=/usr \ --bindir=/usr/bin \ diff --git a/gis/grass/gcc7.patch b/gis/grass/gcc7.patch new file mode 100644 index 0000000000..afcea67c7c --- /dev/null +++ b/gis/grass/gcc7.patch @@ -0,0 +1,90 @@ +Index: /grass/branches/releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/lextab.py +=================================================================== +--- /grass/branches/releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71218) ++++ /grass/branches/releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71219) +@@ -1,59 +1,8 @@ + # lextab.py. This file automatically created by PLY (version 2.2). Don't edit! +-_lextokens = { +- 'RIGHT_OP': None, +- 'RIGHT_ASSIGN': None, +- 'DEC_OP': None, +- 'PP_MACRO_PARAM': None, +- 'DIV_ASSIGN': None, +- 'PP_DEFINE': None, +- 'PP_END_DEFINE': None, +- 'PP_DEFINE_MACRO_NAME': None, +- 'HEADER_NAME': None, +- 'NEWLINE': None, +- 'CHARACTER_CONSTANT': None, +- 'PP_STRINGIFY': None, +- 'AND_ASSIGN': None, +- 'PTR_OP': None, +- 'ELLIPSIS': None, +- 'IDENTIFIER': None, +- 'ADD_ASSIGN': None, +- 'PERIOD': None, +- 'AND_OP': None, +- 'OTHER': None, +- 'LPAREN': None, +- 'LEFT_OP': None, +- 'LE_OP': None, +- 'OR_OP': None, +- 'SUB_ASSIGN': None, +- 'MOD_ASSIGN': None, +- 'STRING_LITERAL': None, +- 'PP_IDENTIFIER_PASTE': None, +- 'PP_NUMBER': None, +- 'PP_DEFINE_NAME': None, +- 'XOR_ASSIGN': None, +- 'OR_ASSIGN': None, +- 'GE_OP': None, +- 'MUL_ASSIGN': None, +- 'LEFT_ASSIGN': None, +- 'INC_OP': None, +- 'NE_OP': None, +- 'EQ_OP': None} +-_lexreflags = 0 +-_lexliterals = '' ++_lextokens = {'RIGHT_OP': None, 'RIGHT_ASSIGN': None, 'DEC_OP': None, 'PP_MACRO_PARAM': None, 'DIV_ASSIGN': None, 'PP_DEFINE': None, 'PP_END_DEFINE': None, 'PP_DEFINE_MACRO_NAME': None, 'HEADER_NAME': None, 'NEWLINE': None, 'CHARACTER_CONSTANT': None, 'PP_STRINGIFY': None, 'AND_ASSIGN': None, 'PTR_OP': None, 'ELLIPSIS': None, 'IDENTIFIER': None, 'ADD_ASSIGN': None, 'PERIOD': None, 'AND_OP': None, 'OTHER': None, 'LPAREN': None, 'LEFT_OP': None, 'LE_OP': None, 'OR_OP': None, 'SUB_ASSIGN': None, 'MOD_ASSIGN': None, 'STRING_LITERAL': None, 'PP_IDENTIFIER_PASTE': None, 'PP_NUMBER': None, 'PP_DEFINE_NAME': None, 'XOR_ASSIGN': None, 'OR_ASSIGN': None, 'GE_OP': None, 'MUL_ASSIGN': None, 'LEFT_ASSIGN': None, 'INC_OP': None, 'NE_OP': None, 'EQ_OP': None} ++_lexreflags = 0 ++_lexliterals = '' + _lexstateinfo = {'INITIAL': 'inclusive', 'DEFINE': 'exclusive'} +-_lexstatere = { +- 'INITIAL': [ +- ('(?P\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [ +- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [ +- None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P(?P[0-9]+)?(?P[.]?)(?P(?(p1)[0-9]*|[0-9]+))(?P(?:[Ee][+-]?[0-9]+)?)(?P[FflL]?)(?!\\w))', [ +- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P(?P(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P[uUlL]*))', [ +- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?PL?\'(\\\\.|[^\\\\\'])+\')|(?PL?"(\\\\.|[^\\\\"])*")|(?P\\()|(?P\\n)|(?P\\#define)', [ +- None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [ +- ('(?P\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [ +- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [ +- None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P(?P[0-9]+)?(?P[.]?)(?P(?(p1)[0-9]*|[0-9]+))(?P(?:[Ee][+-]?[0-9]+)?)(?P[FflL]?)(?!\\w))', [ +- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P(?P(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P[uUlL]*))', [ +- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?PL?\'(\\\\.|[^\\\\\'])+\')|(?PL?"(\\\\.|[^\\\\"])*")|(?P\\()|(?P\\n)|(?P(\\#\\#)|(\\#))', [ +- None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]} ++_lexstatere = {'INITIAL': [('(?P\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P(?P[0-9]+)?(?P[.]?)(?P(?(p1)[0-9]*|[0-9]+))(?P(?:[Ee][+-]?[0-9]+)?)(?P([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P(?P(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?PL?\'(\\\\.|[^\\\\\'])+\')|(?PL?"(\\\\.|[^\\\\"])*")|(?P\\()|(?P\\n)|(?P\\#define)', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [('(?P\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P(?P[0-9]+)?(?P[.]?)(?P(?(p1)[0-9]*|[0-9]+))(?P(?:[Ee][+-]?[0-9]+)?)(?P([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P(?P(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?PL?\'(\\\\.|[^\\\\\'])+\')|(?PL?"(\\\\.|[^\\\\"])*")|(?P\\()|(?P\\n)|(?P(\\#\\#)|(\\#))', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]} + _lexstateignore = {'INITIAL': ' \t\x0b\x0c\r', 'DEFINE': ' \t\x0b\x0c\r'} + _lexstateerrorf = {'INITIAL': 't_INITIAL_error', 'DEFINE': 't_DEFINE_error'} +Index: /grass/branches/releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/pplexer.py +=================================================================== +--- /grass/branches/releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/pplexer.py (revision 71218) ++++ /grass/branches/releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/pplexer.py (revision 71219) +@@ -53,5 +53,5 @@ + 'H': '[a-fA-F0-9]', + 'E': '[Ee][+-]?\s*{D}+', +- 'FS': '[FflL]', ++ 'FS': '([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)', + 'IS': '[uUlL]*', + } +@@ -227,8 +227,8 @@ + suf = m.group("suf") + +- if dp or exp or (suf and suf in ("Ff")): ++ if dp or exp or (suf and suf not in ("Ll")): + s = m.group(0) + if suf: +- s = s[:-1] ++ s = s[:-len(suf)] + # Attach a prefix so the parser can figure out if should become an + # integer, float, or long diff --git a/gis/grass/grass.SlackBuild b/gis/grass/grass.SlackBuild index 1ea290813e..0238b376d5 100644 --- a/gis/grass/grass.SlackBuild +++ b/gis/grass/grass.SlackBuild @@ -119,6 +119,8 @@ done # geos now always enabled: it's an indirect hard dep (via gdal), and makes grass nicer :-) +patch -p4 < $CWD/gcc7.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -fpermissive" \ LDFLAGS="-ldl -lncurses" \ diff --git a/gis/xplanet/xplanet.SlackBuild b/gis/xplanet/xplanet.SlackBuild index 746822007e..2f79c9791e 100644 --- a/gis/xplanet/xplanet.SlackBuild +++ b/gis/xplanet/xplanet.SlackBuild @@ -50,6 +50,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# sed magic from fedora (thanks!) +LANG=C grep -rl "inFile\.getline" . | \ + xargs sed -i.c++11 \ + -e '\@inFile\.getline@s|\(inFile\.getline[ \t]*\)\((.*)\)[ \t]*!= NULL|static_cast (\1\2)|' \ + -e '\@inFile\.getline@s|\(inFile\.getline[ \t]*\)\((.*)\)[ \t]*== NULL|(!(static_cast (\1\2)))|' + # Patch for giflib 5.x from Arch Linux (thanks!) # https://projects.archlinux.org/svntogit/community.git/plain/trunk/giflib6.patch?h=packages/xplanet patch -p1 < $CWD/giflib6.patch diff --git a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild index cd7a56a46a..2d9ef75253 100644 --- a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild +++ b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild @@ -88,7 +88,7 @@ sed -i \ ./build_configure CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -DvtkFloatingPointType=double -Dnullptr=NULL" \ +CXXFLAGS="$SLKCFLAGS -DvtkFloatingPointType=double -Dnullptr=nullptr" \ ./configure \ --prefix=/opt/${PRGNAM} \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/graphics/graphviz/graphviz.SlackBuild b/graphics/graphviz/graphviz.SlackBuild index 2386a2cbfe..25c4d5938d 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/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/kuickshow/kuickshow.SlackBuild b/graphics/kuickshow/kuickshow.SlackBuild index 6a82e2deba..e11058c674 100644 --- a/graphics/kuickshow/kuickshow.SlackBuild +++ b/graphics/kuickshow/kuickshow.SlackBuild @@ -71,6 +71,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +export CC=clang +export CXX=clang++ + mkdir -p build cd build cmake \ @@ -86,6 +89,11 @@ cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +mkdir -p $PKG/usr/doc +mv $PKG/usr/share/doc $PKG/usr/doc/$PRGNAM-$VERSION +cp AUTHORS BUGS COPYING ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/graphics/librecad/librecad.SlackBuild b/graphics/librecad/librecad.SlackBuild index 0644eac171..101e3bf7d9 100644 --- a/graphics/librecad/librecad.SlackBuild +++ b/graphics/librecad/librecad.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=librecad -VERSION=${VERSION:-2.1.0} +VERSION=${VERSION:-2.1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/graphics/librecad/librecad.info b/graphics/librecad/librecad.info index 5875e2d244..bf12e16783 100644 --- a/graphics/librecad/librecad.info +++ b/graphics/librecad/librecad.info @@ -1,8 +1,8 @@ PRGNAM="librecad" -VERSION="2.1.0" +VERSION="2.1.3" HOMEPAGE="http://librecad.org" -DOWNLOAD="https://github.com/LibreCAD/LibreCAD/archive/2.1.0/LibreCAD-2.1.0.tar.gz" -MD5SUM="d876aa6e16f72081f1d92c07153e0f1b" +DOWNLOAD="https://github.com/LibreCAD/LibreCAD/archive/2.1.3/LibreCAD-2.1.3.tar.gz" +MD5SUM="cef168e90e247c4a20ec81dd9686110e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="muParser qt5" diff --git a/graphics/mypaint/mypaint.SlackBuild b/graphics/mypaint/mypaint.SlackBuild index 089622dfa1..12fb75d6bb 100644 --- a/graphics/mypaint/mypaint.SlackBuild +++ b/graphics/mypaint/mypaint.SlackBuild @@ -12,13 +12,13 @@ # without any warranty. PRGNAM=mypaint -VERSION=${VERSION:-1.2.0} +VERSION=${VERSION:-1.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -29,8 +29,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" diff --git a/graphics/mypaint/mypaint.info b/graphics/mypaint/mypaint.info index a17cd09e13..588da4bfbd 100644 --- a/graphics/mypaint/mypaint.info +++ b/graphics/mypaint/mypaint.info @@ -1,10 +1,10 @@ PRGNAM="mypaint" -VERSION="1.2.0" +VERSION="1.2.1" HOMEPAGE="http://mypaint.org/" -DOWNLOAD="https://github.com/mypaint/mypaint/releases/download/v1.2.0/mypaint-1.2.0.tar.xz" -MD5SUM="c7c2cfac8e1eec5549e58567ec68daac" +DOWNLOAD="https://github.com/mypaint/mypaint/releases/download/v1.2.1/mypaint-1.2.1.tar.xz" +MD5SUM="ac08c3135929f5641488fbbb9746fe41" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="numpy" +REQUIRES="json-c numpy" MAINTAINER="Klaatu" EMAIL="klaatu@member.fsf.org" diff --git a/graphics/openimageio/openimageio.SlackBuild b/graphics/openimageio/openimageio.SlackBuild index 7f268b765a..f6afd598ef 100644 --- a/graphics/openimageio/openimageio.SlackBuild +++ b/graphics/openimageio/openimageio.SlackBuild @@ -73,8 +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 {} \; -# save this for GCC 7.0 -#sed -i "s|std=c++11|std=c++11 -Wno-error=maybe-uninitialized -Wno-error=format-truncation -Wno-error=noexcept-type -faligned-new|" CMakeLists.txt +# Needed for GCC 7.0 +sed -i "s|std=c++11|std=c++11 -Wno-error=maybe-uninitialized -Wno-error=format-truncation -Wno-error=noexcept-type -faligned-new|" CMakeLists.txt mkdir -p build cd build diff --git a/graphics/photoprint/photoprint.SlackBuild b/graphics/photoprint/photoprint.SlackBuild index e55e0e7bec..b074117092 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/povray/povray.SlackBuild b/graphics/povray/povray.SlackBuild index b6372da8c2..4f35a86f34 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.3} +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 a1e80f9cb1..412a665356 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.3" HOMEPAGE="http://www.povray.org/" -DOWNLOAD="https://github.com/POV-Ray/povray/archive/v3.7.0.0.tar.gz" -MD5SUM="c9473256677808e9e3246e6eb8f69a75" +DOWNLOAD="https://github.com/POV-Ray/povray/archive/v3.7.0.3/povray-3.7.0.3.tar.gz" +MD5SUM="1f00b96b71db59e2ea80a8b86e62648f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/rawstudio/rawstudio.SlackBuild b/graphics/rawstudio/rawstudio.SlackBuild index 30ec653dcb..7a928498aa 100644 --- a/graphics/rawstudio/rawstudio.SlackBuild +++ b/graphics/rawstudio/rawstudio.SlackBuild @@ -89,7 +89,7 @@ patch -p1 < $CWD/patches/lensfun03.patch patch -p1 < $CWD/patches/libpng15.patch CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/graphics/ufraw/gcc7.patch b/graphics/ufraw/gcc7.patch new file mode 100644 index 0000000000..10d038d418 --- /dev/null +++ b/graphics/ufraw/gcc7.patch @@ -0,0 +1,17 @@ +Index: ufraw-0.22/dcraw.cc +=================================================================== +--- ufraw-0.22.orig/dcraw.cc ++++ ufraw-0.22/dcraw.cc +@@ -9240,9 +9240,9 @@ canon_a5: + filters = 0x16161616; + } + if (make[0] == 'O') { +- i = find_green (12, 32, 1188864, 3576832); +- c = find_green (12, 32, 2383920, 2387016); +- if (abs(i) < abs(c)) { ++ i = abs(find_green (12, 32, 1188864, 3576832)); ++ c = abs(find_green (12, 32, 2383920, 2387016)); ++ if (i < c) { + SWAP(i,c); + load_flags = 24; + } diff --git a/graphics/ufraw/ufraw.SlackBuild b/graphics/ufraw/ufraw.SlackBuild index 6a77d6f771..e83d08666f 100644 --- a/graphics/ufraw/ufraw.SlackBuild +++ b/graphics/ufraw/ufraw.SlackBuild @@ -77,6 +77,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks opensuse +patch -p1 < $CWD/gcc7.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/vulkansdk/README b/graphics/vulkansdk/README deleted file mode 100644 index 14e1886dc4..0000000000 --- a/graphics/vulkansdk/README +++ /dev/null @@ -1,15 +0,0 @@ -The Vulkan SDK provides the development and runtime components -required to build, run and debug Vulkan applications. This SDK is -based on the Vulkan API header. The SDK also includes certain Vulkan -extensions for window system integration and debug extensions. - -The Vulkan API is a low overhead, explicit, cross-platform graphics -API that provides applications with direct control over the GPU, -maximizing performance. - -The SDK does not include a Vulkan driver. Please contact your -CPU hardware vendor for a Vulkan Installable Client Driver (ICD). -This SDK will allow you to build Vulkan applications but you will -need a Vulkan driver (ICD) to execute them. - -The SDK is only supported on x86_64 systems. diff --git a/graphics/vulkansdk/slack-desc b/graphics/vulkansdk/slack-desc deleted file mode 100644 index 1e060c8b6c..0000000000 --- a/graphics/vulkansdk/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -vulkansdk: vulkansdk (Vulkan SDK) -vulkansdk: -vulkansdk: The Vulkan SDK provides the development and runtime components -vulkansdk: required to build, run and debug Vulkan applications. This SDK is -vulkansdk: based on the Vulkan API header. Th SDK also includes certain Vulkan -vulkansdk: extensions for window system integration and debug extensions. -vulkansdk: -vulkansdk: The Vulkan API is a low overhead, explicit, cross-platform graphics -vulkansdk: API that provides applications with direct control over the GPU, -vulkansdk: maximizing performance. -vulkansdk: diff --git a/graphics/vulkansdk/vulkansdk.SlackBuild b/graphics/vulkansdk/vulkansdk.SlackBuild deleted file mode 100644 index 20910d3e95..0000000000 --- a/graphics/vulkansdk/vulkansdk.SlackBuild +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh - -# Slackware build script for vulkansdk - -# Copyright 2017 Dugan Chen 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=vulkansdk -VERSION=${VERSION:-1.0.49.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" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - echo "$ARCH is not supported." >&2 - exit 1 -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf VulkanSDK $PRGNAM-linux-$ARCH-$VERSION.run -cp $CWD/$PRGNAM-linux-$ARCH-$VERSION.run . -chmod +x $PRGNAM-linux-$ARCH-$VERSION.run -./$PRGNAM-linux-$ARCH-$VERSION.run -cd VulkanSDK -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -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/lib$LIBDIRSUFFIX -cp -r $VERSION/$ARCH/lib/* $PKG/usr/lib$LIBDIRSUFFIX -mkdir -p $PKG/{usr/bin,etc,usr/include} -cp -r $VERSION/$ARCH/bin/* $PKG/usr/bin -cp -r $VERSION/$ARCH/etc/* $PKG/etc -cp -r $VERSION/$ARCH/include/* $PKG/usr/include - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - $VERSION/{*.html,doc/,samples/,examples} \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-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/vulkansdk/vulkansdk.info b/graphics/vulkansdk/vulkansdk.info deleted file mode 100644 index de2b8ef6c7..0000000000 --- a/graphics/vulkansdk/vulkansdk.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="vulkansdk" -VERSION="1.0.49.0" -HOMEPAGE="https://www.lunarg.com/vulkan-sdk/" -DOWNLOAD="UNSUPPORTED" -MD5SUM="" -DOWNLOAD_x86_64="https://vulkan.lunarg.com/sdk/download/1.0.49.0/linux/vulkansdk-linux-x86_64-1.0.49.0.run" -MD5SUM_x86_64="338c3dfe0dfd2b62d3abff30b41214a6" -REQUIRES="" -MAINTAINER="Dugan Chen" -EMAIL="thedoogster [at] gmail [dot] com" 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 698098fea8..7018fdd79a 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 174d3f9683..18634bd1cb 100644 --- a/ham/svxlink/svxlink.SlackBuild +++ b/ham/svxlink/svxlink.SlackBuild @@ -107,12 +107,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# From upstream +patch -p2 < $CWD/gcc6.patch + mkdir -p build cd build cmake \ $BUILD_QTEL \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONF_INSTALL_DIR=/etc \ -DLOCAL_STATE_DIR=/var \ diff --git a/libraries/Atlas-C++/Atlas-C++.SlackBuild b/libraries/Atlas-C++/Atlas-C++.SlackBuild index ebd6a108a4..0d55715acd 100644 --- a/libraries/Atlas-C++/Atlas-C++.SlackBuild +++ b/libraries/Atlas-C++/Atlas-C++.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=deprecated" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/CEGUI0.7/CEGUI0.7.SlackBuild b/libraries/CEGUI0.7/CEGUI0.7.SlackBuild index 30917134f4..18d54dd14a 100644 --- a/libraries/CEGUI0.7/CEGUI0.7.SlackBuild +++ b/libraries/CEGUI0.7/CEGUI0.7.SlackBuild @@ -72,7 +72,7 @@ find -L . \ patch -p1 < $CWD/CEGUI.patch CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/DevIL/04_png_set_expand_gray.diff b/libraries/DevIL/04_png_set_expand_gray.diff deleted file mode 100644 index 78fe892881..0000000000 --- a/libraries/DevIL/04_png_set_expand_gray.diff +++ /dev/null @@ -1,26 +0,0 @@ -Index: devil-1.7.8/src-IL/src/il_icon.c -=================================================================== ---- devil-1.7.8.orig/src-IL/src/il_icon.c 2013-05-21 00:08:36.847356129 +0200 -+++ devil-1.7.8/src-IL/src/il_icon.c 2013-05-21 00:10:29.317942183 +0200 -@@ -525,7 +525,7 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -- png_set_gray_1_2_4_to_8(ico_png_ptr); -+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); - } - - // Expand RGB images with transparency to full alpha channels -Index: devil-1.7.8/src-IL/src/il_png.c -=================================================================== ---- devil-1.7.8.orig/src-IL/src/il_png.c 2009-03-08 08:10:09.000000000 +0100 -+++ devil-1.7.8/src-IL/src/il_png.c 2013-05-21 00:10:18.554077504 +0200 -@@ -278,7 +278,7 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - // Expand RGB images with transparency to full alpha channels diff --git a/libraries/DevIL/DevIL.SlackBuild b/libraries/DevIL/DevIL.SlackBuild index 3cf47dc1ea..445923e146 100644 --- a/libraries/DevIL/DevIL.SlackBuild +++ b/libraries/DevIL/DevIL.SlackBuild @@ -6,14 +6,13 @@ # Currently maintained by Dugan Chen PRGNAM=DevIL -SRCNAM=devil -VERSION=${VERSION:-1.7.8} -BUILD=${BUILD:-3} +VERSION=${VERSION:-1.8.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 @@ -24,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" @@ -43,9 +42,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -53,39 +52,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 {} \; -# Fix build with gcc5 -patch -p0 < $CWD/patch-include_IL_il.h +cd $PRGNAM -# Build against libpng14, not libpng12. -sed -i 's/png12/png14/g' configure +sed -i "s|DESTINATION\ lib|DESTINATION lib$LIBDIRSUFFIX|" */CMakeLists.txt -# Fix further linking issues with libpng. This patch is taken -# from Ubuntu. Without this patch, DevIL will compile, but attempts -# to link against it will break. -patch -p1 < $CWD/04_png_set_expand_gray.diff - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --datarootdir=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-static=no \ - --enable-ILU=yes \ - --enable-ILUT=yes \ - --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG +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 -rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/*.info* - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING CREDITS ChangeLog INSTALL Libraries.txt \ - NEWS README README.unix TODO examples/ $PKG/usr/doc/$PRGNAM-$VERSION + NEWS README.md TODO examples/ ../LICENSE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/DevIL/DevIL.info b/libraries/DevIL/DevIL.info index 073e932c59..77a515fb60 100644 --- a/libraries/DevIL/DevIL.info +++ b/libraries/DevIL/DevIL.info @@ -1,8 +1,8 @@ PRGNAM="DevIL" -VERSION="1.7.8" +VERSION="1.8.0" HOMEPAGE="http://openil.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/project/openil/DevIL/1.7.8/DevIL-1.7.8.tar.gz" -MD5SUM="7918f215524589435e5ec2e8736d5e1d" +DOWNLOAD="https://github.com/DentonW/DevIL/archive/v1.8.0/DevIL-1.8.0.tar.gz" +MD5SUM="59d5b69f2fc09d153845f2c6fe287edb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/DevIL/patch-include_IL_il.h b/libraries/DevIL/patch-include_IL_il.h deleted file mode 100644 index e265db2fe4..0000000000 --- a/libraries/DevIL/patch-include_IL_il.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-include_IL_il.h,v 1.1 2012/07/09 19:16:33 joerg Exp $ - ---- include/IL/il.h.orig 2012-07-06 12:31:13.000000000 +0000 -+++ include/IL/il.h -@@ -63,7 +63,7 @@ extern "C" { - #endif - #endif - --#ifdef RESTRICT_KEYWORD -+#if defined(RESTRICT_KEYWORD) && !defined(__cplusplus) - #define RESTRICT restrict - #define CONST_RESTRICT const restrict - #else diff --git a/libraries/FreeImage/FreeImage.SlackBuild b/libraries/FreeImage/FreeImage.SlackBuild index 9787e0772a..45eb0cb1bc 100644 --- a/libraries/FreeImage/FreeImage.SlackBuild +++ b/libraries/FreeImage/FreeImage.SlackBuild @@ -58,7 +58,7 @@ find -L . \ patch -p0 < $CWD/010_avoid-raw-literal.diff CFLAGS="$SLKCFLAGS -fexceptions -fvisibility=hidden -DNO_LCMS" \ -CXXFLAGS="$SLKCFLAGS -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy" \ +CXXFLAGS="$SLKCFLAGS -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy -Wno-narrowing" \ make INSTALLDIR=$PKG/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG make install INSTALLDIR=$PKG/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG diff --git a/libraries/PyQt5/PyQt5.SlackBuild b/libraries/PyQt5/PyQt5.SlackBuild index 654f0c89ce..805612cb5b 100644 --- a/libraries/PyQt5/PyQt5.SlackBuild +++ b/libraries/PyQt5/PyQt5.SlackBuild @@ -34,7 +34,7 @@ # Adapted by Matteo Bernardini PRGNAM=PyQt5 -VERSION=${VERSION:-5.7} +VERSION=${VERSION:-5.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/PyQt5/PyQt5.info b/libraries/PyQt5/PyQt5.info index 6059ff60ae..aa0627da28 100644 --- a/libraries/PyQt5/PyQt5.info +++ b/libraries/PyQt5/PyQt5.info @@ -1,8 +1,8 @@ PRGNAM="PyQt5" -VERSION="5.7" +VERSION="5.7.1" HOMEPAGE="https://riverbankcomputing.com/software/pyqt/intro/" -DOWNLOAD="http://downloads.sourceforge.net/pyqt/PyQt5_gpl-5.7.tar.gz" -MD5SUM="e3dc21f31fd714659f0688e1eb31bacf" +DOWNLOAD="http://downloads.sourceforge.net/pyqt/PyQt5_gpl-5.7.1.tar.gz" +MD5SUM="b3171b67c74aa63a3cd2f386660c898b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5-webkit" diff --git a/libraries/SDL2/README b/libraries/SDL2/README deleted file mode 100644 index 8e26524439..0000000000 --- a/libraries/SDL2/README +++ /dev/null @@ -1,7 +0,0 @@ -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 8d823c8efb..0000000000 --- a/libraries/SDL2/SDL2.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# Slackware build script for SDL2 - -# Copyright 2013 Dugan Chen 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=SDL2 -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 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -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 - -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 252706f5df..0000000000 --- a/libraries/SDL2/SDL2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="SDL2" -VERSION="2.0.5" -HOMEPAGE="https://libsdl.org" -DOWNLOAD="https://www.libsdl.org/release/SDL2-2.0.5.tar.gz" -MD5SUM="d4055424d556b4a908aa76fad63abd3c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dugan Chen" -EMAIL="thedoogster [at] gmail [dot] 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 a63388362c..0000000000 --- a/libraries/SDL2_image/README +++ /dev/null @@ -1,4 +0,0 @@ -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 cb60e02c31..0000000000 --- a/libraries/SDL2_image/SDL2_image.SlackBuild +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh - -# Slackware build script for SDL2_image - -# Copyright 2013 Dugan Chen 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=SDL2_image -VERSION=${VERSION:-2.0.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 - -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 \ - --enable-static=no \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --enable-jpg-shared=no - -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 - -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 132462079c..0000000000 --- a/libraries/SDL2_image/SDL2_image.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="SDL2_image" -VERSION="2.0.1" -HOMEPAGE="https://www.libsdl.org/projects/SDL_image/" -DOWNLOAD="https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.1.tar.gz" -MD5SUM="d94b94555ba022fa249a53a021dc3606" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="SDL2" -MAINTAINER="Dugan Chen" -EMAIL="thedoogster [at] gmail [dot] 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 40553085c7..0000000000 --- a/libraries/SDL2_mixer/README +++ /dev/null @@ -1,11 +0,0 @@ -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 or TiMidity++ (for MIDI suport) -* 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 3cd9f154a4..0000000000 --- a/libraries/SDL2_mixer/SDL2_mixer.SlackBuild +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh - -# Slackware build script for SDL2_mixer - -# Copyright 2013-2015 Dugan Chen 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=SDL2_mixer -VERSION=${VERSION:-2.0.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 - -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/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 3603a807c5..0000000000 --- a/libraries/SDL2_mixer/SDL2_mixer.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="SDL2_mixer" -VERSION="2.0.1" -HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/" -DOWNLOAD="https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.tar.gz" -MD5SUM="c6c4f556d4415871f526248f5c9a627d" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="SDL2" -MAINTAINER="Dugan Chen" -EMAIL="thedoogster [at] gmail [dot] 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 3f3e632887..0000000000 --- a/libraries/SDL2_net/README +++ /dev/null @@ -1,3 +0,0 @@ -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 ac25dc3fe3..0000000000 --- a/libraries/SDL2_net/SDL2_net.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -# Slackware build script for SDL2_net - -# Copyright 2013 Dugan Chen 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=SDL2_net -VERSION=${VERSION:-2.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.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 \ - --enable-static=no \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --disable-gui - -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/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 d607b71b3f..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="Dugan Chen" -EMAIL="thedoogster [at] gmail [dot] 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 ac5e99801e..0000000000 --- a/libraries/SDL2_ttf/README +++ /dev/null @@ -1,4 +0,0 @@ -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 fb3177ba19..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 -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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_ttf -VERSION=${VERSION:-2.0.14} -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 \ - --enable-static=no \ - --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/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 e81eed0c1d..0000000000 --- a/libraries/SDL2_ttf/SDL2_ttf.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="SDL2_ttf" -VERSION="2.0.14" -HOMEPAGE="https://www.libsdl.org/projects/SDL_ttf/" -DOWNLOAD="https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.14.tar.gz" -MD5SUM="e53c05e1e7f1382c316afd6c763388b1" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="SDL2" -MAINTAINER="Dugan Chen" -EMAIL="thedoogster [at] gmail [dot] 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/SFGUI/SFGUI.SlackBuild b/libraries/SFGUI/SFGUI.SlackBuild index 4d1707634a..9c6a1a9004 100644 --- a/libraries/SFGUI/SFGUI.SlackBuild +++ b/libraries/SFGUI/SFGUI.SlackBuild @@ -10,7 +10,7 @@ # without any warranty. PRGNAM=SFGUI -VERSION=${VERSION:-0.3.0} +VERSION=${VERSION:-0.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -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 +unzip $CWD/$PRGNAM-$VERSION.zip cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -79,7 +79,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 5caf3c14b3..e3c218e78e 100644 --- a/libraries/SFGUI/SFGUI.info +++ b/libraries/SFGUI/SFGUI.info @@ -1,8 +1,8 @@ PRGNAM="SFGUI" -VERSION="0.3.0" +VERSION="0.3.2" HOMEPAGE="http://sfgui.sfml-dev.de/p/" -DOWNLOAD="https://github.com/TankOs/SFGUI/archive/0.3.0.zip" -MD5SUM="9e704175dca7c8632e9f72a321c21e25" +DOWNLOAD="https://github.com/TankOs/SFGUI/archive/0.3.2/SFGUI-0.3.2.zip" +MD5SUM="a396d2a0516a84c0d68bcdf2236f5a98" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="SFML" diff --git a/libraries/bamf/bamf.SlackBuild b/libraries/bamf/bamf.SlackBuild index aa14a5fb61..b344480362 100644 --- a/libraries/bamf/bamf.SlackBuild +++ b/libraries/bamf/bamf.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=deprecated-declarations" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/ccrtp/ccrtp.SlackBuild b/libraries/ccrtp/ccrtp.SlackBuild index 8f49eedbdf..82112c5caf 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/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..f2294c52f2 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,9 @@ find -L . \ sed -i 's/\r//g' cuneiform_src/Addfiles/license.txt +# Thanks to ARCH Linux +patch -p1 < $CWD/cuneiform-gcc.patch + mkdir build cd build cmake \ @@ -70,8 +73,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/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 a258756d31..eecfc2e687 100644 --- a/libraries/fuzzylite/fuzzylite.info +++ b/libraries/fuzzylite/fuzzylite.info @@ -1,8 +1,8 @@ PRGNAM="fuzzylite" -VERSION="5.1" +VERSION="6.0" HOMEPAGE="http://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/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/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 c20ae255da..f0903e2bf4 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/json-c/README b/libraries/json-c/README new file mode 100644 index 0000000000..b855ab1f9e --- /dev/null +++ b/libraries/json-c/README @@ -0,0 +1,2 @@ +json-c implements a reference counting object model that allows you +to easily construct JSON objects in C. diff --git a/libraries/json-c/json-c.SlackBuild b/libraries/json-c/json-c.SlackBuild new file mode 100644 index 0000000000..0a839e608a --- /dev/null +++ b/libraries/json-c/json-c.SlackBuild @@ -0,0 +1,110 @@ +#!/bin/sh + +# Slackware build script for json-c + +# Copyright 2015 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. + +# Inherited by the Slackware script removed on february 10th 2017 + +PRGNAM=json-c +VERSION=${VERSION:-0.12.1} +EXTRAVERSION=${EXTRAVERSION:-20160607} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + 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-$EXTRAVERSION +tar xvf $CWD/$PRGNAM-$VERSION-$EXTRAVERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION-$EXTRAVERSION.tar.gz +cd $PRGNAM-$PRGNAM-$VERSION-$EXTRAVERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -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 -Wno-error" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --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 \ + AUTHORS COPYING* NEWS README* doc/html \ + $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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.${PKGTYPE:-tgz} diff --git a/libraries/json-c/json-c.info b/libraries/json-c/json-c.info new file mode 100644 index 0000000000..3206700c1b --- /dev/null +++ b/libraries/json-c/json-c.info @@ -0,0 +1,10 @@ +PRGNAM="json-c" +VERSION="0.12.1" +HOMEPAGE="https://github.com/json-c/json-c" +DOWNLOAD="https://github.com/json-c/json-c/archive/json-c-0.12.1-20160607.tar.gz" +MD5SUM="0a2a49a1e89044fdac414f984f3f81a6" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/libraries/json-c/slack-desc b/libraries/json-c/slack-desc new file mode 100644 index 0000000000..6b63c2a54e --- /dev/null +++ b/libraries/json-c/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------------------------------------------------------| +json-c: json-c (JSON library in C) +json-c: +json-c: json-c implements a reference counting object model that allows you +json-c: to easily construct JSON objects in C. +json-c: +json-c: Homepage: https://github.com/json-c/json-c +json-c: +json-c: +json-c: +json-c: +json-c: diff --git a/libraries/lame/README b/libraries/lame/README deleted file mode 100644 index b196d4079f..0000000000 --- a/libraries/lame/README +++ /dev/null @@ -1,3 +0,0 @@ -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 bf04caabc0..0000000000 --- a/libraries/lame/lame.SlackBuild +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh - -# Slackware build script for lame - -# Copyright 2006 Martin Lefebvre -# Copyright 2008,2010 Michiel van Wessem, Manchester, 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=lame -VERSION=${VERSION:-3.99.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.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Fix for the newer gcc -# http://www.linuxfromscratch.org/blfs/view/svn/multimedia/lame.html -case $(uname -m) in - i?86) sed -i -e '/xmmintrin\.h/d' configure ;; -esac - -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 \ - --build=$ARCH-slackware-linux - -make pkgdocdir=/usr/doc/$PRGNAM-$VERSION -make install pkgdocdir=/usr/doc/$PRGNAM-$VERSION 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 {} \; - -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 88b34affad..0000000000 --- a/libraries/lame/lame.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="lame" -VERSION="3.99.5" -HOMEPAGE="http://lame.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/lame/lame-3.99.5.tar.gz" -MD5SUM="84835b313d4a8b68f5349816d33e07ce" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Michiel van Wessem" -EMAIL="michiel@slackbuilds.org" 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/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 728b4aa8aa..0000000000 --- a/libraries/libbluray/libbluray.SlackBuild +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh - -# Slackware build script for libbluray - -# Copyright 2011-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=libbluray -VERSION=${VERSION:-1.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.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 52f222ec4d..0000000000 --- a/libraries/libbluray/libbluray.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libbluray" -VERSION="1.0.1" -HOMEPAGE="http://www.videolan.org/developers/libbluray.html" -DOWNLOAD="http://ftp.videolan.org/pub/videolan/libbluray/1.0.1/libbluray-1.0.1.tar.bz2" -MD5SUM="cf45fbca25786f6fbc4911e52eabe4c0" -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/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/libcmis/libcmis.SlackBuild b/libraries/libcmis/libcmis.SlackBuild index 128eaea984..ee1e4331c2 100644 --- a/libraries/libcmis/libcmis.SlackBuild +++ b/libraries/libcmis/libcmis.SlackBuild @@ -79,7 +79,7 @@ zcat $CWD/libcmis-boost-gcc.patch.gz | patch -p1 sed '/configure/d' -i autogen.sh ./autogen.sh CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=deprecated" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ 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 @@ + + + +- +
Copyright ©$year DBus-C++ ProjectDocs 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/libe-book/0001-Disable-werror-by-default-since-gperf-code-will-not-.patch b/libraries/libe-book/0001-Disable-werror-by-default-since-gperf-code-will-not-.patch new file mode 100644 index 0000000000..8e0f78ea86 --- /dev/null +++ b/libraries/libe-book/0001-Disable-werror-by-default-since-gperf-code-will-not-.patch @@ -0,0 +1,29 @@ +From 784c5168d1a62618e53619fd0a979363d596775a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= +Date: Sun, 3 Jul 2016 21:43:25 +0200 +Subject: [PATCH] Disable werror by default since gperf code will not build + with gcc 6 + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 06e9afb..6e00ed5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -223,9 +223,9 @@ AS_IF([test "x$platform_win32" = "xyes"], + # Check for cflags + # ================ + AC_ARG_ENABLE([werror], +- [AS_HELP_STRING([--disable-werror], [Treat all warnings as errors, usefull for development])], ++ [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, usefull for development])], + [enable_werror="$enableval"], +- [enable_werror=yes] ++ [enable_werror=no] + ) + AS_IF([test x"$enable_werror" != "xno"], [ + CFLAGS="$CFLAGS -Werror" +-- +2.10.2 + diff --git a/libraries/libe-book/libe-book.SlackBuild b/libraries/libe-book/libe-book.SlackBuild index 359e9bd04a..c36700b6a4 100644 --- a/libraries/libe-book/libe-book.SlackBuild +++ b/libraries/libe-book/libe-book.SlackBuild @@ -69,6 +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 {} \; +# Thanks archlinux +patch -p1 < $CWD/0001-Disable-werror-by-default-since-gperf-code-will-not-.patch + +autoreconf -fi + DOC=${DOC:-no} if [ ! "$DOC" = "yes" ]; then doc="--without-docs" diff --git a/libraries/libedit/README b/libraries/libedit/README deleted file mode 100644 index 026d498ff5..0000000000 --- a/libraries/libedit/README +++ /dev/null @@ -1,11 +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 7e2106e79d..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-2017 LEVAI Daniel -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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:-20170329_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 \ - "${LIBEDIT_WIDEC}" - -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 39459bdcd4..0000000000 --- a/libraries/libedit/libedit.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libedit" -VERSION="20170329_3.1" -HOMEPAGE="http://www.thrysoee.dk/editline/" -DOWNLOAD="http://thrysoee.dk/editline/libedit-20170329-3.1.tar.gz" -MD5SUM="c57a0690e62ef523c083598730272cfd" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="LEVAI Daniel" -EMAIL="leva@ecentrum.hu" diff --git a/libraries/libedit/slack-desc b/libraries/libedit/slack-desc deleted file mode 100644 index e500ae85a3..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: http://www.thrysoee.dk/editline/ -libedit: -libedit: -libedit: diff --git a/libraries/libfaketime/libfaketime.SlackBuild b/libraries/libfaketime/libfaketime.SlackBuild index a3bf2fab57..a3f2abb5c8 100644 --- a/libraries/libfaketime/libfaketime.SlackBuild +++ b/libraries/libfaketime/libfaketime.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libfaketime -VERSION=${VERSION:-0.9.6} +VERSION=${VERSION:-20170608_b23fbd5} 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/libraries/libfaketime/libfaketime.info b/libraries/libfaketime/libfaketime.info index 06d6bba439..48aa19d8b2 100644 --- a/libraries/libfaketime/libfaketime.info +++ b/libraries/libfaketime/libfaketime.info @@ -1,8 +1,8 @@ PRGNAM="libfaketime" -VERSION="0.9.6" +VERSION="20170608_b23fbd5" HOMEPAGE="http://www.code-wizards.com/projects/libfaketime/" -DOWNLOAD="http://www.code-wizards.com/projects/libfaketime/libfaketime-0.9.6.tar.gz" -MD5SUM="f522f899d65a057ad69cff9896c75f78" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/libfaketime-20170608_b23fbd5.tar.xz" +MD5SUM="bd9a43364907784495770f6b1b2ec179" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libffado/libffado-derefptr.patch b/libraries/libffado/libffado-derefptr.patch new file mode 100644 index 0000000000..74f5456147 --- /dev/null +++ b/libraries/libffado/libffado-derefptr.patch @@ -0,0 +1,20 @@ +--- libffado-2.3.0/src/libieee1394/configrom.cpp.derefptr 2017-02-16 12:03:33.894937836 +0000 ++++ libffado-2.3.0/src/libieee1394/configrom.cpp 2017-02-16 12:03:44.000947451 +0000 +@@ -176,7 +176,7 @@ + ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_vendorNameKv ), + len ); + +- while ((buf + len - 1) == '\0') { ++ while (*(buf + len - 1) == '\0') { + len--; + } + // \todo XXX seems a bit strage to do this but the nodemgr.c code does +@@ -195,7 +195,7 @@ + memcpy( buf, + ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_modelNameKv ), + len ); +- while ((buf + len - 1) == '\0') { ++ while (*(buf + len - 1) == '\0') { + len--; + } + // \todo XXX for edirol fa-66 it seems somehow broken. see above diff --git a/libraries/libffado/libffado-gcc6.patch b/libraries/libffado/libffado-gcc6.patch new file mode 100644 index 0000000000..7e989929c8 --- /dev/null +++ b/libraries/libffado/libffado-gcc6.patch @@ -0,0 +1,19 @@ +diff -urp a/src/libutil/TimestampedBuffer.cpp b/src/libutil/TimestampedBuffer.cpp +--- a/src/libutil/TimestampedBuffer.cpp 2014-06-01 19:00:10.000000000 -0500 ++++ b/src/libutil/TimestampedBuffer.cpp 2016-02-29 21:01:56.693239943 -0600 +@@ -32,6 +32,7 @@ + + #include + #include ++#include + + #define DLL_PI (3.141592653589793238) + #define DLL_SQRT2 (1.414213562373095049) +@@ -179,7 +180,6 @@ bool TimestampedBuffer::setWrapValue(ffa + m_wrap_at=w; + return true; + } +-#include + + /** + * \brief return the effective rate 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..2e2d834b15 100644 --- a/libraries/libffado/libffado.SlackBuild +++ b/libraries/libffado/libffado.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libffado -VERSION=${VERSION:-2.2.1} +VERSION=${VERSION:-2.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,11 +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 {} \; +# Patch for the newer gcc, thanks to fedora +patch -p1 < $CWD/libffado-derefptr.patch +patch -p1 < $CWD/libffado-gcc6.patch + # Use our CFLAGS sed -i "s/-O2 -DNDEBUG/$SLKCFLAGS -DNDEBUG/" SConstruct -patch -p1 < $CWD/libffado-mixer.patch - scons \ PREFIX=/usr \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libffado/libffado.info b/libraries/libffado/libffado.info index 04eee7ed85..813f7ca581 100644 --- a/libraries/libffado/libffado.info +++ b/libraries/libffado/libffado.info @@ -1,8 +1,8 @@ PRGNAM="libffado" -VERSION="2.2.1" +VERSION="2.3.0" 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.3.0.tgz" +MD5SUM="8f452977267200cfaf9b8e16ba3c92df" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libconfig libiec61883 libxml++" diff --git a/libraries/libgexiv2/libgexiv2.SlackBuild b/libraries/libgexiv2/libgexiv2.SlackBuild index be7abf73da..eef124a21a 100644 --- a/libraries/libgexiv2/libgexiv2.SlackBuild +++ b/libraries/libgexiv2/libgexiv2.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=libgexiv2 SRCNAM=gexiv2 -VERSION=${VERSION:-0.10.3} +VERSION=${VERSION:-0.10.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/libgexiv2/libgexiv2.info b/libraries/libgexiv2/libgexiv2.info index 6942a4f407..95271cd0ec 100644 --- a/libraries/libgexiv2/libgexiv2.info +++ b/libraries/libgexiv2/libgexiv2.info @@ -1,8 +1,8 @@ PRGNAM="libgexiv2" -VERSION="0.10.3" +VERSION="0.10.6" 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="http://ftp.gnome.org/pub/GNOME/sources/gexiv2/0.10/gexiv2-0.10.6.tar.xz" +MD5SUM="6045847bf08094cd147fcc49d31c0c1a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="vala" diff --git a/libraries/libinput/README b/libraries/libinput/README deleted file mode 100644 index 095c2a9afb..0000000000 --- a/libraries/libinput/README +++ /dev/null @@ -1,13 +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. - -Optional dependency: libwacom diff --git a/libraries/libinput/libinput.SlackBuild b/libraries/libinput/libinput.SlackBuild deleted file mode 100644 index 5aa9f6ccc3..0000000000 --- a/libraries/libinput/libinput.SlackBuild +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -# -# Slackware build script for libinput. -# -# 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=libinput -VERSION=${VERSION:-1.8.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 - -wacom=`pkg-config --exists libwacom` -if [ $? -eq 0 ]; then - libwacom="--enable-libwacom" -else - libwacom="--disable-libwacom" -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" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-udev-dir=/lib/udev \ - --enable-tests=no \ - --disable-debug-gui \ - --disable-documentation \ - $libwacom \ - --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 -ar COPYING README.md 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/libraries/libinput/libinput.info b/libraries/libinput/libinput.info deleted file mode 100644 index febbb02738..0000000000 --- a/libraries/libinput/libinput.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libinput" -VERSION="1.8.1" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput" -DOWNLOAD="https://www.freedesktop.org/software/libinput/libinput-1.8.1.tar.xz" -MD5SUM="8247f0bb67052ffb272c50c3cb9c5998" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libwacom" -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 385f7da66f..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: http://www.freedesktop.org/wiki/Software/libinput/ -libinput: -libinput: -libinput: -libinput: -libinput: diff --git a/libraries/libkqueue/libkqueue.SlackBuild b/libraries/libkqueue/libkqueue.SlackBuild index a989d26944..5b7c6208af 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.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -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 {} \; +autoreconf -fi + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/libkqueue/libkqueue.info b/libraries/libkqueue/libkqueue.info index 6cd089bc9f..f4b2e5d9d1 100644 --- a/libraries/libkqueue/libkqueue.info +++ b/libraries/libkqueue/libkqueue.info @@ -1,8 +1,8 @@ PRGNAM="libkqueue" -VERSION="2.0.1" +VERSION="2.1.0" 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.1.0/libkqueue-2.1.0.tar.gz" +MD5SUM="e8f7cb2287d3c8b05dc413cd41c032fa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libmemcached/libmemcached.SlackBuild b/libraries/libmemcached/libmemcached.SlackBuild index 3cc3e35ca1..aa21736960 100644 --- a/libraries/libmemcached/libmemcached.SlackBuild +++ b/libraries/libmemcached/libmemcached.SlackBuild @@ -82,7 +82,7 @@ export PATH="/usr/libexec:$PATH" patch -p1 < $CWD/patches/libmemcached-fix-linking-with-libpthread.patch CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --exec-prefix=/usr \ diff --git a/libraries/libmp4v2/libmp4v2.SlackBuild b/libraries/libmp4v2/libmp4v2.SlackBuild index e1550512cf..ad61013270 100644 --- a/libraries/libmp4v2/libmp4v2.SlackBuild +++ b/libraries/libmp4v2/libmp4v2.SlackBuild @@ -81,7 +81,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/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/libmwaw/libmwaw.SlackBuild b/libraries/libmwaw/libmwaw.SlackBuild index 3b1d5ebe31..bec64090ea 100644 --- a/libraries/libmwaw/libmwaw.SlackBuild +++ b/libraries/libmwaw/libmwaw.SlackBuild @@ -77,7 +77,7 @@ else 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/libopenshot/libopenshot.SlackBuild b/libraries/libopenshot/libopenshot.SlackBuild index bf459be377..7159278f48 100644 --- a/libraries/libopenshot/libopenshot.SlackBuild +++ b/libraries/libopenshot/libopenshot.SlackBuild @@ -78,6 +78,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DZMQ_INCLUDE_DIR=$TMP/$PRGNAM-$VERSION/include \ + -DENABLE_RUBY=OFF \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/libpqxx/libpqxx.SlackBuild b/libraries/libpqxx/libpqxx.SlackBuild index d3a2f26995..270b23ccf4 100644 --- a/libraries/libpqxx/libpqxx.SlackBuild +++ b/libraries/libpqxx/libpqxx.SlackBuild @@ -20,8 +20,8 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libpqxx -VERSION=${VERSION:-4.0.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20170619_7809d4a} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -51,7 +51,7 @@ else LIBDIRSUFFIX="" fi -DOCS="AUTHORS COPYING ChangeLog INSTALL README README-UPGRADE VERSION" +DOCS="AUTHORS COPYING INSTALL README.md README-UPGRADE VERSION" set -e @@ -59,14 +59,14 @@ 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 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/libraries/libpqxx/libpqxx.info b/libraries/libpqxx/libpqxx.info index 7e980da303..3db1d82ad0 100644 --- a/libraries/libpqxx/libpqxx.info +++ b/libraries/libpqxx/libpqxx.info @@ -1,8 +1,8 @@ PRGNAM="libpqxx" -VERSION="4.0.1" -HOMEPAGE="http://pqxx.org/development/libpqxx/" -DOWNLOAD="http://pqxx.org/download/software/libpqxx/libpqxx-4.0.1.tar.gz" -MD5SUM="6ea888b9ba85dd7cef1b182dc5f223a2" +VERSION="20170619_7809d4a" +HOMEPAGE="https://github.com/jtv/libpqxx" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/libpqxx-20170619_7809d4a.tar.xz" +MD5SUM="675dd58d48f87b7c421d8ccaafd97f34" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="postgresql" 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/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/libr3/libr3.info b/libraries/libr3/libr3.info index d20e7ca1e4..e048225713 100644 --- a/libraries/libr3/libr3.info +++ b/libraries/libr3/libr3.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/c9s/r3/archive/1.3.4/r3-1.3.4.tar.gz" MD5SUM="c2dcc4c04ae3ff3b04131b7b341e33d8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="json-c" MAINTAINER="Andre Barboza" EMAIL="bmg.andre@gmail.com" 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/libu2f-host/libu2f-host.info b/libraries/libu2f-host/libu2f-host.info index 47f70f145e..9a804590f7 100644 --- a/libraries/libu2f-host/libu2f-host.info +++ b/libraries/libu2f-host/libu2f-host.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/Yubico/libu2f-host/archive/libu2f-host-1.1.3.tar.gz MD5SUM="2b38b08573ee31a8e778c3863dee281c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="hidapi gengetopt" +REQUIRES="hidapi gengetopt json-c" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/libraries/libvirt-python/libvirt-python.SlackBuild b/libraries/libvirt-python/libvirt-python.SlackBuild index 7ed892fc3d..d0daa3e6f9 100644 --- a/libraries/libvirt-python/libvirt-python.SlackBuild +++ b/libraries/libvirt-python/libvirt-python.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libvirt-python -VERSION=${VERSION:-3.4.0} +VERSION=${VERSION:-3.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/libvirt-python/libvirt-python.info b/libraries/libvirt-python/libvirt-python.info index 23cf9a6863..aabc636ed1 100644 --- a/libraries/libvirt-python/libvirt-python.info +++ b/libraries/libvirt-python/libvirt-python.info @@ -1,8 +1,8 @@ PRGNAM="libvirt-python" -VERSION="3.4.0" +VERSION="3.6.0" HOMEPAGE="http://libvirt.org" -DOWNLOAD="ftp://libvirt.org/libvirt/python/libvirt-python-3.4.0.tar.gz" -MD5SUM="44c1106feebfcd9c8bb9db1089bfce63" +DOWNLOAD="ftp://libvirt.org/libvirt/python/libvirt-python-3.6.0.tar.gz" +MD5SUM="576f1d90c9e4adaeed6c1030128478a2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libvirt" diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild index 12dac8bf95..ba1980263d 100644 --- a/libraries/libvirt/libvirt.SlackBuild +++ b/libraries/libvirt/libvirt.SlackBuild @@ -5,8 +5,8 @@ # Maintained by Robby Workman PRGNAM=libvirt -VERSION=${VERSION:-3.4.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.6.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info index 0022ee9c4d..38157efdad 100644 --- a/libraries/libvirt/libvirt.info +++ b/libraries/libvirt/libvirt.info @@ -1,8 +1,8 @@ PRGNAM="libvirt" -VERSION="3.4.0" +VERSION="3.6.0" HOMEPAGE="http://libvirt.org" -DOWNLOAD="ftp://libvirt.org/libvirt/libvirt-3.4.0.tar.xz" -MD5SUM="9b8447451bba065c936b462d76b40df4" +DOWNLOAD="ftp://libvirt.org/libvirt/libvirt-3.6.0.tar.xz" +MD5SUM="6a342e5c5a4d5229d971fe409ada2ae8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yajl urlgrabber" 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 b1cca2cbb7..0000000000 --- a/libraries/libwacom/libwacom.SlackBuild +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -# -# Slackware build script for libwacom. -# -# 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=libwacom -VERSION=${VERSION:-0.25} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$(uname -m) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 \ - --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 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/libraries/libwacom/libwacom.info b/libraries/libwacom/libwacom.info deleted file mode 100644 index 95afbb82fc..0000000000 --- a/libraries/libwacom/libwacom.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libwacom" -VERSION="0.25" -HOMEPAGE="https://sourceforge.net/projects/linuxwacom/" -DOWNLOAD="https://sourceforge.net/projects/linuxwacom/files/libwacom/libwacom-0.25.tar.bz2" -MD5SUM="47ce63c65d74a5730fbf6ff3cea6d821" -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 db90625080..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://sourceforge.net/projects/linuxwacom/ -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 013a9c0ac8..0000000000 --- a/libraries/libwebp/libwebp.SlackBuild +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh - -# Slackware build script for webP -# written by powtrix (@gmail.com) - -PRGNAM=libwebp -VERSION=${VERSION:-0.5.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - 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 \ - --enable-experimental \ - --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 2588adfc7f..0000000000 --- a/libraries/libwebp/libwebp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libwebp" -VERSION="0.5.2" -HOMEPAGE="https://developers.google.com/speed/webp/" -DOWNLOAD="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-0.5.2.tar.gz" -MD5SUM="6f36b38c2483b32906f946a621eb0c2e" -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/libwebsockets/libwebsockets.SlackBuild b/libraries/libwebsockets/libwebsockets.SlackBuild index 597f9e9ecc..d4207fb091 100644 --- a/libraries/libwebsockets/libwebsockets.SlackBuild +++ b/libraries/libwebsockets/libwebsockets.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libwebsockets -VERSION=${VERSION:-2.0.2} +VERSION=${VERSION:-2.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/libwebsockets/libwebsockets.info b/libraries/libwebsockets/libwebsockets.info index 9f832a06a7..690337fcab 100644 --- a/libraries/libwebsockets/libwebsockets.info +++ b/libraries/libwebsockets/libwebsockets.info @@ -1,8 +1,8 @@ PRGNAM="libwebsockets" -VERSION="2.0.2" +VERSION="2.2.1" HOMEPAGE="https://libwebsockets.org/" -DOWNLOAD="https://github.com/warmcat/libwebsockets/archive/v2.0.2/libwebsockets-2.0.2.tar.gz" -MD5SUM="778c920a580fba1f943c84e9702e7b26" +DOWNLOAD="https://github.com/warmcat/libwebsockets/archive/v2.2.1/libwebsockets-2.2.1.tar.gz" +MD5SUM="1f641cde2ab3687db3d553f68fe0f620" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libwps/libwps.SlackBuild b/libraries/libwps/libwps.SlackBuild index 6374bc6c79..68765759c1 100644 --- a/libraries/libwps/libwps.SlackBuild +++ b/libraries/libwps/libwps.SlackBuild @@ -77,7 +77,7 @@ else fi CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=implicit-fallthrough=" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ 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 99bbb3bd98..3c18703fa4 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/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 22561e6f6d..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.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 {} \; - -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 COPYING.LESSER 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 ad87f72765..0000000000 --- a/libraries/npth/npth.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="npth" -VERSION="1.2" -HOMEPAGE="https://www.gnupg.org/related_software/npth/index.html" -DOWNLOAD="https://www.gnupg.org/ftp/gcrypt/npth/npth-1.2.tar.bz2" -MD5SUM="226bac7374b9466c6ec26b1c34dab844" -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/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/physfs/physfs.SlackBuild b/libraries/physfs/physfs.SlackBuild index efb820ce35..f83c92c7a9 100644 --- a/libraries/physfs/physfs.SlackBuild +++ b/libraries/physfs/physfs.SlackBuild @@ -72,7 +72,7 @@ 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 \ diff --git a/libraries/poppler-qt5/poppler-qt5.SlackBuild b/libraries/poppler-qt5/poppler-qt5.SlackBuild index ce99c22afc..eb516389cf 100644 --- a/libraries/poppler-qt5/poppler-qt5.SlackBuild +++ b/libraries/poppler-qt5/poppler-qt5.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=poppler-qt5 -VERSION=${VERSION:-0.45.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.53.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/libraries/poppler-qt5/poppler-qt5.info b/libraries/poppler-qt5/poppler-qt5.info index e99b4f6e11..cb2c895596 100644 --- a/libraries/poppler-qt5/poppler-qt5.info +++ b/libraries/poppler-qt5/poppler-qt5.info @@ -1,8 +1,8 @@ PRGNAM="poppler-qt5" -VERSION="0.45.0" +VERSION="0.53.0" HOMEPAGE="https://poppler.freedesktop.org/" -DOWNLOAD="https://poppler.freedesktop.org/poppler-0.45.0.tar.xz" -MD5SUM="a66e8c3cf6dab91dab5ba90d362c6063" +DOWNLOAD="https://poppler.freedesktop.org/poppler-0.53.0.tar.xz" +MD5SUM="943679f1030b9bc19a989f24121a282a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5" diff --git a/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch b/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch deleted file mode 100644 index fcc8d0d2e7..0000000000 --- a/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ptlib-2.10.11/./src/ptlib/common/getdate.y 2013-08-15 01:20:26.000000000 +0200 -+++ /mnt/chroot/cauldron/home/dan/rpm/BUILD/ptlib-2.10.11/src/ptlib/common/getdate.y 2013-12-15 00:24:27.866481490 +0100 -@@ -121,9 +121,9 @@ - static int yylex(); - - #ifdef __GNUC__ --static int yyerror(char const *msg); -+static int yyerror(void *, char const *msg); - #else --static void yyerror(char const *msg); -+static void yyerror(void *, char const *msg); - #endif - - -@@ -132,7 +132,8 @@ - - %} - --%pure_parser -+%pure-parser -+%parse-param {void *parseParam} - - %union { - time_t Number; -@@ -1018,12 +1019,12 @@ - #endif - - #ifdef __GNUC__ --int yyerror(const char * s) -+int yyerror(void *var, const char * s) - { - return 0; - } - #else --static void yyerror(const char * s) -+static void yyerror(void *var, const char * s) - { - } - #endif diff --git a/libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch b/libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch new file mode 100644 index 0000000000..7f5d66cf24 --- /dev/null +++ b/libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch @@ -0,0 +1,2951 @@ +Submitted By: Armin K. +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.SlackBuild b/libraries/ptlib/ptlib.SlackBuild index 6af28cd288..d261599c64 100644 --- a/libraries/ptlib/ptlib.SlackBuild +++ b/libraries/ptlib/ptlib.SlackBuild @@ -68,8 +68,7 @@ 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 diff --git a/libraries/qt5/patches/qt-5.7.1_gcc-7.patch b/libraries/qt5/patches/qt-5.7.1_gcc-7.patch new file mode 100644 index 0000000000..4eb4ca8041 --- /dev/null +++ b/libraries/qt5/patches/qt-5.7.1_gcc-7.patch @@ -0,0 +1,122 @@ +From 64fdd317d4127142ad9e967197a2df6ac81ef55f Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Wed, 29 Mar 2017 17:42:18 +0200 +Subject: [PATCH] Fix build with GCC 7.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes some ambiguities and outright wrong code GCC 7 doesn't accept but +earlier compilers did. + +Task-number:QTBUG-59776 +Change-Id: I012f121842ac6cde49db0d571efc62aabe2115e3 +Reviewed-by: Michael Brüning +--- + .../mojo/public/cpp/bindings/interface_ptr_info.h | 2 +- + .../third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ + chromium/v8/src/objects-body-descriptors.h | 2 +- + chromium/v8/src/objects-inl.h | 19 +++++++++++++++++++ + chromium/v8/src/objects.h | 16 ++-------------- + 5 files changed, 25 insertions(+), 16 deletions(-) + +diff --git a/chromium/mojo/public/cpp/bindings/interface_ptr_info.h b/chromium/mojo/public/cpp/bindings/interface_ptr_info.h +index 5bd29d542d..c94a5acdcd 100644 +--- a/chromium/mojo/public/cpp/bindings/interface_ptr_info.h ++++ b/chromium/mojo/public/cpp/bindings/interface_ptr_info.h +@@ -34,7 +34,7 @@ class InterfacePtrInfo { + + InterfacePtrInfo& operator=(InterfacePtrInfo&& other) { + if (this != &other) { +- handle_ = other.handle_.Pass(); ++ handle_ = std::move(other.handle_); + version_ = other.version_; + other.version_ = 0u; + } +diff --git a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h +index 58d97fbaac..839c7df114 100644 +--- a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h ++++ b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h +@@ -495,6 +495,8 @@ inline LinkedHashSet& LinkedHashSet::operator=(const Lin + return *this; + } + ++inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b); ++ + template + inline void LinkedHashSet::swap(LinkedHashSet& other) + { +diff --git a/chromium/v8/src/objects-body-descriptors.h b/chromium/v8/src/objects-body-descriptors.h +index 91cb8883be..a1c3634bd7 100644 +--- a/chromium/v8/src/objects-body-descriptors.h ++++ b/chromium/v8/src/objects-body-descriptors.h +@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase { + + template + static inline void IterateBody(HeapObject* obj, int object_size) { +- IterateBody(obj); ++ IterateBody(obj); + } + }; + +diff --git a/chromium/v8/src/objects-inl.h b/chromium/v8/src/objects-inl.h +index 177c0294dc..baca18d0ef 100644 +--- a/chromium/v8/src/objects-inl.h ++++ b/chromium/v8/src/objects-inl.h +@@ -3122,6 +3122,25 @@ void HashTableBase::SetNumberOfDeletedElements(int nod) { + + + template ++inline uint32_t HashTable::Hash(Key key) { ++ if (Shape::UsesSeed) { ++ return Shape::SeededHash(key, GetHeap()->HashSeed()); ++ } else { ++ return Shape::Hash(key); ++ } ++} ++ ++template ++inline uint32_t HashTable::HashForObject(Key key, Object* object) { ++ if (Shape::UsesSeed) { ++ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); ++ } else { ++ return Shape::HashForObject(key, object); ++ } ++} ++ ++ ++template + int HashTable::FindEntry(Key key) { + return FindEntry(GetIsolate(), key); + } +diff --git a/chromium/v8/src/objects.h b/chromium/v8/src/objects.h +index 0111c71311..d737a18fe9 100644 +--- a/chromium/v8/src/objects.h ++++ b/chromium/v8/src/objects.h +@@ -3157,21 +3157,9 @@ template + class HashTable : public HashTableBase { + public: + // Wrapper methods +- inline uint32_t Hash(Key key) { +- if (Shape::UsesSeed) { +- return Shape::SeededHash(key, GetHeap()->HashSeed()); +- } else { +- return Shape::Hash(key); +- } +- } ++ inline uint32_t Hash(Key key); + +- inline uint32_t HashForObject(Key key, Object* object) { +- if (Shape::UsesSeed) { +- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); +- } else { +- return Shape::HashForObject(key, object); +- } +- } ++ inline uint32_t HashForObject(Key key, Object* object); + + // Returns a new HashTable object. + MUST_USE_RESULT static Handle New( +-- +2.12.2 + diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild index 7b829ff5f3..dee47a5ad2 100644 --- a/libraries/qt5/qt5.SlackBuild +++ b/libraries/qt5/qt5.SlackBuild @@ -127,6 +127,10 @@ fi echo "$PRCOD" >> qtwebengine/.qmake.conf +# Needed for gcc-7.x +( cd qtwebengine/src/3rdparty + patch -p1 < $CWD/patches/qt-5.7.1_gcc-7.patch ) + export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" ./configure -v \ diff --git a/libraries/rapidjson/rapidjson.SlackBuild b/libraries/rapidjson/rapidjson.SlackBuild index 85a240ac48..0b0a2e02ae 100644 --- a/libraries/rapidjson/rapidjson.SlackBuild +++ b/libraries/rapidjson/rapidjson.SlackBuild @@ -72,7 +72,7 @@ find -L . \ mkdir -p build cd build cmake \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=implicit-fallthrough=" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/libraries/rudiments/rudiments.SlackBuild b/libraries/rudiments/rudiments.SlackBuild index 5ee33033b2..ecd7377f17 100644 --- a/libraries/rudiments/rudiments.SlackBuild +++ b/libraries/rudiments/rudiments.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rudiments -VERSION=${VERSION:-0.55.0} +VERSION=${VERSION:-1.0.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" diff --git a/libraries/rudiments/rudiments.info b/libraries/rudiments/rudiments.info index c3cd414a19..6e6900d699 100644 --- a/libraries/rudiments/rudiments.info +++ b/libraries/rudiments/rudiments.info @@ -1,8 +1,8 @@ PRGNAM="rudiments" -VERSION="0.55.0" +VERSION="1.0.5" HOMEPAGE="http://sqlrelay.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/rudiments/rudiments-0.55.0.tar.gz" -MD5SUM="1b066c718074e78c96b82f900772cf6a" +DOWNLOAD="http://downloads.sourceforge.net/rudiments/rudiments-1.0.5.tar.gz" +MD5SUM="c44ff4cf82f30258b85aebd8e54fc37b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/sdformat/cmake.patch b/libraries/sdformat/cmake.patch new file mode 100644 index 0000000000..38e6b6cca6 --- /dev/null +++ b/libraries/sdformat/cmake.patch @@ -0,0 +1,20 @@ +diff -Naur osrf-sdformat-e5ac5aaa49f2.orig/CMakeLists.txt osrf-sdformat-e5ac5aaa49f2/CMakeLists.txt +--- osrf-sdformat-e5ac5aaa49f2.orig/CMakeLists.txt 2016-10-10 23:51:37.000000000 +0200 ++++ osrf-sdformat-e5ac5aaa49f2/CMakeLists.txt 2017-07-29 19:46:16.021921859 +0200 +@@ -186,11 +186,13 @@ + # OS Specific initialization + if (UNIX) + sdf_setup_unix() +-else (WIN32) ++endif () ++if (WIN32) + sdf_setup_windows() +-else (APPLE) ++endif () ++if (APPLE) + sdf_setup_apple() +-endif() ++endif () + + ################################################# + # Print warnings and errors diff --git a/libraries/sdformat/sdformat.SlackBuild b/libraries/sdformat/sdformat.SlackBuild index 5dea256ef6..b412d5a10d 100644 --- a/libraries/sdformat/sdformat.SlackBuild +++ b/libraries/sdformat/sdformat.SlackBuild @@ -71,6 +71,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Patch for cmake >= 3.9.x +patch -p1 < $CWD/cmake.patch + mkdir -p build cd build cmake \ diff --git a/libraries/ucl/ucl.SlackBuild b/libraries/ucl/ucl.SlackBuild index d7cf336816..f11c45e090 100644 --- a/libraries/ucl/ucl.SlackBuild +++ b/libraries/ucl/ucl.SlackBuild @@ -71,6 +71,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +CPPFLAGS="-std=c90" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/ucommon/ucommon.SlackBuild b/libraries/ucommon/ucommon.SlackBuild index c37d6cd1bf..fd4b20c35b 100644 --- a/libraries/ucommon/ucommon.SlackBuild +++ b/libraries/ucommon/ucommon.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ucommon -VERSION=${VERSION:-6.1.10} +VERSION=${VERSION:-7.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/ucommon/ucommon.info b/libraries/ucommon/ucommon.info index b90320835d..b31fa21fa4 100644 --- a/libraries/ucommon/ucommon.info +++ b/libraries/ucommon/ucommon.info @@ -1,8 +1,8 @@ PRGNAM="ucommon" -VERSION="6.1.10" +VERSION="7.0.0" HOMEPAGE="http://www.gnu.org/software/commoncpp/" -DOWNLOAD="http://ftp.gnu.org/gnu/commoncpp/ucommon-6.1.10.tar.gz" -MD5SUM="a0908c7a1abad82ce9556bb59f77bedb" +DOWNLOAD="http://ftp.gnu.org/gnu/commoncpp/ucommon-7.0.0.tar.gz" +MD5SUM="90468af8f6692f0b6576189927414a39" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/vte2/README b/libraries/vte2/README new file mode 100644 index 0000000000..4c78dea1a2 --- /dev/null +++ b/libraries/vte2/README @@ -0,0 +1,7 @@ +VTE2 is a terminal emulator widget for use with GTK+2. +This package contains the VTE library and development files and +a sample implementation (vte). + +This package can be installed side by side with vte included in +the default Slackware installation since this package is intended +for use with GTK+2. diff --git a/libraries/vte2/fix_meta_alt_keybinding.patch b/libraries/vte2/fix_meta_alt_keybinding.patch new file mode 100644 index 0000000000..bd364be584 --- /dev/null +++ b/libraries/vte2/fix_meta_alt_keybinding.patch @@ -0,0 +1,74 @@ +From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +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..70c043482a --- /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="2" +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 d7de7a2732..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.48.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 - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "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 85bb66a493..0000000000 --- a/libraries/vte3/vte3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="vte3" -VERSION="0.48.3" -HOMEPAGE="https://github.com/GNOME/vte" -DOWNLOAD="https://github.com/GNOME/vte/archive/0.48.3/vte-0.48.3.tar.gz" -MD5SUM="4bd350a9e4d5508ce98ae39438010e18" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="vala pcre2" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/libraries/wvstreams/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch b/libraries/wvstreams/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch new file mode 100644 index 0000000000..3932ddb949 --- /dev/null +++ b/libraries/wvstreams/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch @@ -0,0 +1,50 @@ +From 32ecfa8e89306ace726f7ad14f2b09c2aa1b96c4 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar +Date: Tue, 9 Feb 2016 21:02:59 +0100 +Subject: [PATCH] Use explicit cast and prevent compiler error + +--- + streams/wvstream.cc | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/streams/wvstream.cc b/streams/wvstream.cc +index 4564f3c..76565b4 100644 +--- a/streams/wvstream.cc ++++ b/streams/wvstream.cc +@@ -907,9 +907,9 @@ void WvStream::_build_selectinfo(SelectInfo &si, time_t msec_timeout, + + if (forceable) + { +- si.wants.readable = readcb; +- si.wants.writable = writecb; +- si.wants.isexception = exceptcb; ++ si.wants.readable = static_cast(readcb); ++ si.wants.writable = static_cast(writecb); ++ si.wants.isexception = static_cast(exceptcb); + } + else + { +@@ -1019,7 +1019,7 @@ bool WvStream::_select(time_t msec_timeout, bool readable, bool writable, + + IWvStream::SelectRequest WvStream::get_select_request() + { +- return IWvStream::SelectRequest(readcb, writecb, exceptcb); ++ return IWvStream::SelectRequest(static_cast(readcb), static_cast(writecb), static_cast(exceptcb)); + } + + +@@ -1107,7 +1107,10 @@ bool WvStream::continue_select(time_t msec_timeout) + // inefficient, because if the alarm was expired then pre_select() + // returned true anyway and short-circuited the previous select(). + TRACE("hello-%p\n", this); +- return !alarm_was_ticking || select(0, readcb, writecb, exceptcb); ++ return !alarm_was_ticking || select(0, ++ static_cast(readcb), ++ static_cast(writecb), ++ static_cast(exceptcb)); + } + + +-- +2.5.0 + diff --git a/libraries/wvstreams/wvstreams.SlackBuild b/libraries/wvstreams/wvstreams.SlackBuild index 562bb05d11..ba96227003 100644 --- a/libraries/wvstreams/wvstreams.SlackBuild +++ b/libraries/wvstreams/wvstreams.SlackBuild @@ -59,6 +59,10 @@ patch -p1 < $CWD/patches/wvstreams-4.6.1-parallel-make.patch patch -p1 < $CWD/patches/wvstreams-4.6.1-gcc47.patch # another patch for gcc and glibc > 2.12.0 from debian patch -p1 < $CWD/patches/05_gcc.diff +# another one for gcc-6.x from fedora +patch -p1 < $CWD/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch +# disable a warning (just for readability during build) +sed -i "s|_BSD_SOURCE|_DEFAULT_SOURCE|" wvrules.mk # configure doesn't support disabling static libraries # Don't manually remove them either, as wvdial won't build then :) diff --git a/libraries/xf86-input-libinput/README b/libraries/xf86-input-libinput/README deleted file mode 100644 index 35174e6c84..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 ddea7f7a34..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 a7380fc2a7..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.25.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 5cbfb0d14a..0000000000 --- a/libraries/xf86-input-libinput/xf86-input-libinput.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="xf86-input-libinput" -VERSION="0.25.0" -HOMEPAGE="https://cgit.freedesktop.org/xorg/driver/xf86-input-libinput/" -DOWNLOAD="https://www.x.org/releases/individual/driver/xf86-input-libinput-0.25.0.tar.bz2" -MD5SUM="bd64be831914eda924f7166243c34968" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libinput" -MAINTAINER="Nikolay Nikolov" -EMAIL="nikobnikolov[at]gmail[dot]com" diff --git a/libraries/xml-security-c/xml-security-c.SlackBuild b/libraries/xml-security-c/xml-security-c.SlackBuild index 03d281e865..28153ec7fd 100644 --- a/libraries/xml-security-c/xml-security-c.SlackBuild +++ b/libraries/xml-security-c/xml-security-c.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 -p1 < $CWD/xmlsec-1.6.1-cxx11.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/xml-security-c/xmlsec-1.6.1-cxx11.patch b/libraries/xml-security-c/xmlsec-1.6.1-cxx11.patch new file mode 100644 index 0000000000..bc87d4c141 --- /dev/null +++ b/libraries/xml-security-c/xmlsec-1.6.1-cxx11.patch @@ -0,0 +1,11 @@ +--- xml-security-c-1.6.1/xsec/tools/checksig/InteropResolver.cpp.orig 2016-02-02 23:57:26.204655144 +0000 ++++ xml-security-c-1.6.1/xsec/tools/checksig/InteropResolver.cpp 2016-02-02 23:57:35.796692305 +0000 +@@ -645,7 +645,7 @@ + + } + +- return false; ++ return NULL; + + } + 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/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/hashkill/hashkill.info b/misc/hashkill/hashkill.info index a86e8d75f2..a75a3a2827 100644 --- a/misc/hashkill/hashkill.info +++ b/misc/hashkill/hashkill.info @@ -5,6 +5,6 @@ DOWNLOAD="http://github.com/gat3way/hashkill/archive/0.3.1.tar.gz" MD5SUM="6a9ca282b2156fe340c583fdedc2fccb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="json-c" MAINTAINER="Gabriel Magno" EMAIL="gabrielmagno1@gmail.com" diff --git a/misc/ibus-unikey/ibus-unikey.SlackBuild b/misc/ibus-unikey/ibus-unikey.SlackBuild index 3a60cac3af..b27db048fd 100644 --- a/misc/ibus-unikey/ibus-unikey.SlackBuild +++ b/misc/ibus-unikey/ibus-unikey.SlackBuild @@ -55,7 +55,7 @@ find -L . \ -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/misc/krename/krename.SlackBuild b/misc/krename/krename.SlackBuild index f084711cd4..4e67905635 100644 --- a/misc/krename/krename.SlackBuild +++ b/misc/krename/krename.SlackBuild @@ -71,6 +71,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix for gcc >= 6.x +patch -p1 < $CWD/null.patch + KDEPREF=$(kde4-config --prefix) cmake \ diff --git a/misc/krename/null.patch b/misc/krename/null.patch new file mode 100644 index 0000000000..991ebbea1c --- /dev/null +++ b/misc/krename/null.patch @@ -0,0 +1,12 @@ +diff -Naur krename-r247.orig/src/batchrenamer.cpp krename-r247/src/batchrenamer.cpp +--- krename-r247.orig/src/batchrenamer.cpp 2013-11-24 22:46:05.000000000 +0100 ++++ krename-r247/src/batchrenamer.cpp 2017-06-20 14:42:57.330437870 +0200 +@@ -402,7 +402,7 @@ + break; + case eRenameMode_Link: + // In case of link delete created file +- job = KIO::file_delete( dstUrl, false ); ++ job = KIO::file_delete( dstUrl, NULL ); + break; + case eRenameMode_Copy: // no undo possible + // TODO: Maybe we should delete the created files diff --git a/misc/stardict-tools/stardict-tools.SlackBuild b/misc/stardict-tools/stardict-tools.SlackBuild index 7a681ee867..5466bff3f4 100644 --- a/misc/stardict-tools/stardict-tools.SlackBuild +++ b/misc/stardict-tools/stardict-tools.SlackBuild @@ -52,6 +52,9 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; patch -p0 < $CWD/stardict-tools.patch + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/misc/xca/xca.SlackBuild b/misc/xca/xca.SlackBuild index 667eb50d9f..903a101f97 100644 --- a/misc/xca/xca.SlackBuild +++ b/misc/xca/xca.SlackBuild @@ -69,6 +69,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Hack to avoid building the html docs, broken with the newer linuxdoc-tools +sed -i '/case "$DOCTOOL" in/i \ +DOCTOOL=true' configure + sed -i \ -e 's/LIBS="\${LIBS} \${OPENSSL_LIBS}\${QT_LIBS}"/LIBS="\${LIBS} \${OPENSSL_LIBS} \${QT_LIBS}"/' \ configure diff --git a/misc/yapet/gcc6.patch b/misc/yapet/gcc6.patch new file mode 100644 index 0000000000..a57e0c93c1 --- /dev/null +++ b/misc/yapet/gcc6.patch @@ -0,0 +1,11 @@ +--- yapet-1.0/yapet/cfg.h 2014-02-23 10:18:41.000000000 -0700 ++++ yapet-1.0/yapet/cfg.h 2016-04-14 07:06:49.665672169 -0700 +@@ -163,7 +163,7 @@ + locked = false; + } + +- void is_locked() const { ++ bool is_locked() const { + return locked; + } + diff --git a/misc/yapet/yapet.SlackBuild b/misc/yapet/yapet.SlackBuild index 25630ffe46..91af2b8d91 100644 --- a/misc/yapet/yapet.SlackBuild +++ b/misc/yapet/yapet.SlackBuild @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# From upstream +patch -p1 < $CWD/gcc6.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/misc/zinnia/zinnia-fixes-gcc6-compile.patch b/misc/zinnia/zinnia-fixes-gcc6-compile.patch new file mode 100644 index 0000000000..848f306edb --- /dev/null +++ b/misc/zinnia/zinnia-fixes-gcc6-compile.patch @@ -0,0 +1,22 @@ +Index: zinnia-0.06/trainer.cpp +=================================================================== +--- zinnia-0.06.orig/trainer.cpp ++++ zinnia-0.06/trainer.cpp +@@ -93,7 +93,7 @@ class TrainerImpl: public Trainer { + + public: + bool add(const Character &character) { +- const std::string y = character.value(); ++ std::string y = character.value(); + CHECK_FALSE(!y.empty()) << "input character is empty"; + Features features; + CHECK_FALSE(features.read(character)) << "cannot read character: " << y; +@@ -103,7 +103,7 @@ class TrainerImpl: public Trainer { + if (!fn) { + return false; + } +- x_.push_back(std::make_pair(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/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild index d15469a167..3a1f233485 100644 --- a/multimedia/avidemux/avidemux.SlackBuild +++ b/multimedia/avidemux/avidemux.SlackBuild @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=avidemux -VERSION=${VERSION:-2.6.12} +VERSION=${VERSION:-2.6.20} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -33,7 +33,7 @@ DOCS="AUTHORS License.txt COPYING scripts/automkv.py" 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,6 +73,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 {} \; +# Double elses are not allowed with cmake >= 3.9 and we have an +# x264 library version greater than 73 +patch -p1 < $CWD/cmake_3.9.patch + WITH_CLI=${WITH_CLI:-YES} WITH_QT4=${WITH_QT4:-YES} WITH_GTK=${WITH_GTK:-NO} diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info index 02ce56afc4..577e425374 100644 --- a/multimedia/avidemux/avidemux.info +++ b/multimedia/avidemux/avidemux.info @@ -1,8 +1,8 @@ PRGNAM="avidemux" -VERSION="2.6.12" +VERSION="2.6.20" HOMEPAGE="http://avidemux.org" -DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.6.12.tar.gz" -MD5SUM="354d8ddf75d48d1f698786e8243ecc54" +DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.6.20.tar.gz" +MD5SUM="52be64ae608c9195454b5393ba684fc0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="faac faad2 lame libdca x264 xvidcore" diff --git a/multimedia/avidemux/cmake_3.9.patch b/multimedia/avidemux/cmake_3.9.patch new file mode 100644 index 0000000000..1df0247101 --- /dev/null +++ b/multimedia/avidemux/cmake_3.9.patch @@ -0,0 +1,12 @@ +diff -Naur avidemux_2.6.20.orig/cmake/admCheckX264.cmake avidemux_2.6.20/cmake/admCheckX264.cmake +--- avidemux_2.6.20.orig/cmake/admCheckX264.cmake 2017-04-28 11:22:27.000000000 +0200 ++++ avidemux_2.6.20/cmake/admCheckX264.cmake 2017-07-19 15:15:37.938788401 +0200 +@@ -21,8 +21,6 @@ + IF (x264_version GREATER 73) + FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version}) + ENDIF (x264_version GREATER 73) +- ELSE (x264_version LESS 67) +- FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open) + ENDIF (x264_version LESS 67) + IF(X264_FOUND) + SET(USE_X264 True CACHE BOOL "") 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/dvgrab/dvgrab.SlackBuild b/multimedia/dvgrab/dvgrab.SlackBuild index 73e1d982cb..56cf622cf7 100644 --- a/multimedia/dvgrab/dvgrab.SlackBuild +++ b/multimedia/dvgrab/dvgrab.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-narrowing" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README deleted file mode 100644 index b287ad6cf3..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 -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-audio-connection-kit 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.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild deleted file mode 100644 index f64d5dfb1a..0000000000 --- a/multimedia/ffmpeg/ffmpeg.SlackBuild +++ /dev/null @@ -1,255 +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-audio-connection-kit -# - 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 {} \; - -# 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/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/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/gst-plugins-bad.SlackBuild b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild index c9cfb68a14..12a956d261 100644 --- a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild +++ b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gst-plugins-bad -VERSION=${VERSION:-1.6.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.12.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -78,6 +78,7 @@ CXXFLAGS="$SLKCFLAGS -std=c++11" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-vulkan \ --build=$ARCH-slackware-linux make diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.info b/multimedia/gst-plugins-bad/gst-plugins-bad.info index 553c0edef7..69f621f70d 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.12.0" HOMEPAGE="https://gstreamer.freedesktop.org/" -DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.2.tar.xz" -MD5SUM="7c73bec1d389f0e184ebbbbb9e9f883d" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.0.tar.xz" +MD5SUM="a1813105dc7394aff0be6dbedbf7c6d5" 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..4ae70257a5 100644 --- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild +++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gst-plugins-ugly -VERSION=${VERSION:-1.6.2} +VERSION=${VERSION:-1.12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info index 1fc6a4908f..1ee590dbe2 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.12.0" HOMEPAGE="https://gstreamer.freedesktop.org/" -DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.2.tar.xz" -MD5SUM="0f0e30336e3155443cd5bfec5c215d56" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.0.tar.xz" +MD5SUM="30e815834819a4890eb1ef6ef67cf68d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/kdenlive/kdenlive.SlackBuild b/multimedia/kdenlive/kdenlive.SlackBuild index 9304f04db7..7327a58c3e 100644 --- a/multimedia/kdenlive/kdenlive.SlackBuild +++ b/multimedia/kdenlive/kdenlive.SlackBuild @@ -101,6 +101,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Needed for gcc >= 6.x +sed -i "s|\ abs(| fabs(|" src/scopes/audioscopes/spectrogram.cpp + mkdir build cd build cmake \ diff --git a/multimedia/kodi/kodi.SlackBuild b/multimedia/kodi/kodi.SlackBuild index bd1f131d71..6802cb8568 100644 --- a/multimedia/kodi/kodi.SlackBuild +++ b/multimedia/kodi/kodi.SlackBuild @@ -74,6 +74,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 from upstream +patch -p1 < $CWD/patches/std_string.patch + # No need to show Git: "Version" in a release build. sed -i '/Git:/s|.*| return GetVersionShort();|' $SRCNAM/utils/SystemInfo.cpp diff --git a/multimedia/kodi/patches/std_string.patch b/multimedia/kodi/patches/std_string.patch new file mode 100644 index 0000000000..da8d57a3d6 --- /dev/null +++ b/multimedia/kodi/patches/std_string.patch @@ -0,0 +1,82 @@ +From 634153c85115b44015cdb1ddd6263f5a87e4e41b Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Sun, 7 May 2017 17:30:47 +0300 +Subject: [PATCH] FTPParse.cpp: use std::string + +--- + xbmc/filesystem/FTPParse.cpp | 44 ++++++++++++++++++++++---------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) + +diff --git a/xbmc/filesystem/FTPParse.cpp b/xbmc/filesystem/FTPParse.cpp +index 8dd9633ae19e..d78349adb580 100644 +--- a/xbmc/filesystem/FTPParse.cpp ++++ b/xbmc/filesystem/FTPParse.cpp +@@ -30,7 +30,7 @@ CFTPParse::CFTPParse() + m_time = 0; + } + +-string CFTPParse::getName() ++std::string CFTPParse::getName() + { + return m_name; + } +@@ -55,16 +55,16 @@ time_t CFTPParse::getTime() + return m_time; + } + +-void CFTPParse::setTime(string str) ++void CFTPParse::setTime(std::string str) + { + /* Variables used to capture patterns via the regexes */ +- string month; +- string day; +- string year; +- string hour; +- string minute; +- string second; +- string am_or_pm; ++ std::string month; ++ std::string day; ++ std::string year; ++ std::string hour; ++ std::string minute; ++ std::string second; ++ std::string am_or_pm; + + /* time struct used to set the time_t variable */ + struct tm time_struct = {}; +@@ -334,21 +334,21 @@ int CFTPParse::getDayOfWeek(int month, int date, int year) + return day_of_week; + } + +-int CFTPParse::FTPParse(string str) ++int CFTPParse::FTPParse(std::string str) + { + /* Various variable to capture patterns via the regexes */ +- string permissions; +- string link_count; +- string owner; +- string group; +- string size; +- string date; +- string name; +- string type; +- string stuff; +- string facts; +- string version; +- string file_id; ++ std::string permissions; ++ std::string link_count; ++ std::string owner; ++ std::string group; ++ std::string size; ++ std::string date; ++ std::string name; ++ std::string type; ++ std::string stuff; ++ std::string facts; ++ std::string version; ++ std::string file_id; + + /* Regex for standard Unix listing formats */ + pcrecpp::RE unix_re("^([-bcdlps])" // type diff --git a/multimedia/lightspark/lightspark.SlackBuild b/multimedia/lightspark/lightspark.SlackBuild index 385b3c04aa..5d8e74a483 100644 --- a/multimedia/lightspark/lightspark.SlackBuild +++ b/multimedia/lightspark/lightspark.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lightspark -VERSION=${VERSION:-2017.01.07_308241eb} +VERSION=${VERSION:-20170618_64b9856} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/multimedia/lightspark/lightspark.info b/multimedia/lightspark/lightspark.info index 977fa3ab98..546a9d087e 100644 --- a/multimedia/lightspark/lightspark.info +++ b/multimedia/lightspark/lightspark.info @@ -1,8 +1,8 @@ PRGNAM="lightspark" -VERSION="2017.01.07_308241eb" +VERSION="20170618_64b9856" HOMEPAGE="https://lightspark.github.io/" -DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/lightspark-2017.01.07_308241eb.tar.xz" -MD5SUM="b227bd46f4c05369e0ca15f148b1627b" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/lightspark-20170618_64b9856.tar.xz" +MD5SUM="4c7d5f1328ce9e8fcebcd1f260c08472" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ffmpeg rtmpdump SDL2_mixer" diff --git a/multimedia/mlt/mlt.SlackBuild b/multimedia/mlt/mlt.SlackBuild index e17e410bcf..82b34c88ac 100644 --- a/multimedia/mlt/mlt.SlackBuild +++ b/multimedia/mlt/mlt.SlackBuild @@ -71,7 +71,6 @@ 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 @@ -118,6 +117,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 /' src/framework/mlt_property.h + # Fix building against qt >= 5.7. patch -p1 < $CWD/qt5-5.7.patch @@ -132,7 +135,7 @@ CXXFLAGS="$SLKCFLAGS" \ --luma-compress \ --enable-motion-est \ $qt \ - --swig-languages="$java $lua $perl $php $python $ruby $tcl $csharp" \ + --swig-languages="$lua $perl $php $python $ruby $tcl $csharp" \ --build=$ARCH-slackware-linux make clean 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..633eb4f4cc 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:-0.28.1} 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 \ diff --git a/multimedia/mythtv/mythtv.info b/multimedia/mythtv/mythtv.info index 8f4464b09f..e0df8685ee 100644 --- a/multimedia/mythtv/mythtv.info +++ b/multimedia/mythtv/mythtv.info @@ -1,10 +1,10 @@ PRGNAM="mythtv" -VERSION="0.27.6" +VERSION="0.28.1" HOMEPAGE="https://www.mythtv.org/" -DOWNLOAD="https://github.com/MythTV/mythtv/archive/v0.27.6.tar.gz" -MD5SUM="187756e9f5dc1d6f887bfe5848db6fc5" +DOWNLOAD="https://github.com/MythTV/mythtv/archive/v0.28.1/mythtv-0.28.1.tar.gz" +MD5SUM="0071d8acb82f6ab7dd64649290bd860c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libass faac lame MySQL-python lxml urlgrabber perl-http-message libwww-perl perl-Net-UPnP perl-IO-Socket-INET6 x264 xvidcore" +REQUIRES="libass faac lame MySQL-python lxml urlgrabber perl-http-message libwww-perl perl-Net-UPnP perl-IO-Socket-INET6 qt5 x264 xvidcore" MAINTAINER="David Somero" EMAIL="dsomero@hotmail.com" diff --git a/multimedia/oggvideotools/oggvideotools.SlackBuild b/multimedia/oggvideotools/oggvideotools.SlackBuild index d284d00cae..7f06b2c20f 100644 --- a/multimedia/oggvideotools/oggvideotools.SlackBuild +++ b/multimedia/oggvideotools/oggvideotools.SlackBuild @@ -83,7 +83,7 @@ cd build CXXFLAGS="$SLKCFLAGS" \ cmake .. \ -DCMAKE_INSTALL_PREFIX:STRING="/usr" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=narrowing" \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE" make diff --git a/multimedia/smpeg/smpeg.SlackBuild b/multimedia/smpeg/smpeg.SlackBuild index 19a3a4f6c6..a114b0f574 100644 --- a/multimedia/smpeg/smpeg.SlackBuild +++ b/multimedia/smpeg/smpeg.SlackBuild @@ -71,7 +71,7 @@ find -L . \ ./autogen.sh -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=narrowing" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/multimedia/subtitleeditor/fix-23714-cxx11-v2.patch b/multimedia/subtitleeditor/fix-23714-cxx11-v2.patch deleted file mode 100644 index 2a74a55a74..0000000000 --- a/multimedia/subtitleeditor/fix-23714-cxx11-v2.patch +++ /dev/null @@ -1,273 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac (révision 956) -+++ configure.ac (copie de travail) -@@ -18,8 +18,9 @@ - AC_C_INLINE - - # Checks for programs. -+AC_LANG([C++]) - AC_PROG_CXX --#AC_PROG_CC -+AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) - - # Checks for library functions. - AC_FUNC_SELECT_ARGTYPES -@@ -253,7 +254,7 @@ - - if test "$enable_debug" = "yes"; then - CXXFLAGS="$CXXFLAGS -DDEBUG -g" -- LDFLAGS="$LDFLAGS -g -ansi -Wall" -+ LDFLAGS="$LDFLAGS -g -Wall" - fi - - # ========================================================================= -@@ -265,13 +266,13 @@ - - if test "$enable_profile" = "yes"; then - CXXFLAGS="$CXXFLAGS -pg" -- LDFLAGS="$LDFLAGS -pg -ansi -Wall" -+ LDFLAGS="$LDFLAGS -pg -Wall" - fi - - # ========================================================================= - # gcc flags - --CXXFLAGS="$CXXFLAGS -ansi -Wall -Wextra -Wconversion" #-Werror -+CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wconversion" #-Werror - - # ========================================================================= - # make use of ccache -Index: m4/ax_cxx_compile_stdcxx_11.m4 -=================================================================== ---- m4/ax_cxx_compile_stdcxx_11.m4 (nonexistent) -+++ m4/ax_cxx_compile_stdcxx_11.m4 (copie de travail) -@@ -0,0 +1,172 @@ -+# ============================================================================ -+# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html -+# ============================================================================ -+# -+# SYNOPSIS -+# -+# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional]) -+# -+# DESCRIPTION -+# -+# Check for baseline language coverage in the compiler for the C++11 -+# standard; if necessary, add switches to CXXFLAGS to enable support. -+# -+# The first argument, if specified, indicates whether you insist on an -+# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -+# -std=c++11). If neither is specified, you get whatever works, with -+# preference for an extended mode. -+# -+# The second argument, if specified 'mandatory' or if left unspecified, -+# indicates that baseline C++11 support is required and that the macro -+# should error out if no mode with that support is found. If specified -+# 'optional', then configuration proceeds regardless, after defining -+# HAVE_CXX11 if and only if a supporting mode is found. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Benjamin Kosnik -+# Copyright (c) 2012 Zack Weinberg -+# Copyright (c) 2013 Roy Stogner -+# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov -+# Copyright (c) 2015 Paul Norman -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 13 -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ struct Base { -+ virtual void f() {} -+ }; -+ struct Child : public Base { -+ virtual void f() override {} -+ }; -+ -+ typedef check> right_angle_brackets; -+ -+ int a; -+ decltype(a) b; -+ -+ typedef check check_type; -+ check_type c; -+ check_type&& cr = static_cast(c); -+ -+ auto d = a; -+ auto l = [](){}; -+ // Prevent Clang error: unused variable 'l' [-Werror,-Wunused-variable] -+ struct use_l { use_l() { l(); } }; -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function because of this -+ namespace test_template_alias_sfinae { -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { -+ func(0); -+ } -+ } -+ -+ // Check for C++11 attribute support -+ void noret [[noreturn]] () { throw 0; } -+]]) -+ -+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl -+ m4_if([$1], [], [], -+ [$1], [ext], [], -+ [$1], [noext], [], -+ [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl -+ m4_if([$2], [], [ax_cxx_compile_cxx11_required=true], -+ [$2], [mandatory], [ax_cxx_compile_cxx11_required=true], -+ [$2], [optional], [ax_cxx_compile_cxx11_required=false], -+ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])]) -+ AC_LANG_PUSH([C++])dnl -+ ac_success=no -+ AC_CACHE_CHECK(whether $CXX supports C++11 features by default, -+ ax_cv_cxx_compile_cxx11, -+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], -+ [ax_cv_cxx_compile_cxx11=yes], -+ [ax_cv_cxx_compile_cxx11=no])]) -+ if test x$ax_cv_cxx_compile_cxx11 = xyes; then -+ ac_success=yes -+ fi -+ -+ m4_if([$1], [noext], [], [dnl -+ if test x$ac_success = xno; then -+ for switch in -std=gnu++11 -std=gnu++0x; do -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) -+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, -+ $cachevar, -+ [ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS $switch" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], -+ [eval $cachevar=yes], -+ [eval $cachevar=no]) -+ CXXFLAGS="$ac_save_CXXFLAGS"]) -+ if eval test x\$$cachevar = xyes; then -+ CXXFLAGS="$CXXFLAGS $switch" -+ ac_success=yes -+ break -+ fi -+ done -+ fi]) -+ -+ m4_if([$1], [ext], [], [dnl -+ if test x$ac_success = xno; then -+ dnl HP's aCC needs +std=c++11 according to: -+ dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf -+ dnl Cray's crayCC needs "-h std=c++11" -+ for switch in -std=c++11 -std=c++0x +std=c++11 "-h std=c++11"; do -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) -+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, -+ $cachevar, -+ [ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS $switch" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], -+ [eval $cachevar=yes], -+ [eval $cachevar=no]) -+ CXXFLAGS="$ac_save_CXXFLAGS"]) -+ if eval test x\$$cachevar = xyes; then -+ CXXFLAGS="$CXXFLAGS $switch" -+ ac_success=yes -+ break -+ fi -+ done -+ fi]) -+ AC_LANG_POP([C++]) -+ if test x$ax_cxx_compile_cxx11_required = xtrue; then -+ if test x$ac_success = xno; then -+ AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.]) -+ fi -+ else -+ if test x$ac_success = xno; then -+ HAVE_CXX11=0 -+ AC_MSG_NOTICE([No compiler with C++11 support was found]) -+ else -+ HAVE_CXX11=1 -+ AC_DEFINE(HAVE_CXX11,1, -+ [define if the compiler supports basic C++11 syntax]) -+ fi -+ -+ AC_SUBST(HAVE_CXX11) -+ fi -+]) -Index: plugins/actions/dialoguize/dialoguize.cc -=================================================================== ---- plugins/actions/dialoguize/dialoguize.cc (révision 956) -+++ plugins/actions/dialoguize/dialoguize.cc (copie de travail) -@@ -23,7 +23,7 @@ - * along with this program. If not, see . - */ - --#include -+#include - #include "extension/action.h" - #include "i18n.h" - #include "debug.h" -Index: plugins/actions/documentmanagement/documentmanagement.cc -=================================================================== ---- plugins/actions/documentmanagement/documentmanagement.cc (révision 956) -+++ plugins/actions/documentmanagement/documentmanagement.cc (copie de travail) -@@ -178,9 +178,9 @@ - - ui_id = ui->new_merge_id(); - -- #define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/"name, name, name); -- #define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/"name, name, name); -- #define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/"name, name, name); -+ #define ADD_UI(name) ui->add_ui(ui_id, Glib::ustring::compose("%1/%2","/menubar/menu-file", name), name, name); -+ #define ADD_OPEN_UI(name) ui->add_ui(ui_id, Glib::ustring::compose("%1/%2","/menubar/menu-file/menu-open", name), name, name); -+ #define ADD_SAVE_UI(name) ui->add_ui(ui_id, Glib::ustring::compose("%1/%2","/menubar/menu-file/menu-save", name), name, name); - - ADD_UI("new-document"); - ADD_OPEN_UI("open-document"); -Index: src/subtitleview.cc -=================================================================== ---- src/subtitleview.cc (révision 956) -+++ src/subtitleview.cc (copie de travail) -@@ -1363,7 +1363,7 @@ - { - int num; - std::istringstream ss(event->string); -- bool is_num = ss >> num != 0; -+ bool is_num = static_cast(ss >> num) != 0; - // Update only if it's different - if(is_num != get_enable_search()) - set_enable_search(is_num); -Index: src/utility.h -=================================================================== ---- src/utility.h (révision 956) -+++ src/utility.h (copie de travail) -@@ -91,7 +91,7 @@ - std::istringstream s(src); - // return s >> dest != 0; - -- bool state = s >> dest != 0; -+ bool state = static_cast(s >> dest) != 0; - - if(!state) - se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", src.c_str()); diff --git a/multimedia/subtitleeditor/subtitleeditor.SlackBuild b/multimedia/subtitleeditor/subtitleeditor.SlackBuild index 4d941c98c8..5d37b6538a 100644 --- a/multimedia/subtitleeditor/subtitleeditor.SlackBuild +++ b/multimedia/subtitleeditor/subtitleeditor.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=subtitleeditor -VERSION=${VERSION:-0.52.1} +VERSION=${VERSION:-0.53.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,11 +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 {} \; -# https://gna.org/bugs/?23714 -patch -p0 < $CWD/fix-23714-cxx11-v2.patch - -autoreconf -fi - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/multimedia/subtitleeditor/subtitleeditor.info b/multimedia/subtitleeditor/subtitleeditor.info index de7d773ddb..c5e783c514 100644 --- a/multimedia/subtitleeditor/subtitleeditor.info +++ b/multimedia/subtitleeditor/subtitleeditor.info @@ -1,8 +1,8 @@ PRGNAM="subtitleeditor" -VERSION="0.52.1" +VERSION="0.53.0" HOMEPAGE="http://home.gna.org/subtitleeditor/" -DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/multimedia/subtitleeditor/subtitleeditor-0.52.1.tar.gz" -MD5SUM="d25a3f6966f4d6355485d3dfbcfb437a" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/subtitleeditor-0.53.0.tar.gz" +MD5SUM="bcd3ce93a4759ed3f99a56dc7e4c4e00" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gstreamermm libxml++" diff --git a/multimedia/tvheadend/tvheadend.SlackBuild b/multimedia/tvheadend/tvheadend.SlackBuild index bb17617ff8..9c7ceeb2cd 100644 --- a/multimedia/tvheadend/tvheadend.SlackBuild +++ b/multimedia/tvheadend/tvheadend.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tvheadend -VERSION=${VERSION:-3.4patch1} +VERSION=${VERSION:-20170619_14bd7eb} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -69,7 +69,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/tvheadend/tvheadend.info b/multimedia/tvheadend/tvheadend.info index 8c59604822..d0a2446caa 100644 --- a/multimedia/tvheadend/tvheadend.info +++ b/multimedia/tvheadend/tvheadend.info @@ -1,8 +1,8 @@ PRGNAM="tvheadend" -VERSION="3.4patch1" +VERSION="20170619_14bd7eb" HOMEPAGE="https://tvheadend.org" -DOWNLOAD="https://github.com/tvheadend/tvheadend/archive/3.4patch1.tar.gz" -MD5SUM="86d1be0ad6e02bd2aecd3d529a026797" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/tvheadend-20170619_14bd7eb.tar.xz" +MD5SUM="29d6ad6e10ef3eb8a96f1e947bec3c1d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/tvtime/tvtime.SlackBuild b/multimedia/tvtime/tvtime.SlackBuild index ed2d612d24..c065c9ff79 100644 --- a/multimedia/tvtime/tvtime.SlackBuild +++ b/multimedia/tvtime/tvtime.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tvtime -VERSION=${VERSION:-1.0.7} +VERSION=${VERSION:-1.0.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,16 +40,15 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# The INSTALL file recommends avoiding the use of the "-march" flag, -# and -fPIC on x86_64 results in failure -if [ "$ARCH" = "i486" ]; then +# The INSTALL file recommends avoiding the use of the "-march" flag +if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -69,7 +68,7 @@ find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -87,13 +86,11 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # Let's not clobber the config file mv $PKG/etc/tvtime/tvtime.xml $PKG/etc/tvtime/tvtime.xml.new @@ -101,7 +98,7 @@ mv $PKG/etc/tvtime/tvtime.xml $PKG/etc/tvtime/tvtime.xml.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README docs/html \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/tvtime/tvtime.info b/multimedia/tvtime/tvtime.info index 366e36ce63..04126667b2 100644 --- a/multimedia/tvtime/tvtime.info +++ b/multimedia/tvtime/tvtime.info @@ -1,8 +1,8 @@ PRGNAM="tvtime" -VERSION="1.0.7" +VERSION="1.0.11" HOMEPAGE="http://tvtime.sourceforge.net/" -DOWNLOAD="http://linuxtv.org/downloads/tvtime/tvtime-1.0.7.tar.gz" -MD5SUM="d3cea3053ce8ff0d555da82fad138b44" +DOWNLOAD="http://linuxtv.org/downloads/tvtime/tvtime-1.0.11.tar.gz" +MD5SUM="f4adba831376a8baad92dbda49056138" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild index 8b6cd299f4..befc4adf78 100644 --- a/multimedia/vlc/vlc.SlackBuild +++ b/multimedia/vlc/vlc.SlackBuild @@ -28,7 +28,7 @@ # ----------------------------------------------------------------------------- PRGNAM=vlc -VERSION=${VERSION:-20170523_bec643e} +VERSION=${VERSION:-20170804_6f3e79d} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/multimedia/vlc/vlc.info b/multimedia/vlc/vlc.info index 9277196f99..27dae60f37 100644 --- a/multimedia/vlc/vlc.info +++ b/multimedia/vlc/vlc.info @@ -1,8 +1,8 @@ PRGNAM="vlc" -VERSION="20170523_bec643e" +VERSION="20170804_6f3e79d" HOMEPAGE="http://www.videolan.org/vlc/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/vlc-20170523_bec643e.tar.xz" -MD5SUM="05fd20851b524bba784640e550bc6812" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/vlc-20170804_6f3e79d.tar.xz" +MD5SUM="8b9be8d6f52165660d53e04b8fd868a9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libass libdc1394 libdvbpsi libmpeg2 libupnp lua portaudio twolame opus ffmpeg libwebp gsm opencv libtar libkate faac libdca libmatroska libshout speex avahi projectM jack-audio-connection-kit libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac gnome-vfs live555 qt5 rtmpdump libdvdcss fluidsynth schroedinger libminizip chromaprint x264 x265 libbluray" diff --git a/network/RSSOwl/RSSOwl.SlackBuild b/network/RSSOwl/RSSOwl.SlackBuild index e74ccf654a..999ebe5b99 100644 --- a/network/RSSOwl/RSSOwl.SlackBuild +++ b/network/RSSOwl/RSSOwl.SlackBuild @@ -73,7 +73,7 @@ ln -s /usr/lib${LIBDIRSUFFIX}/RSSOwl/RSSOwl $PKG/usr/bin/RSSOwl mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM cp -av * $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM -sed -i 's,libhunspell-1.2.so.0,libhunspell-1.3.so.0,g' $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/xulrunner/libxul.so +sed -i 's,libhunspell-1.2.so.0,libhunspell-1.6.so.0,g' $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/xulrunner/libxul.so mkdir -p $PKG/usr/share/pixmaps cp -av icon.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm diff --git a/network/aMule/0001-desktop-files-GenericName.patch b/network/aMule/0001-desktop-files-GenericName.patch new file mode 100644 index 0000000000..e33b437bbc --- /dev/null +++ b/network/aMule/0001-desktop-files-GenericName.patch @@ -0,0 +1,65 @@ +diff -Naur a/amule.desktop b/amule.desktop +--- a/amule.desktop 2015-12-05 12:17:44.000000000 +0800 ++++ b/amule.desktop 2016-01-28 17:59:27.159722045 +0800 +@@ -5,6 +5,6 @@ + Terminal=false + Type=Application + Categories=Network;P2P; +-Comment=A client for the eD2k network +-Comment[fr]=Un client pour le réseau eD2k +-Comment[tr]=eD2k ağı için istemci ++GenericName=A client for the eD2k network ++GenericName[fr]=Un client pour le réseau eD2k ++GenericName[tr]=eD2k ağı için istemci +diff -Naur a/amulegui.desktop b/amulegui.desktop +--- a/amulegui.desktop 2015-12-05 12:17:44.000000000 +0800 ++++ b/amulegui.desktop 2016-01-28 18:00:09.484782640 +0800 +@@ -5,8 +5,8 @@ + Terminal=false + Type=Application + Categories=Network;P2P; +-Comment=aMule remote control +-Comment[de]=aMule-Fernsteuerung +-Comment[fr]=Contrôle à distance d'aMule +-Comment[hu]=aMule távoli vezérlő +-Comment[tr]=aMule uzaktan kumandası ++GenericName=aMule remote control ++GenericName[de]=aMule-Fernsteuerung ++GenericName[fr]=Contrôle à distance d'aMule ++GenericName[hu]=aMule távoli vezérlő ++GenericName[tr]=aMule uzaktan kumandası +diff -Naur a/src/utils/aLinkCreator/alc.desktop b/src/utils/aLinkCreator/alc.desktop +--- a/src/utils/aLinkCreator/alc.desktop 2015-12-05 12:17:44.000000000 +0800 ++++ b/src/utils/aLinkCreator/alc.desktop 2016-01-28 17:56:59.532032109 +0800 +@@ -5,8 +5,8 @@ + Terminal=false + Type=Application + Categories=Network;P2P; +-Comment=aMule ed2k link creator +-Comment[de]=ed2k-Linkersteller +-Comment[fr]=Créateur de liens ed2k d'aMule +-Comment[hu]=ed2k hivatkozás készítő +-Comment[tr]=aMule için ed2k bağlantı yaratıcısı ++GenericName=aMule ed2k link creator ++GenericName[de]=ed2k-Linkersteller ++GenericName[fr]=Créateur de liens ed2k d'aMule ++GenericName[hu]=ed2k hivatkozás készítő ++GenericName[tr]=aMule için ed2k bağlantı yaratıcısı +diff -Naur a/src/utils/wxCas/wxcas.desktop b/src/utils/wxCas/wxcas.desktop +--- a/src/utils/wxCas/wxcas.desktop 2015-12-05 12:17:44.000000000 +0800 ++++ b/src/utils/wxCas/wxcas.desktop 2016-01-28 17:58:46.434702658 +0800 +@@ -5,8 +5,8 @@ + Terminal=false + Type=Application + Categories=Network;P2P; +-Comment=aMule online statistics +-Comment[de]=aMule-Onlinestatistik +-Comment[fr]=Statistiques d'aMule en ligne +-Comment[hu]=aMule online statisztikák +-Comment[tr]=Çevrim içi aMule istatistikleri ++GenericName=aMule online statistics ++GenericName[de]=aMule-Onlinestatistik ++GenericName[fr]=Statistiques d'aMule en ligne ++GenericName[hu]=aMule online statisztikák ++GenericName[tr]=Çevrim içi aMule istatistikleri + diff --git a/network/aMule/aMule.SlackBuild b/network/aMule/aMule.SlackBuild index 296b1e5b39..d10bf430ff 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:-2.3.1} +VERSION=${VERSION:-2.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -31,6 +31,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -122,8 +125,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix for gcc-4.7.x -sed -i "s|NotifyObservers|this->NotifyObservers|" src/ObservableQueue.h +patch -p1 < $CWD/0001-desktop-files-GenericName.patch + +sh autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/network/aMule/aMule.info b/network/aMule/aMule.info index ad125272ab..e75dcfd142 100644 --- a/network/aMule/aMule.info +++ b/network/aMule/aMule.info @@ -1,10 +1,10 @@ PRGNAM="aMule" -VERSION="2.3.1" +VERSION="2.3.2" HOMEPAGE="http://www.amule.org" -DOWNLOAD="http://downloads.sourceforge.net/amule/aMule-2.3.1.tar.xz" -MD5SUM="5f5707ad2073d37100409870aa5d3f93" +DOWNLOAD="http://downloads.sourceforge.net/amule/aMule-2.3.2.tar.xz" +MD5SUM="4e666c33f2c87874d389d6d45eb82b7a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="cryptopp wxPython" +REQUIRES="cryptopp wxGTK3" MAINTAINER="Ozan Türkyılmaz" EMAIL="ozan.turkyilmaz@gmail.com" diff --git a/network/bip/bip.SlackBuild b/network/bip/bip.SlackBuild index ff57192f99..2fdb153c85 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/bwm-ng/bwm-ng.SlackBuild b/network/bwm-ng/bwm-ng.SlackBuild index 51a9ee8aba..69f668f7ee 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" \ ./configure \ --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/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/dobbscoin/dobbscoin.info b/network/dobbscoin/dobbscoin.info index 8b0a4770fb..bd12b3870f 100644 --- a/network/dobbscoin/dobbscoin.info +++ b/network/dobbscoin/dobbscoin.info @@ -2,7 +2,7 @@ PRGNAM="dobbscoin" VERSION="0.10.1" HOMEPAGE="http://dobbscoin.info/" DOWNLOAD="https://github.com/dobbscoin/dobbscoin-source/archive/v0.10.1/dobbscoin-source-0.10.1.tar.gz" -MD5SUM="9330b729ebdd458c1ee2825294dffdd2" +MD5SUM="7742688342b80820b7cf70db50d812f6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="protobuf" diff --git a/network/dwb/dwb.info b/network/dwb/dwb.info index f2ca1c84e3..f50d92a9b6 100644 --- a/network/dwb/dwb.info +++ b/network/dwb/dwb.info @@ -5,6 +5,6 @@ DOWNLOAD="https://bitbucket.org/portix/dwb/get/4f6c404f2761.tar.bz2" MD5SUM="08df9c127009284bc201e2301e41f3e1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="webkitgtk" +REQUIRES="json-c webkitgtk" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" 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 23ba92b4da..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://ftp.de.debian.org/debian/pool/main/w/w3m-el-snapshot/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/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/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/guacamole-server/README b/network/guacamole-server/README index 61d82a5c18..0ce6014be2 100644 --- a/network/guacamole-server/README +++ b/network/guacamole-server/README @@ -1,10 +1,8 @@ -guacamole-server - Guacamole server - guacamole-server contains all the native, server-side components required by Guacamole to connect to remote desktops. It provides a common C library, libguac, which all other native components depend on, as well as separate libraries for each supported protocol, and guacd, the heart of Guacamole. -The dependency for the libraries of freerdp and libtelnet are optional, -as Slackware by default has libvncserver and libssh2 installed. +The dependency for the freerdp library is optional as Slackware +by default has libvncserver and libssh2 installed. diff --git a/network/guacamole-server/guacamole-server.SlackBuild b/network/guacamole-server/guacamole-server.SlackBuild index 29c6bd95a5..56268f11dd 100644 --- a/network/guacamole-server/guacamole-server.SlackBuild +++ b/network/guacamole-server/guacamole-server.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=guacamole-server -VERSION=${VERSION:-0.9.9} +VERSION=${VERSION:-20170526_9ee224f} 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 . \ @@ -73,7 +73,7 @@ find -L . \ patch -p1 < $CWD/uuid.patch autoreconf -fi -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=format-overflow=" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -92,15 +92,15 @@ 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 +mv $PKG/etc/rc.d/guacd $PKG/etc/rc.d/rc.guacd.new + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README LICENSE ChangeLog AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README LICENSE ChangeLog CONTRIBUTING DISCLAIMER $PKG/usr/doc/$PRGNAM-$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 -mv $PKG/etc/rc.d/guacd $PKG/etc/rc.d/rc.guacd.new - cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/guacamole-server/guacamole-server.info b/network/guacamole-server/guacamole-server.info index f89b6155c4..9bbd13ecf1 100644 --- a/network/guacamole-server/guacamole-server.info +++ b/network/guacamole-server/guacamole-server.info @@ -1,8 +1,8 @@ PRGNAM="guacamole-server" -VERSION="0.9.9" +VERSION="20170526_9ee224f" HOMEPAGE="http://guac-dev.org" -DOWNLOAD="http://sourceforge.net/projects/guacamole/files/current/source/guacamole-server-0.9.9.tar.gz" -MD5SUM="cce818bfcba35fe0456b45d988118893" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/guacamole-server-20170526_9ee224f.tar.xz" +MD5SUM="fbffd9c3eac1fccc17965e5214ba6805" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libwebp libtelnet" diff --git a/network/guacamole-server/uuid.patch b/network/guacamole-server/uuid.patch index e3c165ee31..5cf2cdc928 100644 --- a/network/guacamole-server/uuid.patch +++ b/network/guacamole-server/uuid.patch @@ -1,6 +1,7 @@ ---- guacamole-server-0.9.8/configure.ac 2015-09-04 17:36:05.000000000 -0700 -+++ guacamole-server-0.9.8.new/configure.ac 2015-11-27 16:36:00.229847035 -0800 -@@ -68,19 +68,25 @@ +diff -Naur guacamole-server-20170526_9ee224f.orig/configure.ac guacamole-server-20170526_9ee224f/configure.ac +--- guacamole-server-20170526_9ee224f.orig/configure.ac 2017-05-27 03:11:06.000000000 +0200 ++++ guacamole-server-20170526_9ee224f/configure.ac 2017-06-03 20:57:20.384944765 +0200 +@@ -65,19 +65,25 @@ # OSSP UUID AC_CHECK_LIB([ossp-uuid], [uuid_make], [UUID_LIBS=-lossp-uuid], @@ -30,9 +31,10 @@ # cunit AC_CHECK_LIB([cunit], [CU_run_test], [CUNIT_LIBS=-lcunit]) ---- guacamole-server-0.9.8/src/libguac/client.c 2015-09-04 17:36:05.000000000 -0700 -+++ guacamole-server-0.9.8.new/src/libguac/client.c 2015-11-27 16:36:00.230847035 -0800 -@@ -39,7 +39,7 @@ +diff -Naur guacamole-server-20170526_9ee224f.orig/src/libguac/id.c guacamole-server-20170526_9ee224f/src/libguac/id.c +--- guacamole-server-20170526_9ee224f.orig/src/libguac/id.c 2017-05-27 03:11:06.000000000 +0200 ++++ guacamole-server-20170526_9ee224f/src/libguac/id.c 2017-06-03 21:00:54.701957689 +0200 +@@ -25,7 +25,7 @@ #ifdef HAVE_OSSP_UUID_H #include #else @@ -40,8 +42,8 @@ +#include #endif - #include -@@ -170,8 +170,8 @@ + #include +@@ -34,8 +34,8 @@ char* buffer; char* identifier; @@ -51,7 +53,7 @@ uuid_t* uuid; /* Attempt to create UUID object */ -@@ -211,6 +211,21 @@ +@@ -75,6 +75,21 @@ } uuid_destroy(uuid); @@ -71,5 +73,5 @@ + uuid_unparse (uuid, identifier); +#endif - buffer[0] = '$'; + buffer[0] = prefix; buffer[UUID_LEN_STR + 1] = '\0'; diff --git a/network/hylafax+/hylafax+.SlackBuild b/network/hylafax+/hylafax+.SlackBuild index e9be8c8f50..caa9ff0c4c 100644 --- a/network/hylafax+/hylafax+.SlackBuild +++ b/network/hylafax+/hylafax+.SlackBuild @@ -24,8 +24,8 @@ PRGNAM=hylafax+ SRCNAM=hylafax -VERSION=${VERSION:-5.5.8} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.5.9} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/network/hylafax+/hylafax+.info b/network/hylafax+/hylafax+.info index 5a13309537..2a0cdaeef8 100644 --- a/network/hylafax+/hylafax+.info +++ b/network/hylafax+/hylafax+.info @@ -1,8 +1,8 @@ PRGNAM="hylafax+" -VERSION="5.5.8" +VERSION="5.5.9" HOMEPAGE="http://hylafax.sourceforge.net" -DOWNLOAD="http://prdownloads.sourceforge.net/hylafax/hylafax-5.5.8.tar.gz" -MD5SUM="4ac12204e37424ef1e07b8760101663d" +DOWNLOAD="http://downloads.sourceforge.net/hylafax/hylafax-5.5.9.tar.gz" +MD5SUM="ab87edc9a0c4c3c8138c6d411daa9981" 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/ip2location-c/ip2location-c.SlackBuild b/network/ip2location-c/ip2location-c.SlackBuild index b163f08e8f..564c2285fe 100644 --- a/network/ip2location-c/ip2location-c.SlackBuild +++ b/network/ip2location-c/ip2location-c.SlackBuild @@ -24,7 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ip2location-c # Previously known as C-IP2Location -VERSION=${VERSION:-7.0.0} +SRCNAM=IP2Location-C-Library +VERSION=${VERSION:-8.0.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,12 +63,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -# Upstream has replaced the original ip2location-c-7.0.0.tar.gz. -# The new one has an extra directory level ip2location-c-7.0.0 level :( -# (remove --strip-components=1 if/when upstream fixes it) -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz --strip-components=1 -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$PRGNAM-$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/network/ip2location-c/ip2location-c.info b/network/ip2location-c/ip2location-c.info index 88c99378ad..e1b00d0ba5 100644 --- a/network/ip2location-c/ip2location-c.info +++ b/network/ip2location-c/ip2location-c.info @@ -1,8 +1,8 @@ PRGNAM="ip2location-c" -VERSION="7.0.0" +VERSION="8.0.5" HOMEPAGE="http://www.ip2location.com/developers/c-7" -DOWNLOAD="http://www.ip2location.com/downloads/ip2location-c-7.0.0.tar.gz" -MD5SUM="b9aad9bd89159d633c57b6692c7f7c52" +DOWNLOAD="https://github.com/chrislim2888/IP2Location-C-Library/archive/8.0.5/ip2location-c-8.0.5.tar.gz" +MD5SUM="e907bcf0e6c7dfb9e512a4324cfa98f3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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/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/kvirc/kvirc.SlackBuild b/network/kvirc/kvirc.SlackBuild index 2315523a57..6f5cb0b30c 100644 --- a/network/kvirc/kvirc.SlackBuild +++ b/network/kvirc/kvirc.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=kvirc -VERSION=${VERSION:-r6366} +VERSION=${VERSION:-20170601_2c89201} 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.?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 {} \; - -# -DMANUAL_REVISION=6366 \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -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 release cd release @@ -79,14 +77,13 @@ cd release -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMANDIR=man \ - -DMANUAL_REVISION=6366 \ -DWANT_DCC_VIDEO="ON" \ .. 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 find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/network/kvirc/kvirc.info b/network/kvirc/kvirc.info index 1a9d335dc0..4b7dbb6f86 100644 --- a/network/kvirc/kvirc.info +++ b/network/kvirc/kvirc.info @@ -1,10 +1,10 @@ PRGNAM="kvirc" -VERSION="r6366" +VERSION="20170601_2c89201" HOMEPAGE="http://kvirc.net" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/kvirc-r6366.tar.xz" -MD5SUM="3ece4daec045a9a3176f4289aa936b95" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/kvirc-20170601_2c89201.tar.xz" +MD5SUM="a1b7a29a840222e9b89238c6665a6fcc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="qt5" MAINTAINER="Elvio Basello (HelLViS69)" EMAIL="hellvis69@slackware.it" diff --git a/network/leechcraft/README b/network/leechcraft/README deleted file mode 100644 index 22782597c3..0000000000 --- a/network/leechcraft/README +++ /dev/null @@ -1,26 +0,0 @@ -LeechCraft is a full-featured modular "Internet client" application, -currently including plugins for a web browser, news feed reader, -BitTorrent client, FTP client, and many more. Plugins are easily added -and integrated with each other with no effort. - -Currently it includes following plugins: -* Aggregator, news feed reader * BitTorrent, the BitTorrent client -* Chatter, the IRC client * CSTP, simple HTTP implementation -* DBusManager, D-Bus for the LeechCraft * DeadLyrics, LyricWiki.org API -* HistoryHolder, downloads history * LCFTP, FTP implementation client -* LMP, simple media player with streaming support -* NetworkMonitor, which monitors for HTTP requests -* Poshuku, the web browser * Poshuku CleanWeb, AdBlock+-compatible ad blocker -* Poshuku FileScheme, support for the file:// browsing -* Poshuku FUA, which allows to set fake user agents per domain -* SeekThru, client for OpenSearch-aware web sites - -The following variables default to ON, but you can disable building any of -them by passing NAME_OF_VARIABLE=OFF to the build script: - ENABLE_SUMMARY ENABLE_TORRENT ENABLE_AGGREGATOR ENABLE_POSHUKU ENABLE_HTTP - ENABLE_FTP ENABLE_LMP ENABLE_DBUSMANAGER ENABLE_DEADLYRICS ENABLE_SEEKTHRU - ENABLE_NETWORKMONITOR ENABLE_HISTORYHOLDER ENABLE_CHATTER ENABLE_YASD - ENABLE_DCMINATOR ENABLE_NEWLIFE ENABLE_ANHERO ENABLE_VGRABBER -As an example, you can do this: ENABLE_LMP=OFF ./leechcraft.SlackBuild - -An optional dependency is libtorrent-rasterbar. diff --git a/network/leechcraft/doinst.sh b/network/leechcraft/doinst.sh deleted file mode 100644 index f3f8604d5a..0000000000 --- a/network/leechcraft/doinst.sh +++ /dev/null @@ -1,22 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/icons/Pevzi/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/Pevzi >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/icons/oxygen/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/oxygen >/dev/null 2>&1 - fi -fi - diff --git a/network/leechcraft/leechcraft.SlackBuild b/network/leechcraft/leechcraft.SlackBuild deleted file mode 100644 index 80b2acc607..0000000000 --- a/network/leechcraft/leechcraft.SlackBuild +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh - -# Slackware build script for LeechCraft - -# Copyright 2009 rexim -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=leechcraft -VERSION=${VERSION:-0.3.65} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" - EXTRA_CMAKE_FLAGS="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" - EXTRA_CMAKE_FLAGS="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - EXTRA_CMAKE_FLAGS="-DRESPECTLIB64=True" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build -cmake \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_SUFFIX="$LIBDIRSUFFIX" \ - -DENABLE_SUMMARY="${ENABLE_SUMMARY:-ON}" \ - -DENABLE_TORRENT="${ENABLE_TORRENT:-ON}" \ - -DENABLE_AGGREGATOR="${ENABLE_AGGREGATOR:-ON}" \ - -DENABLE_POSHUKU="${ENABLE_POSHUKU:-ON}" \ - -DENABLE_HTTP="${ENABLE_HTTP:-ON}" \ - -DENABLE_FTP="${ENABLE_FTP:-ON}" \ - -DENABLE_LMP="${ENABLE_LMP:-ON}" \ - -DENABLE_DBUSMANAGER="${ENABLE_DBUSMANAGER:-ON}" \ - -DENABLE_DEADLYRICS="${ENABLE_DEADLYRICS:-ON}" \ - -DENABLE_SEEKTHRU="${ENABLE_SEEKTHRU:-ON}" \ - -DENABLE_NETWORKMONITOR="${ENABLE_NETWORKMONITOR:-ON}" \ - -DENABLE_HISTORYHOLDER="${ENABLE_HISTORYHOLDER:-ON}" \ - -DENABLE_CHATTER="${ENABLE_CHATTER:-ON}" \ - -DENABLE_YASD="${ENABLE_YASD:-ON}" \ - -DENABLE_DCMINATOR="${ENABLE_DCMINATOR:-ON}" \ - -DENABLE_NEWLIFE="${ENABLE_NEWLIFE:-ON}" \ - -DENABLE_ANHERO="${ENABLE_ANHERO:-ON}" \ - -DENABLE_VGRABBER="${ENABLE_VGRABBER:-ON}" \ - $EXTRA_CMAKE_FLAGS \ - ../src/ - -make -make install DESTDIR=$PKG - -# Move the manual pages to the correct place -mv $PKG/usr/share/man $PKG/usr - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/leechcraft/leechcraft.info b/network/leechcraft/leechcraft.info deleted file mode 100644 index 946c9060bd..0000000000 --- a/network/leechcraft/leechcraft.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="leechcraft" -VERSION="0.3.65" -HOMEPAGE="https://leechcraft.org/" -DOWNLOAD="https://downloads.sourceforge.net/leechcraft/leechcraft-0.3.65.tar.bz2" -MD5SUM="f410eae27731aa80b8921701477b15e7" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="rexim" -EMAIL="reximkut@gmail.com" diff --git a/network/leechcraft/slack-desc b/network/leechcraft/slack-desc deleted file mode 100644 index eddd124950..0000000000 --- a/network/leechcraft/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -leechcraft: leechcraft (modular internet client application) -leechcraft: -leechcraft: LeechCraft is a full-featured modular "Internet client" application, -leechcraft: currently including plugins for a web browser, news feed reader, -leechcraft: BitTorrent client, FTP client and many more. Plugins are easily added -leechcraft: and integrated with each other with no effort. -leechcraft: -leechcraft: Homepage: http://leechcraft.org/ -leechcraft: -leechcraft: -leechcraft: diff --git a/network/linuxdcpp/linuxdcpp.SlackBuild b/network/linuxdcpp/linuxdcpp.SlackBuild index e83b5a345b..bf57367f58 100644 --- a/network/linuxdcpp/linuxdcpp.SlackBuild +++ b/network/linuxdcpp/linuxdcpp.SlackBuild @@ -65,7 +65,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -fpermissive" \ +CXXFLAGS="$SLKCFLAGS -fpermissive -std=gnu++98" \ scons \ PREFIX=/usr \ FAKE_ROOT=$PKG \ diff --git a/network/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/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/ncrack/ncrack.SlackBuild b/network/ncrack/ncrack.SlackBuild index 9271e21f02..825642fade 100644 --- a/network/ncrack/ncrack.SlackBuild +++ b/network/ncrack/ncrack.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/network/newsbeuter/newsbeuter.SlackBuild b/network/newsbeuter/newsbeuter.SlackBuild index aa3ddf2607..d1888c004f 100644 --- a/network/newsbeuter/newsbeuter.SlackBuild +++ b/network/newsbeuter/newsbeuter.SlackBuild @@ -50,6 +50,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ -o -perm 400 \) -exec chmod 644 {} \; +sed -i "s|ncursesw5-config|ncursesw6-config|" config.sh + CXXFLAGS="$SLKCFLAGS" \ make \ prefix=/usr \ diff --git a/network/pdns-recursor/README b/network/pdns-recursor/README index 3a1cfac545..7ccb18857d 100644 --- a/network/pdns-recursor/README +++ b/network/pdns-recursor/README @@ -10,3 +10,5 @@ From the pdns-recursor README: 100 million internet connections. Docs are available at http://doc.powerdns.com/built-in-recursor.html + +Optional dependencies are protobuf, lua and ragel. diff --git a/network/pdns-recursor/pdns-recursor.SlackBuild b/network/pdns-recursor/pdns-recursor.SlackBuild index 65c6997d5f..8f62763a40 100644 --- a/network/pdns-recursor/pdns-recursor.SlackBuild +++ b/network/pdns-recursor/pdns-recursor.SlackBuild @@ -21,14 +21,16 @@ # 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=pdns-recursor -VERSION=${VERSION:-3.2} +VERSION=${VERSION:-4.0.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 @@ -39,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" @@ -63,29 +65,35 @@ 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 {} \; -OPTFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc/powerdns \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux make make install DESTDIR=$PKG -mv $PKG/usr/share/man $PKG/usr/man + mv $PKG/etc/powerdns/recursor.conf-dist $PKG/etc/powerdns/recursor.conf.new -mv $PKG/etc/init.d $PKG/etc/rc.d -mv $PKG/etc/rc.d/pdns-recursor $PKG/etc/rc.d/rc.pdns-recursor.new +install -m 0644 -D $CWD/rc.pdns-recursor $PKG/etc/rc.d/rc.pdns-recursor.new -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 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING NOTICE 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/pdns-recursor/pdns-recursor.info b/network/pdns-recursor/pdns-recursor.info index 524af92790..c3aecdb3ac 100644 --- a/network/pdns-recursor/pdns-recursor.info +++ b/network/pdns-recursor/pdns-recursor.info @@ -1,8 +1,8 @@ PRGNAM="pdns-recursor" -VERSION="3.2" -HOMEPAGE="http://www.powerdns.com/content/home-powerdns.aspx" -DOWNLOAD="http://downloads.powerdns.com/releases/pdns-recursor-3.2.tar.bz2" -MD5SUM="7e14d9487664d58c27448ae26e824215" +VERSION="4.0.4" +HOMEPAGE="https://www.powerdns.com" +DOWNLOAD="https://downloads.powerdns.com/releases/pdns-recursor-4.0.4.tar.bz2" +MD5SUM="7bc78f05154c4c822ab09117f96d819c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/pdns-recursor/rc.pdns-recursor b/network/pdns-recursor/rc.pdns-recursor new file mode 100644 index 0000000000..791ed5026a --- /dev/null +++ b/network/pdns-recursor/rc.pdns-recursor @@ -0,0 +1,103 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: pdns-recursor +# Required-Start: $network $remote_fs $syslog +# Required-Stop: $network $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: PowerDNS Recursor +### END INIT INFO +# chkconfig: - 80 75 +# description: pdns_recursor is a versatile high performance recursing nameserver + +BINARYPATH=/usr/bin +SBINARYPATH=/usr/sbin +SOCKETPATH=/var/run + +pdns_server=$SBINARYPATH/pdns_recursor + +[ -f "$pdns_server" ] || exit 0 + +doPC() +{ + ret=`$BINARYPATH/rec_control $EXTRAOPTS $1 $2 2> /dev/null` +} + + +doPC ping +NOTRUNNING=$? + +case "$1" in + status) + if test "$NOTRUNNING" = "0" + then + echo "running" + exit 0 + else + echo "not running" + # Note: 3 is a white lie. We currently don't *really* + # know that it's not running, or if the ping failed for + # other reasons (= 4). + exit 3 + fi + ;; + + stop) + echo -n "Stopping PowerDNS recursing nameserver: " + if test "$NOTRUNNING" = "0" + then + doPC quit + echo $ret + else + echo "not running" + exit 1 + fi + ;; + + + force-stop) + echo -n "Stopping PowerDNS recursing nameserver: " + killall -v -9 $pdns_server + echo "killed" + ;; + + start) + echo -n "Starting PowerDNS recursing nameserver: " + if test "$NOTRUNNING" = "0" + then + echo "already running" + exit 1 + else + $pdns_server --daemon + if test "$?" = "0" + then + echo "started" + fi + fi + ;; + + force-reload | restart) + echo -n "Restarting PowerDNS recursing nameserver: " + echo -n stopping and waiting.. + doPC quit + sleep 3 + echo done + $0 start + ;; + + monitor) + if test "$NOTRUNNING" = "0" + then + echo "already running" + else + $pdns_server --daemon=no --quiet=no --control-console --loglevel=9 + fi + ;; + + *) + echo pdns [start\|stop\|force-reload\|restart\|status\|monitor] + + ;; +esac + + diff --git a/network/phodav/phodav.SlackBuild b/network/phodav/phodav.SlackBuild index 4e5e51d440..864651a7c1 100644 --- a/network/phodav/phodav.SlackBuild +++ b/network/phodav/phodav.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=phodav -VERSION=${VERSION:-2.1} +VERSION=${VERSION:-2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/phodav/phodav.info b/network/phodav/phodav.info index 247c335ed9..7b7b8d7050 100644 --- a/network/phodav/phodav.info +++ b/network/phodav/phodav.info @@ -1,8 +1,8 @@ PRGNAM="phodav" -VERSION="2.1" +VERSION="2.2" HOMEPAGE="https://wiki.gnome.org/phodav" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/phodav/2.1/phodav-2.1.tar.xz" -MD5SUM="762712ece4cf514e18bf1233be2071e7" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/phodav/2.2/phodav-2.2.tar.xz" +MD5SUM="18dc8890ef3606f2a053054658dbf016" 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/qbittorrent/qbittorrent.SlackBuild b/network/qbittorrent/qbittorrent.SlackBuild index 51f29d627b..13d5e80f7b 100644 --- a/network/qbittorrent/qbittorrent.SlackBuild +++ b/network/qbittorrent/qbittorrent.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qbittorrent -VERSION=${VERSION:-3.2.5} +VERSION=${VERSION:-3.3.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,7 +72,8 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix=/usr + --prefix=/usr \ + --with-qt4 make make install INSTALL_ROOT=$PKG @@ -82,6 +83,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --with-qt4 \ --disable-gui make diff --git a/network/qbittorrent/qbittorrent.info b/network/qbittorrent/qbittorrent.info index bfc2759580..fc105d982f 100644 --- a/network/qbittorrent/qbittorrent.info +++ b/network/qbittorrent/qbittorrent.info @@ -1,8 +1,8 @@ PRGNAM="qbittorrent" -VERSION="3.2.5" +VERSION="3.3.10" HOMEPAGE="http://qbittorrent.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/project/qbittorrent/qbittorrent/qbittorrent-3.2.5/qbittorrent-3.2.5.tar.xz" -MD5SUM="e5c62e31bb577ecd8478fd5d04915b03" +DOWNLOAD="http://downloads.sourceforge.net/qbittorrent/qbittorrent-3.3.10.tar.xz" +MD5SUM="47497bf0fb27ad54efde2bcd5c549e5b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libtorrent-rasterbar" diff --git a/network/qupzilla/qupzilla.SlackBuild b/network/qupzilla/qupzilla.SlackBuild index cc51abdc0c..86c390cfe2 100644 --- a/network/qupzilla/qupzilla.SlackBuild +++ b/network/qupzilla/qupzilla.SlackBuild @@ -24,13 +24,13 @@ PRGNAM=qupzilla SRCNAM=QupZilla -VERSION=${VERSION:-2.0.1} +VERSION=${VERSION:-2.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -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" @@ -79,7 +79,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 BUILDING.md CHANGELOG COPYRIGHT FAQ GPLv3 README.md \ +cp -a AUTHORS BUILDING.md CHANGELOG COPYRIGHT FAQ LICENSE README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/qupzilla/qupzilla.info b/network/qupzilla/qupzilla.info index a0f3159221..fb8d731838 100644 --- a/network/qupzilla/qupzilla.info +++ b/network/qupzilla/qupzilla.info @@ -1,8 +1,8 @@ PRGNAM="qupzilla" -VERSION="2.0.1" +VERSION="2.1.2" HOMEPAGE="http://www.qupzilla.com" -DOWNLOAD="https://github.com/QupZilla/qupzilla/releases/download/v2.0.1/QupZilla-2.0.1.tar.xz" -MD5SUM="953c057afd9c4e9fec898a5af879249b" +DOWNLOAD="https://github.com/QupZilla/qupzilla/releases/download/v2.1.2/QupZilla-2.1.2.tar.xz" +MD5SUM="84e4b9dda1e0bb5ad96f3b87f9fc1328" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5" diff --git a/network/razor-agents/razor-agents.SlackBuild b/network/razor-agents/razor-agents.SlackBuild index 814bf7acf7..bc9ef7a41a 100644 --- a/network/razor-agents/razor-agents.SlackBuild +++ b/network/razor-agents/razor-agents.SlackBuild @@ -71,7 +71,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/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 300d34090d..0000000000 --- a/network/sshfs-fuse/README +++ /dev/null @@ -1,10 +0,0 @@ -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 1e43941878..0000000000 --- a/network/sshfs-fuse/sshfs-fuse.SlackBuild +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh - -# Copyright 2012, Michiel van Wessem, Leicester, United Kingdom -# Copyright 2006-2009 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. - -PRGNAM=sshfs-fuse -SRCNAM=sshfs -VERSION=${VERSION:-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 $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" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --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 $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-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 ec97eeb668..0000000000 --- a/network/sshfs-fuse/sshfs-fuse.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sshfs-fuse" -VERSION="2.8" -HOMEPAGE="https://github.com/libfuse/sshfs" -DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs_2.8/sshfs-2.8.tar.gz" -MD5SUM="0ba25e848ee59e2595d6576c8f6284b6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Michiel van Wessem" -EMAIL="michiel@slackbuilds.org" diff --git a/network/transmission-remote-gtk/README b/network/transmission-remote-gtk/README index 41c17ca20c..82d2a5b511 100644 --- a/network/transmission-remote-gtk/README +++ b/network/transmission-remote-gtk/README @@ -8,4 +8,6 @@ management of the Transmission BitTorrent client using its RPC interface. priorities, add/edit/remove trackers. * Change remote settings like global limits, download directory, and connectivity preferences. - * Russian, Polish, Korean, and German, Spanish, Ukranian translations. + * Russian, Polish, Korean, and German, Spanish, Ukranian translations. + +GeoIP is an optional dependency. diff --git a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild index 677e991256..74e31f7d63 100644 --- a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild +++ b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild @@ -32,13 +32,13 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=transmission-remote-gtk -VERSION=${VERSION:-1.2} +VERSION=${VERSION:-1.3.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 @@ -49,8 +49,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,14 +69,14 @@ 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 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/network/transmission-remote-gtk/transmission-remote-gtk.info b/network/transmission-remote-gtk/transmission-remote-gtk.info index 80f1eaffc3..a34496a278 100644 --- a/network/transmission-remote-gtk/transmission-remote-gtk.info +++ b/network/transmission-remote-gtk/transmission-remote-gtk.info @@ -1,8 +1,8 @@ PRGNAM="transmission-remote-gtk" -VERSION="1.2" +VERSION="1.3.1" HOMEPAGE="https://github.com/transmission-remote-gtk/transmission-remote-gtk/" -DOWNLOAD="https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.2/transmission-remote-gtk-1.2.tar.gz" -MD5SUM="dfb485390b49c1f0af5063b44a4fef03" +DOWNLOAD="https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.3.1/transmission-remote-gtk-1.3.1.tar.xz" +MD5SUM="7a66a947360ed9ae0ce0b4e327dc00ed" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="transmission json-glib" diff --git a/network/vacuum-im/clientinfo.patch b/network/vacuum-im/clientinfo.patch deleted file mode 100644 index 619f00d7db..0000000000 --- a/network/vacuum-im/clientinfo.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: src/plugins/clientinfo/clientinfo.cpp -=================================================================== ---- src/plugins/clientinfo/clientinfo.cpp (revision 1887) -+++ src/plugins/clientinfo/clientinfo.cpp (working copy) -@@ -2,6 +2,8 @@ - - #include - #include -+#include -+#include - #include - #include - -@@ -434,8 +436,23 @@ - } - } - -+// Slackware detect - if (osver.isEmpty()) - { -+ QFile slackwarever("/etc/slackware-version"); -+ if (!slackwarever.open(QIODevice::ReadOnly | QIODevice::Text)); -+ QTextStream slackin(&slackwarever); -+ while (!slackin.atEnd()) -+ { -+ QString slackline = slackin.readLine(); -+ QString slackprocess_line(slackline); -+ osver.append(slackprocess_line); -+ } -+ slackwarever.close(); -+ } -+ -+ if (osver.isEmpty()) -+ { - utsname buf; - if (uname(&buf) != -1) - { diff --git a/network/vacuum-im/vacuum-im.SlackBuild b/network/vacuum-im/vacuum-im.SlackBuild index f1aa966a37..5d9069eae5 100644 --- a/network/vacuum-im/vacuum-im.SlackBuild +++ b/network/vacuum-im/vacuum-im.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=vacuum-im SRCNAM=vacuum -VERSION=${VERSION:-1.2.5} +VERSION=${VERSION:-20170528_781a566} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,10 +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 {} \; -# Add capabilities to read file /etc/slackware-version -# for determine slackware version -patch -p0 < $CWD/clientinfo.patch - mkdir -p build cd build cmake \ diff --git a/network/vacuum-im/vacuum-im.info b/network/vacuum-im/vacuum-im.info index 3a003de8e3..418cf1ff1d 100644 --- a/network/vacuum-im/vacuum-im.info +++ b/network/vacuum-im/vacuum-im.info @@ -1,8 +1,8 @@ PRGNAM="vacuum-im" -VERSION="1.2.5" +VERSION="20170528_781a566" HOMEPAGE="http://www.vacuum-im.org" -DOWNLOAD="https://github.com/Vacuum-IM/vacuum-im/archive/1.2.5/vacuum-im-1.2.5.tar.gz" -MD5SUM="2004a882c95207b3244aadf77e822b9a" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/vacuum-im-20170528_781a566.tar.xz" +MD5SUM="192b53f3dc519d307166282dfaa7a57b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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/zmap/zmap.info b/network/zmap/zmap.info index f0e1a5bfe1..e93c315827 100644 --- a/network/zmap/zmap.info +++ b/network/zmap/zmap.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/zmap/zmap/archive/v2.1.1/zmap-2.1.1.tar.gz" MD5SUM="a37555ac2beda1dc6f3754b411be545e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="byacc gengetopt" +REQUIRES="byacc gengetopt json-c" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" 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/coolreader/coolreader.SlackBuild b/office/coolreader/coolreader.SlackBuild index d4cd5b4820..dd38f2cb84 100644 --- a/office/coolreader/coolreader.SlackBuild +++ b/office/coolreader/coolreader.SlackBuild @@ -22,19 +22,16 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Upsteam url: https://sourceforge.net/p/crengine/crengine/ci/master/tree/ + PRGNAM=coolreader -VERSION=${VERSION:-3.0.56} +VERSION=${VERSION:-20160825_d8a3a1b} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -ORIG_PRGNAM=cr3 -ORIG_VERSION=$VERSION-7 -ORIG_DIRNAME=cr$ORIG_VERSION -ORIG_FILENAME=${ORIG_PRGNAM}_$VERSION.orig.tar.gz - if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -45,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" @@ -59,28 +56,34 @@ else LIBDIRSUFFIX="" fi +ORIG_PRGNAM=cr3 + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $ORIG_DIRNAME -tar xvf $CWD/$ORIG_FILENAME -cd $ORIG_DIRNAME +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +cd $PRGNAM-$VERSION chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; mkdir -p build cd build cmake \ - -D CMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -D CMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D LIB_SUFFIX=${LIBDIRSUFFIX} \ - -D CMAKE_BUILD_TYPE=Release \ - -D MAX_IMAGE_SCALE_MUL=2 \ - -D DOC_DATA_COMPRESSION_LEVEL=3 \ - -D DOC_BUFFER_SIZE=0x1400000 \ - -D GUI=QT .. + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DMAX_IMAGE_SCALE_MUL=2 \ + -DDOC_DATA_COMPRESSION_LEVEL=3 \ + -DDOC_BUFFER_SIZE=0x1400000 \ + -DGUI=QT .. make VERBOSE=1 make install DESTDIR=$PKG cd .. diff --git a/office/coolreader/coolreader.info b/office/coolreader/coolreader.info index 108d2cced0..8e673e0614 100644 --- a/office/coolreader/coolreader.info +++ b/office/coolreader/coolreader.info @@ -1,8 +1,8 @@ PRGNAM="coolreader" -VERSION="3.0.56" -HOMEPAGE="http://coolreader.org" -DOWNLOAD="http://downloads.sourceforge.net/crengine/CoolReader3/cr3_3.0.56.orig.tar.gz" -MD5SUM="cc221a608a1b5fea2db5a519c14eeb39" +VERSION="20160825_d8a3a1b" +HOMEPAGE="https://crengine.sourceforge.io" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/coolreader-20160825_d8a3a1b.tar.xz" +MD5SUM="0c65e080d2cba8213dd19fb26f4ad9b3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/fbreader/fbreader.SlackBuild b/office/fbreader/fbreader.SlackBuild index d5c54adeac..d19b2904a3 100644 --- a/office/fbreader/fbreader.SlackBuild +++ b/office/fbreader/fbreader.SlackBuild @@ -56,6 +56,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Needed for gcc >= 6.x +sed -i "s|-Wall|-Wall -Wno-narrowing|" makefiles/arch/desktop.mk + patch -p1 < $CWD/fbreader-0.99.4.patch export TARGET_ARCH=desktop diff --git a/office/gbgoffice/gbgoffice.SlackBuild b/office/gbgoffice/gbgoffice.SlackBuild index 08a3eac59b..268a1f6f00 100644 --- a/office/gbgoffice/gbgoffice.SlackBuild +++ b/office/gbgoffice/gbgoffice.SlackBuild @@ -78,6 +78,7 @@ patch -p1 -i $CWD/patches/08_fix_const_conversion.patch patch -p1 -i $CWD/patches/09_deprecated_SigC.patch patch -p1 -i $CWD/patches/10_workhelper-buttonbox.patch patch -p1 -i $CWD/patches/11_explicit-linkage.patch +patch -p1 -i $CWD/patches/12_gcc6.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -std=c++11" \ diff --git a/office/gbgoffice/patches/12_gcc6.patch b/office/gbgoffice/patches/12_gcc6.patch new file mode 100644 index 0000000000..2ec2c344f4 --- /dev/null +++ b/office/gbgoffice/patches/12_gcc6.patch @@ -0,0 +1,21 @@ +Description: fixes compilation with GCC-6 + return type must be Translator* and can't be boolean +Author: Damyan Ivanov +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/htmldoc/build_fix.patch b/office/htmldoc/build_fix.patch new file mode 100644 index 0000000000..280ee4e554 --- /dev/null +++ b/office/htmldoc/build_fix.patch @@ -0,0 +1,13 @@ +diff --git a/htmldoc/htmlsep.cxx b/htmldoc/htmlsep.cxx +index f2d57bff..d9b2ca30 100644 +--- a/htmldoc/htmlsep.cxx ++++ b/htmldoc/htmlsep.cxx +@@ -517,7 +517,7 @@ write_doc(FILE **out, // I - Output file + if (t->markup >= MARKUP_H1 && t->markup < (MARKUP_H1 + TocLevels) && + htmlGetVariable(t, (uchar *)"_HD_OMIT_TOC") == NULL) + { +- if (heading >= 0) ++ if (*heading >= 0) + write_footer(out, *heading); + + (*heading) ++; diff --git a/office/htmldoc/htmldoc.SlackBuild b/office/htmldoc/htmldoc.SlackBuild index f88d47c057..82de064e9f 100644 --- a/office/htmldoc/htmldoc.SlackBuild +++ b/office/htmldoc/htmldoc.SlackBuild @@ -31,7 +31,7 @@ # not being copied into the package PRGNAM=htmldoc -VERSION=${VERSION:-1.8.29} +VERSION=${VERSION:-1.8.30} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -48,7 +48,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCFILES="CHANGES.txt README.txt COMPILE.txt COPYING.txt htmldoc.readme" +DOCFILES="CHANGES.md README.md COPYING" if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -70,7 +70,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -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 {} \; +# Upstream compiler fix +patch -p1 < $CWD/build_fix.patch + # workaround to avoid /usr/share/doc/htmldoc's use for help function sed -r -i 's|^#define DOCUMENTATION "$prefix/share/doc/htmldoc"|\ #define DOCUMENTATION "$prefix/doc/htmldoc-$VERSION"|g' ./configure @@ -117,23 +120,16 @@ mkdir -p $PKG/usr/man/man1 cp -a doc/$PRGNAM.1 $PKG/usr/man/man1 mkdir -p $PKG/usr/share/applications cp -a desktop/$PRGNAM.desktop $PKG/usr/share/applications -mkdir -p $PKG/usr/share/mimelnk/application -cp -a desktop/vnd.htmldoc-book.desktop $PKG/usr/share/mimelnk/application mkdir -p $PKG/usr/share/mime/packages cp -a desktop/htmldoc.xml $PKG/usr/share/mime/packages -mkdir -p $PKG/usr/share/icons/hicolor/{16x16,24x24,32x32,48x48,64x64,96x96,128x128}/apps/ -cp -a desktop/htmldoc-16.png $PKG/usr/share/icons/hicolor/16x16/apps/$PRGNAM.png -cp -a desktop/htmldoc-24.png $PKG/usr/share/icons/hicolor/24x24/apps/$PRGNAM.png +mkdir -p $PKG/usr/share/icons/hicolor/{32x32,128x128}/apps/ $PKG/usr/share/pixmaps cp -a desktop/htmldoc-32.png $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png -cp -a desktop/htmldoc-48.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png -cp -a desktop/htmldoc-64.png $PKG/usr/share/icons/hicolor/64x64/apps/$PRGNAM.png -cp -a desktop/htmldoc-96.png $PKG/usr/share/icons/hicolor/96x96/apps/$PRGNAM.png cp -a desktop/htmldoc-128.png $PKG/usr/share/icons/hicolor/128x128/apps/$PRGNAM.png +cp -a desktop/htmldoc.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm mkdir -p $PKG/usr/share/htmldoc/ cp -a fonts $PKG/usr/share/htmldoc/ cp -a data $PKG/usr/share/htmldoc/ - find $PKG -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/htmldoc/htmldoc.info b/office/htmldoc/htmldoc.info index 9bb5a60b8b..9ab9df907b 100644 --- a/office/htmldoc/htmldoc.info +++ b/office/htmldoc/htmldoc.info @@ -1,8 +1,8 @@ PRGNAM="htmldoc" -VERSION="1.8.29" -HOMEPAGE="http://www.msweet.org/projects.php?Z1" -DOWNLOAD="http://www.msweet.org/files/project1/htmldoc-1.8.29-source.tar.bz2" -MD5SUM="dd2a05e2608d4f34db13c17a6667bb5e" +VERSION="1.8.30" +HOMEPAGE="http://michaelrsweet.github.io/htmldoc/" +DOWNLOAD="https://github.com/michaelrsweet/htmldoc/archive/v1.8.30/htmldoc-1.8.30.tar.gz" +MD5SUM="93e20731015a4752a7380c3d27a191bd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="fltk" diff --git a/office/htmldoc/slack-desc b/office/htmldoc/slack-desc index 0a60bdb593..a8d1134c3c 100644 --- a/office/htmldoc/slack-desc +++ b/office/htmldoc/slack-desc @@ -13,7 +13,7 @@ htmldoc: indexed HTML, Adobe(r) PostScript(r), or Adobe(r) Portable Document htmldoc: Format ("PDF") files. htmldoc: It is a product by Easy Software Products. htmldoc: -htmldoc: Homepage: http://www.msweet.org/projects.php?Z1 +htmldoc: Homepage: http://michaelrsweet.github.io/htmldoc/ htmldoc: htmldoc: htmldoc: 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 2b12832e30..0000000000 --- a/office/juffed/juffed.SlackBuild +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh - -# Slackware build script for juffed - -# Copyright 2011-2017 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:-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 - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "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}-1054.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 a9a8d3b42d..0000000000 --- a/office/juffed/juffed.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="juffed" -VERSION="0.10" -HOMEPAGE="http://juffed.com" -DOWNLOAD="http://downloads.sourceforge.net/juffed/juffed-0.10-1054.tar.bz2" -MD5SUM="33ca5c94fd4aedb9925e58f8f9ba9a7c" -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/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/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/python/six/README b/python/six/README deleted file mode 100644 index e968d08d27..0000000000 --- a/python/six/README +++ /dev/null @@ -1,10 +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: python3 and Sphinx - -Note: To install python3 bindings pass PYTHON3=yes to the slackbuild. - - # PYTHON3=yes ./six.SlackBuild diff --git a/python/six/six.SlackBuild b/python/six/six.SlackBuild deleted file mode 100644 index 69506ba6cc..0000000000 --- a/python/six/six.SlackBuild +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh - -# Slackware build script for six - -# Copyright 2012-2015 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.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} - -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:-no}" == "yes" ]; 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 - -# 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 $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 ac1dfc2093..0000000000 --- a/python/six/six.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="six" -VERSION="1.10.0" -HOMEPAGE="https://pypi.python.org/pypi/six/" -DOWNLOAD="https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz" -MD5SUM="34eed507548117b2ab523ab14b2f8b55" -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/system/brasero/brasero.SlackBuild b/system/brasero/brasero.SlackBuild index 0fe5a549ac..3f7d21fb06 100644 --- a/system/brasero/brasero.SlackBuild +++ b/system/brasero/brasero.SlackBuild @@ -75,7 +75,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=format-nonliteral -Wno-error=format-y2k" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/bulk_extractor/bulk_extractor.SlackBuild b/system/bulk_extractor/bulk_extractor.SlackBuild index 2a7e955d4f..627aed32d5 100644 --- a/system/bulk_extractor/bulk_extractor.SlackBuild +++ b/system/bulk_extractor/bulk_extractor.SlackBuild @@ -25,7 +25,7 @@ # edited for v 1.5.5 November 2014 - added LightGrep option. PRGNAM=bulk_extractor -VERSION=${VERSION:-1.5.5} +VERSION=${VERSION:-20170403_779dbe1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,9 +62,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION cd $TMP -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/system/bulk_extractor/bulk_extractor.info b/system/bulk_extractor/bulk_extractor.info index 09b76412bb..d4a31c3dd4 100644 --- a/system/bulk_extractor/bulk_extractor.info +++ b/system/bulk_extractor/bulk_extractor.info @@ -1,8 +1,8 @@ PRGNAM="bulk_extractor" -VERSION="1.5.5" +VERSION="20170403_779dbe1" HOMEPAGE="https://github.com/simsong/bulk_extractor/wiki" -DOWNLOAD="http://digitalcorpora.org/downloads/bulk_extractor/bulk_extractor-1.5.5.tar.gz" -MD5SUM="7155ce6938876be91416def15e44d585" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/bulk_extractor-20170403_779dbe1.tar.xz" +MD5SUM="96f0c04052c51e6746ba83dae9de145e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/caprice32/caprice32.SlackBuild b/system/caprice32/caprice32.SlackBuild index ac27dd4df4..5eb64c1059 100644 --- a/system/caprice32/caprice32.SlackBuild +++ b/system/caprice32/caprice32.SlackBuild @@ -70,6 +70,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +sed -i "s|-O2|$SLKCFLAGS -Wno-narrowing|" makefile.unix + make -f makefile.unix RELEASE=TRUE mkdir -p $PKG/usr/share/$PRGNAM $PKG/usr/bin diff --git a/system/clamav/clamav-0.99.2-gcc-6.patch b/system/clamav/clamav-0.99.2-gcc-6.patch new file mode 100644 index 0000000000..2031edbd38 --- /dev/null +++ b/system/clamav/clamav-0.99.2-gcc-6.patch @@ -0,0 +1,84 @@ +diff --git a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h +index 59ff6aa..1325394 100644 +--- a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h ++++ b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h +@@ -169,3 +169,3 @@ public: + KeyLength+1; +- unsigned Alignment = alignof(); ++ unsigned Alignment = alignOf(); + +diff --git a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h +index 88044c7..86b0f40 100644 +--- a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h ++++ b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h +@@ -417,3 +417,3 @@ namespace llvm { + ileAllocator.Allocate(sizeof(IndexListEntry), +- alignof())); ++ alignOf())); + +diff --git a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h +index 6a7a1a6..979e597 100644 +--- a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h ++++ b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h +@@ -51,8 +51,8 @@ struct AlignOf { + +-/// alignof - A templated function that returns the mininum alignment of ++/// alignOf - A templated function that returns the mininum alignment of + /// of a type. This provides no extra functionality beyond the AlignOf + /// class besides some cosmetic cleanliness. Example usage: +-/// alignof() returns the alignment of an int. ++/// alignOf() returns the alignment of an int. + template +-static inline unsigned alignof() { return AlignOf::Alignment; } ++static inline unsigned alignOf() { return AlignOf::Alignment; } + +diff --git a/libclamav/c++/llvm/include/llvm/Support/Allocator.h b/libclamav/c++/llvm/include/llvm/Support/Allocator.h +index 4a7251f..17caf5e 100644 +--- a/libclamav/c++/llvm/include/llvm/Support/Allocator.h ++++ b/libclamav/c++/llvm/include/llvm/Support/Allocator.h +@@ -203,3 +203,3 @@ public: + for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) { +- Ptr = Allocator.AlignPtr(Ptr, alignof()); ++ Ptr = Allocator.AlignPtr(Ptr, alignOf()); + if (Ptr + sizeof(T) <= End) +diff --git a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp +index b892d85..dc72346 100644 +--- a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp ++++ b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp +@@ -495,3 +495,3 @@ void SCEVUnknown::print(raw_ostream &OS) const { + if (isAlignOf(AllocTy)) { +- OS << "alignof(" << *AllocTy << ")"; ++ OS << "alignOf(" << *AllocTy << ")"; + return; +diff --git a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp +index 824021c..757ca50 100644 +--- a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp ++++ b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp +@@ -569,3 +569,3 @@ void Emitter::emitMemModRMByte(const MachineInstr &MI, + // Calculate what the SS field value should be... +- static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 }; ++ static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u }; + unsigned SS = SSTable[Scale.getImm()]; +diff --git a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp +index 9564fe0..b2b7986 100644 +--- a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp ++++ b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp +@@ -332,3 +332,3 @@ void X86MCCodeEmitter::EmitMemModRMByte(const MCInst &MI, unsigned Op, + // Calculate what the SS field value should be... +- static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 }; ++ static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u }; + unsigned SS = SSTable[Scale.getImm()]; +diff --git a/libclamav/mpool.c b/libclamav/mpool.c +index cd38e15..b5e537d 100644 +--- a/libclamav/mpool.c ++++ b/libclamav/mpool.c +@@ -417,3 +417,3 @@ static size_t from_bits(unsigned int bits) { + +-static inline unsigned int alignof(size_t size) ++static inline unsigned int alignOf(size_t size) + { +@@ -609,3 +609,3 @@ static void* allocate_aligned(struct MPMAP *mpm, size_t size, unsigned align, co + void *mpool_malloc(struct MP *mp, size_t size) { +- size_t align = alignof(size); ++ size_t align = alignOf(size); + size_t i, needed = align_increase(size+FRAG_OVERHEAD, align); diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild index b783811bf2..e6e23864e8 100644 --- a/system/clamav/clamav.SlackBuild +++ b/system/clamav/clamav.SlackBuild @@ -115,6 +115,9 @@ find -L . \ # Patch from upstream patch -p1 < $CWD/bb111711-fix-zlib-version-check.patch +# Thanks Archlinux for this patch +patch -p1 < $CWD/clamav-0.99.2-gcc-6.patch + # Specify the desired mirror in the update config file # http://www.iana.org/cctld/cctld-whois.htm sed -i "s/^\#DatabaseMirror.*/DatabaseMirror db.${COUNTRY}.clamav.net/" \ diff --git a/system/collectd/collectd.SlackBuild b/system/collectd/collectd.SlackBuild index bb766599fb..6cd6455363 100644 --- a/system/collectd/collectd.SlackBuild +++ b/system/collectd/collectd.SlackBuild @@ -11,7 +11,7 @@ # Modified by the SlackBuilds.org project PRGNAM=collectd -VERSION=${VERSION:-5.5.0} +VERSION=${VERSION:-5.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,9 +58,9 @@ find -L . \ -exec chmod 644 {} \; # Fix for gcc-4.8.x -sed -i "s|\ -Werror||" src/Makefile.in +sed -i "s|\ -Werror||" src/Makefile.in || exit 1 -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=format-truncation=" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -96,7 +96,7 @@ rm -fr $PKG/var/run $PKG/var/log mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS ChangeLog COPYING INSTALL README \ + AUTHORS ChangeLog COPYING README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/collectd/collectd.info b/system/collectd/collectd.info index e80a9d6584..2e2bb1c73e 100644 --- a/system/collectd/collectd.info +++ b/system/collectd/collectd.info @@ -1,8 +1,8 @@ PRGNAM="collectd" -VERSION="5.5.0" +VERSION="5.7.1" HOMEPAGE="http://collectd.org" -DOWNLOAD="http://collectd.org/files/collectd-5.5.0.tar.bz2" -MD5SUM="c39305ef5514b44238b0d31f77e29e6a" +DOWNLOAD="http://collectd.org/files/collectd-5.7.1.tar.bz2" +MD5SUM="dc36141ed3058c4919bbd54b87c07873" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/colord/colord.SlackBuild b/system/colord/colord.SlackBuild index ba98ed5883..fe8f40267e 100644 --- a/system/colord/colord.SlackBuild +++ b/system/colord/colord.SlackBuild @@ -103,6 +103,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 f0ecaf36c5..35bf46ff26 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/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/evilvte/evilvte.info b/system/evilvte/evilvte.info index e4cd913dd5..76d6079d62 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="Edinaldo P. Silva" EMAIL="edps.mundognu@gmail.com" 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/fakeroot/fakeroot.SlackBuild b/system/fakeroot/fakeroot.SlackBuild index ed0dbfb4b7..b3ba5e0918 100644 --- a/system/fakeroot/fakeroot.SlackBuild +++ b/system/fakeroot/fakeroot.SlackBuild @@ -70,6 +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 {} \; +# Patches for glibc-2.2.5 from Debian +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=830912 +patch -p1 < $CWD/glibc-xattr-types.patch +patch -p1 < $CWD/hide-dlsym-error.patch + ./bootstrap CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/system/fakeroot/glibc-xattr-types.patch b/system/fakeroot/glibc-xattr-types.patch new file mode 100644 index 0000000000..01962e2c38 --- /dev/null +++ b/system/fakeroot/glibc-xattr-types.patch @@ -0,0 +1,108 @@ +Fix the type of xattr functions to match the glibc headers. + +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -1570,7 +1570,7 @@ + #endif /* HAVE_CAPSET */ + + #if defined(HAVE_SETXATTR) || defined(HAVE_LSETXATTR) || defined(HAVE_FSETXATTR) +-static size_t common_setxattr(INT_STRUCT_STAT *st, const char *name, void * value, size_t size, int flags) ++static int common_setxattr(INT_STRUCT_STAT *st, const char *name, const void * value, size_t size, int flags) + { + xattr_args xattr; + xattr.name = name; +@@ -1625,7 +1625,7 @@ + #endif /* defined(HAVE_LISTXATTR) || defined(HAVE_LLISTXATTR) || defined(HAVE_FLISTXATTR) */ + + #if defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR) +-static size_t common_removexattr(INT_STRUCT_STAT *st, const char *name) ++static int common_removexattr(INT_STRUCT_STAT *st, const char *name) + { + xattr_args xattr; + xattr.name = name; +@@ -1643,7 +1643,7 @@ + #endif /* defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR) */ + + #ifdef HAVE_SETXATTR +-ssize_t setxattr(const char *path, const char *name, void *value, size_t size, int flags) ++int setxattr(const char *path, const char *name, const void *value, size_t size, int flags) + { + INT_STRUCT_STAT st; + int r; +@@ -1664,7 +1664,7 @@ + #endif /* HAVE_SETXATTR */ + + #ifdef HAVE_LSETXATTR +-ssize_t lsetxattr(const char *path, const char *name, void *value, size_t size, int flags) ++int lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags) + { + INT_STRUCT_STAT st; + int r; +@@ -1685,7 +1685,7 @@ + #endif /* HAVE_LSETXATTR */ + + #ifdef HAVE_FSETXATTR +-ssize_t fsetxattr(int fd, const char *name, void *value, size_t size, int flags) ++int fsetxattr(int fd, const char *name, const void *value, size_t size, int flags) + { + INT_STRUCT_STAT st; + int r; +@@ -1832,7 +1832,7 @@ + #endif /* HAVE_FLISTXATTR */ + + #ifdef HAVE_REMOVEXATTR +-ssize_t removexattr(const char *path, const char *name) ++int removexattr(const char *path, const char *name) + { + INT_STRUCT_STAT st; + int r; +@@ -1853,7 +1853,7 @@ + #endif /* HAVE_REMOVEXATTR */ + + #ifdef HAVE_LREMOVEXATTR +-ssize_t lremovexattr(const char *path, const char *name) ++int lremovexattr(const char *path, const char *name) + { + INT_STRUCT_STAT st; + int r; +@@ -1874,7 +1874,7 @@ + #endif /* HAVE_LREMOVEXATTR */ + + #ifdef HAVE_FREMOVEXATTR +-ssize_t fremovexattr(int fd, const char *name) ++int fremovexattr(int fd, const char *name) + { + INT_STRUCT_STAT st; + int r; +--- a/wrapfunc.inp ++++ b/wrapfunc.inp +@@ -168,22 +168,22 @@ + fgetxattr;ssize_t;(int fd, const char *name, void *value, size_t size);(fd, name, value, size) + #endif /* HAVE_FGETXATTR */ + #ifdef HAVE_SETXATTR +-setxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags) ++setxattr;int;(const char *path, const char *name, const void *value, size_t size, int flags);(path, name, value, size, flags) + #endif /* HAVE_SETXATTR */ + #ifdef HAVE_LSETXATTR +-lsetxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags) ++lsetxattr;int;(const char *path, const char *name, const void *value, size_t size, int flags);(path, name, value, size, flags) + #endif /* HAVE_LSETXATTR */ + #ifdef HAVE_FSETXATTR +-fsetxattr;ssize_t;(int fd, const char *name, void *value, size_t size, int flags);(fd, name, value, size, flags) ++fsetxattr;int;(int fd, const char *name, const void *value, size_t size, int flags);(fd, name, value, size, flags) + #endif /* HAVE_FSETXATTR */ + #ifdef HAVE_REMOVEXATTR +-removexattr;ssize_t;(const char *path, const char *name);(path, name) ++removexattr;int;(const char *path, const char *name);(path, name) + #endif /* HAVE_REMOVEXATTR */ + #ifdef HAVE_LREMOVEXATTR +-lremovexattr;ssize_t;(const char *path, const char *name);(path, name) ++lremovexattr;int;(const char *path, const char *name);(path, name) + #endif /* HAVE_LREMOVEXATTR */ + #ifdef HAVE_FREMOVEXATTR +-fremovexattr;ssize_t;(int fd, const char *name);(fd, name) ++fremovexattr;int;(int fd, const char *name);(fd, name) + #endif /* HAVE_FREMOVEXATTR */ + + #ifdef HAVE_FSTATAT + diff --git a/system/fakeroot/hide-dlsym-error.patch b/system/fakeroot/hide-dlsym-error.patch new file mode 100644 index 0000000000..3fd34c8778 --- /dev/null +++ b/system/fakeroot/hide-dlsym-error.patch @@ -0,0 +1,32 @@ +Description: Hide error from dlsym() + dlsym(), starting in glibc 2.24 actually reports errors. In our case, + we try to get ACL functions which are not in the glibc. This causes + failures in test suites, so hide those messages for non-debugging + purposes for now. It also makes the build logs annoying to read. +Author: Julian Andres Klode +Origin: vendor +Bug-Debian: https://bugs.debian.org/830912 +Forwarded: no +Last-Update: 2016-08-12 + +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -256,10 +256,16 @@ void load_library_symbols(void){ + /* clear dlerror() just in case dlsym() legitimately returns NULL */ + msg = dlerror(); + *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name); ++ + if ( (msg = dlerror()) != NULL){ +- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); +-/* abort ();*/ ++#ifdef LIBFAKEROOT_DEBUGGING ++ if (fakeroot_debug) { ++ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); ++/* abort ();*/ ++ } ++#endif + } ++ + } + } + 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/guake/guake.info b/system/guake/guake.info index 7e9cb5842e..8e6b7295c2 100644 --- a/system/guake/guake.info +++ b/system/guake/guake.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/Guake/guake/archive/0.8.9/guake-0.8.9.tar.gz" MD5SUM="43aababf48f04e0e5d0cadc5b3d13935" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gnome-common gnome-python2-gconf python-keybinder pyxdg" +REQUIRES="gnome-common gnome-python2-gconf python-keybinder pyxdg vte2" MAINTAINER="Donald Cooley" EMAIL="chytraeu@sdf.org" diff --git a/system/guefi/README b/system/guefi/README new file mode 100644 index 0000000000..63caa688ed --- /dev/null +++ b/system/guefi/README @@ -0,0 +1,3 @@ +GUEFI is a Python/GTK+3 application that acts as a frontend for +efibootmgr. It provides an easy to use interface for managing +UEFI boot options. diff --git a/system/guefi/guefi.SlackBuild b/system/guefi/guefi.SlackBuild new file mode 100644 index 0000000000..a515d4ceb6 --- /dev/null +++ b/system/guefi/guefi.SlackBuild @@ -0,0 +1,91 @@ +#!/bin/sh + +# Slackware build script for guefi + +# Copyright 2017 Matteo Bernardini , 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/kyotocabinet/kyotocabinet-1.2.76-gcc6.patch b/system/kyotocabinet/kyotocabinet-1.2.76-gcc6.patch new file mode 100644 index 0000000000..d565cff0f3 --- /dev/null +++ b/system/kyotocabinet/kyotocabinet-1.2.76-gcc6.patch @@ -0,0 +1,45 @@ +Patch from Andreas Stührk to work around build +failures with GCC >= 6 like: + +In file included from kcdbext.cc:16:0: +kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)': +kcdbext.h:1281:14: error: cannot convert 'bool' to 'char*' in return + return false; + ^~~~~ +In file included from kclangc.cc:17:0: +kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)': +kcdbext.h:1281:14: error: cannot convert 'bool' to 'char*' in return + return false; + ^~~~~ + +Note that using '\0' rather nullptr (like the patch from openSUSE is +doing) just leads to new build failures with GCC >= 7 like: + +In file included from kcdbext.cc:16:0: +kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)': +kcdbext.h:1281:14: error: invalid conversion from 'char' to 'char*' [-fpermissive] + return '\0'; + ^~~~ +In file included from kclangc.cc:17:0: +kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)': +kcdbext.h:1281:14: error: invalid conversion from 'char' to 'char*' [-fpermissive] + return '\0'; + ^~~~ + +See also: + + - https://bugzilla.redhat.com/show_bug.cgi?id=1307706 + - https://build.opensuse.org/package/view_file/devel:libraries:c_c++/kyotocabinet/gcc6-fix-errors.patch?expand=1 + - https://bugs.debian.org/811627 + +--- kyotocabinet-1.2.76/kcdbext.h 2016-05-25 11:32:53.591866016 +0200 ++++ kyotocabinet-1.2.76/kcdbext.h 2012-05-24 18:27:59.000000000 +0200 +@@ -1278,7 +1278,7 @@ + if (omode_ == 0) { + set_error(_KCCODELINE_, BasicDB::Error::INVALID, "not opened"); + *sp = 0; +- return false; ++ return nullptr; + } + if (!cache_) return db_.get(kbuf, ksiz, sp); + size_t dvsiz = 0; diff --git a/system/kyotocabinet/kyotocabinet.SlackBuild b/system/kyotocabinet/kyotocabinet.SlackBuild index 6cb8823a5a..5efbfdb944 100644 --- a/system/kyotocabinet/kyotocabinet.SlackBuild +++ b/system/kyotocabinet/kyotocabinet.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for kyotocabinet -# Copyright 2013 Matteo Bernardini , Pisa, Italy +# Copyright 2013-2017 Matteo Bernardini , Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Patch for gcc >= 6.x - thanks to opensuse +patch -p1 < $CWD/kyotocabinet-1.2.76-gcc6.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ 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 05fb18a37a..d99cce7266 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="http://lilyterm.luna.com.tw/index.html" -DOWNLOAD="http://lilyterm.luna.com.tw/file/lilyterm-0.9.9.2.tar.gz" -MD5SUM="d68dd29ce4894f765adba1efd470f90e" +DOWNLOAD="http://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/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info index 05df07ceb8..29e8a83f51 100644 --- a/system/lxterminal/lxterminal.info +++ b/system/lxterminal/lxterminal.info @@ -5,6 +5,6 @@ DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxterminal-20170514_0f2ca0 MD5SUM="a39e193d3f392c4e0e7300d3b6a57ce7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="vte2" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/system/lzop/lzop-1.03-gcc6.patch b/system/lzop/lzop-1.03-gcc6.patch new file mode 100644 index 0000000000..9bd8a6bf9c --- /dev/null +++ b/system/lzop/lzop-1.03-gcc6.patch @@ -0,0 +1,26 @@ +--- src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100 ++++ src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 +@@ -4469,12 +4469,12 @@ + #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) + #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) + #else +- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) ++ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) + #endif + ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) + #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) + #else +- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) ++ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) + #endif + ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) + #if defined(acc_int16e_t) +@@ -4703,7 +4703,7 @@ + #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) + #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) + #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) +- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) ++ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) + #endif + #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) + # pragma option pop diff --git a/system/lzop/lzop.SlackBuild b/system/lzop/lzop.SlackBuild index fd0279df72..299a04577f 100644 --- a/system/lzop/lzop.SlackBuild +++ b/system/lzop/lzop.SlackBuild @@ -72,6 +72,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks to opensuse for this patch +patch -p0 < $CWD/lzop-1.03-gcc6.patch + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/nvidia-legacy340-kernel/4.9.patch b/system/nvidia-legacy340-kernel/4.9.patch new file mode 100644 index 0000000000..6a47f79374 --- /dev/null +++ b/system/nvidia-legacy340-kernel/4.9.patch @@ -0,0 +1,15 @@ +diff -Naur a/kernel/nv-drm.c b/kernel/nv-drm.c +--- a/kernel/nv-drm.c 2016-12-15 12:41:26.000000000 +0100 ++++ b/kernel/nv-drm.c 2016-12-15 12:58:48.000000000 +0100 +@@ -115,7 +115,11 @@ + }; + + static struct drm_driver nv_drm_driver = { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++ .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY, ++#else + .driver_features = DRIVER_GEM | DRIVER_PRIME, ++#endif + .load = nv_drm_load, + .unload = nv_drm_unload, + .fops = &nv_drm_fops, diff --git a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild index 2a2ba90016..cbf13d01fc 100644 --- a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild +++ b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.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 {} \; +# Apply a patch for kernel 4.9.x +patch -p1 < $CWD/4.9.patch + (cd kernel || exit 1 make SYSSRC=$KERNELPATH module || exit 1 cd uvm diff --git a/system/opensc/opensc.SlackBuild b/system/opensc/opensc.SlackBuild index e7dc5c71e3..2cfddd439d 100644 --- a/system/opensc/opensc.SlackBuild +++ b/system/opensc/opensc.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=opensc -VERSION=${VERSION:-0.15.0} +VERSION=${VERSION:-0.16.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} -DOCFILES="README COPYING NEWS ChangeLog" -XSL_STYLESHEETS_VER=1.78.1 +DOCFILES="README COPYING NEWS" +XSL_STYLESHEETS_VER=1.79.1 # opensc now supports only one reader subsystem (pcsc-lite or openct) OPENCT=${OPENCT:-0} # pcsc-lite is the default, openct disabled @@ -51,8 +51,8 @@ case "$OPENCT" in *) RDRSUBSYS_flags="--disable-pcsc --enable-openct" ;; esac -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/system/opensc/opensc.info b/system/opensc/opensc.info index 91496b60e0..d536fa91ad 100644 --- a/system/opensc/opensc.info +++ b/system/opensc/opensc.info @@ -1,8 +1,8 @@ PRGNAM="opensc" -VERSION="0.15.0" +VERSION="0.16.0" HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki/" -DOWNLOAD="http://downloads.sourceforge.net/opensc/OpenSC/opensc-0.15.0.tar.gz" -MD5SUM="34c55315b7f381bd047b6435933baab4" +DOWNLOAD="https://sourceforge.net/projects/opensc/files/OpenSC/opensc-0.16.0/opensc-0.16.0.tar.gz" +MD5SUM="724d128f23cd7a74b28d04300ce7bcbd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pcsc-lite" diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild index b0d9c0f940..b629e3bec0 100644 --- a/system/qemu/qemu.SlackBuild +++ b/system/qemu/qemu.SlackBuild @@ -52,10 +52,11 @@ # 4.2 05-JUN-2017 version update to 2.9 release PRGNAM=qemu -VERSION=${VERSION:-2.9.0} +VERSION=${VERSION:-2.10.0_rc1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +SRCVER=$(echo $VERSION | tr _ - ) KVMGROUP=${KVMGROUP:-users} TARGETS=${TARGETS:-some} VNC_ENABLE=${VNC_ENABLE:-yes} @@ -100,9 +101,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/system/qemu/qemu.info b/system/qemu/qemu.info index fe4190cc0c..4fa10f1090 100644 --- a/system/qemu/qemu.info +++ b/system/qemu/qemu.info @@ -1,8 +1,8 @@ PRGNAM="qemu" -VERSION="2.9.0" +VERSION="2.10.0_rc1" HOMEPAGE="http://www.qemu-project.org" -DOWNLOAD="http://download.qemu-project.org/qemu-2.9.0.tar.xz" -MD5SUM="86c95eb3b24ffea3a84a4e3a856b4e26" +DOWNLOAD="http://download.qemu-project.org/qemu-2.10.0-rc1.tar.xz" +MD5SUM="e66826ab255bf922a763410146f9a249" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/qtfm/gcc6.patch b/system/qtfm/gcc6.patch new file mode 100644 index 0000000000..166ef0a79e --- /dev/null +++ b/system/qtfm/gcc6.patch @@ -0,0 +1,12 @@ +diff -Naur qtfm.orig/src/mymodel.cpp qtfm/src/mymodel.cpp +--- qtfm.orig/src/mymodel.cpp 2013-05-25 19:25:38.000000000 +0200 ++++ qtfm/src/mymodel.cpp 2017-05-31 17:12:54.877169485 +0200 +@@ -220,7 +220,7 @@ + + if(item) return item->absoluteFilePath(); + +- return false; ++ return ""; + } + + //--------------------------------------------------------------------------------------- diff --git a/system/qtfm/qtfm.SlackBuild b/system/qtfm/qtfm.SlackBuild index 59cb3c3203..d7a2e4eb1d 100644 --- a/system/qtfm/qtfm.SlackBuild +++ b/system/qtfm/qtfm.SlackBuild @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qtfm -VERSION=${VERSION:-5.5} +VERSION=${VERSION:-5.9} +SRCVER=${SRCVER:-158787} 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.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM +unzip $CWD/$SRCVER-$PRGNAM.zip +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 \) \ @@ -69,6 +70,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/gcc6.patch + # Set doc path to /usr/doc/$PRGNAM-$VERSION in qtfm.pro sed -i "s,usr/share/doc/$PRGNAM,usr/doc/$PRGNAM-$VERSION," qtfm.pro diff --git a/system/qtfm/qtfm.info b/system/qtfm/qtfm.info index f47835683e..e209d2cb6c 100644 --- a/system/qtfm/qtfm.info +++ b/system/qtfm/qtfm.info @@ -1,8 +1,8 @@ PRGNAM="qtfm" -VERSION="5.5" -HOMEPAGE="http://www.qtfm.org/" -DOWNLOAD="http://www.qtfm.org/qtfm-5.5.tar.gz" -MD5SUM="cc1d930503bf0dedc824d6f2abdda719" +VERSION="5.9" +HOMEPAGE="http://www.qtfm.org" +DOWNLOAD="https://dl.opendesktop.org/api/files/download/id/1466643163/158787-qtfm.zip" +MD5SUM="1a94bd7fbe99e87f530dc9bc1d7a8c45" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/rhash/rhash.SlackBuild b/system/rhash/rhash.SlackBuild index eeeb01b5d0..e891df327f 100644 --- a/system/rhash/rhash.SlackBuild +++ b/system/rhash/rhash.SlackBuild @@ -30,8 +30,8 @@ # П.П. Честит ден на Освобождението, българи! PRGNAM=rhash -VERSION=${VERSION:-1.3.3} -BUILD=${BUILD:-3} +VERSION=${VERSION:-1.3.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} # Shall we compile with OpenSSL support? @@ -93,7 +93,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # -DUSE_GETTEXT = internationalization support -make ADDCFLAGS="${SLKCFLAGS} -DUSE_GETTEXT ${OPTCFLAGS}" \ +make -j1 ADDCFLAGS="${SLKCFLAGS} -DUSE_GETTEXT ${OPTCFLAGS}" \ ADDLDFLAGS="${OPTLDFLAGS}" \ PREFIX=/usr \ MANDIR=/usr/man \ diff --git a/system/rhash/rhash.info b/system/rhash/rhash.info index 0673a04919..8b25f74a9b 100644 --- a/system/rhash/rhash.info +++ b/system/rhash/rhash.info @@ -1,8 +1,8 @@ PRGNAM="rhash" -VERSION="1.3.3" +VERSION="1.3.4" HOMEPAGE="http://rhash.anz.ru/?l=en" -DOWNLOAD="http://downloads.sourceforge.net/rhash/rhash-1.3.3-src.tar.gz" -MD5SUM="0e3c758b5e4b25e29e0094a33a9d2764" +DOWNLOAD="http://downloads.sourceforge.net/rhash/rhash-1.3.4-src.tar.gz" +MD5SUM="0b51010604659e9e99f6307b053ba13b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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/tp_smapi/tp_smapi.SlackBuild b/system/tp_smapi/tp_smapi.SlackBuild index b4d5573efd..b95a7238d6 100644 --- a/system/tp_smapi/tp_smapi.SlackBuild +++ b/system/tp_smapi/tp_smapi.SlackBuild @@ -22,7 +22,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tp_smapi -VERSION=${VERSION:-0.41} +VERSION=${VERSION:-0.42} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,9 +60,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf $PRGNAM-tp-smapi-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +cd $PRGNAM-tp-smapi-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/system/tp_smapi/tp_smapi.info b/system/tp_smapi/tp_smapi.info index 498d83db04..2c682a859c 100644 --- a/system/tp_smapi/tp_smapi.info +++ b/system/tp_smapi/tp_smapi.info @@ -1,8 +1,8 @@ PRGNAM="tp_smapi" -VERSION="0.41" +VERSION="0.42" HOMEPAGE="https://github.com/evgeni/tp_smapi" -DOWNLOAD="https://github.com/downloads/evgeni/tp_smapi/tp_smapi-0.41.tar.gz" -MD5SUM="63c683415c764568f6bf17c7eabe4752" +DOWNLOAD="https://github.com/evgeni/tp_smapi/archive/tp-smapi/0.42/tp_smapi-0.42.tar.gz" +MD5SUM="6a51d3aa459ad7a6ebfbb8c29527b3ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ttyrec/ttyrec.SlackBuild b/system/ttyrec/ttyrec.SlackBuild index caecc00574..4b4f00653b 100644 --- a/system/ttyrec/ttyrec.SlackBuild +++ b/system/ttyrec/ttyrec.SlackBuild @@ -72,7 +72,7 @@ find -L . \ # Fixed: "Out of pty's Terminated" patch -p1 < $CWD/ttyrec-1.0.8.RHEL5.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/upx/upx.SlackBuild b/system/upx/upx.SlackBuild index 2f139e743f..61c2d5a537 100644 --- a/system/upx/upx.SlackBuild +++ b/system/upx/upx.SlackBuild @@ -55,6 +55,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +sed -i "s|^CXXFLAGS_WERROR.*|CXXFLAGS_WERROR =|" src/Makefile + # Extract LZMA SDK to a proper place for use at build-time mkdir -p $TMP/lzma465 tar xvf $CWD/lzma465.tar.bz2 -C $TMP/lzma465 diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index 5ad4476b66..1b06e4d4bf 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -24,7 +24,7 @@ # Initialize variables PRGNAM=vice -VERSION=${VERSION:-3.0} +VERSION=${VERSION:-3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -79,8 +79,7 @@ find -L . \ -exec chmod 644 {} \; # Set proper paths in documentation. -sed -i "s/\/usr\/local\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" \ - man/vice.1 src/geninfocontrib_h.sh src/arch/win32/utils/geninfocontrib.c +sed -i "s/\/usr\/local\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" man/vice.1 sed -i 's/"\/vice_toc\.html"/"\/html\/vice_toc\.html"/g' \ src/arch/unix/gui/uicommands.c sed -i "s/\/usr\/local/\/usr/g" doc/vice.* doc/html/*html @@ -113,7 +112,6 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-quicktime \ --enable-ethernet \ --enable-parsid \ - --enable-memmap \ --enable-gnomeui \ --build=$ARCH-slackware-linux diff --git a/system/vice/vice.info b/system/vice/vice.info index 094b1ebd7e..b42b7a439d 100644 --- a/system/vice/vice.info +++ b/system/vice/vice.info @@ -1,8 +1,8 @@ PRGNAM="vice" -VERSION="3.0" +VERSION="3.1" HOMEPAGE="http://vice-emu.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/vice-emu/vice-3.0.tar.gz" -MD5SUM="c732d76a70ac1232a43456dae540b43a" +DOWNLOAD="http://downloads.sourceforge.net/vice-emu/vice-3.1.tar.gz" +MD5SUM="f9018ca464b863da0bb1a82c56374432" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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 \ -- cgit v1.2.3